MDL-9647 simplify dealing with headers/footers in admin sections; some more cleanup

fixed continue button in error() on admin page when link present

diff --git a/admin/roles/assign.php b/admin/roles/assign.php
index 3996b349edf470d7e29f3051634e70e5a5665d9b..3cc60513ff1b288bb473fbc574e3071de9427efb 100755 (executable)
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -286,10 +286,6 @@
         print_table($table);
     }
 
-    if ($context->contextlevel == CONTEXT_SYSTEM or ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID)) {
-        admin_externalpage_print_footer();
-    } else {
-        print_footer($course);
-    }
+    print_footer($course);
 
 ?>

diff --git a/admin/roles/override.php b/admin/roles/override.php
index 4d6d2ece2e7e5bc5ff2e8875b638fd5dde912600..2c250618247e0ee1173e41e85f665ec8a97cbded 100755 (executable)
--- a/admin/roles/override.php
+++ b/admin/roles/override.php
@@ -223,10 +223,6 @@
         print_table($table);
     }
 
-    if ($context->contextlevel == CONTEXT_SYSTEM or ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID)) {
-        admin_externalpage_print_footer();
-    } else {
-        print_footer($course);
-    }
+    print_footer($course);
 
 ?>

diff --git a/course/category.php b/course/category.php
index 26a0867762b6ea01cec5722082723eaea1d8c7b2..5b21889485be5e834340ca9e035c139a6938b49e 100644 (file)
--- a/course/category.php
+++ b/course/category.php
@@ -453,10 +453,6 @@
     
     print_course_search();
     
-    if ($adminediting) {
-        admin_externalpage_print_footer();
-    } else {
-        print_footer();
-    }
+    print_footer();
 
 ?>

diff --git a/course/index.php b/course/index.php
index a39ccee9f4638c9966474c2f7bbe4e619f07423c..1e6178b5765809287c7e3d9669bfc10fc1391fc2 100644 (file)
--- a/course/index.php
+++ b/course/index.php
@@ -157,11 +157,7 @@
                              "index.php?delete=$delete&sure=".md5($deletecat->timemodified)."&sesskey=$USER->sesskey",
                              "index.php?sesskey=$USER->sesskey");
 
-                if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
-                    admin_externalpage_print_footer();
-                } else {
-                    print_footer();  
-                }
+                print_footer();  
                 exit();
             }
         }
@@ -326,11 +322,7 @@
     echo update_categories_button();
     echo '</div></div>';
 
-    if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
-        admin_externalpage_print_footer();
-    } else {
-        print_footer();
-    }
+    print_footer();
 
 
 function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $up=false, $down=false) {

diff --git a/course/report/log/index.php b/course/report/log/index.php
index cada4d3f963bbe43d8fabbb7dddca68a0016c95e..9f984c4be85d451d081302d6d1298f82a82e0912 100644 (file)
--- a/course/report/log/index.php
+++ b/course/report/log/index.php
@@ -144,11 +144,7 @@
 
     }
 
-    if ($hostid != $CFG->mnet_localhost_id || $course->id == SITEID) {
-        admin_externalpage_print_footer();
-    } else {
-        print_footer($course);
-    }
+    print_footer($course);
 
     exit;
 ?>