From 73d6f52f6a7403cfcde63a241de3929fb84f12d9 Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Thu, 6 Aug 2009 14:12:46 +0000 Subject: [PATCH] MDL-19787 Converted all print_footer() calls --- admin/auth_config.php | 2 +- admin/block.php | 2 +- admin/blocks.php | 4 ++-- admin/dbtransfer/dbexport.php | 2 +- admin/dbtransfer/index.php | 4 ++-- admin/delete.php | 6 +++--- admin/enrol.php | 2 +- admin/enrol_config.php | 2 +- admin/environment.php | 2 +- admin/filters.php | 6 +++--- admin/generator.php | 5 +++-- admin/health.php | 2 +- admin/index.php | 12 ++++++------ admin/innodb.php | 4 ++-- admin/lang.php | 4 ++-- admin/langimport.php | 6 +++--- admin/mnet/access_control.php | 2 +- admin/mnet/delete.html | 2 +- admin/mnet/enr_course_enrol.php | 2 +- admin/mnet/enr_courses.php | 2 +- admin/mnet/enr_hosts.php | 2 +- admin/mnet/index.php | 2 +- admin/mnet/mnet_review.html | 2 +- admin/mnet/mnet_review_allhosts.html | 2 +- admin/mnet/mnet_services.html | 2 +- admin/mnet/mnet_themes.html | 2 +- admin/mnet/peers.html | 2 +- admin/mnet/trustedhosts.html | 2 +- admin/modules.php | 4 ++-- admin/multilangupgrade.php | 4 ++-- admin/oacleanup.php | 2 +- admin/phpinfo.php | 2 +- admin/portfolio.php | 2 +- admin/qtypes.php | 6 +++--- admin/register.php | 2 +- admin/replace.php | 4 ++-- admin/report/backups/index.php | 2 +- admin/report/capability/index.php | 2 +- admin/report/configlog/index.php | 2 +- admin/report/courseoverview/index.php | 2 +- admin/report/questioninstances/index.php | 2 +- admin/report/security/index.php | 2 +- admin/report/spamcleaner/index.php | 2 +- admin/report/unittest/dbtest.php | 2 +- admin/report/unittest/index.php | 2 +- admin/repository.php | 2 +- admin/repositoryinstance.php | 2 +- admin/roles/allow.php | 2 +- admin/roles/assign.php | 2 +- admin/roles/check.php | 2 +- admin/roles/define.php | 2 +- admin/roles/explain.php | 2 +- admin/roles/manage.php | 6 +++--- admin/roles/override.php | 2 +- admin/roles/usersroles.php | 2 +- admin/search.php | 2 +- admin/settings.php | 2 +- admin/timezone.php | 2 +- admin/timezoneimport.php | 4 ++-- admin/upgradesettings.php | 2 +- admin/uploadpicture.php | 2 +- admin/uploaduser.php | 6 +++--- admin/user.php | 4 ++-- admin/user/user_bulk.php | 2 +- admin/user/user_bulk_confirm.php | 2 +- admin/user/user_bulk_delete.php | 2 +- admin/user/user_bulk_display.php | 2 +- admin/user/user_bulk_download.php | 2 +- admin/user/user_bulk_enrol.php | 2 +- admin/user/user_bulk_message.php | 4 ++-- admin/wsprotocols.php | 2 +- admin/xmldb/index.php | 2 +- 72 files changed, 101 insertions(+), 100 deletions(-) diff --git a/admin/auth_config.php b/admin/auth_config.php index d89332a905..57cad02b93 100644 --- a/admin/auth_config.php +++ b/admin/auth_config.php @@ -76,7 +76,7 @@ echo '

\n"; echo "\n"; -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); exit; /// Functions ///////////////////////////////////////////////////////////////// diff --git a/admin/block.php b/admin/block.php index fdf3d91839..cab6170911 100644 --- a/admin/block.php +++ b/admin/block.php @@ -71,6 +71,6 @@ print_box_end(); echo ''; - print_footer(); + echo $OUTPUT->footer(); ?> diff --git a/admin/blocks.php b/admin/blocks.php index 2764b6b6e4..396c703402 100644 --- a/admin/blocks.php +++ b/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(); ?> diff --git a/admin/dbtransfer/dbexport.php b/admin/dbtransfer/dbexport.php index 02d28f0e0d..2a32c4d6c7 100644 --- a/admin/dbtransfer/dbexport.php +++ b/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(); diff --git a/admin/dbtransfer/index.php b/admin/dbtransfer/index.php index b9c5aefb2c..5fafd7e57d 100644 --- a/admin/dbtransfer/index.php +++ b/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 '

', get_string('transferdbintro', 'dbtransfer'), "

\n\n"; $form->display(); -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); diff --git a/admin/delete.php b/admin/delete.php index 401ca757e9..e2072fbae4 100644 --- a/admin/delete.php +++ b/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 '

Done!

'; print_continue($CFG->wwwroot); - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); exit; diff --git a/admin/enrol.php b/admin/enrol.php index 774471a792..ee8b9e5aac 100644 --- a/admin/enrol.php +++ b/admin/enrol.php @@ -136,6 +136,6 @@ echo ''; echo ''; - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); ?> diff --git a/admin/enrol_config.php b/admin/enrol_config.php index 3b0f1d1577..2fea1aeb3a 100644 --- a/admin/enrol_config.php +++ b/admin/enrol_config.php @@ -64,7 +64,7 @@ echo ""; echo ""; - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); exit; ?> diff --git a/admin/environment.php b/admin/environment.php index 11f2e42739..e819844597 100644 --- a/admin/environment.php +++ b/admin/environment.php @@ -132,5 +132,5 @@ $status = check_moodle_environment($version, $environment_results); /// Print footer - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); ?> diff --git a/admin/filters.php b/admin/filters.php index 2fe4518495..30ce0402c6 100644 --- a/admin/filters.php +++ b/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 '

' . get_string('filterallwarning', 'filters') . '

'; - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); /// Display helper functions =================================================== diff --git a/admin/generator.php b/admin/generator.php index ef612cbe2c..f523ea1cc6 100755 --- a/admin/generator.php +++ b/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(); } } diff --git a/admin/health.php b/admin/health.php index af9e82a496..5a72796900 100644 --- a/admin/health.php +++ b/admin/health.php @@ -100,7 +100,7 @@ STYLES; } - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); function health_find_problems() { diff --git a/admin/index.php b/admin/index.php index b1e7043538..f6a16393a6 100644 --- a/admin/index.php +++ b/admin/index.php @@ -129,7 +129,7 @@ if (!core_tables_exist()) { echo '
'; 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&confirmrelease=1&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&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&confirmrelease=1'); print_continue('index.php?confirmupgrade=1&confirmrelease=1&confirmplugincheck=1'); - print_footer(); + echo $OUTPUT->footer(); die(); } else { @@ -381,5 +381,5 @@ $copyrighttext = 'Moodle '. print_box($copyrighttext, 'copyright'); ////////////////////////////////////////////////////////////////////////////////////////////////// -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); diff --git a/admin/innodb.php b/admin/innodb.php index 6f6f9c0930..f9de6b9b0e 100644 --- a/admin/innodb.php +++ b/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(); } ?> diff --git a/admin/lang.php b/admin/lang.php index db5b9724ff..c446c1c901 100644 --- a/admin/lang.php +++ b/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(); ////////////////////////////////////////////////////////////////////// diff --git a/admin/langimport.php b/admin/langimport.php index a3f1102eba..614a5491db 100755 --- a/admin/langimport.php +++ b/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 ''; print_box_end(); - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); /** * Returns a list of available language packs from a diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php index ef43d196d5..b56f060bbd 100644 --- a/admin/mnet/access_control.php +++ b/admin/mnet/access_control.php @@ -232,6 +232,6 @@ foreach ($formerror as $error) { } print_simple_box_end(); -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); ?> diff --git a/admin/mnet/delete.html b/admin/mnet/delete.html index f1523002fc..f6f691c8fd 100644 --- a/admin/mnet/delete.html +++ b/admin/mnet/delete.html @@ -51,5 +51,5 @@ echo $OUTPUT->heading(get_string('mnetsettings', 'mnet')); footer(); ?> diff --git a/admin/mnet/enr_course_enrol.php b/admin/mnet/enr_course_enrol.php index 98b4f4926c..493e906dea 100644 --- a/admin/mnet/enr_course_enrol.php +++ b/admin/mnet/enr_course_enrol.php @@ -305,6 +305,6 @@ if (!empty($errors)) { } -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); ?> diff --git a/admin/mnet/enr_courses.php b/admin/mnet/enr_courses.php index 334a2096ec..340a625a75 100644 --- a/admin/mnet/enr_courses.php +++ b/admin/mnet/enr_courses.php @@ -51,6 +51,6 @@ } echo ''; - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); ?> diff --git a/admin/mnet/enr_hosts.php b/admin/mnet/enr_hosts.php index 665628e5a6..3dfccb5688 100644 --- a/admin/mnet/enr_hosts.php +++ b/admin/mnet/enr_hosts.php @@ -54,6 +54,6 @@ echo '' . ''; - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); ?> diff --git a/admin/mnet/index.php b/admin/mnet/index.php index 948d13e7ea..105e7fee76 100644 --- a/admin/mnet/index.php +++ b/admin/mnet/index.php @@ -139,5 +139,5 @@ footer(); ?> diff --git a/admin/mnet/mnet_review.html b/admin/mnet/mnet_review.html index 44723b25d8..b521cb7e14 100644 --- a/admin/mnet/mnet_review.html +++ b/admin/mnet/mnet_review.html @@ -153,5 +153,5 @@ if (!empty($credentials)) { footer(); ?> diff --git a/admin/mnet/mnet_review_allhosts.html b/admin/mnet/mnet_review_allhosts.html index 246e81cc6c..03002eed70 100644 --- a/admin/mnet/mnet_review_allhosts.html +++ b/admin/mnet/mnet_review_allhosts.html @@ -19,5 +19,5 @@ print_simple_box_start("center", ""); footer(); ?> diff --git a/admin/mnet/mnet_services.html b/admin/mnet/mnet_services.html index 101537b241..31f8af6ea9 100644 --- a/admin/mnet/mnet_services.html +++ b/admin/mnet/mnet_services.html @@ -102,5 +102,5 @@ print_simple_box_start("center", ""); footer(); ?> diff --git a/admin/mnet/mnet_themes.html b/admin/mnet/mnet_themes.html index bdeeaea44b..0fbe99e902 100644 --- a/admin/mnet/mnet_themes.html +++ b/admin/mnet/mnet_themes.html @@ -123,5 +123,5 @@ print_tabs(array($tabs), 'mnetthemes'); echo ""; $THEME = $original_theme; -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); ?> diff --git a/admin/mnet/peers.html b/admin/mnet/peers.html index 91d5e99cfc..66a8056aa4 100644 --- a/admin/mnet/peers.html +++ b/admin/mnet/peers.html @@ -97,5 +97,5 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict' footer(); ?> diff --git a/admin/mnet/trustedhosts.html b/admin/mnet/trustedhosts.html index d849642b21..021e819a1a 100644 --- a/admin/mnet/trustedhosts.html +++ b/admin/mnet/trustedhosts.html @@ -64,5 +64,5 @@ admin_externalpage_print_header(); footer(); ?> diff --git a/admin/modules.php b/admin/modules.php index 09e0f5cd53..cf9e69b081 100644 --- a/admin/modules.php +++ b/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(); ?> diff --git a/admin/multilangupgrade.php b/admin/multilangupgrade.php index 158747ef0a..125439474c 100644 --- a/admin/multilangupgrade.php +++ b/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; diff --git a/admin/oacleanup.php b/admin/oacleanup.php index e7e7d9d798..8e53ebf8f0 100644 --- a/admin/oacleanup.php +++ b/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(); } diff --git a/admin/phpinfo.php b/admin/phpinfo.php index 5c2398b576..257433783c 100644 --- a/admin/phpinfo.php +++ b/admin/phpinfo.php @@ -28,6 +28,6 @@ echo ''; - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); ?> diff --git a/admin/portfolio.php b/admin/portfolio.php index af4ccab4f5..1c8a8ac18f 100644 --- a/admin/portfolio.php +++ b/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(); ?> diff --git a/admin/qtypes.php b/admin/qtypes.php index 40ac6c791f..31d3cbd5be 100644 --- a/admin/qtypes.php +++ b/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; diff --git a/admin/register.php b/admin/register.php index 9f77f88c9e..ba93a2f7ab 100644 --- a/admin/register.php +++ b/admin/register.php @@ -185,4 +185,4 @@ echo "\n"; /// Print footer - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); diff --git a/admin/replace.php b/admin/replace.php index 2e75a5947b..740053265f 100644 --- a/admin/replace.php +++ b/admin/replace.php @@ -28,7 +28,7 @@ if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) { /// Pr echo ''; echo ''; 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(); ?> diff --git a/admin/report/backups/index.php b/admin/report/backups/index.php index cb077b5673..2a685d0de9 100644 --- a/admin/report/backups/index.php +++ b/admin/report/backups/index.php @@ -129,6 +129,6 @@ print_simple_box_end(); } - print_footer(); + echo $OUTPUT->footer(); ?> diff --git a/admin/report/capability/index.php b/admin/report/capability/index.php index 3c701c8f3b..5e45dd572b 100644 --- a/admin/report/capability/index.php +++ b/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; diff --git a/admin/report/configlog/index.php b/admin/report/configlog/index.php index 723e84ad38..0d0261a8be 100644 --- a/admin/report/configlog/index.php +++ b/admin/report/configlog/index.php @@ -105,4 +105,4 @@ $rs->close(); print_table($table); -print_footer('none'); +echo $OUTPUT->footer(); diff --git a/admin/report/courseoverview/index.php b/admin/report/courseoverview/index.php index 84c5817f0a..1d54fba7b5 100644 --- a/admin/report/courseoverview/index.php +++ b/admin/report/courseoverview/index.php @@ -114,6 +114,6 @@ print_table($table); } } - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); ?> diff --git a/admin/report/questioninstances/index.php b/admin/report/questioninstances/index.php index 202fc67115..56d72cedf0 100644 --- a/admin/report/questioninstances/index.php +++ b/admin/report/questioninstances/index.php @@ -126,5 +126,5 @@ if ($requestedqtype) { } // Footer. -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); ?> diff --git a/admin/report/security/index.php b/admin/report/security/index.php index cdc0da88ed..1bea6cd1a8 100644 --- a/admin/report/security/index.php +++ b/admin/report/security/index.php @@ -124,4 +124,4 @@ if ($issue and ($result = $issue(true))) { print_table($table); } -print_footer(); +echo $OUTPUT->footer(); diff --git a/admin/report/spamcleaner/index.php b/admin/report/spamcleaner/index.php index fa040efc35..f7be5c52c9 100755 --- a/admin/report/spamcleaner/index.php +++ b/admin/report/spamcleaner/index.php @@ -289,6 +289,6 @@ function print_spamcleaner_javascript() { //$sesskey = sesskey(); } -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); ?> diff --git a/admin/report/unittest/dbtest.php b/admin/report/unittest/dbtest.php index ee352a00ce..cf9feab317 100644 --- a/admin/report/unittest/dbtest.php +++ b/admin/report/unittest/dbtest.php @@ -144,6 +144,6 @@ if (!data_submitted() || !$codecoverage) { } // Footer. -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); ?> diff --git a/admin/report/unittest/index.php b/admin/report/unittest/index.php index 615ded66af..a6090ca38f 100644 --- a/admin/report/unittest/index.php +++ b/admin/report/unittest/index.php @@ -148,6 +148,6 @@ if (is_null($path) || !$codecoverage) { } // Footer. -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); ?> diff --git a/admin/repository.php b/admin/repository.php index 8965a12dbb..4a2c507d2a 100644 --- a/admin/repository.php +++ b/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(); diff --git a/admin/repositoryinstance.php b/admin/repositoryinstance.php index d516533644..d745ab65fd 100644 --- a/admin/repositoryinstance.php +++ b/admin/repositoryinstance.php @@ -130,4 +130,4 @@ if (!empty($return)) { redirect($baseurl); } -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); diff --git a/admin/roles/allow.php b/admin/roles/allow.php index 438de64b97..ba986026d5 100755 --- a/admin/roles/allow.php +++ b/admin/roles/allow.php @@ -80,5 +80,5 @@ echo '
'; echo '
'; - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); ?> diff --git a/admin/roles/assign.php b/admin/roles/assign.php index 3bf0d0b7d6..8697675b06 100755 --- a/admin/roles/assign.php +++ b/admin/roles/assign.php @@ -455,4 +455,4 @@ } } - print_footer(); + echo $OUTPUT->footer(); diff --git a/admin/roles/check.php b/admin/roles/check.php index 141845dc4c..6407e80cce 100755 --- a/admin/roles/check.php +++ b/admin/roles/check.php @@ -193,5 +193,5 @@ get_string('backtopageyouwereon') . ''; } - print_footer(); + echo $OUTPUT->footer(); ?> diff --git a/admin/roles/define.php b/admin/roles/define.php index 7981b5f6d7..784399dbba 100755 --- a/admin/roles/define.php +++ b/admin/roles/define.php @@ -185,5 +185,5 @@ echo '

' . get_string('backtoallroles', 'role') . '

'; echo ''; - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); ?> diff --git a/admin/roles/explain.php b/admin/roles/explain.php index 87f27dcf04..d1b5e62830 100755 --- a/admin/roles/explain.php +++ b/admin/roles/explain.php @@ -274,5 +274,5 @@ if ($userid && $capability != 'moodle/site:doanything' && !$userhascapability && echo '

' . get_string('explainpermissionsdoanything', 'role', $capability) . '

'; } echo $OUTPUT->close_window_button(); -print_footer('empty'); +echo $OUTPUT->footer(); ?> diff --git a/admin/roles/manage.php b/admin/roles/manage.php index a5cfc71e91..438611f03c 100755 --- a/admin/roles/manage.php +++ b/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 ''; - admin_externalpage_print_footer(); + echo $OUTPUT->footer(); die; function get_action_icon($url, $icon, $alt, $tooltip) { diff --git a/admin/roles/override.php b/admin/roles/override.php index 4ffc4c98e8..0f32447922 100755 --- a/admin/roles/override.php +++ b/admin/roles/override.php @@ -267,4 +267,4 @@ } } - print_footer(); + echo $OUTPUT->footer(); diff --git a/admin/roles/usersroles.php b/admin/roles/usersroles.php index 3264b655d2..204e0bf606 100644 --- a/admin/roles/usersroles.php +++ b/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; diff --git a/admin/search.php b/admin/search.php index 7e7511a4db..112f27e0be 100644 --- a/admin/search.php +++ b/admin/search.php @@ -60,6 +60,6 @@ if ($resultshtml != '') { echo ''; echo ''; -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); ?> diff --git a/admin/settings.php b/admin/settings.php index 7cefc1de37..612db979ba 100644 --- a/admin/settings.php +++ b/admin/settings.php @@ -128,6 +128,6 @@ if (empty($SITE->fullname)) { echo ''; } -print_footer(); +echo $OUTPUT->footer(); ?> diff --git a/admin/timezone.php b/admin/timezone.php index b3c1578ef3..5b04706da2 100644 --- a/admin/timezone.php +++ b/admin/timezone.php @@ -44,6 +44,6 @@ echo ''; echo ""; - print_footer(); + echo $OUTPUT->footer(); ?> diff --git a/admin/timezoneimport.php b/admin/timezoneimport.php index bdb81175f9..23b0a323ba 100644 --- a/admin/timezoneimport.php +++ b/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(); ?> diff --git a/admin/upgradesettings.php b/admin/upgradesettings.php index 917c824f25..740848b957 100644 --- a/admin/upgradesettings.php +++ b/admin/upgradesettings.php @@ -65,6 +65,6 @@ echo '
'.get_string('uupreprocessedcount', 'admin', $readcount).'
'; $mform->display(); -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); die; ///////////////////////////////////// diff --git a/admin/user.php b/admin/user.php index 4b2fd933a4..f2aae56ca8 100644 --- a/admin/user.php +++ b/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(); ?> diff --git a/admin/user/user_bulk.php b/admin/user/user_bulk.php index a36261cc82..220b34ac64 100755 --- a/admin/user/user_bulk.php +++ b/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(); ?> diff --git a/admin/user/user_bulk_confirm.php b/admin/user/user_bulk_confirm.php index 7d71c2af80..b5b4c1efc2 100755 --- a/admin/user/user_bulk_confirm.php +++ b/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(); ?> diff --git a/admin/user/user_bulk_delete.php b/admin/user/user_bulk_delete.php index 41127a0dc4..559bef48d0 100755 --- a/admin/user/user_bulk_delete.php +++ b/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(); ?> diff --git a/admin/user/user_bulk_display.php b/admin/user/user_bulk_display.php index 25aa2f8ed0..90b88d4350 100755 --- a/admin/user/user_bulk_display.php +++ b/admin/user/user_bulk_display.php @@ -77,5 +77,5 @@ print_table($table); print_continue($return); -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); ?> diff --git a/admin/user/user_bulk_download.php b/admin/user/user_bulk_download.php index 0ee20bdb51..c9b4d36364 100755 --- a/admin/user/user_bulk_download.php +++ b/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; diff --git a/admin/user/user_bulk_enrol.php b/admin/user/user_bulk_enrol.php index 737f76d2f0..1f3ceee344 100644 --- a/admin/user/user_bulk_enrol.php +++ b/admin/user/user_bulk_enrol.php @@ -130,4 +130,4 @@ echo ''; echo ''; echo ''; -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); diff --git a/admin/user/user_bulk_message.php b/admin/user/user_bulk_message.php index c5c92768d6..67a06730dd 100755 --- a/admin/user/user_bulk_message.php +++ b/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(); ?> diff --git a/admin/wsprotocols.php b/admin/wsprotocols.php index 3a514b0a56..59599ff65c 100644 --- a/admin/wsprotocols.php +++ b/admin/wsprotocols.php @@ -83,4 +83,4 @@ if (!empty($return)) { redirect($baseurl); } -admin_externalpage_print_footer(); +echo $OUTPUT->footer(); diff --git a/admin/xmldb/index.php b/admin/xmldb/index.php index f5b67332ef..6a4723793d 100644 --- a/admin/xmldb/index.php +++ b/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'); -- 2.39.5