Skip to content

Commit

Permalink
MDL-19787 Converted all print_footer() calls
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolasconnault committed Aug 6, 2009
1 parent 5a93139 commit 73d6f52
Show file tree
Hide file tree
Showing 72 changed files with 101 additions and 100 deletions.
2 changes: 1 addition & 1 deletion admin/auth_config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
echo "</div>\n";
echo "</form>\n";

admin_externalpage_print_footer();
echo $OUTPUT->footer();
exit;

/// Functions /////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion admin/block.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@
print_box_end();

echo '</form>';
print_footer();
echo $OUTPUT->footer();

?>
4 changes: 2 additions & 2 deletions admin/blocks.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -212,6 +212,6 @@
$table->print_html();
}

admin_externalpage_print_footer();
echo $OUTPUT->footer();

?>
2 changes: 1 addition & 1 deletion admin/dbtransfer/dbexport.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
admin_externalpage_print_header();
// TODO: add some more info here
$form->display();
admin_externalpage_print_footer();
echo $OUTPUT->footer();
4 changes: 2 additions & 2 deletions admin/dbtransfer/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
// Finish up.
notify(get_string('success'), 'notifysuccess');
print_continue("$CFG->wwwroot/$CFG->admin/");
admin_externalpage_print_footer();
echo $OUTPUT->footer();
die;
}

Expand All @@ -44,4 +44,4 @@
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();
6 changes: 3 additions & 3 deletions admin/delete.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
$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;
}

if (!data_submitted() or empty($reallysure)) {
$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;
}

Expand All @@ -46,7 +46,7 @@

echo '<h1 align="center">Done!</h1>';
print_continue($CFG->wwwroot);
admin_externalpage_print_footer();
echo $OUTPUT->footer();
exit;


Expand Down
2 changes: 1 addition & 1 deletion admin/enrol.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,6 @@
echo '</div>';
echo '</form>';

admin_externalpage_print_footer();
echo $OUTPUT->footer();

?>
2 changes: 1 addition & 1 deletion admin/enrol_config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
echo "</div>";
echo "</form>";

admin_externalpage_print_footer();
echo $OUTPUT->footer();

exit;
?>
2 changes: 1 addition & 1 deletion admin/environment.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,5 +132,5 @@
$status = check_moodle_environment($version, $environment_results);

/// Print footer
admin_externalpage_print_footer();
echo $OUTPUT->footer();
?>
6 changes: 3 additions & 3 deletions admin/filters.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -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 ===================================================

Expand Down
5 changes: 3 additions & 2 deletions admin/generator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@ public function display() {
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();
Expand All @@ -1218,7 +1218,8 @@ public function display() {
}

public function __destroy() {
print_footer();
global $OUTPUT;
echo $OUTPUT->footer();
}
}

Expand Down
2 changes: 1 addition & 1 deletion admin/health.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
}


admin_externalpage_print_footer();
echo $OUTPUT->footer();


function health_find_problems() {
Expand Down
12 changes: 6 additions & 6 deletions admin/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
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)) {
Expand All @@ -149,7 +149,7 @@
print_continue("index.php?agreelicense=1&amp;confirmrelease=1&amp;lang=$CFG->lang");
}

print_footer();
echo $OUTPUT->footer();
die;
}

Expand Down Expand Up @@ -193,7 +193,7 @@
$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)){
Expand All @@ -218,7 +218,7 @@
print_continue('index.php?confirmupgrade=1&amp;confirmrelease=1');
}

