MDL-19787 Converted all print_footer() calls

diff --git a/admin/auth_config.php b/admin/auth_config.php
index d89332a905596e0c8a9cc87c9c15b126278ec237..57cad02b9353b7e071984d3cc0b064eaf2e23c33 100644 (file)
--- a/admin/auth_config.php
+++ b/admin/auth_config.php
@@ -76,7 +76,7 @@ echo '<p style="text-align: center"><input type="submit" value="' . get_string("
 echo "</div>\n";
 echo "</form>\n";
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 exit;
 
 /// Functions /////////////////////////////////////////////////////////////////

diff --git a/admin/block.php b/admin/block.php
index fdf3d91839fab054ee22b85c955cebc171138b45..cab6170911f5ba991c8b7effa94637bc97055141 100644 (file)
--- a/admin/block.php
+++ b/admin/block.php
@@ -71,6 +71,6 @@
     print_box_end();
 
     echo '</form>';
-    print_footer();
+    echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/blocks.php b/admin/blocks.php
index 2764b6b6e46480c272e52fa760ff58d2f9b677fb..396c703402a03878a4b32c6e0ccd03185b51af58 100644 (file)
--- a/admin/blocks.php
+++ b/admin/blocks.php
@@ -60,7 +60,7 @@
             notice_yesno(get_string('blockdeleteconfirm', '', $strblockname),
                          'blocks.php?delete='.$block->id.'&confirm=1&sesskey='.sesskey(),
                          'blocks.php');
-            admin_externalpage_print_footer();
+            echo $OUTPUT->footer();
             exit;
 
         } else {
@@ -212,6 +212,6 @@
         $table->print_html();
     }
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/dbtransfer/dbexport.php b/admin/dbtransfer/dbexport.php
index 02d28f0e0d0a4cb78a311ca3d7b65f83f74ae3a1..2a32c4d6c793009a655aa191acf1c8ca819ab5a2 100644 (file)
--- a/admin/dbtransfer/dbexport.php
+++ b/admin/dbtransfer/dbexport.php
@@ -18,4 +18,4 @@ if ($data = $form->get_data()) {
 admin_externalpage_print_header();
 // TODO: add some more info here
 $form->display();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();

diff --git a/admin/dbtransfer/index.php b/admin/dbtransfer/index.php
index b9c5aefb2cad978fbf8d2f1ee508df6f3cd401e1..5fafd7e57d9b995fd67053eaca7adf5450b3d170 100644 (file)
--- a/admin/dbtransfer/index.php
+++ b/admin/dbtransfer/index.php
@@ -35,7 +35,7 @@ if ($data = $form->get_data()) {
     // Finish up.
     notify(get_string('success'), 'notifysuccess');
     print_continue("$CFG->wwwroot/$CFG->admin/");
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
     die;
 }
 
@@ -44,4 +44,4 @@ admin_externalpage_print_header();
 echo $OUTPUT->heading(get_string('transferdbtoserver', 'dbtransfer'));
 echo '<p>', get_string('transferdbintro', 'dbtransfer'), "</p>\n\n";
 $form->display();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();

diff --git a/admin/delete.php b/admin/delete.php
index 401ca757e9bb8cc5c12326c1e35a050cb99a469c..e2072fbae49650005caafef29dc0904a986f04c8 100644 (file)
--- a/admin/delete.php
+++ b/admin/delete.php
@@ -24,7 +24,7 @@
         $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey());
         notice_yesno ('Are you completely sure you want to delete everything inside the directory '. $deletedir .' ?',
             'delete.php', 'index.php', $optionsyes, NULL, 'post', 'get');
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -32,7 +32,7 @@
         $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey(), 'reallysure'=>'yes');
         notice_yesno ('Are you REALLY REALLY completely sure you want to delete everything inside the directory '. $deletedir .' (this includes all user images, and any other course files that have been created) ?',
             'delete.php', 'index.php', $optionsyes, NULL, 'post', 'get');
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -46,7 +46,7 @@
 
     echo '<h1 align="center">Done!</h1>';
     print_continue($CFG->wwwroot);
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
     exit;
 
 

diff --git a/admin/enrol.php b/admin/enrol.php
index 774471a792640c45209a414867adc5cd1a8ef0d8..ee8b9e5aacb0a7fd7beca219a545e185aeb5e83c 100644 (file)
--- a/admin/enrol.php
+++ b/admin/enrol.php
@@ -136,6 +136,6 @@
     echo '</div>';
     echo '</form>';
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/enrol_config.php b/admin/enrol_config.php
index 3b0f1d1577b7095ae13be0a79eb72b59446cb73f..2fea1aeb3a7cc5511d72a4d4a82fe2620de96daf 100644 (file)
--- a/admin/enrol_config.php
+++ b/admin/enrol_config.php
@@ -64,7 +64,7 @@
     echo "</div>";
     echo "</form>";
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
     exit;
 ?>

diff --git a/admin/environment.php b/admin/environment.php
index 11f2e42739d7814f214cb36855eecaf39e49dced..e819844597d0d0de28305fa251470265c9b34628 100644 (file)
--- a/admin/environment.php
+++ b/admin/environment.php
@@ -132,5 +132,5 @@
     $status = check_moodle_environment($version, $environment_results);
 
 /// Print footer
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 ?>

