Commit 73d6f52f authored by nicolasconnault's avatar nicolasconnault
Browse files

MDL-19787 Converted all print_footer() calls

parent 5a931394
......@@ -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 /////////////////////////////////////////////////////////////////
......
......@@ -71,6 +71,6 @@
print_box_end();
echo '</form>';
print_footer();
echo $OUTPUT->footer();
?>
......@@ -60,7 +60,7 @@
notice_yesno(get_string('blockdeleteconfirm', '', $strblockname),
'blocks.php?delete='.$block->id.'&amp;confirm=1&amp;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();
?>
......@@ -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();
......@@ -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();
......@@ -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;
......
......@@ -136,6 +136,6 @@
echo '</div>';
echo '</form>';
admin_externalpage_print_footer();
echo $OUTPUT->footer();
?>
......@@ -64,7 +64,7 @@
echo "</div>";
echo "</form>";
admin_externalpage_print_footer();
echo $OUTPUT->footer();
exit;
?>
......@@ -132,5 +132,5 @@
$status = check_moodle_environment($version, $environment_results);
/// Print footer
admin_externalpage_print_footer();
echo $OUTPUT->footer();
?>
......@@ -123,7 +123,7 @@
notice_yesno(get_string('deletefilterareyousuremessage', 'admin', $filtername), $returnurl .
'?action=delete&amp;filterpath=' . $filterpath . '&amp;confirm=1&amp;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 ===================================================
......
......@@ -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();
}
}
......
......@@ -100,7 +100,7 @@ STYLES;
}
admin_externalpage_print_footer();
echo $OUTPUT->footer();
function health_find_problems() {
......
......@@ -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();
......@@ -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();
}
?>
......@@ -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();
//////////////////////////////////////////////////////////////////////
......
......@@ -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.'&amp;uninstalllang='.$uninstalllang.'&amp;confirm=1&amp;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
......
......@@ -232,6 +232,6 @@ foreach ($formerror as $error) {
}
print_simple_box_end();
admin_externalpage_print_footer();
echo $OUTPUT->footer();
?>
......@@ -51,5 +51,5 @@ echo $OUTPUT->heading(get_string('mnetsettings', 'mnet'));
</table>
</div>
<?php
print_footer();
echo $OUTPUT->footer();
?>
......@@ -305,6 +305,6 @@ if (!empty($errors)) {
}
admin_externalpage_print_footer();
echo $OUTPUT->footer();
?>
......@@ -51,6 +51,6 @@
}
echo '</table></div>';
admin_externalpage_print_footer();
echo $OUTPUT->footer();
?>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment