MDL-19797 Converted all print_footer() calls

diff --git a/grade/edit/letter/edit.php b/grade/edit/letter/edit.php
index 54e871db8fb962f6d326b5ec58d095cb741740da..f586be25de42b424280122cc10ac5769f75f0f64 100644 (file)
--- a/grade/edit/letter/edit.php
+++ b/grade/edit/letter/edit.php
@@ -130,5 +130,5 @@ if ($admin) {
 
 $mform->display();
 
-print_footer($COURSE);
+echo $OUTPUT->footer();
 ?>

diff --git a/grade/edit/letter/index.php b/grade/edit/letter/index.php
index e30d674ed09012393521382e09b925f0f6764fc2..d3c53b3c6554dafb0690aa5d47f46011831e757c 100644 (file)
--- a/grade/edit/letter/index.php
+++ b/grade/edit/letter/index.php
@@ -61,6 +61,6 @@ $table->width = '30%';
 $table->data  = $data;
 print_table($table);
 
-print_footer($course);
+echo $OUTPUT->footer();
 
 ?>

diff --git a/grade/edit/outcome/course.php b/grade/edit/outcome/course.php
index d258ef0e9580c552747796915e8ead98a9e702e4..fae404b7c45b8caffdda7fc57b4329a227bb0d56 100644 (file)
--- a/grade/edit/outcome/course.php
+++ b/grade/edit/outcome/course.php
@@ -130,5 +130,5 @@ print_grade_page_head($COURSE->id, 'outcome', 'course');
 check_theme_arrows();
 require('course_form.html');
 
-print_footer($course);
+echo $OUTPUT->footer();
 ?>

diff --git a/grade/edit/settings/index.php b/grade/edit/settings/index.php
index da9f7df681cb518061c073591da3e9fb314e1daf..4a38b99131cd6f9d3c075054bf029117d2de7ccd 100644 (file)
--- a/grade/edit/settings/index.php
+++ b/grade/edit/settings/index.php
@@ -74,6 +74,6 @@ print_box_end();
 
 $mform->display();
 
-print_footer($course);
+echo $OUTPUT->footer();
 
 ?>

diff --git a/grade/edit/tree/calculation.php b/grade/edit/tree/calculation.php
index eb8bb2c729b40221f78fcb28253ce543fdfa59de..760ef499c04846b8b5e65c72e0fd96208d5e772d 100644 (file)
--- a/grade/edit/tree/calculation.php
+++ b/grade/edit/tree/calculation.php
@@ -127,7 +127,7 @@ echo '
     </div>
 </form>';
 
-print_footer($course);
+echo $OUTPUT->footer();
 die();
 
 

diff --git a/grade/edit/tree/category.php b/grade/edit/tree/category.php
index f4a096808578f686c6d6ee0dab448f72fcfabb3c..844cf67ab4a416fc7165a8e12a83202fd39c654e 100644 (file)
--- a/grade/edit/tree/category.php
+++ b/grade/edit/tree/category.php
@@ -208,5 +208,5 @@ print_grade_page_head($courseid, 'edittree', null, $heading);
 
 $mform->display();
 
-print_footer($course);
+echo $OUTPUT->footer();
 die;

diff --git a/grade/edit/tree/grade.php b/grade/edit/tree/grade.php
index a49521a9b092955ff99cb9d6a4218677da3a6a4a..8418784dc52e47cf1162aeef27970dfa66e2a40f 100644 (file)
--- a/grade/edit/tree/grade.php
+++ b/grade/edit/tree/grade.php
@@ -264,5 +264,5 @@ $mform->display();
 
 print_simple_box_end();
 
-print_footer($course);
+echo $OUTPUT->footer();
 die;

diff --git a/grade/edit/tree/index.php b/grade/edit/tree/index.php
index 879e42b6ebff67fb5f15f5e24a03a4888c2c92d3..df7a2f27b67dfdd88764c4ae553c30fc813e0d79 100644 (file)
--- a/grade/edit/tree/index.php
+++ b/grade/edit/tree/index.php
@@ -145,7 +145,7 @@ switch ($action) {
                 $optionsyes = array('eid'=>$eid, 'confirm'=>1, 'sesskey'=>sesskey(), 'id'=>$course->id, 'action'=>'delete');
                 $optionsno  = array('id'=>$course->id);
                 notice_yesno($strdeletecheckfull, 'index.php', 'index.php', $optionsyes, $optionsno, 'post', 'get');
-                print_footer($course);
+                echo $OUTPUT->footer();
                 die;
             }
         }
@@ -346,7 +346,7 @@ if ($moving) {
 
 echo '</div>';
 
-print_footer($course);
+echo $OUTPUT->footer();
 
 // Restore original show/hide preference if moving
 if ($moving) {

diff --git a/grade/edit/tree/item.php b/grade/edit/tree/item.php
index b6a7028fcde01fedb8db3cdd6674d370717dabb7..8d6ddb90cd1519230b5647ce3cc1ba4e931154d7 100644 (file)
--- a/grade/edit/tree/item.php
+++ b/grade/edit/tree/item.php
@@ -162,4 +162,4 @@ print_grade_page_head($courseid, 'edittree', null, $heading);
 
 $mform->display();
 
-print_footer($course);
+echo $OUTPUT->footer();

diff --git a/grade/edit/tree/outcomeitem.php b/grade/edit/tree/outcomeitem.php
index 483552e563c191a08f147efcd45c851f598b4f3b..29daf9708d41967f78908371c239c2df2c3e136d 100644 (file)
--- a/grade/edit/tree/outcomeitem.php
+++ b/grade/edit/tree/outcomeitem.php
@@ -205,10 +205,10 @@ print_grade_page_head($courseid, 'edittree', null, $heading);
 
 if (!grade_outcome::fetch_all_available($COURSE->id)) {
     notice_yesno(get_string('nooutcomes', 'grades'), $CFG->wwwroot.'/grade/edit/outcome/course.php?id='.$courseid, $returnurl);
-    print_footer($course);
+    echo $OUTPUT->footer();
     die();
 }
 
 $mform->display();
 
-print_footer($course);
+echo $OUTPUT->footer();

diff --git a/grade/export/key.php b/grade/export/key.php
index 6ebbab1044c8ad1b2b03d7ca1cbca3e99d58dba6..8cee15694b1b97c119095a85b4c1290cdbf1c51a 100644 (file)
--- a/grade/export/key.php
+++ b/grade/export/key.php
@@ -65,7 +65,7 @@ if ($id and $delete) {
         $optionsyes = array('id'=>$id, 'delete'=>1, 'courseid'=>$courseid, 'sesskey'=>sesskey(), 'confirm'=>1);
         $optionsno  = array('id'=>$courseid);
         notice_yesno(get_string('deletekeyconfirm', 'userkey', $key->value), 'key.php', 'keymanager.php', $optionsyes, $optionsno, 'get', 'get');
-        print_footer();
+        echo $OUTPUT->footer();
         die;
 
     } else if (confirm_sesskey()){
@@ -115,5 +115,5 @@ $navigation = build_navigation($navlinks);
 print_header_simple($strkeys, ': '.$strkeys, $navigation, '', '', true, '', navmenu($course));
 
 $editform->display();
-print_footer($course);
+echo $OUTPUT->footer();
 ?>

diff --git a/grade/export/keymanager.php b/grade/export/keymanager.php
index c27aeb7c1ed41cbb6b4807c72937005ce27f587b..29ef1ddcc9c146e250757590cad5af96597a4e75 100644 (file)
--- a/grade/export/keymanager.php
+++ b/grade/export/keymanager.php
@@ -64,5 +64,5 @@ echo '<div class="buttons">';
 print_single_button('key.php', array('courseid'=>$course->id), get_string('newuserkey', 'userkey'));
 echo '</div>';
 
-print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/grade/export/ods/index.php b/grade/export/ods/index.php
index af2263a8749326f398c5d73947af2e7e8bd7cf8a..b43d879c31d2e41cc3ccfabae4ca787a6b03895d 100755 (executable)
--- a/grade/export/ods/index.php
+++ b/grade/export/ods/index.php
@@ -43,7 +43,7 @@ $groupmode    = groups_get_course_groupmode($course);   // Groups are being used
 $currentgroup = groups_get_course_group($course, true);
 if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) {
     echo $OUTPUT->heading(get_string("notingroup"));
-    print_footer($course);
+    echo $OUTPUT->footer();
     die;    
 }
 
@@ -55,7 +55,7 @@ if ($data = $mform->get_data()) {
     $export->process_form($data);
     $export->print_continue();
     $export->display_preview();
-    print_footer($course);
+    echo $OUTPUT->footer();
     exit;
 }
 
@@ -64,5 +64,5 @@ echo '<div class="clearer"></div>';
 
 $mform->display();
 
-print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/grade/export/txt/index.php b/grade/export/txt/index.php
index bf5d66e699e067110a74c1f0f2a82cb4027bb1de..dbcddf6dc090418b9dfa509e793b214ef2942d82 100755 (executable)
--- a/grade/export/txt/index.php
+++ b/grade/export/txt/index.php
@@ -43,7 +43,7 @@ $groupmode    = groups_get_course_groupmode($course);   // Groups are being used
 $currentgroup = groups_get_course_group($course, true);
 if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) {
     echo $OUTPUT->heading(get_string("notingroup"));
-    print_footer($course);
+    echo $OUTPUT->footer();
     die;    
 }
 
@@ -56,7 +56,7 @@ if ($data = $mform->get_data()) {
     $export->process_form($data);
     $export->print_continue();
     $export->display_preview();
-    print_footer($course);
+    echo $OUTPUT->footer();
     exit;
 }
 
@@ -65,5 +65,5 @@ echo '<div class="clearer"></div>';
 
 $mform->display();
 
-print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/grade/export/xls/index.php b/grade/export/xls/index.php
index 3de1a7f29de57ff1abe1a2115d563f5a213657cd..7adab3af5bf042b6629ba6458fc91ad95d7b302e 100755 (executable)
--- a/grade/export/xls/index.php
+++ b/grade/export/xls/index.php
@@ -43,7 +43,7 @@ $groupmode    = groups_get_course_groupmode($course);   // Groups are being used
 $currentgroup = groups_get_course_group($course, true);
 if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) {
     echo $OUTPUT->heading(get_string("notingroup"));
-    print_footer($course);
+    echo $OUTPUT->footer();
     die;    
 }
 
@@ -55,7 +55,7 @@ if ($data = $mform->get_data()) {
     $export->process_form($data);
     $export->print_continue();
     $export->display_preview();
-    print_footer($course);
+    echo $OUTPUT->footer();
     exit;
 }
 
@@ -64,5 +64,5 @@ echo '<div class="clearer"></div>';
 
 $mform->display();
 
-print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/grade/export/xml/index.php b/grade/export/xml/index.php
index aada6d2bcb79da6e5f196fc8529b5a3f4ef85874..ef93124ad14045a3dad4c35b4b8aa641a977c7a2 100755 (executable)
--- a/grade/export/xml/index.php
+++ b/grade/export/xml/index.php
@@ -43,7 +43,7 @@ $groupmode    = groups_get_course_groupmode($course);   // Groups are being used
 $currentgroup = groups_get_course_group($course, true);
 if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) {
     echo $OUTPUT->heading(get_string("notingroup"));
-    print_footer($course);
+    echo $OUTPUT->footer();
     die;    
 }
 
@@ -55,7 +55,7 @@ if ($data = $mform->get_data()) {
     $export->process_form($data);
     $export->print_continue();
     $export->display_preview(true);
-    print_footer($course);
+    echo $OUTPUT->footer();
     exit;
 }
 
@@ -64,5 +64,5 @@ echo '<div class="clearer"></div>';
 
 $mform->display();
 