diff --git a/admin/filters.php b/admin/filters.php
index 2fe451849540d4c08bb548b1e935dba44eec3cb5..30ce0402c60bd71510046398e6291a2939130244 100644 (file)
--- a/admin/filters.php
+++ b/admin/filters.php
@@ -123,7 +123,7 @@
             notice_yesno(get_string('deletefilterareyousuremessage', 'admin', $filtername), $returnurl .
                     '?action=delete&filterpath=' . $filterpath . '&confirm=1&sesskey=' . sesskey(),
                     $returnurl, NULL, NULL, 'post', 'get');
-            admin_externalpage_print_footer();
+            echo $OUTPUT->footer();
             exit;
         }
 
@@ -140,7 +140,7 @@
         $a->directory = $filterpath;
         print_box(get_string('deletefilterfiles', 'admin', $a), 'generalbox', 'notice');
         print_continue($returnurl);
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -219,7 +219,7 @@
 
     print_table($table);
     echo '<p class="filtersettingnote">' . get_string('filterallwarning', 'filters') . '</p>';
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 /// Display helper functions ===================================================
 

diff --git a/admin/generator.php b/admin/generator.php
index ef612cbe2cab54715237c93f261e36b8db3cd000..f523ea1cc6ec788e385f56cd2fd115628c53e198 100755 (executable)
--- a/admin/generator.php
+++ b/admin/generator.php
@@ -1209,7 +1209,7 @@ class generator_web extends generator {
         if (!has_capability('moodle/site:doanything', $systemcontext)) {
             // If not logged in, give link to login page for current site
             notify("You must be logged in as administrator before using this script.");
-            print_footer();
+            echo $OUTPUT->footer();
             require_login();
         } else {
             $this->mform->display();
@@ -1218,7 +1218,8 @@ class generator_web extends generator {
     }
 
     public function __destroy() {
-        print_footer();
+        global $OUTPUT;
+        echo $OUTPUT->footer();
     }
 }
 

diff --git a/admin/health.php b/admin/health.php
index af9e82a4967b4e58b4324becaf4d8bf2564cabd9..5a727969006b60ed6471b7e038157de1fbfafe48 100644 (file)
--- a/admin/health.php
+++ b/admin/health.php
@@ -100,7 +100,7 @@ STYLES;
     }
 
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 
 function health_find_problems() {

diff --git a/admin/index.php b/admin/index.php
index b1e7043538e37884e413419b8440ac1b5d2e5a9f..f6a16393a6db20ad11f705ed1e1931f8040cbb8c 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -129,7 +129,7 @@ if (!core_tables_exist()) {
         echo '<br />';
         notice_yesno(get_string('doyouagree'), "index.php?agreelicense=1&lang=$CFG->lang",
                                                "http://docs.moodle.org/en/License");
-        print_footer();
+        echo $OUTPUT->footer();
         die;
     }
     if (empty($confirmrelease)) {
@@ -149,7 +149,7 @@ if (!core_tables_exist()) {
             print_continue("index.php?agreelicense=1&amp;confirmrelease=1&amp;lang=$CFG->lang");
         }
 
-        print_footer();
+        echo $OUTPUT->footer();
         die;
     }
 
@@ -193,7 +193,7 @@ if ($version > $CFG->version) {  // upgrade
         $continueform->method = 'get';
         $continueform->url = new moodle_url('index.php', array('confirmupgrade' => 1));
         echo $OUTPUT->confirm(get_string('upgradesure', 'admin', $a->newversion), $continueform, 'index.php');
-        print_footer();
+        echo $OUTPUT->footer();
         exit;
 
     } else if (empty($confirmrelease)){
@@ -218,7 +218,7 @@ if ($version > $CFG->version) {  // upgrade
             print_continue('index.php?confirmupgrade=1&amp;confirmrelease=1');
         }
 
-        print_footer();
+        echo $OUTPUT->footer();
         die;
 
     } elseif (empty($confirmplugins)) {
@@ -232,7 +232,7 @@ if ($version > $CFG->version) {  // upgrade
         print_plugin_tables();
         print_upgrade_reload('index.php?confirmupgrade=1&amp;confirmrelease=1');
         print_continue('index.php?confirmupgrade=1&amp;confirmrelease=1&amp;confirmplugincheck=1');
-        print_footer();
+        echo $OUTPUT->footer();
         die();
 
     } else {
@@ -381,5 +381,5 @@ $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
 print_box($copyrighttext, 'copyright');
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 

diff --git a/admin/innodb.php b/admin/innodb.php
index 6f6f9c0930c56f51773864bcae56ea0bb4a5f334..f9de6b9b0e06f3a637b61fbf0399c305e7e13561 100644 (file)
--- a/admin/innodb.php
+++ b/admin/innodb.php
@@ -32,13 +32,13 @@
         }
         notify('... done.', 'notifysuccess');
         print_continue('index.php');
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
 
     } else {
         $optionsyes = array('confirm'=>'1', 'sesskey'=>sesskey());
         notice_yesno('Are you sure you want convert all your tables to the InnoDB format?',
                      'innodb.php', 'index.php', $optionsyes, NULL, 'post', 'get');
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
     }
 
 ?>

diff --git a/admin/lang.php b/admin/lang.php
index db5b9724ffdb059e2725359f0e345a428ef52f7a..c446c1c901f397d0fd67b2c5016f54c251fb590b 100644 (file)
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -142,7 +142,7 @@
         $langs = get_list_of_languages(false, true);
         popup_form ("$CFG->wwwroot/$CFG->admin/lang.php?lang=", $langs, "chooselang", $currlang, "", "", "", false, 'self', $strcurrentlanguage.':');
         print_box_end();
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -905,7 +905,7 @@
     } // fi $mode == 'helpfiles'
 
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 //////////////////////////////////////////////////////////////////////
 