print_footer();
echo $OUTPUT->footer();
die;

} elseif (empty($confirmplugins)) {
Expand All @@ -232,7 +232,7 @@
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 {
Expand Down Expand Up @@ -381,5 +381,5 @@
print_box($copyrighttext, 'copyright');
//////////////////////////////////////////////////////////////////////////////////////////////////

admin_externalpage_print_footer();
echo $OUTPUT->footer();

4 changes: 2 additions & 2 deletions admin/innodb.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

?>
4 changes: 2 additions & 2 deletions admin/lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -905,7 +905,7 @@
} // fi $mode == 'helpfiles'


admin_externalpage_print_footer();
echo $OUTPUT->footer();

//////////////////////////////////////////////////////////////////////

Expand Down
6 changes: 3 additions & 3 deletions admin/langimport.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
if (!empty($CFG->skiplangupgrade)) {
admin_externalpage_print_header();
print_box(get_string('langimportdisabled', 'admin'));
print_footer();
echo $OUTPUT->footer();
die;
}

Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion admin/mnet/access_control.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,6 @@
}

print_simple_box_end();
admin_externalpage_print_footer();
echo $OUTPUT->footer();

?>
2 changes: 1 addition & 1 deletion admin/mnet/delete.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
</table>
</div>
<?php
print_footer();
echo $OUTPUT->footer();
?>
2 changes: 1 addition & 1 deletion admin/mnet/enr_course_enrol.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,6 @@
}


admin_externalpage_print_footer();
echo $OUTPUT->footer();

?>
2 changes: 1 addition & 1 deletion admin/mnet/enr_courses.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@
}
echo '</table></div>';

admin_externalpage_print_footer();
echo $OUTPUT->footer();

?>
2 changes: 1 addition & 1 deletion admin/mnet/enr_hosts.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@
echo '</table>'
. '</div>';

admin_externalpage_print_footer();
echo $OUTPUT->footer();

?>
2 changes: 1 addition & 1 deletion admin/mnet/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,5 +139,5 @@
</center>

<?php
admin_externalpage_print_footer();
echo $OUTPUT->footer();
?>
2 changes: 1 addition & 1 deletion admin/mnet/mnet_review.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,5 @@
</form>
<?php
print_simple_box_end();
admin_externalpage_print_footer();
echo $OUTPUT->footer();
?>
2 changes: 1 addition & 1 deletion admin/mnet/mnet_review_allhosts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
</table>
<?php
print_simple_box_end();
admin_externalpage_print_footer();
echo $OUTPUT->footer();
?>
2 changes: 1 addition & 1 deletion admin/mnet/mnet_services.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,5 +102,5 @@ <h3><?php echo get_string($name.'_name', $version['parent_type'].'_'.$version['p
</form>
<?php
print_simple_box_end();
admin_externalpage_print_footer();
echo $OUTPUT->footer();
?>
2 changes: 1 addition & 1 deletion admin/mnet/mnet_themes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,5 +123,5 @@
echo "</table>";

$THEME = $original_theme;
admin_externalpage_print_footer();
echo $OUTPUT->footer();
?>
2 changes: 1 addition & 1 deletion admin/mnet/peers.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,5 @@
</form>
</div>
<?php
admin_externalpage_print_footer();
echo $OUTPUT->footer();
?>
2 changes: 1 addition & 1 deletion admin/mnet/trustedhosts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@
</table>
</div>
<?php
admin_externalpage_print_footer();
echo $OUTPUT->footer();
?>
4 changes: 2 additions & 2 deletions admin/modules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename),
"modules.php?delete=$delete&amp;confirm=1&amp;sesskey=".sesskey(),
"modules.php");
admin_externalpage_print_footer();
echo $OUTPUT->footer();
exit;

} else { // Delete everything!!
Expand Down Expand Up @@ -262,6 +262,6 @@

$table->print_html();

admin_externalpage_print_footer();
echo $OUTPUT->footer();

?>
4 changes: 2 additions & 2 deletions admin/multilangupgrade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
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;
}

Expand Down Expand Up @@ -102,7 +102,7 @@

print_continue('index.php');

admin_externalpage_print_footer();
echo $OUTPUT->footer();
die;


Expand Down
Loading

0 comments on commit 73d6f52

Please sign in to comment.