MDL-19787 Converted all print_footer() calls

admin/auth_config.php

@@ -76,7 +76,7 @@ echo '<p style="text-align: center"><input type="submit" value="' . get_string("
 echo "</div>\n";
 echo "</form>\n";
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 exit;
 
 /// Functions /////////////////////////////////////////////////////////////////

admin/block.php

@@ -71,6 +71,6 @@
     print_box_end();
 
     echo '</form>';
-    print_footer();
+    echo $OUTPUT->footer();
 
 ?>

admin/blocks.php

@@ -60,7 +60,7 @@
             notice_yesno(get_string('blockdeleteconfirm', '', $strblockname),
                          'blocks.php?delete='.$block->id.'&confirm=1&sesskey='.sesskey(),
                          'blocks.php');
-            admin_externalpage_print_footer();
+            echo $OUTPUT->footer();
             exit;
 
         } else {
@@ -212,6 +212,6 @@
         $table->print_html();
     }
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

admin/dbtransfer/dbexport.php

@@ -18,4 +18,4 @@ if ($data = $form->get_data()) {
 admin_externalpage_print_header();
 // TODO: add some more info here
 $form->display();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();

admin/dbtransfer/index.php

@@ -35,7 +35,7 @@ if ($data = $form->get_data()) {
     // Finish up.
     notify(get_string('success'), 'notifysuccess');
     print_continue("$CFG->wwwroot/$CFG->admin/");
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
     die;
 }
 
@@ -44,4 +44,4 @@ admin_externalpage_print_header();
 echo $OUTPUT->heading(get_string('transferdbtoserver', 'dbtransfer'));
 echo '<p>', get_string('transferdbintro', 'dbtransfer'), "</p>\n\n";
 $form->display();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();

admin/delete.php

@@ -24,7 +24,7 @@
         $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey());
         notice_yesno ('Are you completely sure you want to delete everything inside the directory '. $deletedir .' ?',
             'delete.php', 'index.php', $optionsyes, NULL, 'post', 'get');
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -32,7 +32,7 @@
         $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey(), 'reallysure'=>'yes');
         notice_yesno ('Are you REALLY REALLY completely sure you want to delete everything inside the directory '. $deletedir .' (this includes all user images, and any other course files that have been created) ?',
             'delete.php', 'index.php', $optionsyes, NULL, 'post', 'get');
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -46,7 +46,7 @@
 
     echo '<h1 align="center">Done!</h1>';
     print_continue($CFG->wwwroot);
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
     exit;
 
 

admin/enrol.php

@@ -136,6 +136,6 @@
     echo '</div>';
     echo '</form>';
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

admin/enrol_config.php

@@ -64,7 +64,7 @@
     echo "</div>";
     echo "</form>";
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
     exit;
 ?>

admin/environment.php

@@ -132,5 +132,5 @@
     $status = check_moodle_environment($version, $environment_results);
 
 /// Print footer
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 ?>

admin/filters.php

@@ -123,7 +123,7 @@
             notice_yesno(get_string('deletefilterareyousuremessage', 'admin', $filtername), $returnurl .
                     '?action=delete&filterpath=' . $filterpath . '&confirm=1&sesskey=' . sesskey(),
                     $returnurl, NULL, NULL, 'post', 'get');
-            admin_externalpage_print_footer();
+            echo $OUTPUT->footer();
             exit;
         }
 
@@ -140,7 +140,7 @@
         $a->directory = $filterpath;
         print_box(get_string('deletefilterfiles', 'admin', $a), 'generalbox', 'notice');
         print_continue($returnurl);
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -219,7 +219,7 @@
 
     print_table($table);
     echo '<p class="filtersettingnote">' . get_string('filterallwarning', 'filters') . '</p>';
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 /// Display helper functions ===================================================
 

admin/generator.php

@@ -1209,7 +1209,7 @@ class generator_web extends generator {
         if (!has_capability('moodle/site:doanything', $systemcontext)) {
             // If not logged in, give link to login page for current site
             notify("You must be logged in as administrator before using this script.");
-            print_footer();
+            echo $OUTPUT->footer();
             require_login();
         } else {
             $this->mform->display();
@@ -1218,7 +1218,8 @@ class generator_web extends generator {
     }
 
     public function __destroy() {
-        print_footer();
+        global $OUTPUT;
+        echo $OUTPUT->footer();
     }
 }
 

admin/health.php

@@ -100,7 +100,7 @@ STYLES;
     }
 
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 
 function health_find_problems() {

admin/index.php

@@ -129,7 +129,7 @@ if (!core_tables_exist()) {
         echo '<br />';
         notice_yesno(get_string('doyouagree'), "index.php?agreelicense=1&lang=$CFG->lang",
                                                "http://docs.moodle.org/en/License");
-        print_footer();
+        echo $OUTPUT->footer();
         die;
     }
     if (empty($confirmrelease)) {
@@ -149,7 +149,7 @@ if (!core_tables_exist()) {
             print_continue("index.php?agreelicense=1&amp;confirmrelease=1&amp;lang=$CFG->lang");
         }
 
-        print_footer();
+        echo $OUTPUT->footer();
         die;
     }
 
@@ -193,7 +193,7 @@ if ($version > $CFG->version) {  // upgrade
         $continueform->method = 'get';
         $continueform->url = new moodle_url('index.php', array('confirmupgrade' => 1));
         echo $OUTPUT->confirm(get_string('upgradesure', 'admin', $a->newversion), $continueform, 'index.php');
-        print_footer();
+        echo $OUTPUT->footer();
         exit;
 
     } else if (empty($confirmrelease)){
@@ -218,7 +218,7 @@ if ($version > $CFG->version) {  // upgrade
             print_continue('index.php?confirmupgrade=1&amp;confirmrelease=1');
         }
 
-        print_footer();
+        echo $OUTPUT->footer();
         die;
 
     } elseif (empty($confirmplugins)) {
@@ -232,7 +232,7 @@ if ($version > $CFG->version) {  // upgrade
         print_plugin_tables();
         print_upgrade_reload('index.php?confirmupgrade=1&amp;confirmrelease=1');
         print_continue('index.php?confirmupgrade=1&amp;confirmrelease=1&amp;confirmplugincheck=1');
-        print_footer();
+        echo $OUTPUT->footer();
         die();
 
     } else {
@@ -381,5 +381,5 @@ $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
 print_box($copyrighttext, 'copyright');
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 

admin/innodb.php

@@ -32,13 +32,13 @@
         }
         notify('... done.', 'notifysuccess');
         print_continue('index.php');
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
 
     } else {
         $optionsyes = array('confirm'=>'1', 'sesskey'=>sesskey());
         notice_yesno('Are you sure you want convert all your tables to the InnoDB format?',
                      'innodb.php', 'index.php', $optionsyes, NULL, 'post', 'get');
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
     }
 
 ?>

admin/lang.php

@@ -142,7 +142,7 @@
         $langs = get_list_of_languages(false, true);
         popup_form ("$CFG->wwwroot/$CFG->admin/lang.php?lang=", $langs, "chooselang", $currlang, "", "", "", false, 'self', $strcurrentlanguage.':');
         print_box_end();
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -905,7 +905,7 @@
     } // fi $mode == 'helpfiles'
 
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 //////////////////////////////////////////////////////////////////////
 

admin/langimport.php

@@ -14,7 +14,7 @@
     if (!empty($CFG->skiplangupgrade)) {
         admin_externalpage_print_header();
         print_box(get_string('langimportdisabled', 'admin'));
-        print_footer();
+        echo $OUTPUT->footer();
         die;
     }
 
@@ -107,7 +107,7 @@
                 notice_yesno(get_string('uninstallconfirm', 'admin', $uninstalllang),
                              'langimport.php?mode='.DELETION_OF_SELECTED_LANG.'&uninstalllang='.$uninstalllang.'&confirm=1&sesskey='.sesskey(),
                              'langimport.php');