diff --git a/admin/langimport.php b/admin/langimport.php
index a3f1102ebace9b76910abd7203b2f8702b237a9a..614a5491dbff9ff820952be7aeea5f46c044e8bb 100755 (executable)
--- a/admin/langimport.php
+++ b/admin/langimport.php
@@ -14,7 +14,7 @@
     if (!empty($CFG->skiplangupgrade)) {
         admin_externalpage_print_header();
         print_box(get_string('langimportdisabled', 'admin'));
-        print_footer();
+        echo $OUTPUT->footer();
         die;
     }
 
@@ -107,7 +107,7 @@
                 notice_yesno(get_string('uninstallconfirm', 'admin', $uninstalllang),
                              'langimport.php?mode='.DELETION_OF_SELECTED_LANG.'&uninstalllang='.$uninstalllang.'&confirm=1&sesskey='.sesskey(),
                              'langimport.php');
-                print_footer();
+                echo $OUTPUT->footer();
                 die;
 
             } else if (confirm_sesskey()) {
@@ -391,7 +391,7 @@
     echo '</td></tr></table>';
     print_box_end();
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
     /**
      * Returns a list of available language packs from a

diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php
index ef43d196d532ca8bd60a3ab54732b93ef0d9c214..b56f060bbd152b496e3d631ae4366395fbcd0aac 100644 (file)
--- a/admin/mnet/access_control.php
+++ b/admin/mnet/access_control.php
@@ -232,6 +232,6 @@ foreach ($formerror as $error) {
 }
 
 print_simple_box_end();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/mnet/delete.html b/admin/mnet/delete.html
index f1523002fc643115f18696b7c05fc75969e4b6d3..f6f691c8fde3de2c562229cf8409379d62ddee7c 100644 (file)
--- a/admin/mnet/delete.html
+++ b/admin/mnet/delete.html
@@ -51,5 +51,5 @@ echo $OUTPUT->heading(get_string('mnetsettings', 'mnet'));
     </table>
 </div>
 <?php
-print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/mnet/enr_course_enrol.php b/admin/mnet/enr_course_enrol.php
index 98b4f4926c5bb20d740469cae6bffa252a952afd..493e906deaf04d4f7b7f13ec95b404087a46476e 100644 (file)
--- a/admin/mnet/enr_course_enrol.php
+++ b/admin/mnet/enr_course_enrol.php
@@ -305,6 +305,6 @@ if (!empty($errors)) {
 }
 
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/mnet/enr_courses.php b/admin/mnet/enr_courses.php
index 334a2096ecc42135815ea71c97e82159bed54d24..340a625a75400ae0866559d8c7218ff9017faed6 100644 (file)
--- a/admin/mnet/enr_courses.php
+++ b/admin/mnet/enr_courses.php
@@ -51,6 +51,6 @@
     }
     echo '</table></div>';
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/mnet/enr_hosts.php b/admin/mnet/enr_hosts.php
index 665628e5a66b54b68b2b85b8391ff9f6eb19d295..3dfccb5688f9448026ecef02637502dc6d3c87f7 100644 (file)
--- a/admin/mnet/enr_hosts.php
+++ b/admin/mnet/enr_hosts.php
@@ -54,6 +54,6 @@
     echo '</table>'
        . '</div>';
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/mnet/index.php b/admin/mnet/index.php
index 948d13e7ea85f39a51386e4e639bb63372a9fd62..105e7fee7681d0f1bc540428e69212b43cadda63 100644 (file)
--- a/admin/mnet/index.php
+++ b/admin/mnet/index.php
@@ -139,5 +139,5 @@
 </center>
 
 <?php
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/mnet/mnet_review.html b/admin/mnet/mnet_review.html
index 44723b25d8d7c755ea0b8b7bb2a22e49b8e8cd61..b521cb7e14b2f9a1400483ded70b0f22b4096c18 100644 (file)
--- a/admin/mnet/mnet_review.html
+++ b/admin/mnet/mnet_review.html
@@ -153,5 +153,5 @@ if (!empty($credentials)) {
 </form>
 <?php
 print_simple_box_end();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/mnet/mnet_review_allhosts.html b/admin/mnet/mnet_review_allhosts.html
index 246e81cc6c70b424ff7c09a9f46677f116a8f448..03002eed70f47da1f2c53c6f2cda8092f007be13 100644 (file)
--- a/admin/mnet/mnet_review_allhosts.html
+++ b/admin/mnet/mnet_review_allhosts.html
@@ -19,5 +19,5 @@ print_simple_box_start("center", "");
 </table>
 <?php
 print_simple_box_end();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/mnet/mnet_services.html b/admin/mnet/mnet_services.html
index 101537b241f6b263d3973e7791407ce26903aa9b..31f8af6ea95dd18f9d542fc7491911086bcca85a 100644 (file)
--- a/admin/mnet/mnet_services.html
+++ b/admin/mnet/mnet_services.html
@@ -102,5 +102,5 @@ print_simple_box_start("center", "");
 </form>
 <?php
 print_simple_box_end();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/mnet/mnet_themes.html b/admin/mnet/mnet_themes.html
index bdeeaea44bb0d476ed7268339dd1f806519aa312..0fbe99e90227a6510f190f1f3a1563e00cf0e501 100644 (file)
--- a/admin/mnet/mnet_themes.html
+++ b/admin/mnet/mnet_themes.html
@@ -123,5 +123,5 @@ print_tabs(array($tabs), 'mnetthemes');
     echo "</table>";
 
 $THEME = $original_theme;
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/mnet/peers.html b/admin/mnet/peers.html
index 91d5e99cfc4d7dd596329484f68643fcfbbc8cdb..66a8056aa402911c403e3c23d469bb674e97d3e1 100644 (file)
--- a/admin/mnet/peers.html
+++ b/admin/mnet/peers.html
@@ -97,5 +97,5 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
     </form>
 </div>
 <?php
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/mnet/trustedhosts.html b/admin/mnet/trustedhosts.html
index d849642b21088a9f44d98d6e648409f837a6334c..021e819a1a1f0c154409fbba8523ae19d598f660 100644 (file)
--- a/admin/mnet/trustedhosts.html
+++ b/admin/mnet/trustedhosts.html
@@ -64,5 +64,5 @@ admin_externalpage_print_header();
 </table>
 </div>
 <?php
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/modules.php b/admin/modules.php
index 09e0f5cd53bfc40204284dfedb5d2f1692826835..cf9e69b081948deac79eb2c408bde47fcec29cd9 100644 (file)
--- a/admin/modules.php
+++ b/admin/modules.php
@@ -80,7 +80,7 @@
             notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename),
                          "modules.php?delete=$delete&confirm=1&sesskey=".sesskey(),
                          "modules.php");
-            admin_externalpage_print_footer();
+            echo $OUTPUT->footer();
             exit;
 
         } else {  // Delete everything!!
@@ -262,6 +262,6 @@
 
     $table->print_html();
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/multilangupgrade.php b/admin/multilangupgrade.php
index 158747ef0a57c7a4ace23f8655df6c0d37392f16..125439474c0ebf01c6caed0777ebe0ce34e827eb 100644 (file)
--- a/admin/multilangupgrade.php
+++ b/admin/multilangupgrade.php
@@ -19,7 +19,7 @@ $strmultilangupgrade = get_String('multilangupgradeinfo', 'admin');
 if (!$go or !data_submitted() or !confirm_sesskey()) {   /// Print a form
     $optionsyes = array('go'=>1, 'sesskey'=>sesskey());
     notice_yesno($strmultilangupgrade, 'multilangupgrade.php', 'index.php', $optionsyes, null, 'post', 'get');
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
     die;
 }
 
@@ -102,7 +102,7 @@ notify('...finished', 'notifysuccess');
 
 print_continue('index.php');
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 die;
 
 

diff --git a/admin/oacleanup.php b/admin/oacleanup.php
index e7e7d9d798a54003208a1e92548574633f7a0c2b..8e53ebf8f031a7d15a3a8e548bbc698ade7608a7 100644 (file)
--- a/admin/oacleanup.php
+++ b/admin/oacleanup.php
@@ -9,7 +9,7 @@ if (!isset($CFG)) {
 
     admin_externalpage_print_header();
     online_assignment_cleanup(true);
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 }
 

diff --git a/admin/phpinfo.php b/admin/phpinfo.php
index 5c2398b576fec3eb96c238aa8be0443c07e05820..257433783cd8e64000ce3d75ded793af562495c8 100644 (file)
--- a/admin/phpinfo.php
+++ b/admin/phpinfo.php
@@ -28,6 +28,6 @@
 
     echo '</div>';
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/portfolio.php b/admin/portfolio.php
index af4ccab4f578d1d25ba0e6b77ecf8826c70c2617..1c8a8ac18f9ebc41f3810a2b6bf6d37c2b12c354 100644 (file)
--- a/admin/portfolio.php
+++ b/admin/portfolio.php
@@ -110,5 +110,5 @@ if (!empty($return)) {
     // normal display. fall through to here (don't call exit) if you want this to run
     redirect($baseurl);
 }
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/qtypes.php b/admin/qtypes.php
index 40ac6c791fcd88169390e1b9dc5e3a8ab69a7841..31d3cbd5be48f9444c7f27bbde11bdde656df4a5 100644 (file)
--- a/admin/qtypes.php
+++ b/admin/qtypes.php
@@ -125,7 +125,7 @@
             notice_yesno(get_string('deleteqtypeareyousuremessage', 'admin', $qtypename),
                     admin_url('qtypes.php?delete=' . $delete . '&confirm=1&sesskey=' . sesskey()),
                     admin_url('qtypes.php'), NULL, NULL, 'post', 'get');
-            admin_externalpage_print_footer();
+            echo $OUTPUT->footer();
             exit;
         }
 
@@ -150,7 +150,7 @@
         $a->directory = $QTYPES[$delete]->plugin_dir();
         print_box(get_string('qtypedeletefiles', 'admin', $a), 'generalbox', 'notice');
         print_continue(admin_url('qtypes.php'));
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -259,7 +259,7 @@
 
     $table->finish_output();
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 function admin_url($endbit) {
     global $CFG;

diff --git a/admin/register.php b/admin/register.php
index 9f77f88c9e4238a950fc5ebd59a574d4121847e3..ba93a2f7ab39b4fdc8f698a11be6d76f783595a2 100644 (file)
--- a/admin/register.php
+++ b/admin/register.php
@@ -185,4 +185,4 @@
     echo "</form>\n";
 
 /// Print footer
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();

diff --git a/admin/replace.php b/admin/replace.php
index 2e75a5947b16950a80b1295eddb729a13b8fc7ad..740053265f318ba1d22cd8d3924b69225e8e0bdc 100644 (file)
--- a/admin/replace.php
+++ b/admin/replace.php
@@ -28,7 +28,7 @@ if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Pr
     echo '</form>';
     echo '</div>';
     print_simple_box_end();
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
     die;
 }
 
@@ -57,6 +57,6 @@ notify('...finished', 'notifysuccess');
 
 print_continue('index.php');
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/report/backups/index.php b/admin/report/backups/index.php
index cb077b5673a8cc8b08f3569d58283a7592275578..2a685d0de9483dd3d4188c88857d1221ab23676d 100644 (file)
--- a/admin/report/backups/index.php
+++ b/admin/report/backups/index.php
@@ -129,6 +129,6 @@
         print_simple_box_end();
     }
 
-    print_footer();
+    echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/report/capability/index.php b/admin/report/capability/index.php
index 3c701c8f3b1f1906279a2b29073b8f6c08d52676..5e45dd572b772f4de8b3fac470d2bda866870984 100644 (file)
--- a/admin/report/capability/index.php
+++ b/admin/report/capability/index.php
@@ -157,7 +157,7 @@ if ($capability) {
 }
 
 // Footer.
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 function print_report_tree($contextid, $contexts, $allroles) {
     global $CFG;

diff --git a/admin/report/configlog/index.php b/admin/report/configlog/index.php
index 723e84ad38c5f2cd15c87d3e220993180cab87da..0d0261a8be0092444288e01d65978faea48853e5 100644 (file)
--- a/admin/report/configlog/index.php
+++ b/admin/report/configlog/index.php
@@ -105,4 +105,4 @@ $rs->close();
 
 print_table($table);
 
-print_footer('none');
+echo $OUTPUT->footer();

diff --git a/admin/report/courseoverview/index.php b/admin/report/courseoverview/index.php
index 84c5817f0a3d090d496d43605865150e00612915..1d54fba7b5ef8419426283595f3f4e723a6fa93f 100644 (file)
--- a/admin/report/courseoverview/index.php
+++ b/admin/report/courseoverview/index.php
@@ -114,6 +114,6 @@
             print_table($table);
         }
     }
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/report/questioninstances/index.php b/admin/report/questioninstances/index.php
index 202fc67115255764cd655c50bb78322e3de3cdc6..56d72cedf06142aa12c5d9ee7f60fb3346e1048c 100644 (file)
--- a/admin/report/questioninstances/index.php
+++ b/admin/report/questioninstances/index.php
@@ -126,5 +126,5 @@ if ($requestedqtype) {
 }
 
 // Footer.
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/report/security/index.php b/admin/report/security/index.php
index cdc0da88ede38a6d84ed16aeb91deb18cf09b0e7..1bea6cd1a846696d66024d5562b72ef22eeba520 100644 (file)
--- a/admin/report/security/index.php
+++ b/admin/report/security/index.php
@@ -124,4 +124,4 @@ if ($issue and ($result = $issue(true))) {
     print_table($table);
 }
 
-print_footer();
+echo $OUTPUT->footer();

diff --git a/admin/report/spamcleaner/index.php b/admin/report/spamcleaner/index.php
index fa040efc350619f6377a46de6937cf64f85367fb..f7be5c52c93d0c6f82ad55bdf6fe4325aa155940 100755 (executable)
--- a/admin/report/spamcleaner/index.php
+++ b/admin/report/spamcleaner/index.php
@@ -289,6 +289,6 @@ function print_spamcleaner_javascript()  {
     //$sesskey = sesskey();
 }
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/report/unittest/dbtest.php b/admin/report/unittest/dbtest.php
index ee352a00ce1d7225ff2136593bf7f01b40d589c2..cf9feab31784f2155b6996f44ee799d01756aa95 100644 (file)
--- a/admin/report/unittest/dbtest.php
+++ b/admin/report/unittest/dbtest.php
@@ -144,6 +144,6 @@ if (!data_submitted() || !$codecoverage) {
 }
 
 // Footer.
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/report/unittest/index.php b/admin/report/unittest/index.php
index 615ded66af2b5d6b6ffeefa99521173f70e4a0c2..a6090ca38f381766e23d947159ecb9b84e375ec0 100644 (file)
--- a/admin/report/unittest/index.php
+++ b/admin/report/unittest/index.php
@@ -148,6 +148,6 @@ if (is_null($path) || !$codecoverage) {
 }
 
 // Footer.
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/repository.php b/admin/repository.php
index 8965a12dbbf8c63726d370cbf18d6b017d6db6c0..4a2c507d2abe3f860d54b980faa3e8fcd27d78fc 100644 (file)
--- a/admin/repository.php
+++ b/admin/repository.php
@@ -167,4 +167,4 @@ else if (!empty($move) && !empty($type)) {
 if (!empty($return)) {
     redirect($baseurl);
 }
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();

diff --git a/admin/repositoryinstance.php b/admin/repositoryinstance.php
index d51653364464e563745cf64b937e2eef196e09ec..d745ab65fde523da86b3787420647366d1d82432 100644 (file)
--- a/admin/repositoryinstance.php
+++ b/admin/repositoryinstance.php
@@ -130,4 +130,4 @@ if (!empty($return)) {
 
     redirect($baseurl);
 }
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();

diff --git a/admin/roles/allow.php b/admin/roles/allow.php
index 438de64b9760dfc2af104478e26d727444604e4e..ba986026d58eaa2c6571fa495a005cd6734b8b55 100755 (executable)
--- a/admin/roles/allow.php
+++ b/admin/roles/allow.php
@@ -80,5 +80,5 @@
     echo '<div class="buttons"><input type="submit" name="submit" value="'.get_string('savechanges').'"/>';
     echo '</div></form>';
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 ?>

diff --git a/admin/roles/assign.php b/admin/roles/assign.php
index 3bf0d0b7d603712d00599de8870d09126553c481..8697675b06c31cb5033cc327c124b4e4028c97e1 100755 (executable)
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -455,4 +455,4 @@
         }
     }
 
-    print_footer();
+    echo $OUTPUT->footer();

diff --git a/admin/roles/check.php b/admin/roles/check.php
index 141845dc4cc097fee1abd0c0591dc16d49fd7db3..6407e80ccebefdc65617f6354298991cd5dddc02 100755 (executable)
--- a/admin/roles/check.php
+++ b/admin/roles/check.php
@@ -193,5 +193,5 @@
                 get_string('backtopageyouwereon') . '</a></div>';
     }
 
-    print_footer();
+    echo $OUTPUT->footer();
 ?>

diff --git a/admin/roles/define.php b/admin/roles/define.php
index 7981b5f6d7d50da0ae13a0725c81f837c9b25326..784399dbba03e40711f09f3148a860f871a0f5ae 100755 (executable)
--- a/admin/roles/define.php
+++ b/admin/roles/define.php
@@ -185,5 +185,5 @@
     echo '<p><a href="' . $manageurl . '">' . get_string('backtoallroles', 'role') . '</a></p>';
     echo '</div>';
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 ?>

diff --git a/admin/roles/explain.php b/admin/roles/explain.php
index 87f27dcf04a9dc16166b2ec60042016059e3b6be..d1b5e6283090669398586f428f6ed2497283b310 100755 (executable)
--- a/admin/roles/explain.php
+++ b/admin/roles/explain.php
@@ -274,5 +274,5 @@ if ($userid && $capability != 'moodle/site:doanything' && !$userhascapability &&
     echo '<p>' . get_string('explainpermissionsdoanything', 'role', $capability) . '</p>';
 }
 echo $OUTPUT->close_window_button();
-print_footer('empty');
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/roles/manage.php b/admin/roles/manage.php
index a5cfc71e9112ad7ed58706b1e891666e78fb68cc..438611f03cc34205c415cc4d66c636f7050bffd9 100755 (executable)
--- a/admin/roles/manage.php
+++ b/admin/roles/manage.php
@@ -90,7 +90,7 @@
                 $a->shortname = $roles[$roleid]->shortname;
                 $a->count = $DB->count_records('role_assignments', array('roleid'=>$roleid));
                 notice_yesno(get_string('deleterolesure', 'role', $a), $baseurl, $baseurl, $optionsyes, NULL, 'post', 'get');
-                admin_externalpage_print_footer();
+                echo $OUTPUT->footer();
                 die;
             }
             if (!delete_role($roleid)) {
@@ -170,7 +170,7 @@
                     $warning = get_string('resetrolesure', 'role', $a);
                 }
                 notice_yesno($warning, 'manage.php', 'manage.php', $optionsyes, $optionsno, 'post', 'get');
-                admin_externalpage_print_footer();
+                echo $OUTPUT->footer();
                 die;
             }
 
@@ -262,7 +262,7 @@
     print_single_button($defineurl, array('action' => 'add'), get_string('addrole', 'role'), 'get');
     echo '</div>';
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
     die;
 
 function get_action_icon($url, $icon, $alt, $tooltip) {

diff --git a/admin/roles/override.php b/admin/roles/override.php
index 4ffc4c98e8b36a86bbbd97952e61f459bbfb9d25..0f324479228196db109cae7eaff5a2a2662196de 100755 (executable)
--- a/admin/roles/override.php
+++ b/admin/roles/override.php
@@ -267,4 +267,4 @@
         }
     }
 
-    print_footer();
+    echo $OUTPUT->footer();

diff --git a/admin/roles/usersroles.php b/admin/roles/usersroles.php
index 3264b655d2c74255639bb003ea62bae69ecc1586..204e0bf60632aa75b142557f381ac7ec975eb8bf 100644 (file)
--- a/admin/roles/usersroles.php
+++ b/admin/roles/usersroles.php
@@ -156,7 +156,7 @@ if (!$roleassignments) {
 
 /// End of page.
 print_box_end();
-print_footer($course);
+echo $OUTPUT->footer();
 
 function print_report_tree($contextid, $contexts, $systemcontext, $fullname) {
     global $CFG, $OUTPUT;

diff --git a/admin/search.php b/admin/search.php
index 7e7511a4db163b04379b48ac625e743fcc12c2e3..112f27e0be6ebb418f4dc6a3a663ef6d13676926 100644 (file)
--- a/admin/search.php
+++ b/admin/search.php
@@ -60,6 +60,6 @@ if ($resultshtml != '') {
 echo '</fieldset>';
 echo '</form>';
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/settings.php b/admin/settings.php
index 7cefc1de379f09e287f8ffd4c07351f3c23d020d..612db979bac636f691c206e7b36564839bafed6a 100644 (file)
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -128,6 +128,6 @@ if (empty($SITE->fullname)) {
     echo '</form>';
 }
 
-print_footer();
+echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/timezone.php b/admin/timezone.php
index b3c1578ef37b24de26bcdfb9c5d8b8fce74342b2..5b04706da233c02f8402d190fe9f0b694119b2cb 100644 (file)
--- a/admin/timezone.php
+++ b/admin/timezone.php
@@ -44,6 +44,6 @@
     echo '<input type="submit" value="'.s($strsavechanges).'" />';
     echo "</form></center>";
 
-    print_footer();
+    echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/timezoneimport.php b/admin/timezoneimport.php
index bdb81175f94fad03484e5ceec76eac8db6484bdc..23b0a323bae4a672b8004000eb7d4b1302e6bfab 100644 (file)
--- a/admin/timezoneimport.php
+++ b/admin/timezoneimport.php
@@ -32,7 +32,7 @@
 
         notice_yesno($message, 'timezoneimport.php?ok=1&sesskey='.sesskey(), 'index.php');
 
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         exit;
     }
 
@@ -121,6 +121,6 @@
         print_continue('index.php');
     }
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/upgradesettings.php b/admin/upgradesettings.php
index 917c824f25ea77191dc4a0ef1c9bd3e837588293..740848b957643f743741c9358ba6e4500d32735f 100644 (file)
--- a/admin/upgradesettings.php
+++ b/admin/upgradesettings.php
@@ -65,6 +65,6 @@ echo '<div class="form-buttons"><input class="form-submit" type="submit" value="
 echo '</div>';
 echo '</form>';
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/uploadpicture.php b/admin/uploadpicture.php
index 28f1b0672004a35ac75da8905c5a38b93331c87c..8f8a44daf61363d49cff90c37841c611da98dde1 100644 (file)
--- a/admin/uploadpicture.php
+++ b/admin/uploadpicture.php
@@ -107,7 +107,7 @@ if ($formdata = $mform->get_data()) {
     }
 }
 $mform->display();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 exit;
 
 // ----------- Internal functions ----------------

diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index ba104f865c65bf067405cb5158ecbd5b3c08770c..046f8ce2fae0ad39f5e6af1c2a7cf1aed034bc67 100755 (executable)
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -108,7 +108,7 @@ if (empty($iid)) {
         admin_externalpage_print_header();
         print_heading_with_help(get_string('uploadusers'), 'uploadusers3');
         $mform->display();
-        admin_externalpage_print_footer();
+        echo $OUTPUT->footer();
         die;
     }
 } else {
@@ -733,7 +733,7 @@ if ($formdata = $mform->is_cancelled()) {
     } else {
         print_continue($returnurl);
     }
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
     die;
 }
 
@@ -774,7 +774,7 @@ $cir->close();
 echo '</table>';
 echo '<div class="centerpara">'.get_string('uupreprocessedcount', 'admin', $readcount).'</div>';
 $mform->display();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 die;
 
 /////////////////////////////////////

diff --git a/admin/user.php b/admin/user.php
index 4b2fd933a476aebd0dad341e97f70a14570482b8..f2aae56ca8570413f9662b1cef9b30b8d7a55f61 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -74,7 +74,7 @@
             echo $OUTPUT->heading(get_string('deleteuser', 'admin'));
             $optionsyes = array('delete'=>$delete, 'confirm'=>md5($delete), 'sesskey'=>sesskey());
             notice_yesno(get_string('deletecheckfull', '', "'$fullname'"), 'user.php', 'user.php', $optionsyes, NULL, 'post', 'get');
-            admin_externalpage_print_footer();
+            echo $OUTPUT->footer();
             die;
         } else if (data_submitted() and !$user->deleted) {
             if (delete_user($user)) {
@@ -304,7 +304,7 @@
         }
     }
 
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
 
 
 ?>

diff --git a/admin/user/user_bulk.php b/admin/user/user_bulk.php
index a36261cc82a3d748a7c547cafeb4de6f892269aa..220b34ac64934d59ae3715ab04fb3696c3828a21 100755 (executable)
--- a/admin/user/user_bulk.php
+++ b/admin/user/user_bulk.php
@@ -81,6 +81,6 @@ $ufiltering->display_active();
 $user_bulk_form->display();
 $action_form->display();
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 
 ?>

diff --git a/admin/user/user_bulk_confirm.php b/admin/user/user_bulk_confirm.php
index 7d71c2af807d599764316ff3ef9dd7c01ef07d59..b5b4c1efc2867729a7d6d79315cd5892de021017 100755 (executable)
--- a/admin/user/user_bulk_confirm.php
+++ b/admin/user/user_bulk_confirm.php
@@ -50,5 +50,5 @@ if ($confirm and confirm_sesskey()) {
     notice_yesno(get_string('confirmcheckfull', '', $usernames), 'user_bulk_confirm.php', 'user_bulk.php', $optionsyes, NULL, 'post', 'get');
 }
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/user/user_bulk_delete.php b/admin/user/user_bulk_delete.php
index 41127a0dc459b1eb5ca3b8314843ccd36b031b63..559bef48d083ba61c3f7662cc2a9cfe108d50c1f 100755 (executable)
--- a/admin/user/user_bulk_delete.php
+++ b/admin/user/user_bulk_delete.php
@@ -50,5 +50,5 @@ if ($confirm and confirm_sesskey()) {
     notice_yesno(get_string('deletecheckfull', '', $usernames), 'user_bulk_delete.php', 'user_bulk.php', $optionsyes, NULL, 'post', 'get');
 }
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/user/user_bulk_display.php b/admin/user/user_bulk_display.php
index 25aa2f8ed0cf8e1016b49b4997a1688a38866954..90b88d4350b668d5f1b260f445a12ea2d929a68d 100755 (executable)
--- a/admin/user/user_bulk_display.php
+++ b/admin/user/user_bulk_display.php
@@ -77,5 +77,5 @@ print_table($table);
 
 print_continue($return);
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/user/user_bulk_download.php b/admin/user/user_bulk_download.php
index 0ee20bdb51ce67d1e10476169a9ec6a109ae058b..c9b4d36364c749694245d6c0b15ca81f772d7571 100755 (executable)
--- a/admin/user/user_bulk_download.php
+++ b/admin/user/user_bulk_download.php
@@ -66,7 +66,7 @@ print_box_end();
 
 print_continue($return);
 
-print_footer();
+echo $OUTPUT->footer();
 
 function user_download_ods($fields) {
     global $CFG, $SESSION, $DB;

diff --git a/admin/user/user_bulk_enrol.php b/admin/user/user_bulk_enrol.php
index 737f76d2f083fa5b22681bd2966226ac48d60d44..1f3ceee3449cfe6b2170ccf6c096e7af6805549b 100644 (file)
--- a/admin/user/user_bulk_enrol.php
+++ b/admin/user/user_bulk_enrol.php
@@ -130,4 +130,4 @@ echo '<input type="submit" name="multienrolsubmit" value="save changes" />';
 echo '</div>';
 echo '</form>';
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();

diff --git a/admin/user/user_bulk_message.php b/admin/user/user_bulk_message.php
index c5c92768d606fb1cb11dad2c1e93c80e6a7fced5..67a06730dd644d8b3b82516627f98fdbdd8ce9ad 100755 (executable)
--- a/admin/user/user_bulk_message.php
+++ b/admin/user/user_bulk_message.php
@@ -63,11 +63,11 @@ if ($msgform->is_cancelled()) {
     echo $OUTPUT->heading(get_string('confirmation', 'admin'));
     print_box($msg, 'boxwidthnarrow boxaligncenter generalbox', 'preview');
     notice_yesno(get_string('confirmmessage', 'bulkusers', $usernames), 'user_bulk_message.php', 'user_bulk.php', $optionsyes, NULL, 'post', 'get');
-    admin_externalpage_print_footer();
+    echo $OUTPUT->footer();
     die;
 }
 
 admin_externalpage_print_header();
 $msgform->display();
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();
 ?>

diff --git a/admin/wsprotocols.php b/admin/wsprotocols.php
index 3a514b0a56a7740fd17bb4e74b3858d4097325d5..59599ff65cb2c62592f21f8c51bc9ece17bad2e9 100644 (file)
--- a/admin/wsprotocols.php
+++ b/admin/wsprotocols.php
@@ -83,4 +83,4 @@ if (!empty($return)) {
     redirect($baseurl);
 }
 
-admin_externalpage_print_footer();
+echo $OUTPUT->footer();

diff --git a/admin/xmldb/index.php b/admin/xmldb/index.php
index f5b67332efd454c07f3decca1ffdda07acb1d988..6a4723793d9bbd7de9b8965e8d2e087207e83eec 100644 (file)
--- a/admin/xmldb/index.php
+++ b/admin/xmldb/index.php
@@ -102,7 +102,7 @@
                         admin_externalpage_print_header();
                         echo $OUTPUT->heading($xmldb_action->getTitle());
                         echo $xmldb_action->getOutput();
-                        admin_externalpage_print_footer();
+                        echo $OUTPUT->footer();
                         break;
                     case ACTION_GENERATE_XML:
                         header('Content-type: application/xhtml+xml');