Admin page cleanup (Google soc 2006)

admin/enrol_config.php

@@ -3,23 +3,13 @@
        //                    Yes, enrol is correct English spelling.
 
     require_once("../config.php");
+    require_once($CFG->dirroot . '/admin/adminlib.php');
+    
+    admin_externalpage_setup('enrolment');
 
     $enrol = required_param('enrol', PARAM_ALPHA);
     $CFG->pagepath = 'enrol/' . $enrol;
-    
-    require_login();
 
-    if (!$site = get_site()) {
-        redirect("index.php");
-    }
-
-    if (!isadmin()) {
-        error("Only the admin can use this page");
-    }
-
-    if (!confirm_sesskey()) {
-        error(get_string('confirmsesskeybad', 'error'));
-    }
 
     require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
 
@@ -28,6 +18,9 @@
 /// If data submitted, then process and store.
 
     if ($frm = data_submitted()) {
+        if (!confirm_sesskey()) {
+            error(get_string('confirmsesskeybad', 'error'));
+        }    
         if ($enrolment->process_config($frm)) {
             redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
         }
@@ -40,6 +33,7 @@
     /// get language strings
     $str = get_strings(array('enrolmentplugins', 'configuration', 'users', 'administration'));
 
+    unset($options);
 
     $modules = get_list_of_plugins("enrol");
     foreach ($modules as $module) {
@@ -47,11 +41,7 @@
     }
     asort($options);
 
-    print_header("$site->shortname: $str->enrolmentplugins", "$site->fullname",
-                  "<a href=\"index.php\">$str->administration</a> -> 
-                   <a href=\"users.php\">$str->users</a> -> 
-                   <a href=\"enrol.php?sesskey=$USER->sesskey\">$str->enrolmentplugins</a> -> 
-                   $str->configuration");
+    admin_externalpage_print_header();
 
     echo "<form target=\"{$CFG->framename}\" name=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">";
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">";
@@ -61,7 +51,7 @@
 /// Choose an enrolment method
     echo get_string('chooseenrolmethod').': ';
     choose_from_menu ($options, "enrol", $enrol, "",
-                      "document.location='enrol_config.php?sesskey=$USER->sesskey&enrol='+document.enrolmenu.enrol.options[document.enrolmenu.enrol.selectedIndex].value", "");
+                      "document.location='enrol_config.php?enrol='+document.enrolmenu.enrol.options[document.enrolmenu.enrol.selectedIndex].value", "");
 
     echo "</b></p></div>";
     
@@ -82,7 +72,7 @@
 
     print_simple_box_end();
 
-    print_footer();
+    admin_externalpage_print_footer();
 
     exit;
 ?>