MDL-19803 Converted all print_footer() calls

diff --git a/mod/assignment/index.php b/mod/assignment/index.php
index ae84d38bba7e3324e5c28865c7b87ff1d4a9f509..cb3247b835fa2cdc8240fb21d6694ec2a74911a7 100644 (file)
--- a/mod/assignment/index.php
+++ b/mod/assignment/index.php
@@ -116,5 +116,5 @@
 
     print_table($table);
 
-    print_footer($course);
+    echo $OUTPUT->footer();
 ?>

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 4ee016d0457f20747c5571793610ca53347cb18e..d75545c4960c45e8ef37f2d3189a507c763bb273 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -244,7 +244,8 @@ class assignment_base {
      * This will be suitable for most assignment types
      */
     function view_footer() {
-        print_footer($this->course);
+        global $OUTPUT;
+        echo $OUTPUT->footer();
     }
 
     /**
@@ -847,7 +848,7 @@ class assignment_base {
      * @param string $extra_javascript
      */
     function display_submission($extra_javascript = '') {
-        global $CFG, $DB, $PAGE;
+        global $CFG, $DB, $PAGE, $OUTPUT;
         require_once($CFG->libdir.'/gradelib.php');
         require_once($CFG->libdir.'/tablelib.php');
 
@@ -1039,7 +1040,7 @@ class assignment_base {
 
         echo '</table>';
 
-        print_footer('none');
+        echo $OUTPUT->footer();
     }
 
     /**
@@ -1422,7 +1423,7 @@ class assignment_base {
         echo '</td></tr></table>';
         echo '</div></form></div>';
         ///End of mini form
-        print_footer($this->course);
+        echo $OUTPUT->footer();
     }
 
     /**

diff --git a/mod/assignment/type/online/all.php b/mod/assignment/type/online/all.php
index 9a5551c950878c274c3dc9b70f32c1d21b5b1457..561cab12d661c25d3368f78da6cbc4665d039d4b 100644 (file)
--- a/mod/assignment/type/online/all.php
+++ b/mod/assignment/type/online/all.php
@@ -161,5 +161,5 @@
         print_container_end();
     }
 
-    print_footer($course);
+    echo $OUTPUT->footer();
 ?>

diff --git a/mod/assignment/type/online/file.php b/mod/assignment/type/online/file.php
index f31c1bc4721a61d675de7e7585148cac8d32a6b0..5915c2e18d3f26d43889ecd8b853aca36dae798c 100644 (file)
--- a/mod/assignment/type/online/file.php
+++ b/mod/assignment/type/online/file.php
@@ -57,7 +57,7 @@
 
         print_simple_box(format_text($submission->data1, $submission->data2), 'center', '100%');
         echo $OUTPUT->close_window_button();
-        print_footer('none');
+        echo $OUTPUT->footer();
     } else {
         print_string('emptysubmission', 'assignment');
     }

diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index 61bd6d773e8ab4b7eb7241bd556d5e37f759069b..e81b83dbd56e7001c2aeff05766e21c0c64a6767 100644 (file)
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -522,7 +522,7 @@ class assignment_upload extends assignment_base {
     }
 
     function upload_responsefile() {
-        global $CFG, $USER;
+        global $CFG, $USER, $OUTPUT;
 
         $userid = required_param('userid', PARAM_INT);
         $mode   = required_param('mode', PARAM_ALPHA);
@@ -545,7 +545,7 @@ class assignment_upload extends assignment_base {
         print_header(get_string('upload'));
         notify(get_string('uploaderror', 'assignment'));
         print_continue($returnurl);
-        print_footer('none');
+        echo $OUTPUT->footer();
         die;
     }
 
@@ -770,7 +770,7 @@ class assignment_upload extends assignment_base {
             print_header(get_string('delete'));
             echo $OUTPUT->heading(get_string('delete'));
             notice_yesno(get_string('confirmdeletefile', 'assignment', $file), 'delete.php', $urlreturn, $optionsyes, $optionsreturn, 'post', 'get');
-            print_footer('none');
+            echo $OUTPUT->footer();
             die;
         }
 
@@ -785,7 +785,7 @@ class assignment_upload extends assignment_base {
         print_header(get_string('delete'));
         notify(get_string('deletefilefailed', 'assignment'));
         print_continue($returnurl);
-        print_footer('none');
+        echo $OUTPUT->footer();
         die;
 
     }
@@ -833,7 +833,7 @@ class assignment_upload extends assignment_base {
             if (empty($mode)) {
                 $this->view_footer();
             } else {
-                print_footer('none');
+                echo $OUTPUT->footer();
             }
             die;
         }
@@ -862,7 +862,7 @@ class assignment_upload extends assignment_base {
         if (empty($mode)) {
             $this->view_footer();
         } else {
-            print_footer('none');
+            echo $OUTPUT->footer();
         }
         die;
     }

diff --git a/mod/assignment/type/upload/notes.php b/mod/assignment/type/upload/notes.php
index 304f51654e429957e1df357bb226bea58b5bbd9a..120d375729a064a3c8f3845be7af59fdbd12e2b5 100644 (file)
--- a/mod/assignment/type/upload/notes.php
+++ b/mod/assignment/type/upload/notes.php
@@ -49,7 +49,7 @@
         } else {
             print_continue($returnurl);
         }
-        print_footer('none');
+        echo $OUTPUT->footer();
     } else {
         print_header(fullname($user,true).': '.$assignment->name);
         echo $OUTPUT->heading(get_string('notes', 'assignment').' - '.fullname($user,true));
@@ -59,7 +59,7 @@
         } else {
             print_continue($returnurl);
         }
-        print_footer('none');
+        echo $OUTPUT->footer();
     }
 
 ?>