From 0578c9a2a9af8e8329e9135d2caaa1a2518da0fd Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Thu, 6 Aug 2009 14:13:29 +0000 Subject: [PATCH] MDL-19809 Converted all print_footer() calls --- mod/glossary/comment.php | 10 +++++----- mod/glossary/comments.php | 2 +- mod/glossary/deleteentry.php | 2 +- mod/glossary/edit.php | 2 +- mod/glossary/editcategories.php | 9 +++++---- mod/glossary/export.php | 2 +- mod/glossary/exportentry.php | 4 ++-- mod/glossary/formats.php | 2 +- mod/glossary/import.php | 10 +++++----- mod/glossary/index.php | 2 +- mod/glossary/print.php | 2 +- mod/glossary/report.php | 2 +- mod/glossary/showentry.php | 2 +- mod/glossary/view.php | 2 +- 14 files changed, 27 insertions(+), 26 deletions(-) diff --git a/mod/glossary/comment.php b/mod/glossary/comment.php index f774b0d221..c917e3eef9 100644 --- a/mod/glossary/comment.php +++ b/mod/glossary/comment.php @@ -81,7 +81,7 @@ function glossary_comment_add() { } else { glossary_comment_print_header($course, $cm, $glossary, $entry, 'add'); $mform->display(); - print_footer($course); + echo $OUTPUT->footer(); die; } } @@ -90,7 +90,7 @@ function glossary_comment_add() { * Deleting existing comments */ function glossary_comment_delete() { - global $USER, $DB; + global $USER, $DB, $OUTPUT; $id = optional_param('id', 0, PARAM_INT); // Comment ID $confirm = optional_param('confirm', 0, PARAM_BOOL); // delete confirmation @@ -135,7 +135,7 @@ function glossary_comment_delete() { glossary_comment_print_header($course, $cm, $glossary, $entry, 'delete'); glossary_print_comment($course, $cm, $glossary, $entry, $comment); notice_yesno($strdeletewarning, $linkyes, $linkno, $optionsyes, $optionsno, 'post', 'get'); - print_footer($course); + echo $OUTPUT->footer(); die; } } @@ -144,7 +144,7 @@ function glossary_comment_delete() { * Edit existing comments */ function glossary_comment_edit() { - global $CFG, $USER, $DB; + global $CFG, $USER, $DB, $OUTPUT; $id = optional_param('id', 0, PARAM_INT); // Comment ID @@ -197,7 +197,7 @@ function glossary_comment_edit() { } else { glossary_comment_print_header($course, $cm, $glossary, $entry, 'edit'); $mform->display(); - print_footer($course); + echo $OUTPUT->footer(); die; } } diff --git a/mod/glossary/comments.php b/mod/glossary/comments.php index 1aa16e1736..6bf4ed51ef 100644 --- a/mod/glossary/comments.php +++ b/mod/glossary/comments.php @@ -71,6 +71,6 @@ /// Finish the page - print_footer($course); + echo $OUTPUT->footer(); ?> diff --git a/mod/glossary/deleteentry.php b/mod/glossary/deleteentry.php index 4996d561e3..6cf14a6b66 100644 --- a/mod/glossary/deleteentry.php +++ b/mod/glossary/deleteentry.php @@ -103,6 +103,6 @@ notice_yesno($areyousure, $linkyes, $linkno, $optionsyes, $optionsno, 'post', 'get'); - print_footer($course); + echo $OUTPUT->footer(); } ?> diff --git a/mod/glossary/edit.php b/mod/glossary/edit.php index ddaa2bb67e..70ff623de8 100644 --- a/mod/glossary/edit.php +++ b/mod/glossary/edit.php @@ -173,5 +173,5 @@ echo $OUTPUT->heading(format_string($glossary->name)); $mform->display(); -print_footer($course); +echo $OUTPUT->footer(); diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php index 0de8b1f32d..3d17803e69 100644 --- a/mod/glossary/editcategories.php +++ b/mod/glossary/editcategories.php @@ -77,7 +77,7 @@ $name = $category->name; $usedynalink = $category->usedynalink; require "editcategories.html"; - print_footer(); + echo $OUTPUT->footer(); die; } @@ -90,7 +90,7 @@ echo "
" . get_string("categorydeleted","glossary") ."
"; echo ""; print_simple_box_end(); - print_footer($course); + echo $OUTPUT->footer(); add_to_log($course->id, "glossary", "delete category", "editcategories.php?id=$cm->id", $hook,$cm->id); @@ -167,7 +167,7 @@ } if ( $action ) { - print_footer(); + echo $OUTPUT->footer(); die; } @@ -241,4 +241,5 @@ - +footer(); diff --git a/mod/glossary/export.php b/mod/glossary/export.php index 19cc3fde53..33fce80969 100644 --- a/mod/glossary/export.php +++ b/mod/glossary/export.php @@ -65,5 +65,5 @@ $button->render(); } print_box_end(); - print_footer($course); + echo $OUTPUT->footer(); ?> diff --git a/mod/glossary/exportentry.php b/mod/glossary/exportentry.php index 23cb0aec15..ce9d2f9085 100644 --- a/mod/glossary/exportentry.php +++ b/mod/glossary/exportentry.php @@ -66,7 +66,7 @@ nootify(get_string('errconceptalreadyexists', 'glossary')); print_continue($returnurl); print_simple_box_end(); - print_footer(); + echo $OUTPUT->footer(); die; } } @@ -82,7 +82,7 @@ notice_yesno($areyousure, $linkyes, $linkno, $optionsyes, $optionsno, 'post', 'get'); echo ''; - print_footer(); + echo $OUTPUT->footer(); die; } else { diff --git a/mod/glossary/formats.php b/mod/glossary/formats.php index c285abe2a5..e29bbd4e04 100644 --- a/mod/glossary/formats.php +++ b/mod/glossary/formats.php @@ -251,5 +251,5 @@ echo ''; - print_footer(); + echo $OUTPUT->footer(); ?> diff --git a/mod/glossary/import.php b/mod/glossary/import.php index f6353f15ae..b2ff708da3 100644 --- a/mod/glossary/import.php +++ b/mod/glossary/import.php @@ -56,7 +56,7 @@ include("import.html"); print_box_end(); - print_footer($course); + echo $OUTPUT->footer(); exit; } @@ -71,7 +71,7 @@ print_continue('import.php?id='.$id); print_box_end(); - print_footer(); + echo $OUTPUT->footer(); die(); } @@ -134,7 +134,7 @@ notify("Error while trying to create the new glossary."); echo ''; glossary_print_tabbed_table_end(); - print_footer($course); + echo $OUTPUT->footer(); exit; } else { //The instance has been created, so lets do course_modules @@ -180,7 +180,7 @@ } } else { notify("Error while trying to create the new glossary."); - print_footer($course); + echo $OUTPUT->footer(); exit; } } @@ -351,6 +351,6 @@ } /// Finish the page - print_footer($course); + echo $OUTPUT->footer(); ?> diff --git a/mod/glossary/index.php b/mod/glossary/index.php index 73607b7ae7..7a59cd7193 100644 --- a/mod/glossary/index.php +++ b/mod/glossary/index.php @@ -129,6 +129,6 @@ /// Finish the page - print_footer($course); + echo $OUTPUT->footer(); ?> diff --git a/mod/glossary/print.php b/mod/glossary/print.php index 942d05d5b2..fcafdc7b22 100644 --- a/mod/glossary/print.php +++ b/mod/glossary/print.php @@ -181,5 +181,5 @@ } } - print_footer('empty'); + echo $OUTPUT->footer(); ?> diff --git a/mod/glossary/report.php b/mod/glossary/report.php index 03133a8c6c..511466b030 100644 --- a/mod/glossary/report.php +++ b/mod/glossary/report.php @@ -80,5 +80,5 @@ } echo $OUTPUT->close_window_button(); - print_footer('none'); + echo $OUTPUT->footer(); ?> diff --git a/mod/glossary/showentry.php b/mod/glossary/showentry.php index e63459b621..d534a870c0 100644 --- a/mod/glossary/showentry.php +++ b/mod/glossary/showentry.php @@ -67,6 +67,6 @@ echo $OUTPUT->close_window_button(); /// Show one reduced footer - print_footer('none'); + echo $OUTPUT->footer(); ?> diff --git a/mod/glossary/view.php b/mod/glossary/view.php index 4d3a55dcf3..4429eb2a65 100644 --- a/mod/glossary/view.php +++ b/mod/glossary/view.php @@ -517,7 +517,7 @@ glossary_print_tabbed_table_end(); /// Finish the page - print_footer($course); + echo $OUTPUT->footer(); /// Mark as viewed $completion=new completion_info($course); -- 2.39.5