-                print_footer();
+                echo $OUTPUT->footer();
                 die;
 
             } else if (confirm_sesskey()) {
@@ -391,7 +391,7 @@
     echo '</td></tr></table>';
     print_box_end();
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
     /**
      * Returns a list of available language packs from a

admin/mnet/access_control.php

@@ -232,6 +232,6 @@ foreach ($formerror as $error) {
 }
 
 print_simple_box_end();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

admin/mnet/delete.html

@@ -51,5 +51,5 @@ echo $OUTPUT->heading(get_string('mnetsettings', 'mnet'));
     </table>
 </div>
 <?php
-print_footer();
+echo $OUTPUT->footer();
 ?>

admin/mnet/enr_course_enrol.php

@@ -305,6 +305,6 @@ if (!empty($errors)) {
 }
 
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

admin/mnet/enr_courses.php

@@ -51,6 +51,6 @@
     }
     echo '</table></div>';
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

admin/mnet/enr_hosts.php

@@ -54,6 +54,6 @@
     echo '</table>'
        . '</div>';
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

admin/mnet/index.php

@@ -139,5 +139,5 @@
 </center>
 
 <?php
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

admin/mnet/mnet_review.html

@@ -153,5 +153,5 @@ if (!empty($credentials)) {
 </form>
 <?php
 print_simple_box_end();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

admin/mnet/mnet_review_allhosts.html

@@ -19,5 +19,5 @@ print_simple_box_start("center", "");
 </table>
 <?php
 print_simple_box_end();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

admin/mnet/mnet_services.html

@@ -102,5 +102,5 @@ print_simple_box_start("center", "");
 </form>
 <?php
 print_simple_box_end();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

admin/mnet/mnet_themes.html

@@ -123,5 +123,5 @@ print_tabs(array($tabs), 'mnetthemes');
     echo "</table>";
 
 $THEME = $original_theme;
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

admin/mnet/peers.html

@@ -97,5 +97,5 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
     </form>
 </div>
 <?php
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

admin/mnet/trustedhosts.html

@@ -64,5 +64,5 @@ admin_externalpage_print_header();
 </table>
 </div>
 <?php
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

admin/modules.php

@@ -80,7 +80,7 @@
             notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename),
                          "modules.php?delete=$delete&confirm=1&sesskey=".sesskey(),
                          "modules.php");
-            admin_externalpage_print_footer();
+            echo $OUTPUT->footer();
             exit;
 
         } else {  // Delete everything!!
@@ -262,6 +262,6 @@
 
     $table->print_html();
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

admin/multilangupgrade.php

@@ -19,7 +19,7 @@ $strmultilangupgrade = get_String('multilangupgradeinfo', 'admin');
 if (!$go or !data_submitted() or !confirm_sesskey()) {   /// Print a form
     $optionsyes = array('go'=>1, 'sesskey'=>sesskey());
     notice_yesno($strmultilangupgrade, 'multilangupgrade.php', 'index.php', $optionsyes, null, 'post', 'get');
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
     die;
 }
 
@@ -102,7 +102,7 @@ notify('...finished', 'notifysuccess');
 
 print_continue('index.php');
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 die;
 
 

admin/oacleanup.php

@@ -9,7 +9,7 @@ if (!isset($CFG)) {
 
     admin_externalpage_print_header();
     online_assignment_cleanup(true);
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 }
 

admin/phpinfo.php

@@ -28,6 +28,6 @@
 
     echo '</div>';
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

admin/portfolio.php

@@ -110,5 +110,5 @@ if (!empty($return)) {
     // normal display. fall through to here (don't call exit) if you want this to run
     redirect($baseurl);
 }
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

admin/qtypes.php

@@ -125,7 +125,7 @@
             notice_yesno(get_string('deleteqtypeareyousuremessage', 'admin', $qtypename),
                     admin_url('qtypes.php?delete=' . $delete . '&confirm=1&sesskey=' . sesskey()),
                     admin_url('qtypes.php'), NULL, NULL, 'post', 'get');
-            admin_externalpage_print_footer();
+            echo $OUTPUT->footer();
             exit;
         }
 
@@ -150,7 +150,7 @@
         $a->directory = $QTYPES[$delete]->plugin_dir();
         print_box(get_string('qtypedeletefiles', 'admin', $a), 'generalbox', 'notice');
         print_continue(admin_url('qtypes.php'));
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -259,7 +259,7 @@
 
     $table->finish_output();
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 function admin_url($endbit) {
     global $CFG;

admin/register.php

@@ -185,4 +185,4 @@
     echo "</form>\n";
 
 /// Print footer
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();

admin/replace.php

@@ -28,7 +28,7 @@ if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Pr
     echo '</form>';
     echo '</div>';
     print_simple_box_end();
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
     die;
 }
 
@@ -57,6 +57,6 @@ notify('...finished', 'notifysuccess');
 
 print_continue('index.php');
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

admin/report/backups/index.php

@@ -129,6 +129,6 @@
         print_simple_box_end();
     }
 
-    print_footer();
+    echo $OUTPUT->footer();
 
 ?>

admin/report/capability/index.php

@@ -157,7 +157,7 @@ if ($capability) {
 }
 
 // Footer.
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 function print_report_tree($contextid, $contexts, $allroles) {
     global $CFG;

admin/report/configlog/index.php

@@ -105,4 +105,4 @@ $rs->close();
 
 print_table($table);
 
-print_footer('none');
+echo $OUTPUT->footer();

admin/report/courseoverview/index.php

@@ -114,6 +114,6 @@
             print_table($table);
         }
     }
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

admin/report/questioninstances/index.php

@@ -126,5 +126,5 @@ if ($requestedqtype) {
 }
 
 // Footer.
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

admin/report/security/index.php

@@ -124,4 +124,4 @@ if ($issue and ($result = $issue(true))) {
     print_table($table);
 }
 
-print_footer();
+echo $OUTPUT->footer();

admin/report/spamcleaner/index.php

@@ -289,6 +289,6 @@ function print_spamcleaner_javascript()  {
     //$sesskey = sesskey();
 }
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

admin/report/unittest/dbtest.php

@@ -144,6 +144,6 @@ if (!data_submitted() || !$codecoverage) {
 }
 
 // Footer.
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

admin/report/unittest/index.php

@@ -148,6 +148,6 @@ if (is_null($path) || !$codecoverage) {
 }
 
 // Footer.
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

admin/repository.php

@@ -167,4 +167,4 @@ else if (!empty($move) && !empty($type)) {
 if (!empty($return)) {
     redirect($baseurl);
 }
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();

admin/repositoryinstance.php

@@ -130,4 +130,4 @@ if (!empty($return)) {
 
     redirect($baseurl);
 }
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();

admin/roles/allow.php

@@ -80,5 +80,5 @@
     echo '<div class="buttons"><input type="submit" name="submit" value="'.get_string('savechanges').'"/>';
     echo '</div></form>';
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 ?>

admin/roles/assign.php

@@ -455,4 +455,4 @@
         }
     }
 
-    print_footer();
+    echo $OUTPUT->footer();

admin/roles/check.php

@@ -193,5 +193,5 @@
                 get_string('backtopageyouwereon') . '</a></div>';
     }
 
-    print_footer();
+    echo $OUTPUT->footer();
 ?>

admin/roles/define.php

@@ -185,5 +185,5 @@
     echo '<p><a href="' . $manageurl . '">' . get_string('backtoallroles', 'role') . '</a></p>';
     echo '</div>';
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 ?>

admin/roles/explain.php

@@ -274,5 +274,5 @@ if ($userid && $capability != 'moodle/site:doanything' && !$userhascapability &&
     echo '<p>' . get_string('explainpermissionsdoanything', 'role', $capability) . '</p>';
 }
 echo $OUTPUT->close_window_button();
-print_footer('empty');
+echo $OUTPUT->footer();
 ?>

admin/roles/manage.php

@@ -90,7 +90,7 @@
                 $a->shortname = $roles[$roleid]->shortname;
                 $a->count = $DB->count_records('role_assignments', array('roleid'=>$roleid));
                 notice_yesno(get_string('deleterolesure', 'role', $a), $baseurl, $baseurl, $optionsyes, NULL, 'post', 'get');
-                admin_externalpage_print_footer();
+                echo $OUTPUT->footer();
                 die;
             }
             if (!delete_role($roleid)) {
@@ -170,7 +170,7 @@
                     $warning = get_string('resetrolesure', 'role', $a);
                 }
                 notice_yesno($warning, 'manage.php', 'manage.php', $optionsyes, $optionsno, 'post', 'get');
-                admin_externalpage_print_footer();
+                echo $OUTPUT->footer();
                 die;
             }
 
@@ -262,7 +262,7 @@
     print_single_button($defineurl, array('action' => 'add'), get_string('addrole', 'role'), 'get');
     echo '</div>';
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
     die;
 
 function get_action_icon($url, $icon, $alt, $tooltip) {

admin/roles/override.php

@@ -267,4 +267,4 @@
         }
     }
 
-    print_footer();
+    echo $OUTPUT->footer();

admin/roles/usersroles.php

@@ -156,7 +156,7 @@ if (!$roleassignments) {
 
 /// End of page.
 print_box_end();
-print_footer($course);
+echo $OUTPUT->footer();
 
 function print_report_tree($contextid, $contexts, $systemcontext, $fullname) {
     global $CFG, $OUTPUT;

admin/search.php

@@ -60,6 +60,6 @@ if ($resultshtml != '') {
 echo '</fieldset>';
 echo '</form>';
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

admin/settings.php

@@ -128,6 +128,6 @@ if (empty($SITE->fullname)) {
     echo '</form>';
 }
 
-print_footer();
+echo $OUTPUT->footer();
 
 ?>

admin/timezone.php

@@ -44,6 +44,6 @@
     echo '<input type="submit" value="'.s($strsavechanges).'" />';
     echo "</form></center>";
 
-    print_footer();
+    echo $OUTPUT->footer();
 
 ?>

admin/timezoneimport.php

@@ -32,7 +32,7 @@
 
         notice_yesno($message, 'timezoneimport.php?ok=1&sesskey='.sesskey(), 'index.php');
 
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -121,6 +121,6 @@
         print_continue('index.php');
     }
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

admin/upgradesettings.php

@@ -65,6 +65,6 @@ echo '<div class="form-buttons"><input class="form-submit" type="submit" value="
 echo '</div>';
 echo '</form>';
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

admin/uploadpicture.php

@@ -107,7 +107,7 @@ if ($formdata = $mform->get_data()) {
     }
 }
 $mform->display();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 exit;
 
 // ----------- Internal functions ----------------

admin/uploaduser.php

@@ -108,7 +108,7 @@ if (empty($iid)) {
         admin_externalpage_print_header();
         print_heading_with_help(get_string('uploadusers'), 'uploadusers3');
         $mform->display();
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         die;
     }
 } else {
@@ -733,7 +733,7 @@ if ($formdata = $mform->is_cancelled()) {
     } else {
         print_continue($returnurl);
     }
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
     die;
 }
 
@@ -774,7 +774,7 @@ $cir->close();
 echo '</table>';
 echo '<div class="centerpara">'.get_string('uupreprocessedcount', 'admin', $readcount).'</div>';
 $mform->display();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 die;
 
 /////////////////////////////////////

admin/user.php

@@ -74,7 +74,7 @@
             echo $OUTPUT->heading(get_string('deleteuser', 'admin'));
             $optionsyes = array('delete'=>$delete, 'confirm'=>md5($delete), 'sesskey'=>sesskey());
             notice_yesno(get_string('deletecheckfull', '', "'$fullname'"), 'user.php', 'user.php', $optionsyes, NULL, 'post', 'get');
-            admin_externalpage_print_footer();
+            echo $OUTPUT->footer();
             die;
         } else if (data_submitted() and !$user->deleted) {
             if (delete_user($user)) {
@@ -304,7 +304,7 @@
         }
     }
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 
 ?>

admin/user/user_bulk.php

@@ -81,6 +81,6 @@ $ufiltering->display_active();
 $user_bulk_form->display();
 $action_form->display();
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

admin/user/user_bulk_confirm.php

@@ -50,5 +50,5 @@ if ($confirm and confirm_sesskey()) {
     notice_yesno(get_string('confirmcheckfull', '', $usernames), 'user_bulk_confirm.php', 'user_bulk.php', $optionsyes, NULL, 'post', 'get');
 }
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

admin/user/user_bulk_delete.php

@@ -50,5 +50,5 @@ if ($confirm and confirm_sesskey()) {
     notice_yesno(get_string('deletecheckfull', '', $usernames), 'user_bulk_delete.php', 'user_bulk.php', $optionsyes, NULL, 'post', 'get');
 }
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

admin/user/user_bulk_display.php

@@ -77,5 +77,5 @@ print_table($table);
 
 print_continue($return);
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

admin/user/user_bulk_download.php

@@ -66,7 +66,7 @@ print_box_end();
 
 print_continue($return);
 
-print_footer();
+echo $OUTPUT->footer();
 
 function user_download_ods($fields) {
     global $CFG, $SESSION, $DB;

admin/user/user_bulk_enrol.php

@@ -130,4 +130,4 @@ echo '<input type="submit" name="multienrolsubmit" value="save changes" />';
 echo '</div>';
 echo '</form>';
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();

admin/user/user_bulk_message.php

@@ -63,11 +63,11 @@ if ($msgform->is_cancelled()) {
     echo $OUTPUT->heading(get_string('confirmation', 'admin'));
     print_box($msg, 'boxwidthnarrow boxaligncenter generalbox', 'preview');
     notice_yesno(get_string('confirmmessage', 'bulkusers', $usernames), 'user_bulk_message.php', 'user_bulk.php', $optionsyes, NULL, 'post', 'get');
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
     die;
 }
 
 admin_externalpage_print_header();
 $msgform->display();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

admin/wsprotocols.php

@@ -83,4 +83,4 @@ if (!empty($return)) {
     redirect($baseurl);
 }
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();

admin/xmldb/index.php

@@ -102,7 +102,7 @@
                         admin_externalpage_print_header();
                         echo $OUTPUT->heading($xmldb_action->getTitle());
                         echo $xmldb_action->getOutput();
-                        admin_externalpage_print_footer();
+                        echo $OUTPUT->footer();
                         break;
                     case ACTION_GENERATE_XML:
                         header('Content-type: application/xhtml+xml');