-print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php
index 027255abba5bb95572f8b24d8b528134f598752e..94561f02e6d7553900888db9a4815a405700afad 100755 (executable)
--- a/grade/import/csv/index.php
+++ b/grade/import/csv/index.php
@@ -484,5 +484,5 @@ if ($formdata = $mform->get_data()) {
     $mform->display();
 }
 
-print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/grade/import/key.php b/grade/import/key.php
index 127c7d07d81037a37b9fc7b5192bc5f16be47ec9..0929d1675e607f0950007818f5e3ee2b82245425 100644 (file)
--- a/grade/import/key.php
+++ b/grade/import/key.php
@@ -65,7 +65,7 @@ if ($id and $delete) {
         $optionsyes = array('id'=>$id, 'delete'=>1, 'courseid'=>$courseid, 'sesskey'=>sesskey(), 'confirm'=>1);
         $optionsno  = array('id'=>$courseid);
         notice_yesno(get_string('deletekeyconfirm', 'userkey', $key->value), 'key.php', 'keymanager.php', $optionsyes, $optionsno, 'get', 'get');
-        print_footer();
+        echo $OUTPUT->footer();
         die;
 
     } else if (confirm_sesskey()){
@@ -115,5 +115,5 @@ $navigation = build_navigation($navlinks);
 print_header_simple($strkeys, ': '.$strkeys, $navigation, '', '', true, '', navmenu($course));
 
 $editform->display();
-print_footer($course);
+echo $OUTPUT->footer();
 ?>

diff --git a/grade/import/keymanager.php b/grade/import/keymanager.php
index 866fbe5b09bcafc51a8b72ef89be4590182b483b..3f5a0cb14f429fac11670e94c09b03f37e274dc2 100644 (file)
--- a/grade/import/keymanager.php
+++ b/grade/import/keymanager.php
@@ -63,5 +63,5 @@ echo '<div class="buttons">';
 print_single_button('key.php', array('courseid'=>$course->id), get_string('newuserkey', 'userkey'));
 echo '</div>';
 
-print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/grade/import/xml/import.php b/grade/import/xml/import.php
index 44950962cb629a2574a59d77ea2113cfe6ee4379..52fce61964a263c574f920cca6793827ee95180e 100644 (file)
--- a/grade/import/xml/import.php
+++ b/grade/import/xml/import.php
@@ -67,7 +67,7 @@ if ($importcode !== false) {
 
         grade_import_commit($id, $importcode, $feedback, true);
 
-        print_footer();
+        echo $OUTPUT->footer();
         die;
     }
 

diff --git a/grade/import/xml/index.php b/grade/import/xml/index.php
index 369301d0801318fbec7e5035d123934e15c87139..1db29f6eb7ee57907e3ea566dc54a0ffa476d41f 100755 (executable)
--- a/grade/import/xml/index.php
+++ b/grade/import/xml/index.php
@@ -57,12 +57,12 @@ if ($data = $mform->get_data()) {
         $importcode = import_xml_grades($text, $course, $error);
         if ($importcode) {
             grade_import_commit($id, $importcode, $data->feedback, true);
-            print_footer();
+            echo $OUTPUT->footer();
             die;
         } else {
             notify($error);
             print_continue($CFG->wwwroot.'/grade/index.php?id='.$course->id);
-            print_footer();
+            echo $OUTPUT->footer();
             die;
         }
 
@@ -80,7 +80,7 @@ if ($data = $mform->get_data()) {
         $link = $CFG->wwwroot.'/grade/import/xml/fetch.php?id='.$id.'&feedback='.(int)($data->feedback).'&url='.urlencode($data->url).'&key='.$data->key;
         echo get_string('import', 'grades').': <a href="'.$link.'">'.$link.'</a>';
         echo '</div>';
-        print_footer();
+        echo $OUTPUT->footer();
         die;
     }
 }
@@ -89,6 +89,6 @@ print_grade_page_head($COURSE->id, 'import', 'xml', get_string('importxml', 'gra
 
 $mform->display();
 
-print_footer();
+echo $OUTPUT->footer();
 
 ?>

diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php
index 0475894fa3947c627c5da3dff73f98cfc0d3f208..a94a72b2c632af5a95a79fa917ecffe6c63f911e 100644 (file)
--- a/grade/report/grader/index.php
+++ b/grade/report/grader/index.php
@@ -126,7 +126,7 @@ if ($report->get_pref('enableajax')) {
 if ($report->currentgroup == -2) {
     print_grade_page_head($COURSE->id, 'report', 'grader', $reportname, false, $buttons);
     echo $OUTPUT->heading(get_string("notingroup"));
-    print_footer($course);
+    echo $OUTPUT->footer();
     exit;
 }
 
@@ -361,6 +361,6 @@ YAHOO.util.Event.onDOMReady(init);
 </script>
 <?php
 
-print_footer($course);
+echo $OUTPUT->footer();
 
 ?>

diff --git a/grade/report/grader/preferences.php b/grade/report/grader/preferences.php
index c7f98d0c1ce2bc120f4afb1692d0ae53836cf3a1..cf0d95bb483552843c3db4cf21df2b2de773bd09 100644 (file)
--- a/grade/report/grader/preferences.php
+++ b/grade/report/grader/preferences.php
@@ -73,5 +73,5 @@ print_simple_box_start("center");
 $mform->display();
 print_simple_box_end();
 
-print_footer($course);
+echo $OUTPUT->footer();
 ?>

diff --git a/grade/report/grader/quickedit_item.php b/grade/report/grader/quickedit_item.php
index cd2d4c1971f942d7093c00e8847030f73af5221e..35079e88df76650c52b88a5613303b9557653f82 100644 (file)
--- a/grade/report/grader/quickedit_item.php
+++ b/grade/report/grader/quickedit_item.php
@@ -103,5 +103,5 @@ if (!empty($studentsperpage) && $studentsperpage >= 20) {
     print_paging_bar($numusers, $report->page, $studentsperpage, $report->pbarurl);
 }
 
-print_footer($course);
+echo $OUTPUT->footer();
 ?>

diff --git a/grade/report/outcomes/index.php b/grade/report/outcomes/index.php
index 74d29b9195e6c2d8f15129dd19aece986a5762d1..dd2c93343337b7ca54514ca697b302a1ed0667fc 100644 (file)
--- a/grade/report/outcomes/index.php
+++ b/grade/report/outcomes/index.php
@@ -152,6 +152,6 @@ print_grade_page_head($courseid, 'report', 'outcomes');
 
 
 echo $html;
-print_footer($course);
+echo $OUTPUT->footer();
 
 ?>

diff --git a/grade/report/overview/index.php b/grade/report/overview/index.php
index c2b24d5bf365e7b39e4dd4442d1a80db3f1576c7..8e392455416af8071e146b080979243b211b5fb5 100644 (file)
--- a/grade/report/overview/index.php
+++ b/grade/report/overview/index.php
@@ -135,6 +135,6 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all
     }
 }
 
-print_footer($course);
+echo $OUTPUT->footer();
 
 ?>

diff --git a/grade/report/user/index.php b/grade/report/user/index.php
index e6c4293e83080c93b77c5960292dc5e39c781027..ed2079e03235ad021a1d2b42bd599c3be13c3726 100644 (file)
--- a/grade/report/user/index.php
+++ b/grade/report/user/index.php
@@ -142,6 +142,6 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all
     }
 }
 
-print_footer($course);
+echo $OUTPUT->footer();
 
 ?>