MDL-19809 Converted all print_footer() calls

diff --git a/mod/glossary/comment.php b/mod/glossary/comment.php
index f774b0d22140afac8ac4ee3d55219e85857cb592..c917e3eef94304add708cec2d02e515af4a288b8 100644 (file)
--- 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 1aa16e173684a362cf27937e0036a7afd13d163c..6bf4ed51efb1d63a39b76bb87a538048a8c0f73a 100644 (file)
--- 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 4996d561e34e80bbe28efbfa8d6c482b02ca650a..6cf14a6b66ad3c7a089834b903cbbbbbcbe66db0 100644 (file)
--- 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 ddaa2bb67ea4a2007e52b15bf93c7642fba6d94e..70ff623de84470bd828b439ff157040ca6a54c32 100644 (file)
--- 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 0de8b1f32db1a4612da342b318eeff87d504595c..3d17803e6913a5bb111bbc4359f410edd34090b7 100644 (file)
--- 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 "<div style=\"text-align:center\">" . get_string("categorydeleted","glossary") ."</div>";
                 echo "</center>";
                 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 @@
 
 </form>
 
-<?php print_footer() ?>
+<?php 
+echo $OUTPUT->footer();

diff --git a/mod/glossary/export.php b/mod/glossary/export.php
index 19cc3fde535effdb7c4d03a474826d5e74152dd7..33fce80969832270c93af31632693c64c8aec864 100644 (file)
--- 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 23cb0aec15ca13bce5ce1eebf94f79f051b71fcb..ce9d2f90850289903c38603ffc6e514ab1dcb753 100644 (file)
--- 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 '</div>';
-        print_footer();
+        echo $OUTPUT->footer();
         die;
 
     } else {

diff --git a/mod/glossary/formats.php b/mod/glossary/formats.php
index c285abe2a5c05dda5d7118071dcb0501058c4656..e29bbd4e04be04492b3de82af4659300e81fb4c9 100644 (file)
--- a/mod/glossary/formats.php
+++ b/mod/glossary/formats.php
@@ -251,5 +251,5 @@
 
     echo '</table></form>';
 
-    print_footer();
+    echo $OUTPUT->footer();
 ?>

diff --git a/mod/glossary/import.php b/mod/glossary/import.php
index f6353f15ae7e83716c59836c9275b79112326648..b2ff708da333944102c86e1fad4e59ef4e97248c 100644 (file)
--- 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 '</center>';
                     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 73607b7ae7ecade0cf0217204009f8857d94b258..7a59cd719324a5b7d0d75dac698131b82ff80b6b 100644 (file)
--- 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 942d05d5b214031de85917ac9a6ace19cc5a37ca..fcafdc7b22cde14d037dfc832512a1f1fefc75c2 100644 (file)
--- 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 03133a8c6c88f67c14a5c3f7f6150b84056c9fb2..511466b0301be142df50504a061c01f3640816c1 100644 (file)
--- 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 e63459b621333095f4b3c043679049d1f0199b98..d534a870c05e6f42ae5ea5fd108309ca84e8e5a0 100644 (file)
--- 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 4d3a55dcf359ab0807bfec1ffd76648c05bab860..4429eb2a657aa6bbb9331eb29f71f32a2232fa8c 100644 (file)
--- 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);