From: nicolasconnault <nicolasconnault>
Date: Thu, 6 Aug 2009 14:12:17 +0000 (+0000)
Subject: MDL-19797 Converted all print_footer() calls
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=5a931394400314874943570d42d3e3916c44fe28;p=moodle.git

MDL-19797 Converted all print_footer() calls
---

diff --git a/grade/edit/letter/edit.php b/grade/edit/letter/edit.php
index 54e871db8f..f586be25de 100644
--- 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 e30d674ed0..d3c53b3c65 100644
--- 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 d258ef0e95..fae404b7c4 100644
--- 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 da9f7df681..4a38b99131 100644
--- 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 eb8bb2c729..760ef499c0 100644
--- 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 f4a0968085..844cf67ab4 100644
--- 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 a49521a9b0..8418784dc5 100644
--- 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 879e42b6eb..df7a2f27b6 100644
--- 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 b6a7028fcd..8d6ddb90cd 100644
--- 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 483552e563..29daf9708d 100644
--- 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 6ebbab1044..8cee15694b 100644
--- 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 c27aeb7c1e..29ef1ddcc9 100644
--- 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 af2263a874..b43d879c31 100755
--- 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 bf5d66e699..dbcddf6dc0 100755
--- 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 3de1a7f29d..7adab3af5b 100755
--- 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 aada6d2bcb..ef93124ad1 100755
--- 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 027255abba..94561f02e6 100755
--- 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 127c7d07d8..0929d1675e 100644
--- 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 866fbe5b09..3f5a0cb14f 100644
--- 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 44950962cb..52fce61964 100644
--- 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 369301d080..1db29f6eb7 100755
--- 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.'&amp;feedback='.(int)($data->feedback).'&amp;url='.urlencode($data->url).'&amp;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 0475894fa3..a94a72b2c6 100644
--- 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 c7f98d0c1c..cf0d95bb48 100644
--- 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 cd2d4c1971..35079e88df 100644
--- 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 74d29b9195..dd2c933433 100644
--- 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 c2b24d5bf3..8e39245541 100644
--- 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 e6c4293e83..ed2079e032 100644
--- 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();
 
 ?>