Bumping to Moodle 1.9.4 for release!

report/security MDL-18039 Just some trivial text fixes
Updated the 19 build version to 20090128
2009-01-28 06:20:53 +00:00 · 2009-01-28 06:10:38 +00:00 · 2009-01-27 23:54:27 +00:00 · 2009-01-27 18:08:29 +00:00 · 2009-01-27 17:51:52 +00:00 · 2009-01-27 17:40:02 +00:00
3279 changed files with 466090 additions and 176927 deletions
@@ -1,4 +1,4 @@
-README     $Id$
+README      $Id$
 ------

 QUICK INSTALL
@@ -7,273 +7,96 @@
 *
 */

-require_once dirname(dirname(__FILE__)) . '/config.php';
-require_once $CFG->libdir . '/tablelib.php';
+require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir.'/tablelib.php');

-$adminroot = admin_get_root();
-admin_externalpage_setup('userauthentication', $adminroot);
+require_login();
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+
+$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageauths";
+
+$action = optional_param('action', '', PARAM_ACTION);
+$auth   = optional_param('auth', '', PARAM_SAFEDIR);

 // get currently installed and enabled auth plugins
 $authsavailable = get_list_of_plugins('auth');
-if (empty($CFG->auth_plugins_enabled)) {
-    set_config('auth_plugins_enabled', $CFG->auth);
-    $CFG->auth_plugins_enabled = $CFG->auth;
-}
-$authsenabled = explode(',', $CFG->auth_plugins_enabled);

-// save form
-if ($form = data_submitted()) {
-
-    if (!confirm_sesskey()) {
-        error(get_string('confirmsesskeybad', 'error'));
-    }
-
-    if (! isset($form->guestloginbutton)) {
-        $form->guestloginbutton = 1;
-    }
-    if (empty($form->alternateloginurl)) {
-        $form->alternateloginurl = '';
-    }
-    if (empty($form->register)) {
-        $form->register = 'manual';
-    }
-    set_config('guestloginbutton', $form->guestloginbutton);
-    set_config('alternateloginurl', $form->alternateloginurl);
-    set_config('auth', $form->register);
-
-    // add $CFG->auth to auth_plugins_enabled list
-    if (!array_search($form->register, $authsenabled)) {
-        $authsenabled[] = $form->register;
-        $authsenabled = array_unique($authsenabled);
-        set_config('auth_plugins_enabled', implode(',', $authsenabled));
-    }
+get_enabled_auth_plugins(true); // fix the list of enabled auths
+if (empty($CFG->auth)) {
+    $authsenabled = array();
+} else {
+    $authsenabled = explode(',', $CFG->auth);
 }

-// grab GET/POST parameters
-$params = new object();
-$params->action    = optional_param('action', '', PARAM_ACTION);
-$params->auth      = optional_param('auth', $CFG->auth, PARAM_ALPHANUM);
+if (!empty($auth) and !exists_auth_plugin($auth)) {
+    print_error('pluginnotinstalled', 'auth', $url, $auth);
+}

 ////////////////////////////////////////////////////////////////////////////////
 // process actions

-switch ($params->action) {
+if (!confirm_sesskey()) {
+    redirect($returnurl);
+}

+switch ($action) {
    case 'disable':
-        // remove from enabled list 
-        $key = array_search($params->auth, $authsenabled);
-        if ($key !== false and $params->auth != $CFG->auth) {
+        // remove from enabled list
+        $key = array_search($auth, $authsenabled);
+        if ($key !== false) {
            unset($authsenabled[$key]);
-            set_config('auth_plugins_enabled', implode(',', $authsenabled));
+            set_config('auth', implode(',', $authsenabled));
+        }
+
+        if ($auth == $CFG->registerauth) {
+            set_config('registerauth', '');
        }
        break;
-        
+
    case 'enable':
-        // check auth plugin is valid first
-        if (!exists_auth_plugin($params->auth)) {
-            error(get_string('pluginnotinstalled', 'auth', $params->auth), $url);
-        }
        // add to enabled list
-        if (!array_search($params->auth, $authsenabled)) {
-            $authsenabled[] = $params->auth;
+        if (!in_array($auth, $authsenabled)) {
+            $authsenabled[] = $auth;
            $authsenabled = array_unique($authsenabled);
-            set_config('auth_plugins_enabled', implode(',', $authsenabled));
+            set_config('auth', implode(',', $authsenabled));
        }
        break;
-        
+
    case 'down':
-        $key = array_search($params->auth, $authsenabled);
+        $key = array_search($auth, $authsenabled);
        // check auth plugin is valid
        if ($key === false) {
-            error(get_string('pluginnotenabled', 'auth', $params->auth), $url);
+            print_error('pluginnotenabled', 'auth', $url, $auth);
        }
        // move down the list
        if ($key < (count($authsenabled) - 1)) {
            $fsave = $authsenabled[$key];
            $authsenabled[$key] = $authsenabled[$key + 1];
            $authsenabled[$key + 1] = $fsave;
-            set_config('auth_plugins_enabled', implode(',', $authsenabled));
+            set_config('auth', implode(',', $authsenabled));
        }
        break;
-        
+
    case 'up':
-        $key = array_search($params->auth, $authsenabled);
+        $key = array_search($auth, $authsenabled);
        // check auth is valid
        if ($key === false) {
-            error(get_string('pluginnotenabled', 'auth', $params->auth), $url);
+            print_error('pluginnotenabled', 'auth', $url, $auth);
        }
        // move up the list
        if ($key >= 1) {
            $fsave = $authsenabled[$key];
            $authsenabled[$key] = $authsenabled[$key - 1];
            $authsenabled[$key - 1] = $fsave;
-            set_config('auth_plugins_enabled', implode(',', $authsenabled));
+            set_config('auth', implode(',', $authsenabled));
        }
        break;
-        
-    case 'save':
-        // save settings
-        set_config('auth_plugins_enabled', implode(',', $authsenabled));
-        set_config('auth', $authsenabled[0]);
-        redirect("auth.php?sesskey=$USER->sesskey", get_string('changessaved'), 1);
-        break;

    default:
        break;
 }

-// display strings
-$txt = get_strings(array('authenticationplugins', 'users', 'administration',
-                         'settings', 'edit', 'name', 'enable', 'disable',
-                         'up', 'down', 'none'));
-$txt->updown = "$txt->up/$txt->down";
-
-// construct the display array, with enabled auth plugins at the top, in order
-$displayauths = array();
-$registrationauths = array();
-$registrationauths['manual'] = $txt->disable;
-foreach ($authsenabled as $auth) {
-    $displayauths[$auth] = get_string("auth_{$auth}title", 'auth');
-    $authplugin = get_auth_plugin($auth);
-    if (method_exists($authplugin, 'user_signup')) {
-        $registrationauths[$auth] = get_string("auth_{$auth}title", 'auth');
-    }    
-}
-foreach ($authsavailable as $auth) {
-    if (!array_key_exists($auth, $displayauths)) {
-        $displayauths[$auth] = get_string("auth_{$auth}title", 'auth');
-    }
-    $authplugin = get_auth_plugin($auth);
-    if (method_exists($authplugin, 'user_signup')) {
-        $registrationauths[$auth] = get_string("auth_{$auth}title", 'auth');
-    }    
-}
-
-// build the display table
-$table = new flexible_table('auth_admin_table');
-$table->define_columns(array('name', 'enable', 'order', 'settings'));
-$table->column_style('enable', 'text-align', 'center');
-$table->column_style('order', 'text-align', 'center');
-$table->column_style('settings', 'text-align', 'center');
-$table->define_headers(array($txt->name, $txt->enable, $txt->updown, $txt->settings));
-$table->define_baseurl("{$CFG->wwwroot}/{$CFG->admin}/auth.php");
-$table->set_attribute('id', 'blocks');
-$table->set_attribute('class', 'flexible generaltable generalbox');
-$table->set_attribute('style', 'margin:auto;');
-$table->set_attribute('cellpadding', '5');
-$table->setup();
-
-// iterate through auth plugins and add to the display table
-$updowncount = 1;
-$authcount = count($authsenabled);
-$url = "auth.php?sesskey=" . sesskey();
-foreach ($displayauths as $auth => $name) {
-    // hide/show link
-    if (in_array($auth, $authsenabled)) {
-        $hideshow = "<a href=\"$url&amp;action=disable&amp;auth=$auth\">";
-        $hideshow .= "<img src=\"{$CFG->pixpath}/i/hide.gif\" class=\"icon\" alt=\"disable\" /></a>";
-        // $hideshow = "<a href=\"$url&amp;action=disable&amp;auth=$auth\"><input type=\"checkbox\" checked /></a>";
-        $enabled = true;
-        $displayname = "<span>$name</span>";
-    }
-    else {
-        $hideshow = "<a href=\"$url&amp;action=enable&amp;auth=$auth\">";
-        $hideshow .= "<img src=\"{$CFG->pixpath}/i/show.gif\" class=\"icon\" alt=\"enable\" /></a>";
-        // $hideshow = "<a href=\"$url&amp;action=enable&amp;auth=$auth\"><input type=\"checkbox\" /></a>";
-        $enabled = false;
-        $displayname = "<span class=\"dimmed_text\">$name</span>";
-    }
-
-    // up/down link (only if auth is enabled)
-    $updown = '';
-    if ($enabled) {
-        if ($updowncount > 1) {
-            $updown .= "<a href=\"$url&amp;action=up&amp;auth=$auth\">";
-            $updown .= "<img src=\"{$CFG->pixpath}/t/up.gif\" alt=\"up\" /></a>&nbsp;";
-        }
-        else {
-            $updown .= "<img src=\"{$CFG->pixpath}/spacer.gif\" class=\"icon\" alt=\"\" />&nbsp;";
-        }
-        if ($updowncount < $authcount) {
-            $updown .= "<a href=\"$url&amp;action=down&amp;auth=$auth\">";
-            $updown .= "<img src=\"{$CFG->pixpath}/t/down.gif\" alt=\"down\" /></a>";
-        }
-        else {
-            $updown .= "<img src=\"{$CFG->pixpath}/spacer.gif\" class=\"icon\" alt=\"\" />";
-        }
-        ++ $updowncount;
-    }
-    
-    // settings link
-    $settings = "<a href=\"auth_config.php?sesskey={$USER->sesskey}&amp;auth=$auth\">{$txt->settings}</a>";
-
-    // add a row to the table
-    $table->add_data(array($displayname, $hideshow, $updown, $settings));
-}
-
-// output form
-admin_externalpage_print_header($adminroot);
-print_simple_box(get_string('configauthenticationplugins', 'admin'), 'center', '700');
-
-echo "<form $CFG->frametarget id=\"authmenu\" method=\"post\" action=\"auth.php\">";
-echo "<fieldset class=\"invisiblefieldset\"><input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" /></fieldset>";
-print_table($table);
-
-////////////////////////////////////////////////////////////////////////////////
-
-$guestoptions[0] = get_string("hide");
-$guestoptions[1] = get_string("show");
-
-echo '<hr />';
-print_heading(get_string('auth_common_settings', 'auth'));
-echo '<table cellspacing="0" cellpadding="5" border="0" style="margin-left:auto;margin-right:auto">';
-
-// User self registration
-echo "<tr valign=\"top\">\n";
-echo "<td align=\"right\" style=\"white-space:nowrap\">\n";
-print_string("selfregistration", "auth");
-echo ":</td>\n";
-echo "<td>\n";
-choose_from_menu($registrationauths, "register", $CFG->auth, "");
-echo "</td>\n";
-echo "<td>\n";
-print_string("selfregistration_help", "auth");
-echo "</td></tr>\n";
-
-// Login as guest button enabled
-echo "<tr valign=\"top\">\n";
-echo "<td style=\"white-space:nowrap;text-align:right\">\n";
-print_string("guestloginbutton", "auth");
-echo ":</td>\n";
-echo "<td>\n";
-choose_from_menu($guestoptions, "guestloginbutton", $CFG->guestloginbutton, "");
-echo "</td>\n";
-echo "<td>\n";
-print_string("showguestlogin","auth");
-echo "</td></tr>\n";
-
-/// An alternate url for the login form. It means we can use login forms that are integrated
-/// into non-moodle pages
-echo "<tr valign=\"top\">\n";
-echo "<td align=\"right\" style=\"white-space:nowrap\">\n";
-print_string('alternateloginurl', 'auth');
-echo "</td>\n";
-echo "<td>\n";
-echo '<input type="text" size="40" name="alternateloginurl" alt="'.get_string('alternateloginurl', 'auth').'" value="'.$CFG->alternateloginurl."\" />\n";
-echo "</td>\n";
-echo "<td>\n";
-print_string('alternatelogin', 'auth', htmlspecialchars($CFG->wwwroot.'/login/index.php'));
-echo "</td>\n";
-echo "</tr>\n";
-
-echo "</table>\n";
-
-////////////////////////////////////////////////////////////////////////////////
-
-
-echo '<div style="text-align:center"><input type="submit" value="'.get_string('savechanges').'" /></div>';
-echo '</form>';
-admin_externalpage_print_footer($adminroot);
+redirect ($returnurl);

 ?>
@@ -2,26 +2,26 @@
 /**
 * Edit configuration for an individual auth plugin
 */
- 
+
 require_once '../config.php';
 require_once $CFG->libdir.'/adminlib.php';

-$adminroot = admin_get_root();
-admin_externalpage_setup('userauthentication', $adminroot);
-$auth = optional_param('auth', '', PARAM_SAFEDIR);
+$auth = required_param('auth', PARAM_SAFEDIR);
+
+$CFG->pagepath = 'auth/' . $auth;
+
+admin_externalpage_setup('authsetting'.$auth);
+
 $authplugin = get_auth_plugin($auth);
 $err = array();

+$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageauths";
+
 // save configuration changes
-if ($frm = data_submitted()) {
+if ($frm = data_submitted() and confirm_sesskey()) {
+    $frm = stripslashes_recursive($frm);

-    if (!confirm_sesskey()) {
-        error(get_string('confirmsesskeybad', 'error'));
-    }
-
-    if (method_exists($authplugin, 'validate_form')) {
-        $authplugin->validate_form($frm, $err);
-    }
+    $authplugin->validate_form($frm, $err);

    if (count($err) == 0) {

@@ -33,52 +33,54 @@ if ($frm = data_submitted()) {
                if (preg_match('/^lockconfig_(.+?)$/', $name, $matches)) {
                    $plugin = "auth/$auth";
                    $name   = $matches[1];
-                    if (!set_config($name, $value, $plugin)) {                        
-                        notify("Problem saving config $name as $value for plugin $plugin");
+                    if (!set_config($name, $value, $plugin)) {
+                        error("Problem saving config $name as $value for plugin $plugin");
                    }
                }
            }
-            redirect("auth.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
+            redirect($returnurl);
            exit;
        }
    } else {
        foreach ($err as $key => $value) {
            $focus = "form.$key";
        }
-    }    
+    }
 } else {
    $frm = get_config("auth/$auth");
 }

-$user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "department", "address", "city", "country", "description", "idnumber", "lang");
+$user_fields = $authplugin->userfields;
+//$user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "institution", "department", "address", "city", "country", "description", "idnumber", "lang");

-$modules = get_list_of_plugins('auth');
-foreach ($modules as $module) {
-    $options[$module] = get_string("auth_{$module}title", 'auth');
-}
-asort($options);
+/// Get the auth title (from core or own auth lang files)
+    $authtitle = $authplugin->get_title();
+/// Get the auth descriptions (from core or own auth lang files)
+    $authdescription = $authplugin->get_description();

 // output configuration form
-admin_externalpage_print_header($adminroot);
+admin_externalpage_print_header();

 // choose an authentication method
 echo "<form $CFG->frametarget id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
+echo "<div>\n";
 echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />\n";
 echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";

 // auth plugin description
 print_simple_box_start('center', '80%');
-print_heading($options[$auth]);
-print_simple_box_start('center', '60%', '', 5, 'informationbox');
-print_string("auth_{$auth}description", 'auth');
+print_heading($authtitle);
+print_simple_box_start('center', '80%', '', 5, 'informationbox');
+echo $authdescription;
 print_simple_box_end();
 echo "<hr />\n";
-$authplugin->config_form($frm, $err);
+$authplugin->config_form($frm, $err, $user_fields);
 print_simple_box_end();
-echo '<center><p><input type="submit" value="' . get_string("savechanges") . "\" /></p></center>\n";
+echo '<p style="text-align: center"><input type="submit" value="' . get_string("savechanges") . "\" /></p>\n";
+echo "</div>\n";
 echo "</form>\n";

-admin_externalpage_print_footer($adminroot);
+admin_externalpage_print_footer();
 exit;

 /// Functions /////////////////////////////////////////////////////////////////
@@ -86,7 +88,7 @@ exit;
 // Good enough for most auth plugins
 // but some may want a custom one if they are offering
 // other options
-// Note: lockconfig_ fields have special handling. 
+// Note: lockconfig_ fields have special handling.
 function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts, $updateopts) {

    echo '<tr><td colspan="3">';
@@ -104,7 +106,7 @@ function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts,
                                'onlogin'   => get_string('update_onlogin', 'auth'));
    $updateextoptions = array('0'  => get_string('update_never', 'auth'),
                              '1'   => get_string('update_onupdate', 'auth'));
-    
+
    $pluginconfig = get_config("auth/$auth");

    // helptext is on a field with rowspan
@@ -134,34 +136,37 @@ function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts,
            $fieldname = get_string('language');
        } elseif (preg_match('/^(.+?)(\d+)$/', $fieldname, $matches)) {
            $fieldname =  get_string($matches[1]) . ' ' . $matches[2];
+        } elseif ($fieldname == 'url') {
+            $fieldname = get_string('webpage');
        } else {
            $fieldname = get_string($fieldname);
-        }
-
-        echo '<tr valign="top"><td align="right">';
-        echo $fieldname;
-        echo '</td><td>';
-
+        } 
        if ($retrieveopts) {
            $varname = 'field_map_' . $field;

-            echo "<input name=\"lockconfig_{$varname}\" type=\"text\" size=\"30\" value=\"{$pluginconfig->$varname}\" />";
-            echo '<div align="right">';
-            echo  get_string('auth_updatelocal', 'auth') . '&nbsp;&nbsp;';
+            echo '<tr valign="top"><td align="right">';
+            echo '<label for="lockconfig_'.$varname.'">'.$fieldname.'</label>';
+            echo '</td><td>';
+
+            echo "<input id=\"lockconfig_{$varname}\" name=\"lockconfig_{$varname}\" type=\"text\" size=\"30\" value=\"{$pluginconfig->$varname}\" />";
+            echo '<div style="text-align: right">';
+            echo '<label for="menulockconfig_field_updatelocal_'.$field.'">'.get_string('auth_updatelocal', 'auth') . '</label>&nbsp;';
            choose_from_menu($updatelocaloptions, "lockconfig_field_updatelocal_{$field}", $pluginconfig->{"field_updatelocal_$field"}, "");
            echo '<br />';
            if ($updateopts) {
-                echo  get_string('auth_updateremote', 'auth') . '&nbsp;&nbsp;';
-                 '&nbsp;&nbsp;';
+                echo '<label for="menulockconfig_field_updateremote_'.$field.'">'.get_string('auth_updateremote', 'auth') . '</label>&nbsp;';
                choose_from_menu($updateextoptions, "lockconfig_field_updateremote_{$field}", $pluginconfig->{"field_updateremote_$field"}, "");
                echo '<br />';


            }
-            echo  get_string('auth_fieldlock', 'auth') . '&nbsp;&nbsp;';
+            echo '<label for="menulockconfig_field_lock_'.$field.'">'.get_string('auth_fieldlock', 'auth') . '</label>&nbsp;';
            choose_from_menu($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, "");
            echo '</div>';
        } else {
+            echo '<tr valign="top"><td align="right">';
+            echo '<label for="menulockconfig_field_lock_'.$field.'">'.$fieldname.'</label>';
+            echo '</td><td>';
            choose_from_menu($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, "");
        }
        echo '</td>';
@@ -4,16 +4,16 @@

    require_once('../config.php');
    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('manageblocks', $adminroot);
    require_once($CFG->libdir.'/blocklib.php');

    $blockid = required_param('block', PARAM_INT);

-    if(($blockrecord = blocks_get_record($blockid)) === false) {
+    if(!$blockrecord = blocks_get_record($blockid)) {
        error('This block does not exist');
    }

+    admin_externalpage_setup('blocksetting'.$blockrecord->name);
+
    $block = block_instance($blockrecord->name);
    if($block === false) {
        error('Problem in instantiating block object');
@@ -31,7 +31,7 @@
    if ($config = data_submitted()) {

        if (!confirm_sesskey()) {
-             error(get_string('confirmsesskeybad', 'error'));
+             print_error('confirmsesskeybad', 'error');
        }
        if(!$block->has_config()) {
            error('This block does not support global configuration');
@@ -50,16 +50,11 @@
    $strmanageblocks = get_string('manageblocks');
    $strblockname = $block->get_title();

-    // $CFG->pagepath is used to generate the body and id attributes for the body tag
-    // of the page. It is also used to generate the link to the Moodle Docs for this view.
-    $CFG->pagepath = 'block/' . $block->name() . '/config';
-
-
-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();

    print_heading($strblockname);

-    print_simple_box('<center>'.get_string('configwarning', 'admin').'</center>', 'center', '50%');
+    print_simple_box(get_string('configwarning', 'admin'), 'center', '50%');
    echo '<br />';

    echo '<form method="post" action="block.php">';
@@ -70,6 +65,6 @@
    echo '</p>';
    $block->config_print();
    echo '</form>';
-    admin_externalpage_print_footer($adminroot);
+    print_footer();

 ?>
@@ -8,8 +8,7 @@
    require_once($CFG->libdir.'/tablelib.php');
    require_once($CFG->libdir.'/ddllib.php');

-    $adminroot = admin_get_root();
-    admin_externalpage_setup('manageblocks', $adminroot);
+    admin_externalpage_setup('manageblocks');

    $confirm  = optional_param('confirm', 0, PARAM_BOOL);
    $hide     = optional_param('hide', 0, PARAM_INT);
@@ -17,7 +16,6 @@
    $delete   = optional_param('delete', 0, PARAM_INT);
    $multiple = optional_param('multiple', 0, PARAM_INT);

-
 /// Print headings

    $strmanageblocks = get_string('manageblocks');
@@ -29,10 +27,7 @@
    $strcourses = get_string('blockinstances', 'admin');
    $strname = get_string('name');
    $strmultiple = get_string('blockmultiple', 'admin');
-
-    admin_externalpage_print_header($adminroot);
-
-    print_heading($strmanageblocks);
+    $strshowblockcourse = get_string('showblockcourse');

 /// If data submitted, then process and store.

@@ -41,6 +36,7 @@
            error("Block doesn't exist!");
        }
        set_field('block', 'visible', '0', 'id', $block->id);      // Hide block
+        admin_get_root(true, false);  // settings not required - only pages
    }

    if (!empty($show) && confirm_sesskey() ) {
@@ -48,6 +44,7 @@
            error("Block doesn't exist!");
        }
        set_field('block', 'visible', '1', 'id', $block->id);      // Show block
+        admin_get_root(true, false);  // settings not required - only pages
    }

    if (!empty($multiple) && confirm_sesskey()) {
@@ -56,9 +53,12 @@
        }
        $block->multiple = !$block->multiple;
        update_record('block', $block);
+        admin_get_root(true, false);  // settings not required - only pages
    }

    if (!empty($delete) && confirm_sesskey()) {
+        admin_externalpage_print_header();
+        print_heading($strmanageblocks);

        if (!$block = blocks_get_record($delete)) {
            error("Block doesn't exist!");
@@ -76,7 +76,7 @@
            notice_yesno(get_string('blockdeleteconfirm', '', $strblockname),
                         'blocks.php?delete='.$block->id.'&amp;confirm=1&amp;sesskey='.$USER->sesskey,
                         'blocks.php');
-            admin_externalpage_print_footer($adminroot);
+            admin_externalpage_print_footer();
            exit;

        } else {
@@ -100,34 +100,24 @@
                notify("Error occurred while deleting the $strblockname record from blocks table");
            }

-            // Then the tables themselves
-            if ($tables = $db->Metatables()) {
-                $prefix = $CFG->prefix.$block->name;
-                $prefix2 = $CFG->prefix.'block_'.$block->name;
-                foreach ($tables as $table) {
-                    if (strpos($table, $prefix) === 0 || strpos($table, $prefix2) === 0) {
-                    /// If the match has been due to the 1st condition, debug to developers
-                        if (strpos($table, $prefix) === 0) {
-                            debugging('This block has some wrongly named tables. See Moodle Docs coding guidelines (and MDL-6786)', DEBUG_DEVELOPER);
-                        }
-                    /// Strip prefix from $table
-                        $table = preg_replace("/^{$CFG->prefix}/", '', $table);
-                        $xmldb_table = new XMLDBTable($table);
-                        if (!drop_table($xmldb_table, true, false)) {
-                            notify("ERROR: while trying to drop table $table");
-                        }
-                    }
-                }
-            }
+            drop_plugin_tables($block->name, "$CFG->dirroot/blocks/$block->name/db/install.xml", false); // old obsoleted table names
+            drop_plugin_tables('block_'.$block->name, "$CFG->dirroot/blocks/$block->name/db/install.xml", false);
+
            // Delete the capabilities that were defined by this block
            capabilities_cleanup('block/'.$block->name);

+            // remove entent handlers and dequeue pending events
+            events_uninstall('block/'.$block->name);
+
            $a->block = $strblockname;
            $a->directory = $CFG->dirroot.'/blocks/'.$block->name;
            notice(get_string('blockdeletefiles', '', $a), 'blocks.php');
        }
    }

+    admin_externalpage_print_header();
+    print_heading($strmanageblocks);
+
 /// Main display starts here

 /// Get and sort the existing blocks
@@ -165,25 +155,43 @@
    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'multiple', 'delete', 'settings'));
    $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strmultiple, $strdelete, $strsettings));
    $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
-
-    $table->set_attribute('cellspacing', '0');
    $table->set_attribute('id', 'blocks');
-    $table->set_attribute('class', 'generaltable generalbox');
-
+    $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
    $table->setup();

    foreach ($blockbyname as $blockname => $blockid) {

        $blockobject = $blockobjects[$blockid];
+        $block       = $blocks[$blockid];

        $delete = '<a href="blocks.php?delete='.$blockid.'&amp;sesskey='.$USER->sesskey.'">'.$strdelete.'</a>';

        $settings = ''; // By default, no configuration
-        if($blockobject->has_config()) {
-            $settings = '<a href="block.php?block='.$blockid.'">'.$strsettings.'</a>';
+        if ($blockobject->has_config()) {
+            if (file_exists($CFG->dirroot.'/blocks/'.$block->name.'/settings.php')) {
+                $settings = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=blocksetting'.$block->name.'">'.$strsettings.'</a>';
+            } else {
+                $settings = '<a href="block.php?block='.$blockid.'">'.$strsettings.'</a>';
+            }
        }

-        $count = count_records('block_instance', 'blockid', $blockid);
+        // MDL-11167, blocks can be placed on mymoodle, or the blogs page
+        // and it should not show up on course search page
+
+        $totalcount = count_records('block_instance', 'blockid', $blockid);
+
+        $count = count_records_sql('SELECT COUNT(*)
+                                        FROM '.$CFG->prefix.'block_instance
+                                        WHERE blockid = '.$blockid.' AND
+                                        pagetype = \'course-view\'');
+
+        if ($count>0) {
+            $blocklist = "<a href=\"{$CFG->wwwroot}/course/search.php?blocklist=$blockid&amp;sesskey={$USER->sesskey}\" ";
+            $blocklist .= "title=\"$strshowblockcourse\" >$totalcount</a>";
+        }
+        else {
+            $blocklist = "$totalcount";
+        }
        $class = ''; // Nothing fancy, by default

        if ($blocks[$blockid]->visible) {
@@ -208,8 +216,8 @@

        $table->add_data(array(
            '<span'.$class.'>'.$blockobject->get_title().'</span>',
-            $count,
-            $blockobject->get_version(),
+            $blocklist,
+            '<span'.$class.'>'.$blockobject->get_version().'</span>',
            $visible,
            $multiple,
            $delete,
@@ -228,9 +236,8 @@
        $table->define_headers(array($strname, $strdelete));
        $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');

-        $table->set_attribute('cellspacing', '0');
        $table->set_attribute('id', 'incompatible');
-        $table->set_attribute('class', 'generaltable generalbox');
+        $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');

        $table->setup();

@@ -243,6 +250,6 @@
        $table->print_html();
    }

-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();

 ?>
@@ -1,4 +1,4 @@
-<?PHP // $Id$
+<?php // $Id$

 /// This script looks through all the module directories for cron.php files
 /// and runs them.  These files can contain cleanup functions, email functions
@@ -10,7 +10,7 @@
 ///
 /// eg   wget -q -O /dev/null 'http://moodle.somewhere.edu/admin/cron.php'
 /// or   php /web/moodle/admin/cron.php 
-
+    set_time_limit(0);
    $starttime = microtime();

 /// The following is a hack necessary to allow this script to work well 
@@ -32,6 +32,16 @@

    require_once(dirname(__FILE__) . '/../config.php');
    require_once($CFG->libdir.'/adminlib.php');
+    require_once($CFG->libdir.'/gradelib.php');
+
+/// Extra debugging (set in config.php)
+    if (!empty($CFG->showcronsql)) {
+        $db->debug = true;
+    }
+    if (!empty($CFG->showcrondebugging)) {
+        $CFG->debug = DEBUG_DEVELOPER;
+        $CFG->debugdisplay = true;
+    }

 /// extra safety
    @session_write_close();
@@ -90,7 +100,8 @@
 /// Run all cron jobs for each module

    mtrace("Starting activity modules");
-    if ($mods = get_records_select("modules", "cron > 0 AND (($timenow - lastcron) > cron)")) {
+    get_mailer('buffer');
+    if ($mods = get_records_select("modules", "cron > 0 AND (($timenow - lastcron) > cron) AND visible = 1 ")) {
        foreach ($mods as $mod) {
            $libfile = "$CFG->dirroot/mod/$mod->name/lib.php";
            if (file_exists($libfile)) {
@@ -98,20 +109,32 @@
                $cron_function = $mod->name."_cron";
                if (function_exists($cron_function)) {
                    mtrace("Processing module function $cron_function ...", '');
+                    $pre_dbqueries = null;
+                    if (!empty($PERF->dbqueries)) {
+                        $pre_dbqueries = $PERF->dbqueries;
+                        $pre_time      = microtime(1);
+                    }
                    if ($cron_function()) {
                        if (! set_field("modules", "lastcron", $timenow, "id", $mod->id)) {
                            mtrace("Error: could not update timestamp for $mod->fullname");
                        }
                    }
+                    if (isset($pre_dbqueries)) {
+                        mtrace("... used " . ($PERF->dbqueries - $pre_dbqueries) . " dbqueries");
+                        mtrace("... used " . (microtime(1) - $pre_time) . " seconds");
+                    }
+                /// Reset possible changes by modules to time_limit. MDL-11597
+                    @set_time_limit(0);
                    mtrace("done.");
                }
            }
        }
    }
+    get_mailer('close');
    mtrace("Finished activity modules");

    mtrace("Starting blocks");
-    if ($blocks = get_records_select("block", "cron > 0 AND (($timenow - lastcron) > cron)")) {
+    if ($blocks = get_records_select("block", "cron > 0 AND (($timenow - lastcron) > cron) AND visible = 1")) {
        // we will need the base class.
        require_once($CFG->dirroot.'/blocks/moodleblock.class.php');
        foreach ($blocks as $block) {
@@ -127,19 +150,79 @@
                            mtrace('Error: could not update timestamp for '.$block->name);
                        }
                    }
+                /// Reset possible changes by blocks to time_limit. MDL-11597
+                    @set_time_limit(0);
                    mtrace('done.');
                }
            }

        }
    }
-    mtrace("Finished blocks");
+    mtrace('Finished blocks');
+
+    mtrace('Starting admin reports');
+    // Admin reports do not have a database table that lists them. Instead a
+    // report includes cron.php with function report_reportname_cron() if it wishes
+    // to be cronned. It is up to cron.php to handle e.g. if it only needs to
+    // actually do anything occasionally.
+    $reports = get_list_of_plugins($CFG->admin.'/report');
+    foreach($reports as $report) {
+        $cronfile = $CFG->dirroot.'/'.$CFG->admin.'/report/'.$report.'/cron.php';
+        if (file_exists($cronfile)) {
+            require_once($cronfile);
+            $cronfunction = 'report_'.$report.'_cron';
+            mtrace('Processing cron function for '.$report.'...', '');
+            $pre_dbqueries = null;
+            if (!empty($PERF->dbqueries)) {
+                $pre_dbqueries = $PERF->dbqueries;
+                $pre_time      = microtime(true);
+            }
+            $cronfunction();
+            if (isset($pre_dbqueries)) {
+                mtrace("... used " . ($PERF->dbqueries - $pre_dbqueries) . " dbqueries");
+                mtrace("... used " . round(microtime(true) - $pre_time, 2) . " seconds");
+            }
+            mtrace('done.');
+        }
+    }
+    mtrace('Finished admin reports');

    if (!empty($CFG->langcache)) {
        mtrace('Updating languages cache');
-        get_list_of_languages();
+        get_list_of_languages(true);
    }

+    mtrace('Removing expired enrolments ...', '');     // See MDL-8785
+    $timenow = time();
+    $somefound = false;
+    // The preferred way saves memory, dmllib.php
+    // find courses where limited enrolment is enabled
+    global $CFG;
+    $rs_enrol = get_recordset_sql("SELECT ra.roleid, ra.userid, ra.contextid
+        FROM {$CFG->prefix}course c
+        INNER JOIN {$CFG->prefix}context cx ON cx.instanceid = c.id
+        INNER JOIN {$CFG->prefix}role_assignments ra ON ra.contextid = cx.id
+        WHERE cx.contextlevel = '".CONTEXT_COURSE."'
+        AND ra.timeend > 0
+        AND ra.timeend < '$timenow'
+        AND c.enrolperiod > 0
+        ");
+    while ($oldenrolment = rs_fetch_next_record($rs_enrol)) {
+        role_unassign($oldenrolment->roleid, $oldenrolment->userid, 0, $oldenrolment->contextid);
+        $somefound = true;
+    }
+    rs_close($rs_enrol);
+    if($somefound) {
+        mtrace('Done');
+    } else {
+        mtrace('none found');
+    }
+
+
+    mtrace('Starting main gradebook job ...');
+    grade_cron();
+    mtrace('done.');
+

 /// Run all core cron jobs, but not every time since they aren't too important.
 /// These don't have a timer to reduce load, so we'll use a random number 
@@ -154,73 +237,107 @@
        /// Unenrol users who haven't logged in for $CFG->longtimenosee

        if ($CFG->longtimenosee) { // value in days
-            $longtime = $timenow - ($CFG->longtimenosee * 3600 * 24);
-            if ($assigns = get_users_longtimenosee($longtime)) {
-                foreach ($assigns as $assign) {
-                    if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
-                        if (role_unassign(0, $assign->id, 0, $context->id)) {
-                            mtrace("Deleted assignment for user $assign->id from course $assign->courseid");
-                        }
+            $cuttime = $timenow - ($CFG->longtimenosee * 3600 * 24);
+            $rs = get_recordset_sql ("SELECT id, userid, courseid
+                                        FROM {$CFG->prefix}user_lastaccess
+                                       WHERE courseid != ".SITEID."
+                                         AND timeaccess < $cuttime ");
+            while ($assign = rs_fetch_next_record($rs)) {
+                if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
+                    if (role_unassign(0, $assign->userid, 0, $context->id)) {
+                        mtrace("removing user $assign->userid from course $assign->courseid as they have not accessed the course for over $CFG->longtimenosee days");
                    }
                }
            }
-        }
-    
-    
-        /// Delete users who haven't confirmed within required period
-
-        if (!empty($CFG->deleteunconfirmed)) {
-            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
-            if ($users = get_users_unconfirmed($oneweek)) {
-                foreach ($users as $user) {
-                    if (delete_records('user', 'id', $user->id)) {
-                        mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
+            rs_close($rs);
+        /// Execute the same query again, looking for remaining records and deleting them
+        /// if the user hasn't moodle/course:view in the CONTEXT_COURSE context (orphan records)
+            $rs = get_recordset_sql ("SELECT id, userid, courseid
+                                        FROM {$CFG->prefix}user_lastaccess
+                                       WHERE courseid != ".SITEID."
+                                         AND timeaccess < $cuttime ");
+            while ($assign = rs_fetch_next_record($rs)) {
+                if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
+                    if (!has_capability('moodle/course:view', $context, $assign->userid)) {
+                        delete_records('user_lastaccess', 'userid', $assign->userid, 'courseid', $assign->courseid);
+                        mtrace("Deleted orphan user_lastaccess for user $assign->userid from course $assign->courseid");
                    }
                }
            }
+            rs_close($rs);
        }
        flush();


+        /// Delete users who haven't confirmed within required period
+
+        if (!empty($CFG->deleteunconfirmed)) {
+            $cuttime = $timenow - ($CFG->deleteunconfirmed * 3600);
+            $rs = get_recordset_sql ("SELECT id, firstname, lastname
+                                        FROM {$CFG->prefix}user
+                                       WHERE confirmed = 0
+                                         AND firstaccess > 0
+                                         AND firstaccess < $cuttime");
+            while ($user = rs_fetch_next_record($rs)) {
+                if (delete_records('user', 'id', $user->id)) {
+                    mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
+                }
+            }
+            rs_close($rs);
+        }
+        flush();
+

        /// Delete users who haven't completed profile within required period

-        if (!empty($CFG->deleteunconfirmed)) {
-            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
-            if ($users = get_users_not_fully_set_up($oneweek)) {
-                foreach ($users as $user) {
-                    if (delete_records('user', 'id', $user->id)) {
-                        mtrace("Deleted not fully setup user $user->username ($user->id)");
-                    }
+        if (!empty($CFG->deleteincompleteusers)) {
+            $cuttime = $timenow - ($CFG->deleteincompleteusers * 3600);
+            $rs = get_recordset_sql ("SELECT id, username
+                                        FROM {$CFG->prefix}user
+                                       WHERE confirmed = 1
+                                         AND lastaccess > 0
+                                         AND lastaccess < $cuttime
+                                         AND deleted = 0
+                                         AND (lastname = '' OR firstname = '' OR email = '')");
+            while ($user = rs_fetch_next_record($rs)) {
+                if (delete_user($user)) {
+                    mtrace("Deleted not fully setup user $user->username ($user->id)");
                }
            }
+            rs_close($rs);
+        }
+        flush();
+
+
+        /// Delete old logs to save space (this might need a timer to slow it down...)
+
+        if (!empty($CFG->loglifetime)) {  // value in days
+            $loglifetime = $timenow - ($CFG->loglifetime * 3600 * 24);
+            if (delete_records_select("log", "time < '$loglifetime'")) {
+                mtrace("Deleted old log records");
+            }
        }
        flush();


-    
-        /// Delete old logs to save space (this might need a timer to slow it down...)
-    
-        if (!empty($CFG->loglifetime)) {  // value in days
-            $loglifetime = $timenow - ($CFG->loglifetime * 3600 * 24);
-            delete_records_select("log", "time < '$loglifetime'");
-        }
-        flush();
-
        /// Delete old cached texts

        if (!empty($CFG->cachetext)) {   // Defined in config.php
            $cachelifetime = time() - $CFG->cachetext - 60;  // Add an extra minute to allow for really heavy sites
-            delete_records_select('cache_text', "timemodified < '$cachelifetime'");
+            if (delete_records_select('cache_text', "timemodified < '$cachelifetime'")) {
+                mtrace("Deleted old cache_text records");
+            }
        }
        flush();

        if (!empty($CFG->notifyloginfailures)) {
            notify_login_failures();
+            mtrace('Notified login failured');
        }
        flush();

        sync_metacourses();
+        mtrace('Synchronised metacourses');

        //
        // generate new password emails for users 
@@ -246,6 +363,24 @@
                }
            }
        }
+        
+        if (!empty($CFG->usetags)) {
+            require_once($CFG->dirroot.'/tag/lib.php');
+            tag_cron();
+            mtrace ('Executed tag cron');
+        }
+        
+        // Accesslib stuff
+        cleanup_contexts();
+        mtrace ('Cleaned up contexts');
+        gc_cache_flags();
+        mtrace ('Cleaned cache flags');
+        // If you suspect that the context paths are somehow corrupt
+        // replace the line below with: build_context_path(true); 
+        build_context_path();
+        mtrace ('Built context paths');
+
+        mtrace("Finished clean-up tasks...");

    } // End of occasional clean-up tasks

@@ -254,7 +389,7 @@
        //Execute backup's cron
        //Perhaps a long time and memory could help in large sites
        @set_time_limit(0);
-        @raise_memory_limit("196M");
+        @raise_memory_limit("192M");
        if (function_exists('apache_child_terminate')) {
            // if we are running from Apache, give httpd a hint that 
            // it can recycle the process after it's done. Apache's 
@@ -307,9 +442,8 @@
    }

 /// Run the auth cron, if any
-    if (!($auths = explode(',', $CFG->auth_plugins_enabled))) {
-        $auths = array($user->auth);
-    }
+    $auths = get_enabled_auth_plugins();
+
    mtrace("Running auth crons if required...");
    foreach ($auths as $auth) {
        $authplugin = get_auth_plugin($auth);
@@ -324,50 +458,75 @@
    }

    if (!empty($CFG->enablestats) and empty($CFG->disablestatsprocessing)) {
-
+        require_once($CFG->dirroot.'/lib/statslib.php');
        // check we're not before our runtime
-        $timetocheck = strtotime("$CFG->statsruntimestarthour:$CFG->statsruntimestartminute today");
+        $timetocheck = stats_get_base_daily() + $CFG->statsruntimestarthour*60*60 + $CFG->statsruntimestartminute*60;

        if (time() > $timetocheck) {
-            $time = 60*60*20; // set it to 20 here for first run... (overridden by $CFG)
-            $clobber = true;
-            if (!empty($CFG->statsmaxruntime)) {
-                $time = $CFG->statsmaxruntime+(60*30); // add on half an hour just to make sure (it could take that long to break out of the loop)
-            }
-            if (!get_field_sql('SELECT id FROM '.$CFG->prefix.'stats_daily')) {
-                // first run, set another lock. we'll check for this in subsequent runs to set the timeout to later for the normal lock.
-                set_cron_lock('statsfirstrunlock',true,$time,true);
-                $firsttime = true;
-            }
-            $time = 60*60*2; // this time set to 2.. (overridden by $CFG)
-            if (!empty($CFG->statsmaxruntime)) {
-                $time = $CFG->statsmaxruntime+(60*30); // add on half an hour to make sure (it could take that long to break out of the loop)
-            }
-            if ($config = get_record('config','name','statsfirstrunlock')) {
-                if (!empty($config->value)) {
-                    $clobber = false; // if we're on the first run, just don't clobber it.
+            // process configured number of days as max (defaulting to 31)
+            $maxdays = empty($CFG->statsruntimedays) ? 31 : abs($CFG->statsruntimedays);
+            if (stats_cron_daily($maxdays)) {
+                if (stats_cron_weekly()) {
+                    if (stats_cron_monthly()) {
+                        stats_clean_old();
+                    }
                }
            }
-            if (set_cron_lock('statsrunning',true,$time, $clobber)) {
-                require_once($CFG->dirroot.'/lib/statslib.php');
-                $return = stats_cron_daily();
-                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
-                    stats_cron_weekly();
+            @set_time_limit(0);
+        } else {
+            mtrace('Next stats run after:'. userdate($timetocheck));
+        }
+    }
+
+    // run gradebook import/export/report cron
+    if ($gradeimports = get_list_of_plugins('grade/import')) {
+        foreach ($gradeimports as $gradeimport) {           
+            if (file_exists($CFG->dirroot.'/grade/import/'.$gradeimport.'/lib.php')) {
+                require_once($CFG->dirroot.'/grade/import/'.$gradeimport.'/lib.php');
+                $cron_function = 'grade_import_'.$gradeimport.'_cron';                                    
+                if (function_exists($cron_function)) {
+                    mtrace("Processing gradebook import function $cron_function ...", '');
+                    $cron_function;  
                }
-                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
-                    $return = $return && stats_cron_monthly();
-                }
-                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
-                    stats_clean_old();
-                }
-                set_cron_lock('statsrunning',false);
-                if (!empty($firsttime)) {
-                    set_cron_lock('statsfirstrunlock',false);
+            }
+        }      
+    }
+
+    if ($gradeexports = get_list_of_plugins('grade/export')) {
+        foreach ($gradeexports as $gradeexport) {           
+            if (file_exists($CFG->dirroot.'/grade/export/'.$gradeexport.'/lib.php')) {
+                require_once($CFG->dirroot.'/grade/export/'.$gradeexport.'/lib.php');
+                $cron_function = 'grade_export_'.$gradeexport.'_cron';                                    
+                if (function_exists($cron_function)) {
+                    mtrace("Processing gradebook export function $cron_function ...", '');
+                    $cron_function;  
                }
            }
        }
    }

+    if ($gradereports = get_list_of_plugins('grade/report')) {
+        foreach ($gradereports as $gradereport) {           
+            if (file_exists($CFG->dirroot.'/grade/report/'.$gradereport.'/lib.php')) {
+                require_once($CFG->dirroot.'/grade/report/'.$gradereport.'/lib.php');
+                $cron_function = 'grade_report_'.$gradereport.'_cron';                                    
+                if (function_exists($cron_function)) {
+                    mtrace("Processing gradebook report function $cron_function ...", '');
+                    $cron_function;  
+                }
+            }
+        }
+    }
+    
+    // run any customized cronjobs, if any
+    // looking for functions in lib/local/cron.php
+    if (file_exists($CFG->dirroot.'/local/cron.php')) {
+        mtrace('Processing customized cron script ...', '');
+        include_once($CFG->dirroot.'/local/cron.php');
+        mtrace('done.');
+    }
+
+
    //Unset session variables and destroy it
    @session_unset();
    @session_destroy();
@@ -377,7 +536,7 @@
    $difftime = microtime_diff($starttime, microtime());
    mtrace("Execution took ".$difftime." seconds"); 

-/// finishe the IE hack
+/// finish the IE hack
    if (check_browser_version('MSIE')) {
        echo "</xmp>";
    }
@@ -12,15 +12,17 @@

    require_login();

-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));

    $strdatabaseperformance = get_string("databaseperformance");
    $stradministration = get_string("administration");
    $site = get_site();

+    $navigation = build_navigation(array(
+        array('name'=>$stradministration, 'link'=>'index.php', 'type'=>'misc'),
+        array('name'=>$strdatabaseperformance, 'link'=>null, 'type'=>'misc')));
    if (!empty($topframe)) {
-        print_header("$site->shortname: $strdatabaseperformance", "$site->fullname", 
-                     "<a $CFG->frametarget href=\"index.php\">$stradministration</a> -> Database performance");
+        print_header("$site->shortname: $strdatabaseperformance", "$site->fullname", $navigation);
        exit;
    }

@@ -5,26 +5,26 @@

    require_once('../config.php');
    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('purgemoodledata', $adminroot);
+
+    admin_externalpage_setup('purgemoodledata');

    require_login();

    $sure       = optional_param('sure', 0, PARAM_BOOL);
    $reallysure = optional_param('reallysure', 0, PARAM_BOOL);

-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));

    $deletedir = $CFG->dataroot;   // The directory to delete!

-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();
    print_heading('Purge moodledata');

    if (empty($sure)) {
        $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($adminroot);
+        admin_externalpage_print_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($adminroot);
+        admin_externalpage_print_footer();
        exit;
    }

@@ -46,7 +46,7 @@

    echo '<h1 align="center">Done!</h1>';
    print_continue($CFG->wwwroot);
-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();
    exit;


@@ -54,7 +54,7 @@ function delete_subdirectories($rootdir) {

    $dir = opendir($rootdir);

-    while ($file = readdir($dir)) {
+    while (false !== ($file = readdir($dir))) {
        if ($file != '.' and $file != '..') {
            $fullfile = $rootdir .'/'. $file;
            if (filetype($fullfile) == 'dir') {
@@ -5,21 +5,25 @@
    require_once('../config.php');
    require_once($CFG->libdir.'/adminlib.php');

-    $enrol = optional_param('enrol', $CFG->enrol, PARAM_SAFEDIR);
+    $enrol        = optional_param('enrol', $CFG->enrol, PARAM_SAFEDIR);
+    $savesettings = optional_param('savesettings', 0, PARAM_BOOL);
+
    $CFG->pagepath = 'enrol';

-    $adminroot = admin_get_root();
-    admin_externalpage_setup('enrolment', $adminroot);
+    admin_externalpage_setup('enrolment');

+    if (!isset($CFG->sendcoursewelcomemessage)) {
+        set_config('sendcoursewelcomemessage', 1);
+    }


    require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class

 /// Save settings

-    if ($frm = data_submitted()) {
+    if ($frm = data_submitted() and !$savesettings) {
        if (!confirm_sesskey()) {
-            error(get_string('confirmsesskeybad', 'error'));
+            print_error('confirmsesskeybad', 'error');
        }
        if (empty($frm->enable)) {
            $frm->enable = array();
@@ -35,13 +39,19 @@
        set_config('enrol_plugins_enabled', implode(',', $frm->enable));
        set_config('enrol', $frm->default);
        redirect("enrol.php", get_string("changessaved"), 1);
+
+    } else if ($frm = data_submitted() and $savesettings) {
+        if (!confirm_sesskey()) {
+            print_error('confirmsesskeybad', 'error');
+        }
+        set_config('sendcoursewelcomemessage', required_param('sendcoursewelcomemessage', PARAM_BOOL));
    }

 /// Print the form

    $str = get_strings(array('enrolmentplugins', 'users', 'administration', 'settings', 'edit'));

-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();

    $modules = get_list_of_plugins("enrol");
    $options = array();
@@ -102,6 +112,33 @@
    echo "</div>";
    echo "</form>";

-    admin_externalpage_print_footer($adminroot);
+    echo '<hr />';

-?>
+    $yesnooptions = array(0=>get_string('no'), 1=>get_string('yes'));
+
+    echo '<form '.$CFG->frametarget.' id="adminsettings" method="post" action="enrol.php">';
+    echo '<div class="settingsform clearfix">';
+    print_heading(get_string('commonsettings', 'admin'));
+    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
+    echo '<input type="hidden" name="savesettings" value="1" />';
+    echo '<fieldset>';
+    echo '<div class="form-item clearfix" id="admin-sendcoursewelcomemessage">';
+    
+    echo '<div class="form-label"><label for = "menusendcoursewelcomemessage">' . get_string('sendcoursewelcomemessage', 'admin');
+    echo '<span class="form-shortname">sendcoursewelcomemessage</span>';
+    echo '</label></div>';
+    echo '<div class="form-setting"><div class="form-checkbox defaultsnext">';
+    choose_from_menu($yesnooptions, 'sendcoursewelcomemessage', $CFG->sendcoursewelcomemessage, '');
+    echo '</div><div class="form-defaultinfo">'.get_string('defaultsettinginfo', 'admin', get_string('yes')).'</div></div>';
+    echo '<div class="form-description">' . get_string('configsendcoursewelcomemessage', 'admin') . '</div>';
+    echo '</div>';
+
+    echo '</fieldset>';
+
+    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="'.get_string('savechanges', 'admin').'" /></div>';
+    echo '</div>';
+    echo '</form>';
+
+    admin_externalpage_print_footer();
+
+?>
@@ -5,8 +5,7 @@
    require_once("../config.php");
    require_once($CFG->libdir.'/adminlib.php');

-    $adminroot = admin_get_root();
-    admin_externalpage_setup('enrolment', $adminroot);
+    admin_externalpage_setup('enrolment');

    $enrol = required_param('enrol', PARAM_ALPHA);
    $CFG->pagepath = 'enrol/' . $enrol;
@@ -20,7 +19,7 @@

    if ($frm = data_submitted()) {
        if (!confirm_sesskey()) {
-            error(get_string('confirmsesskeybad', 'error'));
+            print_error('confirmsesskeybad', 'error');
        }
        if ($enrolment->process_config($frm)) {
            redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
@@ -42,7 +41,7 @@
    }
    asort($options);

-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();

    echo "<form $CFG->frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">";
    echo "<div>";
@@ -66,7 +65,7 @@
    echo "</div>";
    echo "</form>";

-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();

    exit;
 ?>
@@ -7,7 +7,7 @@
 // Moodle - Modular Object-Oriented Dynamic Learning Environment         //
 //          http://moodle.com                                            //
 //                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
+// Copyright (C) 1999 onwards Martin Dougiamas     http://dougiamas.com  //
 //           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
 //                                                                       //
 // This program is free software; you can redistribute it and/or modify  //
@@ -34,8 +34,7 @@
    require_once($CFG->libdir.'/environmentlib.php');
    require_once($CFG->libdir.'/componentlib.class.php');

-    $adminroot = admin_get_root();
-    admin_externalpage_setup('environment', $adminroot);
+    admin_externalpage_setup('environment');

 /// Parameters
    $action  = optional_param('action', '', PARAM_ACTION);
@@ -53,7 +52,7 @@
    $strmisc = get_string('miscellaneous');

 /// Print the header stuff
-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();

 /// Print the component download link
    echo '<div class="reportlink"><a href="environment.php?action=updatecomponent&amp;sesskey='.$USER->sesskey.'">'.$strupdate.'</a></div>';
@@ -66,10 +65,10 @@
        if ($cd = new component_installer('http://download.moodle.org', 
                                          'environment', 
                                          'environment.zip')) {
-            $status = $cd->install(); //returns ERROR | UPTODATE | INSTALLED
+            $status = $cd->install(); //returns COMPONENT_(ERROR | UPTODATE | INSTALLED)
            switch ($status) {
-                case ERROR:
-                    if ($cd->get_error() == 'remotedownloadnotallowed') {
+                case COMPONENT_ERROR:
+                    if ($cd->get_error() == 'remotedownloaderror') {
                        $a = new stdClass();
                        $a->url = 'http://download.moodle.org/environment/environment.zip';
                        $a->dest= $CFG->dataroot.'/';
@@ -78,10 +77,10 @@
                        print_simple_box(get_string($cd->get_error(), 'error'), 'center', '', '', 5, 'errorbox');
                    }
                    break;
-                case UPTODATE:
+                case COMPONENT_UPTODATE:
                    print_simple_box(get_string($cd->get_error(), 'error'), 'center');
                    break;
-                case INSTALLED:
+                case COMPONENT_INSTALLED:
                    print_simple_box(get_string('componentinstalled', 'admin'), 'center');
                    break;
            }
@@ -133,5 +132,5 @@
    $status = check_moodle_environment($version, $environment_results);

 /// Print footer
-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();
 ?>
@@ -117,6 +117,166 @@
          <ON_CHECK message="tokenizerrecommended" />
        </FEEDBACK>
      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ctyperecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
    </PHP_EXTENSIONS>
  </MOODLE>
+  <MOODLE version="1.9">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="4.1.16">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
+      </VENDOR>
+      <VENDOR name="postgres" version="8.0" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="9.0" />
+    </DATABASE>
+    <PHP version="4.3.0" level="required">
+      <RESTRICT function="restrict_php50_version" message="php50restricted" />
+    </PHP>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iconvrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="curlrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opensslrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ctyperecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="question/upgrade.php" function="question_check_no_rqp_questions" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="qtyperqpwillberemovedanyway" />
+          <ON_OK message="qtyperqpwillberemoved" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/upgrade.php" function="question_random_check" level="optional">
+        <FEEDBACK>
+          <ON_OK message="questioncwqpfsok" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_register_globals" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="globalswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
+  <MOODLE version="2.0" requires="1.9">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="4.1.16">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
+      </VENDOR>
+      <VENDOR name="postgres" version="8.0" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="9.0" />
+      <VENDOR name="sqlite" version="2.0" />
+    </DATABASE>
+    <PHP version="5.2.4" level="required">
+    </PHP>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iconvrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opensslrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_register_globals" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="globalswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -6,21 +6,15 @@
    require_once($CFG->libdir.'/adminlib.php');
    require_once($CFG->libdir.'/tablelib.php');

-    $adminroot = admin_get_root();
-    admin_externalpage_setup('managefilters', $adminroot);
+    $filterfull = required_param('filter', PARAM_PATH);
+    $forcereset  = optional_param('reset', 0, PARAM_BOOL);

-    // get parameters
-    $param = new Object;
+    $filtername =  substr($filterfull, strpos( $filterfull, '/' )+1 ) ;

-    $param->filter = required_param('filter', PARAM_PATH);
-    $param->submit = optional_param('submit', 0, PARAM_BOOL);
-    $param->reset  = optional_param('reset', 0, PARAM_BOOL);
+    admin_externalpage_setup('filtersetting'.str_replace('/', '', $filterfull));

-    $filtername =  substr($param->filter, strpos( $param->filter, '/' )+1 ) ;
+    $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=managefilters";

-    // $CFG->pagepath is used to generate the body and id attributes for the body tag
-    // of the page. It is also used to generate the link to the Moodle Docs for this view.
-    $CFG->pagepath = 'filter/' . $filtername . '/config';

    // get translated strings for use on page
    $txt = new Object;
@@ -33,12 +27,7 @@
    //======================

    // if reset pressed let filter config page handle it
-    $forcereset = false;
-    if (!empty($param->reset)) {
-        $forcereset = true;
-    }
-    else
-    if ($config = data_submitted()) {
+    if ($config = data_submitted() and !$forcereset) {

        // check session key
        if (!confirm_sesskey()) {
@@ -59,10 +48,13 @@
            // run through submitted data
            // reject if does not start with filter_
            foreach ($config as $name => $value) {
-                set_config( $name,$value );
+                set_config($name, stripslashes($value));
            }
        }
-        redirect( "$CFG->wwwroot/$CFG->admin/filters.php", get_string('changessaved'), 1);
+
+        reset_text_filters_cache();
+
+        redirect($returnurl);
        exit;
    }

@@ -71,28 +63,28 @@
    //==============================

    $filtername = ucfirst($filtername);
-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();
    print_heading( $filtername );

-    print_simple_box("<center>".get_string("configwarning", "admin")."</center>", "center", "50%");
+    print_simple_box(get_string("configwarning", "admin"), "center", "50%");
    echo "<br />";

    print_simple_box_start("center",'');

    ?>
-    <form action="filter.php?filter=<?php echo urlencode($param->filter); ?>" method="post">
+    <form action="filter.php?filter=<?php echo urlencode($filterfull); ?>" method="post">
+    <div style="text-align: center">
    <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />

-    <?php include "$CFG->dirroot/$param->filter/filterconfig.html"; ?>
+    <?php include "$CFG->dirroot/$filterfull/filterconfig.html"; ?>

-    <center>
        <input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" />
        <input type="submit" name="reset" value="<?php echo print_string('resettodefaults'); ?>" />
-    </center>
+    </div>
    </form>

    <?php
    print_simple_box_end();

-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();
 ?>
@@ -1,136 +1,73 @@
 <?php // $Id$
-    // filters.php
-    // Edit list of available text filters

    require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    require_once($CFG->libdir.'/tablelib.php');

-    // defines
-    define('FILTER_TABLE','filter_administration_table');
+    $action     = optional_param('action', '', PARAM_ACTION);
+    $filterpath = optional_param('filterpath', '', PARAM_PATH);

-    $adminroot = admin_get_root();
-    admin_externalpage_setup('managefilters', $adminroot);
+    require_login();
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));

-    // get values from page
-    $params = new object();
-    $params->action     = optional_param('action', '', PARAM_ACTION);
-    $params->filterpath = optional_param('filterpath', '', PARAM_PATH);
-    $params->cachetext  = optional_param('cachetext', 0, PARAM_INT);
-    $params->filterall  = optional_param('filterall', 0, PARAM_BOOL);
-    $params->filteruploadedfiles   = optional_param('filteruploadedfiles', 0, PARAM_INT);
-    $params->filtermatchoneperpage = optional_param('filtermatchoneperpage', 0, PARAM_BOOL);
-    $params->filtermatchonepertext = optional_param('filtermatchonepertext', 0, PARAM_BOOL);
+    $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=managefilters";

-    // some basic information
-    $url = 'filters.php';
-    $myurl = "$url?sesskey=" . sesskey();
-    $img = "$CFG->pixpath/t";
+    if (!confirm_sesskey()) {
+        redirect($returnurl);
+    }

-    // get translated strings for use on page
-    $txt = new object();
-    $txt->managefilters = get_string('managefilters');
-    $txt->administration = get_string('administration');
-    $txt->configuration = get_string('configuration');
-    $txt->name = get_string('name');
-    $txt->hide = get_string('hide');
-    $txt->show = get_string('show');
-    $txt->hideshow = "$txt->hide/$txt->show";
-    $txt->settings = get_string('settings');
-    $txt->up = get_string('up');
-    $txt->down = get_string('down');
-    $txt->updown = "$txt->up/$txt->down";
-    $txt->cachetext = get_string('cachetext', 'admin');
-    $txt->configcachetext = get_string('configcachetext', 'admin');
-    $txt->filteruploadedfiles = get_string('filteruploadedfiles','admin');
-    $txt->configfilteruploadedfiles = get_string('configfilteruploadedfiles','admin');
-    $txt->filterall = get_string('filterall','admin');
-    $txt->filtermatchoneperpage = get_string('filtermatchoneperpage','admin');
-    $txt->filtermatchonepertext = get_string('filtermatchonepertext','admin');
-    $txt->configfilterall = get_string('configfilterall','admin');
-    $txt->configfiltermatchoneperpage = get_string('configfiltermatchoneperpage','admin');
-    $txt->configfiltermatchonepertext = get_string('configfiltermatchonepertext','admin');
-    $txt->cachecontrols = get_string('cachecontrols');
-    $txt->yes = get_string('yes');
-    $txt->no = get_string('no');
-    $txt->none = get_string('none');
-    $txt->allfiles = get_string('allfiles');
-    $txt->htmlfilesonly = get_string('htmlfilesonly');
-
-    // get a list of possible filters (and translate name if possible)
-    // note filters can be in the dedicated filters area OR in their
-    // associated modules
+    // get a list of installed filters
    $installedfilters = array();
-    $filtersettings = array();
    $filterlocations = array('mod','filter');
    foreach ($filterlocations as $filterlocation) {
        $plugins = get_list_of_plugins($filterlocation);
        foreach ($plugins as $plugin) {
            $pluginpath = "$CFG->dirroot/$filterlocation/$plugin/filter.php";
-            $settingspath = "$CFG->dirroot/$filterlocation/$plugin/filterconfig.html";
            if (is_readable($pluginpath)) {
-                $name = trim(get_string("filtername", $plugin));
-                if (empty($name) or ($name == '[[filtername]]')) {
-                    $name = ucfirst($plugin);
-                }
-                $installedfilters["$filterlocation/$plugin"] = $name;
-                if (is_readable($settingspath)) {
-                    $filtersettings[] = "$filterlocation/$plugin";
-                }
+                $installedfilters["$filterlocation/$plugin"] = "$filterlocation/$plugin";
            }
        }
    }

    // get all the currently selected filters
    if (!empty($CFG->textfilters)) {
-        $oldactivefilters = explode(',', $CFG->textfilters);
-        $oldactivefilters = array_unique($oldactivefilters);
+        $activefilters = explode(',', $CFG->textfilters);
    } else {
-        $oldactivefilters = array();
-    }
-
-    // take this opportunity to clean up filters
-    $activefilters = array();
-    foreach ($oldactivefilters as $oldactivefilter) {
-        if (!empty($oldactivefilter) and array_key_exists($oldactivefilter, $installedfilters)) {
-            $activefilters[] = $oldactivefilter;
-        }
+        $activefilters = array();
    }

    //======================
    // Process Actions
    //======================

-    if ($params->action=="") {
-        // store cleaned active filers in db
-        set_config('textfilters', implode(',', $activefilters));
-    } elseif (($params->action=="hide") and confirm_sesskey()) {
-        $key=array_search($params->filterpath, $activefilters);
+    switch ($action) {
+
+    case 'hide':
+        $key=array_search($filterpath, $activefilters);
        // check filterpath is valid
        if ($key===false) {
-            // ignore it - doubleclick??
-        } else {
-            // just delete it
-            unset($activefilters[$key]);
-            set_config('textfilters', implode(',', $activefilters));
+            break;
        }
-    } elseif (($params->action=="show") and confirm_sesskey()) {
+        // just delete it
+        unset($activefilters[$key]);
+        break;
+
+    case 'show':
        // check filterpath is valid
-        if (!array_key_exists($params->filterpath, $installedfilters)) {
-            error("Filter $params->filterpath is not currently installed", $url);
-        } elseif (array_search($params->filterpath,$activefilters)) {
+        if (!array_key_exists($filterpath, $installedfilters)) {
+            error("Filter $filterpath is not currently installed", $url);
+        } elseif (array_search($filterpath,$activefilters)) {
            // filterpath is already active - doubleclick??
        } else {
            // add it to installed filters
-            $activefilters[] = $params->filterpath;
+            $activefilters[] = $filterpath;
            $activefilters = array_unique($activefilters);
-            set_config('textfilters', implode(',', $activefilters));
        }
-    } elseif (($params->action=="down") and confirm_sesskey()) {
-        $key=array_search($params->filterpath, $activefilters);
+        break;
+
+    case 'down':
+        $key=array_search($filterpath, $activefilters);
        // check filterpath is valid
        if ($key===false) {
-            error("Filter $params->filterpath is not currently active", $url);
+            error("Filter $filterpath is not currently active", $url);
        } elseif ($key>=(count($activefilters)-1)) {
            // cannot be moved any further down - doubleclick??
        } else {
@@ -138,13 +75,14 @@
            $fsave = $activefilters[$key];
            $activefilters[$key] = $activefilters[$key+1];
            $activefilters[$key+1] = $fsave;
-            set_config('textfilters', implode(',', $activefilters));
        }
-    } elseif (($params->action=="up") and confirm_sesskey()) {
-        $key=array_search($params->filterpath, $activefilters);
+        break;
+
+    case 'up':
+        $key=array_search($filterpath, $activefilters);
        // check filterpath is valid
        if ($key===false) {
-            error("Filter $params->filterpath is not currently active", $url);
+            error("Filter $filterpath is not currently active", $url);
        } elseif ($key<1) {
            //cannot be moved any further up - doubleclick??
        } else {
@@ -152,131 +90,13 @@
            $fsave = $activefilters[$key];
            $activefilters[$key] = $activefilters[$key-1];
            $activefilters[$key-1] = $fsave;
-            set_config('textfilters', implode(',', $activefilters));
        }
-    } elseif (($params->action=="config") and confirm_sesskey()) {
-        set_config('cachetext', $params->cachetext);
-        set_config('filteruploadedfiles', $params->filteruploadedfiles);
-        set_config('filterall', $params->filterall);
-        set_config('filtermatchoneperpage', $params->filtermatchoneperpage);
-        set_config('filtermatchonepertext', $params->filtermatchonepertext);
+        break;
    }

-    //======================
-    // Build Display Objects
-    //======================
-
-    // construct the display array with installed filters
-    // at the top in the right order
-    $displayfilters = array();
-    foreach ($activefilters as $activefilter) {
-        $name = $installedfilters[$activefilter];
-        $displayfilters[$activefilter] = $name;
-    }
-    foreach ($installedfilters as $key => $filter) {
-        if (!array_key_exists($key, $displayfilters)) {
-            $displayfilters[$key] = $filter;
-        }
-    }
-
-    // construct the flexible table ready to display
-    $table = new flexible_table(FILTER_TABLE);
-    $table->define_columns(array('name', 'hideshow', 'order', 'settings'));
-    $table->column_style('hideshow', 'text-align', 'center');
-    $table->column_style('order', 'text-align', 'center');
-    $table->column_style('settings', 'text-align', 'center');
-    $table->define_headers(array($txt->name, $txt->hideshow, $txt->updown, $txt->settings));
-    $table->define_baseurl("$CFG->wwwroot/$CFG->admin/filters.php");
-    $table->set_attribute('id', 'blocks');
-    $table->set_attribute('class', 'flexible generaltable generalbox');
-    $table->set_attribute('style', 'margin:auto;');
-    $table->set_attribute('cellpadding', '5');
-    $table->setup();
-
-    // iterate through filters adding to display table
-    $updowncount = 1;
-    $activefilterscount = count($activefilters);
-    foreach ($displayfilters as $path => $name) {
-        $upath = urlencode($path);
-        // get hide/show link
-        if (in_array($path, $activefilters)) {
-            $hideshow = "<a href=\"$myurl&amp;action=hide&amp;filterpath=$upath\">";
-            $hideshow .= "<img src=\"{$CFG->pixpath}/i/hide.gif\" class=\"icon\" alt=\"$txt->hide\" /></a>";
-            $hidden = false;
-            $displayname = "<span>$name</span>";
-        }
-        else {
-            $hideshow = "<a href=\"$myurl&amp;action=show&amp;filterpath=$upath\">";
-            $hideshow .= "<img src=\"{$CFG->pixpath}/i/show.gif\" class=\"icon\" alt=\"$txt->show\" /></a>";
-            $hidden = true;
-            $displayname = "<span class=\"dimmed_text\">$name</span>";
-        }
-
-        // get up/down link (only if not hidden)
-        $updown = '';
-        if (!$hidden) {
-            if ($updowncount>1) {
-                $updown .= "<a href=\"$myurl&amp;action=up&amp;filterpath=$upath\">";
-                $updown .= "<img src=\"$img/up.gif\" alt=\"$txt->up\" /></a>&nbsp;";
-            }
-            else {
-                $updown .= "<img src=\"$CFG->pixpath/spacer.gif\" class=\"icon\" alt=\"\" />&nbsp;";
-            }
-            if ($updowncount<$activefilterscount) {
-                $updown .= "<a href=\"$myurl&amp;action=down&amp;filterpath=$upath\">";
-                $updown .= "<img src=\"$img/down.gif\" alt=\"$txt->down\" /></a>";
-            }
-            else {
-                $updown .= "<img src=\"$CFG->pixpath/spacer.gif\" class=\"icon\" alt=\"\" />";
-            }
-            ++$updowncount;
-        }
-
-        // settings link (if defined)
-        $settings = '';
-        if (in_array($path, $filtersettings)) {
-            $settings = "<a href=\"filter.php?filter=" . urlencode($path) . "\">";
-            $settings .= "{$txt->settings}</a>";
-        }
-
-        // write data into the table object
-        $table->add_data(array($displayname, $hideshow, $updown, $settings));
-    }
-
-    // build options list for cache lifetime
-    $seconds = array(604800,86400,43200,10800,7200,3600,2700,1800,900,600,540,480,420,360,300,240,180,120,60,30,0);
-    unset($lifetimeoptions);
-    foreach ($seconds as $second) {
-        if ($second>=86400) {
-            $options[$second] = get_string('numdays','',$second/86400);
-        }
-        elseif ($second>=3600) {
-            $options[$second] = get_string('numhours','',$second/3600);
-        }
-        elseif ($second>=60) {
-            $options[$second] = get_string('numminutes','',$second/60);
-        }
-        elseif ($second>=1) {
-            $options[$second] = get_string('numseconds','',$second);
-        }
-        else {
-            $options[$second] = get_string('no');
-        }
-    }
-
-    //==============================
-    // Display logic
-    //==============================
-
-    admin_externalpage_print_header($adminroot);
-
-    print_heading_with_help($txt->managefilters, 'filters');
-
-    // print the table of all the filters
-    $table->print_html();
-
-    // cache control table has been removed
-
-    admin_externalpage_print_footer($adminroot);
+    // save, reset cache and return
+    set_config('textfilters', implode(',', $activefilters));
+    reset_text_filters_cache();
+    redirect($returnurl);

 ?>
@@ -40,7 +40,7 @@ while(!feof($fd)) {
    
    $user = get_record("user","id",$log->userid);
    $course = get_record("course","id",$log->course);
-    $subject = get_string('virusfoundsubject','moodle',$site->fullname);
+    $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
    $a->date = userdate($log->time);

    $a->action = $action;
@@ -78,7 +78,7 @@ function notify_admins_unknown($file,$a) {
    global $site;

    $admins = get_admins();
-    $subject = get_string('virusfoundsubject','moodle',$site->fullname);
+    $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
    $body = get_string('virusfoundlateradminnolog','moodle',$a);
    foreach ($admins as $admin) {
        email_to_user($admin,$admin,$subject,$body);
@@ -13,8 +13,8 @@
    }

    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('healthcenter', $adminroot);
+
+    admin_externalpage_setup('healthcenter');

    define('SEVERITY_NOTICE',      'notice');
    define('SEVERITY_ANNOYANCE',   'annoyance');
@@ -24,11 +24,11 @@
    $solution = optional_param('solution', 0, PARAM_SAFEDIR); //in fact it is class name alhanumeric and _

    require_login();
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));

    $site = get_site();

-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();

 echo <<<STYLES
 <style type="text/css">
@@ -100,7 +100,7 @@ STYLES;
    }


-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();


 function health_find_problems() {
@@ -525,11 +525,300 @@ class problem_000011 extends problem_base {
            }
            return 'Error counter was cleared.';
        } else {
-            return '<p>Session errors can be caused by:<ul><li>unresolved problem in server software (aka random switching of users),</li><li>blocked or modified cookies,</li><li>deleting of active session files.</li></ul></p><p><a href="'.me().'&resetsesserrorcounter=1">Reset counter.</a></p>';
+            return '<p>Session errors can be caused by:</p><ul>' .
+            '<li>unresolved problem in server software (aka random switching of users),</li>' .
+            '<li>blocked or modified cookies,</li>' .
+            '<li>deleting of active session files.</li>' .
+            '</ul><p><a href="'.me().'&amp;resetsesserrorcounter=1">Reset counter</a></p>';
        }
    }
 }

+class problem_000012 extends problem_base {
+    function title() {
+        return 'Random questions data consistency';
+    }
+    function exists() {
+        return record_exists_select('question', "qtype = 'random' AND parent <> id");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>For random questions, question.parent should equal question.id. ' .
+        'There are some questions in your database for which this is not true. ' .
+        'One way that this could have happened is for random questions restored from backup before ' .
+        '<a href="http://tracker.moodle.org/browse/MDL-5482">MDL-5482</a> was fixed.</p>';
+    }
+    function solution() {
+        global $CFG;
+        return '<p>Upgrade to Moodle 1.9.1 or later, or manually execute the SQL</p>' .
+        '<pre>UPDATE ' . $CFG->prefix . 'question SET parent = id WHERE qtype = \'random\' and parent &lt;> id;</pre>';
+    }
+}
+
+class problem_000013 extends problem_base {
+    function title() {
+        return 'Multi-answer questions data consistency';
+    }
+    function exists() {
+        global $CFG;
+        $positionexpr = sql_position(sql_concat("','", "q.id", "','"), 
+                sql_concat("','", "qma.sequence", "','"));
+        return record_exists_sql("
+                SELECT * FROM {$CFG->prefix}question q
+                    JOIN {$CFG->prefix}question_multianswer qma ON $positionexpr > 0
+                WHERE qma.question <> q.parent") ||
+            record_exists_sql("
+                SELECT * FROM {$CFG->prefix}question q
+                    JOIN {$CFG->prefix}question parent_q ON parent_q.id = q.parent
+                WHERE q.category <> parent_q.category");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>For each sub-question whose id is listed in ' .
+        'question_multianswer.sequence, its question.parent field should equal ' .
+        'question_multianswer.question; and each sub-question should be in the same ' .
+        'category as its parent. There are questions in your database for ' .
+        'which this is not the case. One way that this could have happened is ' .
+        'for multi-answer questions restored from backup before ' .
+        '<a href="http://tracker.moodle.org/browse/MDL-14750">MDL-14750</a> was fixed.</p>';
+    }
+    function solution() {
+        return '<p>Upgrade to Moodle 1.9.1 or later, or manually execute the ' .
+        'code in question_multianswer_fix_subquestion_parents_and_categories in ' .
+        '<a href="http://cvs.moodle.org/moodle/question/type/multianswer/db/upgrade.php?revision=1.1.10.2&amp;view=markup">/question/type/multianswer/db/upgrade.php' .
+        'from the 1.9 stable branch</a>.</p>';
+    }
+}
+
+class problem_000014 extends problem_base {
+    function title() {
+        return 'Only multianswer and random questions should be the parent of another question';
+    }
+    function exists() {
+        global $CFG;
+        return record_exists_sql("
+                SELECT * FROM {$CFG->prefix}question q
+                    JOIN {$CFG->prefix}question parent_q ON parent_q.id = q.parent
+                WHERE parent_q.qtype NOT IN ('random', 'multianswer')");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>You have questions that violate this in your databse. ' .
+        'You will need to investigate to determine how this happened.</p>';
+    }
+    function solution() {
+        return '<p>It is impossible to give a solution without knowing more about ' .
+        ' how the problem was caused. You may be able to get help from the ' .
+        '<a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a>.</p>';
+    }
+}
+
+class problem_000015 extends problem_base {
+    function title() {
+        return 'Question categories should belong to a valid context';
+    }
+    function exists() {
+        global $CFG;
+        return record_exists_sql("
+            SELECT qc.*, (SELECT COUNT(1) FROM {$CFG->prefix}question q WHERE q.category = qc.id) AS numquestions
+            FROM {$CFG->prefix}question_categories qc
+                LEFT JOIN {$CFG->prefix}context con ON qc.contextid = con.id
+            WHERE con.id IS NULL");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        global $CFG;
+        $problemcategories = get_records_sql("
+            SELECT qc.id, qc.name, qc.contextid, (SELECT COUNT(1) FROM {$CFG->prefix}question q WHERE q.category = qc.id) AS numquestions
+            FROM {$CFG->prefix}question_categories qc
+                LEFT JOIN {$CFG->prefix}context con ON qc.contextid = con.id
+            WHERE con.id IS NULL
+            ORDER BY numquestions DESC, qc.name");
+        $table = '<table><thead><tr><th>Cat id</th><th>Category name</th>' .
+        "<th>Context id</th><th>Num Questions</th></tr></thead><tbody>\n";
+        if ($problemcategories) {
+            foreach ($problemcategories as $cat) {
+                $table .= "<tr><td>$cat->id</td><td>" . s($cat->name) . "</td><td>" .
+                $cat->contextid ."</td><td>$cat->numquestions</td></tr>\n";
+            }
+        }
+        $table .= '</tbody></table>';
+        return '<p>All question categories are linked to a context id, and, ' .
+        'the context they are linked to must exist. The following categories ' .
+        'belong to a non-existant category:</p>' . $table . '<p>Any of these ' .
+        'categories that contain no questions can just be deleted form the database. ' .
+        'Other categories will require more thought.</p>';
+    }
+    function solution() {
+        global $CFG;
+        return '<p>You can delete the empty categories by executing the following SQL:</p><pre>
+DELETE FROM ' . $CFG->prefix . 'question_categories
+WHERE
+    NOT EXISTS (SELECT * FROM ' . $CFG->prefix . 'question q WHERE q.category = ' . $CFG->prefix . 'question_categories.id)
+AND NOT EXISTS (SELECT * FROM ' . $CFG->prefix . 'context con WHERE contextid = con.id)
+        </pre><p>Any remaining categories that contain questions will require more thought. ' .
+        'People in the <a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a> may be able to help.</p>';
+    }
+}
+
+class problem_000016 extends problem_base {
+    function title() {
+        return 'Question categories should belong to the same context as their parent';
+    }
+    function exists() {
+        global $CFG;
+        return record_exists_sql("
+            SELECT parent_qc.id AS parent, child_qc.id AS child, child_qc.contextid
+            FROM {$CFG->prefix}question_categories child_qc
+                JOIN {$CFG->prefix}question_categories parent_qc ON child_qc.parent = parent_qc.id
+            WHERE child_qc.contextid <> parent_qc.contextid");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        global $CFG;
+        $problemcategories = get_records_sql("
+            SELECT
+                parent_qc.id AS parentid, parent_qc.name AS parentname, parent_qc.contextid AS parentcon,
+                child_qc.id AS childid, child_qc.name AS childname, child_qc.contextid AS childcon
+            FROM {$CFG->prefix}question_categories child_qc
+                JOIN {$CFG->prefix}question_categories parent_qc ON child_qc.parent = parent_qc.id
+            WHERE child_qc.contextid <> parent_qc.contextid");
+        $table = '<table><thead><tr><th colspan="3">Child category</th><th colspan="3">Parent category</th></tr><tr>' .
+        '<th>Id</th><th>Name</th><th>Context id</th>' .
+        '<th>Id</th><th>Name</th><th>Context id</th>' .
+        "</tr></thead><tbody>\n";
+        if ($problemcategories) {
+            foreach ($problemcategories as $cat) {
+                $table .= "<tr><td>$cat->childid</td><td>" . s($cat->childname) .
+                "</td><td>$cat->childcon</td><td>$cat->parentid</td><td>" . s($cat->parentname) .
+                "</td><td>$cat->parentcon</td></tr>\n";
+            }
+        }
+        $table .= '</tbody></table>';
+        return '<p>When one question category is the parent of another, then they ' .
+        'should both belong to the same context. This is not true for the following categories:</p>' .
+        $table;
+    }
+    function solution() {
+        return '<p>An automated solution is difficult. It depends whether the ' .
+        'parent or child category is in the wrong pace.' .
+        'People in the <a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a> may be able to help.</p>';
+    }
+}
+
+class problem_000017 extends problem_base {
+    function title() {
+        return 'Question categories tree structure';
+    }
+    function find_problems() {
+        static $answer = null;
+
+        if (is_null($answer)) {
+            $categories = get_records('question_categories', '', '', 'id');
+
+            // Look for missing parents.
+            $missingparent = array();
+            foreach ($categories as $category) {
+                if ($category->parent != 0 && !array_key_exists($category->parent, $categories)) {
+                    $missingparent[$category->id] = $category;
+                }
+            }
+
+            // Look for loops.
+            $loops = array();
+            while (!empty($categories)) {
+                $current = array_pop($categories);
+                $thisloop = array($current->id => $current);
+                while (true) {
+                    if (isset($thisloop[$current->parent])) {
+                        // Loop detected
+                        $loops[$current->id] = $thisloop;
+                        break;
+                    } else if (!isset($categories[$current->parent])) {
+                        // Got to the top level, or a category we already know is OK.
+                        break;
+                    } else {
+                        // Continue following the path.
+                        $current = $categories[$current->parent];
+                        $thisloop[$current->id] = $current;
+                        unset($categories[$current->id]);
+                    }
+                }
+            }
+
+            $answer = array($missingparent, $loops);
+        }
+
+        return $answer;
+    }
+    function exists() {
+        list($missingparent, $loops) = $this->find_problems();
+        return !empty($missingparent) || !empty($loops);
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        list($missingparent, $loops) = $this->find_problems();
+
+        $description = '<p>The question categories should be arranged into tree ' .
+                ' structures by the question_categories.parent field. Sometimes ' .
+                ' this tree structure gets messed up.</p>';
+
+        if (!empty($missingparent)) {
+            $description .= '<p>The following categories are missing their parents:</p><ul>';
+            foreach ($missingparent as $cat) {
+                $description .= "<li>Category $cat->id: " . s($cat->name) . "</li>\n";
+            }
+            $description .= "</ul>\n";
+        }
+
+        if (!empty($loops)) {
+            $description .= '<p>The following categories form a loop of parents:</p><ul>';
+            foreach ($loops as $loop) {
+                $description .= "<li><ul>\n";
+                foreach ($loop as $cat) {
+                    $description .= "<li>Category $cat->id: " . s($cat->name) . " has parent $cat->parent</li>\n";
+                }
+                $description .= "</ul></li>\n";
+            }
+            $description .= "</ul>\n";
+        }
+
+        return $description;
+    }
+    function solution() {
+        global $CFG;
+        list($missingparent, $loops) = $this->find_problems();
+
+        $solution = '<p>Consider executing the following SQL queries. These fix ' .
+                'the problem by moving some categories to the top level.</p>';
+
+        if (!empty($missingparent)) {
+            $solution .= "<pre>UPDATE " . $CFG->prefix . "question_categories\n" .
+                    "        SET parent = 0\n" .
+                    "        WHERE id IN (" . implode(',', array_keys($missingparent)) . ");</pre>\n";
+        }
+
+        if (!empty($loops)) {
+            $solution .= "<pre>UPDATE " . $CFG->prefix . "question_categories\n" .
+                    "        SET parent = 0\n" .
+                    "        WHERE id IN (" . implode(',', array_keys($loops)) . ");</pre>\n";
+        }
+
+        return $solution;
+    }
+}

 class problem_00000x extends problem_base {
    function title() {
@@ -24,13 +24,15 @@
    require_once('../config.php');
    require_once($CFG->libdir.'/adminlib.php');  // Contains various admin-only functions
    require_once($CFG->libdir.'/ddllib.php'); // Install/upgrade related db functions
+    require_once($CFG->libdir.'/db/upgradelib.php');  // Upgrade-related functions

-    $id             = optional_param('id', '', PARAM_ALPHANUM);
+    $id             = optional_param('id', '', PARAM_TEXT);
    $confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
    $confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL);
    $agreelicense   = optional_param('agreelicense', 0, PARAM_BOOL);
    $autopilot      = optional_param('autopilot', 0, PARAM_BOOL);
    $ignoreupgradewarning = optional_param('ignoreupgradewarning', 0, PARAM_BOOL);
+    $confirmplugincheck = optional_param('confirmplugincheck', 0, PARAM_BOOL);

 /// check upgrade status first
    if ($ignoreupgradewarning and !empty($_SESSION['upgraderunning'])) {
@@ -59,6 +61,10 @@
        error("The PHP server variable 'file_uploads' is not turned On - $documentationlink");
    }

+    if (is_float_problem()) {
+        print_error('phpfloatproblem', 'admin', '', $documentationlink);
+    }
+
    if (empty($CFG->prefix) && $CFG->dbfamily != 'mysql') {  //Enforce prefixes for everybody but mysql
        error('$CFG->prefix can\'t be empty for your target DB (' . $CFG->dbtype . ')');
    }
@@ -122,6 +128,7 @@
            }
        }
    }
+    
    if (! $maintables) {
    /// hide errors from headers in case debug enabled in config.php
        $origdebug = $CFG->debug;
@@ -129,24 +136,27 @@
        error_reporting($CFG->debug);
        if (empty($agreelicense)) {
            $strlicense = get_string('license');
-            print_header($strlicense, $strlicense, $strlicense, "", "", false, "&nbsp;", "&nbsp;");
+            $navigation = build_navigation(array(array('name'=>$strlicense, 'link'=>null, 'type'=>'misc')));
+            print_header($strlicense, $strlicense, $navigation, "", "", false, "&nbsp;", "&nbsp;");
            print_heading("<a href=\"http://moodle.org\">Moodle</a> - Modular Object-Oriented Dynamic Learning Environment");
            print_heading(get_string('copyrightnotice'));
            print_box(text_to_html(get_string('gpl')), 'copyrightnotice');
            echo "<br />";
            notice_yesno(get_string('doyouagree'), "index.php?agreelicense=1",
                                                   "http://docs.moodle.org/en/License");
+            print_footer('none');
            exit;
        }
        if (empty($confirmrelease)) {
            $strcurrentrelease = get_string("currentrelease");
-            print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
+            $navigation = build_navigation(array(array('name'=>$strcurrentrelease, 'link'=>null, 'type'=>'misc')));
+            print_header($strcurrentrelease, $strcurrentrelease, $navigation, "", "", false, "&nbsp;", "&nbsp;");
            print_heading("Moodle $release");
-            print_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'));
-            echo '<form action="index.php"><fieldset class="invisiblefieldset">';
+            print_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'), 'generalbox boxaligncenter boxwidthwide');
+            echo '<form action="index.php"><div>';
            echo '<input type="hidden" name="agreelicense" value="1" />';
            echo '<input type="hidden" name="confirmrelease" value="1" />';
-            echo '</fieldset>';
+            echo '</div>';
            echo '<div class="continuebutton"><input name="autopilot" id="autopilot" type="checkbox" value="1" /><label for="autopilot">'.get_string('unattendedoperation', 'admin').'</label>';
            echo '<br /><br /><input type="submit" value="'.get_string('continue').'" /></div>';
            echo '</form>';
@@ -154,9 +164,11 @@
            die;
        }

+
        $strdatabasesetup    = get_string("databasesetup");
        $strdatabasesuccess  = get_string("databasesuccess");
-        print_header($strdatabasesetup, $strdatabasesetup, $strdatabasesetup,
+        $navigation = build_navigation(array(array('name'=>$strdatabasesetup, 'link'=>null, 'type'=>'misc')));
+        print_header($strdatabasesetup, $strdatabasesetup, $navigation,
                        "", upgrade_get_javascript(), false, "&nbsp;", "&nbsp;");
    /// return to original debugging level
        $CFG->debug = $origdebug;
@@ -166,13 +178,13 @@

    /// Both old .sql files and new install.xml are supported
    /// But we prioritise install.xml (XMLDB) if present
-    
+
        change_db_encoding(); // first try to change db encoding to utf8
        if (!setup_is_unicodedb()) {
            // If could not convert successfully, throw error, and prevent installation
-            print_error('unicoderequired', 'admin');  
+            print_error('unicoderequired', 'admin');
        }
-    
+
        $status = false;
        if (file_exists("$CFG->libdir/db/install.xml")) {
            $status = install_from_xmldb_file("$CFG->libdir/db/install.xml"); //New method
@@ -188,30 +200,31 @@
    /// Continue with the instalation
        $db->debug = false;
        if ($status) {
+
+            /// Groups install is now in core above.
+
            // Install the roles system.
            moodle_install_roles();
            set_config('statsrolesupgraded',time());

-            // Write default settings unconditionally (i.e. even if a setting is already set, overwrite it)
-            // (this should only have any effect during initial install).
-            $adminroot = admin_get_root();
-            $adminroot->prune('backups'); // backup settings table not created yet
-            apply_default_settings($adminroot);
+            // install core event handlers
+            events_update_definition();

            /// This is used to handle any settings that must exist in $CFG but which do not exist in
            /// admin_get_root()/$ADMIN as admin_setting objects (there are some exceptions).
-            apply_default_exception_settings(array('alternateloginurl' => '',
-                                                   'auth' => 'email',
+            apply_default_exception_settings(array('auth' => 'email',
                                                   'auth_pop3mailbox' => 'INBOX',
-                                                   'changepassword' => '',
                                                   'enrol' => 'manual',
                                                   'enrol_plugins_enabled' => 'manual',
-                                                   'guestloginbutton' => 1,
                                                   'style' => 'default',
                                                   'template' => 'default',
                                                   'theme' => 'standardwhite',
                                                   'filter_multilang_converted' => 1));

+            // Write default settings unconditionally (i.e. even if a setting is already set, overwrite it)
+            // (this should only have any effect during initial install).
+            admin_apply_default_settings(NULL, true);
+
            notify($strdatabasesuccess, "green");
            require_once $CFG->dirroot.'/mnet/lib.php';
        } else {
@@ -253,35 +266,84 @@
            $CFG->debug = DEBUG_MINIMAL;
            error_reporting($CFG->debug);

-            // logout in case we are upgrading from pre 1.7 version - prevention of weird session problems
-            if ($CFG->version < 2006050600) {
+            // logo ut in case we are upgrading from pre 1.9 version in order to prevent
+            // weird session/role problems caused by incorrect data in USER and SESSION
+            if ($CFG->version < 2007101500) {
                require_logout();
            }

            if (empty($confirmupgrade)) {
-                print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
+                $navigation = build_navigation(array(array('name'=>$strdatabasechecking, 'link'=>null, 'type'=>'misc')));
+                print_header($strdatabasechecking, $stradministration, $navigation,
                        "", "", false, "&nbsp;", "&nbsp;");

                notice_yesno(get_string('upgradesure', 'admin', $a->newversion), 'index.php?confirmupgrade=1', 'index.php');
+                print_footer('none');
                exit;

            } else if (empty($confirmrelease)){
                $strcurrentrelease = get_string("currentrelease");
-                print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
+                $navigation = build_navigation(array(array('name'=>$strcurrentrelease, 'link'=>null, 'type'=>'misc')));
+                print_header($strcurrentrelease, $strcurrentrelease, $navigation, "", "", false, "&nbsp;", "&nbsp;");
                print_heading("Moodle $release");
                print_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'));
-                echo '<form action="index.php"><fieldset class="invisiblefieldset">';
+
+                require_once($CFG->libdir.'/environmentlib.php');
+                print_heading(get_string('environment', 'admin'));
+                if (!check_moodle_environment($release, $environment_results, true)) {
+                    if (empty($CFG->skiplangupgrade)) {
+                        print_box_start('generalbox', 'notice'); // MDL-8330
+                        print_string('langpackwillbeupdated', 'admin');
+                        print_box_end();
+                    }
+                    notice_yesno(get_string('environmenterrorupgrade', 'admin'),
+                                 'index.php?confirmupgrade=1&amp;confirmrelease=1', 'index.php');
+                } else {
+                    notify(get_string('environmentok', 'admin'), 'notifysuccess');
+                    if (empty($CFG->skiplangupgrade)) {
+                        print_box_start('generalbox', 'notice'); // MDL-8330
+                        print_string('langpackwillbeupdated', 'admin');
+                        print_box_end();
+                    }
+                    echo '<form action="index.php"><div>';
+                    echo '<input type="hidden" name="confirmupgrade" value="1" />';
+                    echo '<input type="hidden" name="confirmrelease" value="1" />';
+                    echo '</div>';
+                    echo '<div class="continuebutton">';
+                    echo '<br /><br /><input type="submit" value="'.get_string('continue').'" /></div>';
+                    echo '</form>';
+                }
+
+                print_footer('none');
+                die;
+            } elseif (empty($confirmplugincheck)) { 
+                $strplugincheck = get_string('plugincheck');
+                $navigation = build_navigation(array(array('name'=>$strplugincheck, 'link'=>null, 'type'=>'misc')));
+                print_header($strplugincheck, $strplugincheck, $navigation, "", "", false, "&nbsp;", "&nbsp;");
+                print_heading($strplugincheck);
+                print_box_start('generalbox', 'notice'); // MDL-8330
+                print_string('pluginchecknotice');
+                print_box_end();
+                print_plugin_tables();
+                echo "<br />";
+                echo '<div class="continuebutton">';
+                echo '<a href="index.php?confirmupgrade=1&amp;confirmrelease=1" title="'.get_string('reload').'" ><img src="'.$CFG->pixpath.'/i/reload.gif" alt="" /> '.get_string('reload').'</a>';
+                echo '</div><br />';
+                echo '<form action="index.php"><div>';
                echo '<input type="hidden" name="confirmupgrade" value="1" />';
                echo '<input type="hidden" name="confirmrelease" value="1" />';
-                echo '</fieldset>';
-                echo '<div class="continuebutton"><input name="autopilot" id="autopilot" type="checkbox" value="0" /><label for="autopilot">'.get_string('unattendedoperation', 'admin').'</label>';
+                echo '<input type="hidden" name="confirmplugincheck" value="1" />';
+                echo '</div>';
+                echo '<div class="continuebutton"><input name="autopilot" id="autopilot" type="checkbox" value="1" /><label for="autopilot">'.get_string('unattendedoperation', 'admin').'</label>';
                echo '<br /><br /><input type="submit" value="'.get_string('continue').'" /></div>';
                echo '</form>';
                print_footer('none');
-                die;
+                die();
+    
            } else {
                $strdatabasesuccess  = get_string("databasesuccess");
-                print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
+                $navigation = build_navigation(array(array('name'=>$strdatabasesuccess, 'link'=>null, 'type'=>'misc')));
+                print_header($strdatabasechecking, $stradministration, $navigation,
                        "", upgrade_get_javascript(), false, "&nbsp;", "&nbsp;");

            /// return to original debugging level
@@ -290,7 +352,9 @@
                upgrade_log_start();

            /// Upgrade current language pack if we can
-                upgrade_language_pack();   
+                if (empty($CFG->skiplangupgrade)) {
+                    upgrade_language_pack();
+                }

                print_heading($strdatabasechecking);
                $db->debug=true;
@@ -307,12 +371,18 @@
            /// If successful, continue upgrading roles and setting everything properly
                if ($status) {
                    if (empty($CFG->rolesactive)) {
+
+                        /// Groups upgrade is now in core above.
+
                        // Upgrade to the roles system.
                        moodle_install_roles();
                        set_config('rolesactive', 1);
                    } else if (!update_capabilities()) {
                        error('Had trouble upgrading the core capabilities for the Roles System');
                    }
+                    // update core events
+                    events_update_definition();
+
                    require_once($CFG->libdir.'/statslib.php');
                    if (!stats_upgrade_for_roles_wrapper()) {
                        notify('Couldn\'t upgrade the stats tables to use the new roles system');
@@ -329,7 +399,7 @@
            /// Main upgrade not success
                } else {
                    notify('Main Upgrade failed!  See lib/db/upgrade.php');
-                    print_continue('index.php?confirmupgrade=1&amp;confirmrelease=1');
+                    print_continue('index.php?confirmupgrade=1&amp;confirmrelease=1&amp;confirmplugincheck=1');
                    print_footer('none');
                    die;
                }
@@ -354,6 +424,9 @@
        }
    }

+/// Groups install/upgrade is now in core above.
+
+
 /// Find and check all main modules and load them up or upgrade them if necessary
 /// first old *.php update and then the new upgrade.php script
    upgrade_activity_modules("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
@@ -381,6 +454,9 @@
 /// first old *.php update and then the new upgrade.php script
    upgrade_plugins('enrol', 'enrol', "$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards

+/// Check all auth plugins and upgrade if necessary
+    upgrade_plugins('auth','auth',"$CFG->wwwroot/$CFG->admin/index.php");
+
 /// Check all course formats and upgrade if necessary
    upgrade_plugins('format','course/format',"$CFG->wwwroot/$CFG->admin/index.php");

@@ -389,14 +465,24 @@
    require_once("$CFG->dirroot/lib/locallib.php");
    upgrade_local_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards

-/// Check for new groups and upgrade if necessary. TODO:
-    require_once("$CFG->dirroot/group/db/upgrade.php");
-    upgrade_group_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
-
 /// Check for changes to RPC functions
-    require_once($CFG->dirroot.'/admin/mnet/adminlib.php');
+    require_once("$CFG->dirroot/$CFG->admin/mnet/adminlib.php");
    upgrade_RPC_functions("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards

+/// Upgrade all plugins for gradebook
+    upgrade_plugins('gradeexport', 'grade/export', "$CFG->wwwroot/$CFG->admin/index.php");
+    upgrade_plugins('gradeimport', 'grade/import', "$CFG->wwwroot/$CFG->admin/index.php");
+    upgrade_plugins('gradereport', 'grade/report', "$CFG->wwwroot/$CFG->admin/index.php");
+
+/// Check all message output plugins and upgrade if necessary
+    upgrade_plugins('message','message/output',"$CFG->wwwroot/$CFG->admin/index.php");
+
+/// Check all course report plugins and upgrade if necessary
+    upgrade_plugins('coursereport', 'course/report', "$CFG->wwwroot/$CFG->admin/index.php");
+
+/// Check all admin report plugins and upgrade if necessary
+    upgrade_plugins('report', $CFG->admin.'/report', "$CFG->wwwroot/$CFG->admin/index.php");
+

 /// just make sure upgrade logging is properly terminated
    upgrade_log_finish();
@@ -408,10 +494,10 @@
        // We are about to create the site "course"
        require_once($CFG->libdir.'/blocklib.php');

-        $newsite = new Object();
+        $newsite = new object();
        $newsite->fullname = "";
        $newsite->shortname = "";
-        $newsite->summary = "";
+        $newsite->summary = NULL;
        $newsite->newsitems = 3;
        $newsite->numsections = 0;
        $newsite->category = 0;
@@ -422,21 +508,27 @@
        $newsite->students = get_string("defaultcoursestudents");
        $newsite->timemodified = time();

-        if ($newid = insert_record('course', $newsite)) {
-            // Site created, add blocks for it
-            $page = page_create_object(PAGE_COURSE_VIEW, $newid);
-            blocks_repopulate_page($page); // Return value not checked because you can always edit later
-
-            $cat = new Object();
-            $cat->name = get_string('miscellaneous');
-            if (insert_record('course_categories', $cat)) {
-                  redirect('index.php');
-            } else {
-                 error("Serious Error! Could not set up a default course category!");
-            }
-        } else {
+        if (!$newid = insert_record('course', $newsite)) {
            error("Serious Error! Could not set up the site!");
        }
+        // make sure course context exists
+        get_context_instance(CONTEXT_COURSE, $newid);
+
+        // Site created, add blocks for it
+        $page = page_create_object(PAGE_COURSE_VIEW, $newid);
+        blocks_repopulate_page($page); // Return value not checked because you can always edit later
+
+        $cat = new object();
+        $cat->name = get_string('miscellaneous');
+        $cat->depth = 1;
+        if (!$catid = insert_record('course_categories', $cat)) {
+            error("Serious Error! Could not set up a default course category!");
+        }
+        // make sure category context exists
+        get_context_instance(CONTEXT_COURSECAT, $catid);
+        mark_context_dirty('/'.SYSCONTEXTID);
+
+        redirect('index.php');
    }

    // initialise default blocks on admin and site page if needed
@@ -450,35 +542,23 @@
        //add admin_tree block to site if not already present
        if ($admintree = get_record('block', 'name', 'admin_tree')) {
            $page = page_create_object(PAGE_COURSE_VIEW, SITEID);
-            blocks_execute_action($page, blocks_get_by_page($page), 'add', (int)$admintree->id, false, false);
+            $pageblocks=blocks_get_by_page($page);
+            blocks_execute_action($page, $pageblocks, 'add', (int)$admintree->id, false, false);
            if ($admintreeinstance = get_record('block_instance', 'pagetype', $page->type, 'pageid', SITEID, 'blockid', $admintree->id)) {
-                blocks_execute_action($page, blocks_get_by_page($page), 'moveleft', $admintreeinstance, false, false);
+                $pageblocks=blocks_get_by_page($page); // Needs to be re-got, since has just changed
+                blocks_execute_action($page, $pageblocks, 'moveleft', $admintreeinstance, false, false);
            }
        }

        set_config('adminblocks_initialised', 1);
    }

-/// Define the unique site ID code if it isn't already
-    if (empty($CFG->siteidentifier)) {    // Unique site identification code
-        set_config('siteidentifier', random_string(32).$_SERVER['HTTP_HOST']);
-    }
+/// Define the unique site ID code if it isn't already set. This getter does that as a side-effect.
+    get_site_identifier();

 /// Check if the guest user exists.  If not, create one.
    if (! record_exists("user", "username", "guest")) {
-        $guest->auth        = "manual";
-        $guest->username    = "guest";
-        $guest->password    = md5("guest");
-        $guest->firstname   = addslashes(get_string("guestuser"));
-        $guest->lastname    = " ";
-        $guest->email       = "root@localhost";
-        $guest->description = addslashes(get_string("guestuserinfo"));
-        $guest->mnethostid  = $CFG->mnet_localhost_id;
-        $guest->confirmed   = 1;
-        $guest->lang        = $CFG->lang;
-        $guest->timemodified= time();
-
-        if (! $guest->id = insert_record("user", $guest)) {
+        if (! $guest = create_guest_record()) {
            notify("Could not create guest user record !!!");
        }
    }
@@ -486,19 +566,23 @@

 /// Set up the admin user
    if (empty($CFG->rolesactive)) {
+        build_context_path(); // just in case - should not be needed
        create_admin_user();
    }

-/// Check for valid admin user
-    require_login();
+/// Check for valid admin user - no guest autologin
+    require_login(0, false);

-    $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $context = get_context_instance(CONTEXT_SYSTEM);

    require_capability('moodle/site:config', $context);

 /// check that site is properly customized
-    if (empty($site->shortname) or empty($site->shortname)) {
-        redirect('settings.php?section=frontpagesettings&amp;return=site');
+    if (empty($site->shortname)) {
+        // probably new installation - lets return to frontpage after this step
+        // remove settings that we want uninitialised
+        unset_config('registerauth');
+        redirect('upgradesettings.php?return=site');
    }

 /// Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders
@@ -509,17 +593,29 @@
        }
    }

+/// setup critical warnings before printing admin tree block
+    $insecuredataroot         = is_dataroot_insecure(true);
+    $register_globals_enabled = ini_get_bool('register_globals'); 
+
+    $SESSION->admin_critical_warning = ($register_globals_enabled || $insecuredataroot==INSECURE_DATAROOT_ERROR); 
+
+    $adminroot =& admin_get_root();
+
+/// Check if there are any new admin settings which have still yet to be set
+    if (any_new_admin_settings($adminroot)){
+        redirect('upgradesettings.php');
+    }
+
 /// Everything should now be set up, and the user is an admin

 /// Print default admin page with notifications.

-    $adminroot = admin_get_root();
-    admin_externalpage_setup('adminnotifications', $adminroot);
-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_setup('adminnotifications');
+    admin_externalpage_print_header();

 /// Deprecated database! Warning!!
    if (!empty($CFG->migrated_to_new_db)) {
-        print_box(print_string('dbmigrationdeprecateddb','admin'));
+        print_box(print_string('dbmigrationdeprecateddb', 'admin'), 'generalbox adminwarning');
    }

 /// Check for any special upgrades that might need to be run
@@ -527,12 +623,26 @@
        print_box(get_string("upgrade$CFG->upgrade", "admin", "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"));
    }

-    if (ini_get_bool('register_globals') && !ini_get_bool('magic_quotes_gpc')) {
-        print_box(get_string('globalsquoteswarning', 'admin'));
+    if ($register_globals_enabled) {
+        print_box(get_string('globalswarning', 'admin'), 'generalbox adminerror');
    }

-    if (is_dataroot_insecure()) {
-        print_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot));
+    if ($insecuredataroot == INSECURE_DATAROOT_WARNING) {
+        print_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'generalbox adminwarning');
+    } else if ($insecuredataroot == INSECURE_DATAROOT_ERROR) {
+        print_box(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'generalbox adminerror');
+        
+    }
+
+    if (defined('WARN_DISPLAY_ERRORS_ENABLED')) {
+        print_box(get_string('displayerrorswarning', 'admin'), 'generalbox adminwarning');
+    }
+
+    if (substr($CFG->wwwroot, -1) == '/') {
+        print_box(get_string('cfgwwwrootslashwarning', 'admin'), 'generalbox adminwarning');
+    }
+    if (strpos($ME, $CFG->httpswwwroot.'/') === false) {
+        print_box(get_string('cfgwwwrootwarning', 'admin'), 'generalbox adminwarning');
    }

 /// If no recently cron run
@@ -540,60 +650,44 @@
    if (time() - $lastcron > 3600 * 24) {
        $strinstallation = get_string('installation', 'install');
        $helpbutton = helpbutton('install', $strinstallation, 'moodle', true, false, '', true);
-        print_box(get_string('cronwarning', 'admin')."&nbsp;".$helpbutton);
+        print_box(get_string('cronwarning', 'admin')."&nbsp;".$helpbutton, 'generalbox adminwarning');
    }

 /// Print multilang upgrade notice if needed
    if (empty($CFG->filter_multilang_converted)) {
-        print_box(get_string('multilangupgradenotice', 'admin'));
+        print_box(get_string('multilangupgradenotice', 'admin'), 'generalbox adminwarning');
    }

 /// Alert if we are currently in maintenance mode
    if (file_exists($CFG->dataroot.'/1/maintenance.html')) {
-        print_box(get_string('sitemaintenancewarning', 'admin'));
+        print_box(get_string('sitemaintenancewarning', 'admin'), 'generalbox adminwarning');
    }


-/// Print slightly annoying registration button every six months   ;-)
-/// You can set the "registered" variable to something far in the future
-/// if you really want to prevent this.   eg  9999999999
-    if (!isset($CFG->registered) || $CFG->registered < (time() - 3600*24*30*6)) {
-        $options = array();
-        $options['sesskey'] = $USER->sesskey;
-        print_box_start();
-        print_string('pleaseregister', 'admin');
-        print_single_button('register.php', $options, get_string('registration'));
-        print_box_end();
-        $registrationbuttonshown = true;
+/// Print slightly annoying registration button
+    $options = array();
+    $options['sesskey'] = $USER->sesskey;
+    print_box_start('generalbox adminwarning');
+    if(!isset($CFG->registered)) {
+       print_string('pleaseregister', 'admin');
    }
+    else { /* if (isset($CFG->registered) && $CFG->registered < (time() - 3600*24*30*6)) { */
+       print_string('pleaserefreshregistration', 'admin', userdate($CFG->registered));
+    }
+    print_single_button('register.php', $options, get_string('registration'));
+    print_box_end();
+

    //////////////////////////////////////////////////////////////////////////////////////////////////
    ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
    $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
-                     '<a href="http://docs.moodle.org/en/Release">'.$CFG->release.'</a> ('.$CFG->version.')<br />'.
+                     '<a href="http://docs.moodle.org/en/Release" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
                     'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
                     'and <a href="http://docs.moodle.org/en/Credits">many other contributors</a>.<br />'.
                     '<a href="http://docs.moodle.org/en/License">GNU Public License</a>';
    print_box($copyrighttext, 'copyright');
    //////////////////////////////////////////////////////////////////////////////////////////////////

-
-    if (empty($registrationbuttonshown)) {
-        $options = array();
-        $options['sesskey'] = $USER->sesskey;
-        print_single_button('register.php', $options, get_string('registration'));
-    }
-
-
-    if (optional_param('dbmigrate')) {               // ??? Is this actually used?
-        print_box_start();
-        require_once($CFG->dirroot.'/'.$CFG->admin.'/utfdbmigrate.php');
-        db_migrate2utf8();
-        print_box_end();
-    }
-
-
-    admin_externalpage_print_footer($adminroot);
-
+    admin_externalpage_print_footer();

 ?>
@@ -2,16 +2,16 @@

   require_once('../config.php');
   require_once($CFG->libdir.'/adminlib.php');
-   $adminroot = admin_get_root();
-   admin_externalpage_setup('toinodb', $adminroot);
+
+   admin_externalpage_setup('toinodb');

   $confirm = optional_param('confirm', 0, PARAM_BOOL);

   require_login();

-   require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+   require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));

-   admin_externalpage_print_header($adminroot);
+   admin_externalpage_print_header();
   print_heading('Convert all MySQL tables from MYISAM to InnoDB');

   if ($CFG->dbfamily != 'mysql') {
@@ -31,13 +31,13 @@
       }
       notify('... done.', 'notifysuccess');
       print_continue('index.php');
-       admin_externalpage_print_footer($adminroot);
+       admin_externalpage_print_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($adminroot);
+       admin_externalpage_print_footer();
   }

 ?>
@@ -11,8 +11,7 @@
 */
    require_once('../config.php');
    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('langedit', $adminroot);
+    admin_externalpage_setup('langedit');

    //
    // Some local configuration
@@ -32,7 +31,10 @@
    $strthislanguage = get_string("thislanguage");
    $stredithelpdocs = get_string('edithelpdocs', 'admin');

-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();
+
+    notify('NOTICE: This interface is obsolete now and will be removed. You should use 
+        improved <a href="lang.php?mode=helpfiles">lang.php</a> interface.');

    $currentlang = current_language();
    $langdir = "$CFG->dataroot/lang/$currentlang";
@@ -40,7 +42,7 @@


    if (!file_exists($langdir)) {
-        error ('to edit this language pack, you need to put it in '.$CFG->dataroot.'/lang','',$adminroot);
+        error ('to edit this language pack, you need to put it in '.$CFG->dataroot.'/lang');
    }
    // Shall I save POSTed data?

@@ -49,7 +51,7 @@
            if (langdoc_save_file($langdir, $currentfile, $_POST['filedata'])) {
                notify(get_string("changessaved")." ($langdir/$currentfile)", "green");
            } else {
-                error("Could not save the file '$currentfile'!", "langdoc.php?currentfile=$currentfile&sesskey=$USER->sesskey", $adminroot);
+                error("Could not save the file '$currentfile'!", "langdoc.php?currentfile=$currentfile&sesskey=$USER->sesskey");
            }
        }
    }
@@ -61,7 +63,7 @@
    // Get all files from /docs directory

    if (! $files = get_directory_list("$CFG->dirroot/lang/en_utf8/docs", "CVS")) {
-        error("Could not find English language docs files!",'',$adminroot);
+        error("Could not find English language docs files!");
    }

    $options = array();
@@ -81,7 +83,7 @@
    // Get all files from /help directory

    if (! $files = get_directory_list("$CFG->dirroot/lang/en_utf8/help", "CVS")) {
-        error("Could not find English language help files!",'',$adminroot);
+        error("Could not find English language help files!");
    }

    foreach ($files as $filekey => $file) {    // check all the help files.
@@ -184,7 +186,7 @@ $langdir/$currentfile")."</font></p>";
            if ($preview_url) {
                link_to_popup_window($preview_url, 'popup', get_string('preview'));
            }
-            echo '<div align="center"><input type="submit" value="'.get_string('savechanges').': lang/'.$currentlang.'/'.$currentfile.'" /></div>';
+            echo '<div class="mdl-align"><input type="submit" value="'.get_string('savechanges').': lang/'.$currentlang.'/'.$currentfile.'" /></div>';
            echo '</form>';
        }

@@ -194,7 +196,7 @@ $langdir/$currentfile")."</font></p>";
        error_reporting($CFG->debug);
    }

-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();

 //////////////////////////////////////////////////////////////////////

@@ -244,7 +246,7 @@ function langdoc_preview_url($currentfile) {
        $currentfile = substr($currentfile, 5);
        $currentpathexp = explode('/', $currentfile);
        if (count($currentpathexp) > 1) {
-            $url = '/help.php?module='.$currentpathexp[0].'&amp;file='.$currentpathexp[1];
+            $url = '/help.php?module='.implode('/',array_slice($currentpathexp,0,count($currentpathexp)-1)).'&amp;file='.end($currentpathexp); 
        } else {
            $url = '/help.php?module=moodle&amp;file='.$currentfile;
        }
@@ -6,93 +6,105 @@

    require_once('../config.php');
    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('langimport', $adminroot);
+    require_once($CFG->libdir.'/filelib.php');
+    require_once($CFG->libdir.'/componentlib.class.php');
+
+    admin_externalpage_setup('langimport');
+
+    if (!empty($CFG->skiplangupgrade)) {
+        admin_externalpage_print_header();
+        print_box(get_string('langimportdisabled', 'admin'));
+        print_footer();
+        die;
+    }

    $mode          = optional_param('mode', 0, PARAM_INT);     //phase
-    $pack          = optional_param('pack', '', PARAM_FILE);   //pack to install
+    $pack          = optional_param('pack', array(), PARAM_FILE);   //pack to install
    $displaylang   = $pack;
    $uninstalllang = optional_param('uninstalllang', '', PARAM_FILE);
    $confirm       = optional_param('confirm', 0, PARAM_BOOL);
    $sitelang      = optional_param('sitelangconfig', '', PARAM_FILE);

    define('INSTALLATION_OF_SELECTED_LANG', 2);
-    define('CHANGE_SITE_LANG', 3);
    define('DELETION_OF_SELECTED_LANG', 4);
    define('UPDATE_ALL_LANG', 5);

-    $strlang = get_string('langimport','admin');
+    $strlang         = get_string('langimport','admin');
+    $strlanguage     = get_string('language');
+    $strthislanguage = get_string('thislanguage');
+    $title           = $strlang;

-    $strlanguage = get_string("language");
-    $strthislanguage = get_string("thislanguage");
-    $title = $strlang;
-
-    admin_externalpage_print_header($adminroot);
+    //reset and diagnose lang cache permissions
+    @unlink($CFG->dataroot.'/cache/languages');
+    if (file_exists($CFG->dataroot.'/cache/languages')) {
+        error('Language cache can not be deleted, please fix permissions in dataroot/cache/languages!');
+    }
+    get_list_of_languages(true); //refresh lang cache

+    $notice_ok     = array();
+    $notice_error = array();

    switch ($mode){

        case INSTALLATION_OF_SELECTED_LANG:    ///installation of selected language pack

-            if (confirm_sesskey()) {
+            if (confirm_sesskey() and !empty($pack)) {
+                set_time_limit(0);
                @mkdir ($CFG->dataroot.'/temp/');    //make it in case it's a fresh install, it might not be there
                @mkdir ($CFG->dataroot.'/lang/');

-                require_once($CFG->libdir.'/componentlib.class.php');
-                if ($cd = new component_installer('http://download.moodle.org', 'lang16',
-                                                    $pack.'.zip', 'languages.md5', 'lang')) {
-                    $status = $cd->install(); //returns ERROR | UPTODATE | INSTALLED
-                    switch ($status) {
+                if (is_array($pack)) {
+                    $packs = $pack;
+                } else {
+                    $packs = array($pack);
+                }

-                        case ERROR:
-                            if ($cd->get_error() == 'remotedownloadnotallowed') {
-                                $a = new stdClass();
-                                $a->url = 'http://download.moodle.org/lang16/'.$pack.'zip';
-                                $a->dest= $CFG->dataroot.'/lang';
-                                error(get_string($cd->get_error(), 'error', $a));
-                            } else {
-                                error(get_string($cd->get_error(), 'error'));
-                            }
-                        break;
+                foreach ($packs as $pack) {
+                    if ($cd = new component_installer('http://download.moodle.org', 'lang16',
+                                                        $pack.'.zip', 'languages.md5', 'lang')) {
+                        $status = $cd->install(); //returns COMPONENT_(ERROR | UPTODATE | INSTALLED)
+                        switch ($status) {

-                        case INSTALLED:
-                            @unlink($CFG->dataroot.'/cache/languages');
-                            redirect('langimport.php', get_string('langpackupdated','admin',$pack));
-                        break;
+                            case COMPONENT_ERROR:
+                                if ($cd->get_error() == 'remotedownloaderror') {
+                                    $a = new object();
+                                    $a->url = 'http://download.moodle.org/lang16/'.$pack.'.zip';
+                                    $a->dest= $CFG->dataroot.'/lang';
+                                    print_error($cd->get_error(), 'error', 'langimport.php', $a);
+                                } else {
+                                    print_error($cd->get_error(), 'error', 'langimport.php');
+                                }
+                            break;

-                        case UPTODATE:
-                        break;
+                            case COMPONENT_INSTALLED:
+                                $notice_ok[] = get_string('langpackinstalled','admin',$pack);
+                            break;

+                            case COMPONENT_UPTODATE:
+                            break;
+
+                        }
+                    } else {
+                        notify('Had an unspecified error with the component installer, sorry.');
                    }
-                } else {
-                    notify('Had an unspecified error with the component installer, sorry.');
                }
            }
        break;

-        case CHANGE_SITE_LANG:    //change site language
-
-            if (confirm_sesskey()) {
-                $langconfig = get_record('config','name','lang');
-                $langconfig->value = $sitelang;
-                if (!empty($sitelang) && update_record('config',$langconfig)){
-                    redirect('langimport.php', get_string('sitelangchanged','admin'));
-                } else {
-                    error('Could not update the default site language!');
-                }
-            }
-
-        break;
        case DELETION_OF_SELECTED_LANG:    //delete a directory(ies) containing a lang pack completely

-            if (!$confirm && confirm_sesskey()) {
+            if ($uninstalllang == 'en_utf8') {
+                $notice_error[] = 'en_utf8 can not be uninstalled!';
+
+            } else if (!$confirm && confirm_sesskey()) {
+                admin_externalpage_print_header();
                notice_yesno(get_string('uninstallconfirm', 'admin', $uninstalllang),
-                             'langimport.php?mode=4&amp;uninstalllang='.$uninstalllang.'&amp;confirm=1&amp;sesskey='.sesskey(),
+                             'langimport.php?mode='.DELETION_OF_SELECTED_LANG.'&amp;uninstalllang='.$uninstalllang.'&amp;confirm=1&amp;sesskey='.sesskey(),
                             'langimport.php');
+                print_footer();
+                die;
+
            } else if (confirm_sesskey()) {
-                if ($uninstalllang == 'en_utf8') {
-                    error ('en_utf8 can not be uninstalled!');
-                }
                $dest1 = $CFG->dataroot.'/lang/'.$uninstalllang;
                $dest2 = $CFG->dirroot.'/lang/'.$uninstalllang;
                $rm1 = false;
@@ -103,31 +115,30 @@
                if (file_exists($dest2)){
                    $rm2 = remove_dir($dest2);
                }
+                get_list_of_languages(true); //refresh lang cache
                //delete the direcotries
                if ($rm1 or $rm2) {
-                    redirect('langimport.php', get_string('langpackremoved','admin'));
+                    $notice_ok[] = get_string('langpackremoved','admin');
                } else {    //nothing deleted, possibly due to permission error
-                    error('An error has occurred, language pack is not completely uninstalled, please check file permissions');
+                    $notice_error[] = 'An error has occurred, language pack is not completely uninstalled, please check file permissions';
                }
            }
-            @unlink($CFG->dataroot.'/cache/languages');
        break;

        case UPDATE_ALL_LANG:    //1 click update for all updatable language packs
+            set_time_limit(0);

            //0th pull a list from download.moodle.org,
            //key = langname, value = md5
-            $source = 'http://download.moodle.org/lang16/languages.md5';
            $md5array = array();
            $updated = 0;    //any packs updated?
-            unset($CFG->langlist);   // ignore admin's langlist
-            $alllangs = array_keys(get_list_of_languages());
+            $alllangs = array_keys(get_list_of_languages(false, true)); //get all available langs
            $lang16 = array();   //all the Moodle 1.6 unicode lang packs (updated and not updated)
            $packs = array();    //all the packs that needs updating


-            if (!$availablelangs = proxy_url($source)) {
-                error ('can not read from course');
+            if (!$availablelangs = get_remote_list_of_languages()) {
+                print_error('cannotdownloadlanguageupdatelist');
            }

            //and build an associative array
@@ -135,8 +146,12 @@
                $md5array[$alang[0]] = $alang[1];
            }

-            //filtering out non-16 packs
+            //filtering out non-16 and unofficial packs
            foreach ($alllangs as $clang) {
+                if (!array_key_exists($clang, $md5array)) {
+                    $notice_ok[] = get_string('langpackupdateskipped', 'admin', $clang);
+                    continue;
+                }
                $dest1 = $CFG->dataroot.'/lang/'.$clang;
                $dest2 = $CFG->dirroot.'/lang/'.$clang;

@@ -158,6 +173,7 @@
                if ($pack == 'en_utf8') {    // no update for en_utf8
                    continue;
                }
+
                //1. delete old director(ies)

                $dest1 = $CFG->dataroot.'/lang/'.$pack;
@@ -165,38 +181,40 @@
                $rm1 = false;
                $rm2 = false;
                if (file_exists($dest1)) {
-                    $rm1 = remove_dir($dest1);
+                    if (!remove_dir($dest1)) {
+                        $notice_error[] = 'Could not delete old directory '.$dest1.', update of '.$pack.' failed, please check permissions.';
+                        continue;
+                    }
                }
                if (file_exists($dest2)) {
-                    $rm2 = remove_dir($dest2);
-                }
-                if (!($rm1 || $rm2)) {
-                    error ('could not delete old directory, update failed');
+                    if (!remove_dir($dest2)) {
+                        $notice_error[] = 'Could not delete old directory '.$dest2.', update of '.$pack.' failed, please check permissions.';
+                        continue;
+                    }
                }

                //2. copy & unzip into new

-                require_once($CFG->libdir.'/componentlib.class.php');
                if ($cd = new component_installer('http://download.moodle.org', 'lang16',
                                       $pack.'.zip', 'languages.md5', 'lang')) {
-                $status = $cd->install(); //returns ERROR | UPTODATE | INSTALLED
+                $status = $cd->install(); //returns COMPONENT_(ERROR | UPTODATE | INSTALLED)
                switch ($status) {

-                    case ERROR:
-                        if ($cd->get_error() == 'remotedownloadnotallowed') {
+                    case COMPONENT_ERROR:
+                        if ($cd->get_error() == 'remotedownloaderror') {
                            $a = new stdClass();
-                            $a->url = 'http://download.moodle.org/lang16/'.$pack.'zip';
+                            $a->url = 'http://download.moodle.org/lang16/'.$pack.'.zip';
                            $a->dest= $CFG->dataroot.'/lang';
-                            error(get_string($cd->get_error(), 'error', $a));
+                            print_error($cd->get_error(), 'error', "", $a); // not probable
                        } else {
-                            error(get_string($cd->get_error(), 'error'));
+                            print_error($cd->get_error(), 'error'); // not probable
                        }
                    break;
-                    case UPTODATE:
+                    case COMPONENT_UPTODATE:
                        //Print error string or whatever you want to do
                    break;
-                    case INSTALLED:
-                        notify(get_string('langpackupdated','admin',$pack), 'notifysuccess');
+                    case COMPONENT_INSTALLED:
+                        $notice_ok[] = get_string('langpackupdated', 'admin', $pack);
                        $updated = true;
                        //Print/do whatever you want
                    break;
@@ -208,132 +226,178 @@
            }

            if ($updated) {
-                notice(get_string('langupdatecomplete','admin'), 'langimport.php');
+                $notice_ok[] = get_string('langupdatecomplete','admin');
            } else {
-                notice(get_string('nolangupdateneeded','admin'), 'langimport.php');
+                $notice_ok[] = get_string('nolangupdateneeded','admin');
            }

        break;
-
-        default:    //display choice mode
-
-            $source = 'http://download.moodle.org/lang16/languages.md5';
-            $remote = 0;    //flag for reading from remote or local
-
-            if ($availablelangs = proxy_url($source)) {
-                $remote = 1;
-            } else {
-                $availablelangs = get_local_list_of_languages();
-            }
-/*
-            if ($fp = fopen($source, 'r')){    /// attempt to get the list from Moodle.org.
-                while(!feof ($fp)) {
-                    $availablelangs[] = split(',', fgets($fp,1024));
-                }
-                $remote = 1;    //can read from download.moodle.org
-            } else {    /// fopen failed, we find local copy of list.
-                $availablelangs = get_local_list_of_languages();
-            }
-*/
-            if (!$remote) {
-                print_box_start();
-                print_string('remotelangnotavailable','admin',$CFG->dataroot.'/lang/');
-                print_box_end();
-            }
-
-            print_box_start();
-            echo '<table summary="">';
-            echo '<tr><td align="center" valign="top">';
-            echo '<form id="uninstallform" action="langimport.php?mode=4" method="post">';
-            echo '<fieldset class="invisiblefieldset">';
-            echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
-            unset($CFG->langlist);   // ignore admin's langlist
-            $installedlangs = get_list_of_languages();
-
-            /// display installed langs here
-
-            echo '<label for="uninstalllang">'.get_string('installedlangs','admin')."</label><br />\n";
-            echo '<select name="uninstalllang" id="uninstalllang" size="15">';
-            foreach ($installedlangs as $clang =>$ilang){
-                echo '<option value="'.$clang.'">'.$ilang.'</option>';
-            }
-            echo '</select>';
-            echo '<br /><input type="submit" value="'.get_string('uninstall','admin').'" />';
-            echo '</fieldset>';
-            echo '</form>';
-            echo '<form id="updateform" action="langimport.php?mode=5" method="post">';
-            echo '<fieldset class="invisiblefieldset">';
-            echo '<br /><input type="submit" value="'.get_string('updatelangs','admin').'" />';
-            echo '</fieldset>';
-            echo '</form>';
-
-            /// Display option to change site language
-
-            /// display to be installed langs here
-
-            echo '</td><td align="center" valign="top">';
-            //availabe langs table
-            $empty = 1;    //something to pring
-
-            /// if this language pack is not already installed, then we allow installation
-
-            echo '<form id="installform" method="post" action="langimport.php?mode=2">';
-            echo '<fieldset class="invisiblefieldset">';
-            echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
-            echo '<label for="pack">'.get_string('availablelangs','admin')."</label><br />\n";
-            if ($remote) {
-                echo '<select name="pack" id="pack" size="15">';
-            }
-
-            foreach ($availablelangs as $alang) {
-                if (trim($alang[0]) != "en_utf8") {
-                    if ($remote){
-                        if (substr($alang[0], -5) == '_utf8') {   //Remove the _utf8 suffix from the lang to show
-                            $shortlang = substr($alang[0], 0, -5);
-                        } else {
-                            $shortlang = $alang[0];
-                        }
-                        if (!is_installed_lang($alang[0], $alang[1])){    //if not already installed
-                            echo '<option value="'.$alang[0].'">'.$alang[2].' ('.$shortlang.')</option>';
-                        }
-                    } else {    //print list in local format, and instruction to install
-                        echo '<tr><td>'.$alang[2].'</td><td><a href="http://download.moodle.org/lang16/'.$alang[0].'.zip">'.get_string('download','admin').'</a></td></tr>';
-                    }
-                    $empty = 0;
-                }
-            }
-            if ($remote) {
-                echo '</select>';
-                echo '<br /><input type="submit" value="&larr; '.get_string('install','admin').'" />';
-            }
-            echo '</fieldset>';
-            echo '</form>';
-
-            if ($empty) {
-                echo '<br />';
-                print_string('nolanguagetodownload','admin');
-            }
-
-            //close available langs table
-            echo '</td></tr></table>';
-            print_simple_box_end();
-
-        break;
-
    }    //close of main switch

-    admin_externalpage_print_footer($adminroot);

-    /* returns a list of available language packs from a
+    admin_externalpage_print_header();
+
+    $installedlangs = get_list_of_languages(true, true);
+
+    $missingparents = array();
+    $oldlang = isset($SESSION->lang) ? $SESSION->lang : null; // override current lang
+
+    foreach($installedlangs as $l=>$unused) {
+        $SESSION->lang = $l;
+        $parent = get_string('parentlanguage');
+        if ($parent == 'en_utf8') {
+            continue;
+        }
+        if (strpos($parent, '[[') !== false) {
+            continue; // no parent
+        }
+        if (!isset($installedlangs[$parent])) {
+            $missingparents[$l] = $parent;
+        }
+    }
+    if (isset($oldlang)) {
+        $SESSION->lang = $oldlang;
+    } else {
+        unset($SESSION->lang);
+    }
+
+    if ($availablelangs = get_remote_list_of_languages()) {
+        $remote = 1;
+    } else {
+        $remote = 0;    //flag for reading from remote or local
+        $availablelangs = get_local_list_of_languages();
+    }
+
+    if (!$remote) {
+        print_box_start();
+        print_string('remotelangnotavailable', 'admin', $CFG->dataroot.'/lang/');
+        print_box_end();
+    }
+
+    if ($notice_ok) {
+        $info = implode('<br />', $notice_ok);
+        notify($info, 'notifysuccess');
+    }
+
+    if ($notice_error) {
+        $info = implode('<br />', $notice_error);
+        notify($info, 'notifyproblem');
+    }
+
+    if ($missingparents) {
+        foreach ($missingparents as $l=>$parent) {
+            $a = new object();
+            $a->lang   = $installedlangs[$l];
+            $a->parent = $parent;
+            foreach ($availablelangs as $alang) {
+                if ($alang[0] == $parent) {
+                    if (substr($alang[0], -5) == '_utf8') {   //Remove the _utf8 suffix from the lang to show
+                        $shortlang = substr($alang[0], 0, -5);
+                    } else {
+                        $shortlang = $alang[0];
+                    }
+                    $a->parent = $alang[2].' ('.$shortlang.')';
+                }
+            }
+            $info = get_string('missinglangparent', 'admin', $a);
+            notify($info, 'notifyproblem');
+        }
+    }
+
+    print_box_start();
+    echo '<table summary="">';
+    echo '<tr><td align="center" valign="top">';
+    echo '<form id="uninstallform" action="langimport.php?mode='.DELETION_OF_SELECTED_LANG.'" method="post">';
+    echo '<fieldset class="invisiblefieldset">';
+    echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
+
+    /// display installed langs here
+
+    echo '<label for="uninstalllang">'.get_string('installedlangs','admin')."</label><br />\n";
+    echo '<select name="uninstalllang" id="uninstalllang" size="15">';
+    foreach ($installedlangs as $clang =>$ilang){
+        echo '<option value="'.$clang.'">'.$ilang.'</option>';
+    }
+    echo '</select>';
+    echo '<br /><input type="submit" value="'.get_string('uninstall','admin').'" />';
+    echo '</fieldset>';
+    echo '</form>';
+
+    if ($remote) {
+        echo '<form id="updateform" action="langimport.php?mode='.UPDATE_ALL_LANG.'" method="post">';
+        echo '<div>';
+        echo '<br /><input type="submit" value="'.get_string('updatelangs','admin').'" />';
+        echo '</div>';
+        echo '</form>';
+    }
+
+    /// Display option to change site language
+
+    /// display to be installed langs here
+
+    echo '</td><td align="center" valign="top">';
+    //availabe langs table
+    $empty = 1;    //something to pring
+
+    /// if this language pack is not already installed, then we allow installation
+
+    echo '<form id="installform" method="post" action="langimport.php?mode='.INSTALLATION_OF_SELECTED_LANG.'">';
+    echo '<fieldset class="invisiblefieldset">';
+    echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
+    echo '<label for="pack">'.get_string('availablelangs','admin')."</label><br />\n";
+    if ($remote) {
+        echo '<select name="pack[]" id="pack" size="15" multiple="multiple">';
+    }
+
+    foreach ($availablelangs as $alang) {
+        if ($alang[0] == '') {
+            continue;
+        }
+        if (trim($alang[0]) != "en_utf8") {
+            if ($remote) {
+                if (substr($alang[0], -5) == '_utf8') {   //Remove the _utf8 suffix from the lang to show
+                    $shortlang = substr($alang[0], 0, -5);
+                } else {
+                    $shortlang = $alang[0];
+                }
+                if (!is_installed_lang($alang[0], $alang[1])){    //if not already installed
+                    echo '<option value="'.$alang[0].'">'.$alang[2].' ('.$shortlang.')</option>';
+                }
+            } else {    //print list in local format, and instruction to install
+                echo '<tr><td>'.$alang[2].'</td><td><a href="http://download.moodle.org/lang16/'.$alang[0].'.zip">'.get_string('download','admin').'</a></td></tr>';
+            }
+            $empty = 0;
+        }
+    }
+    if ($remote) {
+        echo '</select>';
+        echo '<br /><input type="submit" value="'.$THEME->larrow.' '.get_string('install','admin').'" />';
+    }
+    echo '</fieldset>';
+    echo '</form>';
+
+    if ($empty) {
+        echo '<br />';
+        print_string('nolanguagetodownload','admin');
+    }
+
+    //close available langs table
+    echo '</td></tr></table>';
+    print_box_end();
+
+    admin_externalpage_print_footer();
+
+    /**
+     * Returns a list of available language packs from a
     * local copy shipped with standard moodle distro
-     * this is for site that can't perform fopen
+     * this is for site that can't download components.
     * @return array
     */
    function get_local_list_of_languages() {
        global $CFG;
-        $source = $CFG->wwwroot.'/lib/languages.md5';
+        $source = $CFG->dirroot.'/lib/languages.md5';
        $availablelangs = array();
-        if ($fp = fopen($source, 'r')){
+        if ($fp = fopen($source, 'r')) {
            while(!feof ($fp)) {
                $availablelangs[] = split(',', fgets($fp,1024));
            }
@@ -341,7 +405,8 @@
        return $availablelangs;
    }

-    /* checks the md5 of the zip file, grabbed from download.moodle.org,
+    /**
+     * checks the md5 of the zip file, grabbed from download.moodle.org,
     * against the md5 of the local language file from last update
     * @param string $lang
     * @param string $md5check
@@ -356,37 +421,26 @@
        return false;
    }

-    //returns an array of languages, or false if can not read from source
-    //uses a socket if proxy is set as a config variable
-    function proxy_url($url) {
-        global $CFG;
+    /**
+     * Returns the latest list of available language packs from
+     * moodle.org
+     * @return array or false if can not download
+     */
+    function get_remote_list_of_languages() {
+        $source = 'http://download.moodle.org/lang16/languages.md5';
+        $availablelangs = array();

-        if ($CFG->proxyhost && $CFG->proxyport) {
-
-            $proxy_fp = fsockopen($CFG->proxyhost, $CFG->proxyport);
-            if (!$proxy_fp) {
-                return false;    //failed
-            }
-            fputs($proxy_fp, "GET $url HTTP/1.0\r\nHost: $CFG->proxyhost\r\n\r\n");
-            $i = 0;
-                while(!feof($proxy_fp)) {
-                $string = fgets($proxy_fp, 1024);
-                if ($i > 11) {    //12 lines of info skipped
-                    $availablelangs[] = split(',', $string);
+        if ($content = download_file_content($source)) {
+            $alllines = split("\n", $content);
+            foreach($alllines as $line) {
+                if (!empty($line)){
+                    $availablelangs[] = split(',', $line);
                }
-                $i++;
            }
-            fclose($proxy_fp);
+            return $availablelangs;

-        } else {    //proxy not in use
-            if ($fp = fopen($url, 'r')){    /// attempt to get the list from Moodle.org.
-                while(!feof ($fp)) {
-                    $availablelangs[] = split(',', fgets($fp,1024));
-                }
-            } else {    /// fopen failed, return false.
-                return false;
-            }
+        } else {
+            return false;
        }
-        return $availablelangs;
    }
 ?>
@@ -0,0 +1,77 @@
+#!/usr/bin/php
+<?php
+  /*
+   * Utility to debug mailouts - will save the content of emails to a
+   * logfile instead of sending them out. Use it as a sendmail
+   * "stand-in" when testing mailouts.
+   *
+   * It is not Moodle specific - use it anywhere by setting the php
+   * "sendmail_path" setting to this file with a logfile parameter.
+   *
+   * - Set in php.ini (not settable in config.php):
+   *     sendmail_path=/path-to-moodle/admin/mailout-debugger.php');
+   *   Or from the commandline
+   *     php -d sendmail_path='/path-to-moodle/admin/mailout-debugger.php' /path/to/cron.php
+   *
+   * - Create a file in admin called mailout-debugger.enable
+   *   (this is a security check to prevent execution in prod environments)
+   *   touch /path/to/moodle/admin/mailout-debugger.enable
+   *
+   * - Mark as executable: chmod ugo+rx mailout-debugger.php
+   *
+   * - Run your admin/cron.php
+   *
+   * - Read /tmp/moodle-mailout.log
+   *   
+   *
+   * This script will create logfiles in /tmp/ or in $TMPDIR if set.
+   * On windows, use php -r 'print sys_get_temp_dir()' to see where the file is saved.
+   */
+
+// Security check.
+if (!file_exists(dirname(__FILE__).'/mailout-debugger.enable')) {
+    mdie("Disabled.");
+}
+$tmpdir=sys_get_temp_dir(); // default
+
+if (isset($_SERVER['REMOTE_ADDR'])) {
+    mdie("should not be called from web server!");
+}
+
+if (isset($_ENV['TMPDIR']) && is_dir($_ENV['TMPDIR'])) {
+    $tmpdir = $_ENV['TMPDIR'];
+}
+
+$tmpfile = $tmpdir . '/moodle-mailout.log';
+$fh = fopen($tmpfile, 'a+', false)
+    or mdie("Error openning $tmpfile on append\n");
+fwrite($fh, "==== ".strftime("%a %b %e %H:%M:%S %Y", time())." ====\n");
+fwrite($fh, "==== Commandline: " . implode(' ',$argv) . "\n");
+
+$stdin = fopen('php://stdin', 'r');
+
+while ($line = fgets($stdin)) {
+    fwrite($fh, $line);
+}
+fwrite($fh, "\n");
+fclose($fh);
+fclose($stdin);
+
+/**
+ * Print an error to STDOUT and exit with a non-zero code. For commandline scripts.
+ * Default errorcode is 1.
+ *
+ * Very useful for perl-like error-handling:
+ *
+ * do_somethting() or mdie("Something went wrong");
+ *
+ * @param string  $msg       Error message
+ * @param integer $errorcode Error code to emit
+ *
+ */
+function mdie($msg='', $errorcode=1) {
+    trigger_error($msg);
+    exit($errorcode);
+}
+
+?>
@@ -6,8 +6,7 @@

    $action = optional_param('action', '', PARAM_ALPHA);

-    $adminroot = admin_get_root();
-    admin_externalpage_setup('maintenancemode', $adminroot);
+    admin_externalpage_setup('maintenancemode');

    //Check folder exists
    if (! make_upload_directory(SITEID)) {   // Site folder
@@ -32,31 +31,38 @@

 /// Print the header stuff

-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();
+
+    print_heading(get_string('sitemaintenancemode', 'admin'));
+
+    print_box_start();

 /// Print the appropriate form

    if (file_exists($filename)) {   // We are in maintenance mode
-        echo '<div style="margin-left:auto;margin-right:auto">';
+        echo '<div class="buttons">';
+        echo '<p>'.get_string('sitemaintenanceon', 'admin').'</p>';
        echo '<form action="maintenance.php" method="post">';
+        echo '<div>';
        echo '<input type="hidden" name="action" value="disable" />';
        echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
        echo '<p><input type="submit" value="'.get_string('disable').'" /></p>';
+        echo '</div>';
        echo '</form>';
        echo '</div>';
    } else {                        // We are not in maintenance mode
        $usehtmleditor = can_use_html_editor();

-        echo '<div style="text-align:center;margin-left:auto;margin-right:auto">';
+        echo '<div class="buttons">';
        echo '<form action="maintenance.php" method="post">';
        echo '<div>';
        echo '<input type="hidden" name="action" value="enable" />';
        echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
        echo '<p><input type="submit" value="'.get_string('enable').'" /></p>';
        echo '<p>'.get_string('optionalmaintenancemessage', 'admin').':</p>';
-        echo '<table><tr><td>';
+        echo '<div class="editor" style="width:600px;">';  // contains the editor
        print_textarea($usehtmleditor, 20, 50, 600, 400, "text");
-        echo '</td></tr></table>';
+        echo '</div>';
        echo '</div>';
        echo '</form>';
        echo '</div>';
@@ -66,5 +72,7 @@
        }
    }

-    admin_externalpage_print_footer($adminroot);
+    print_box_end();
+
+    admin_externalpage_print_footer();
 ?>
@@ -13,15 +13,13 @@ $perpage      = optional_param('perpage', 30, PARAM_INT);
 $action       = trim(strtolower(optional_param('action', '', PARAM_ALPHA)));

 require_login();
-$adminroot = admin_get_root();

+admin_externalpage_setup('ssoaccesscontrol');

-admin_externalpage_setup('ssoaccesscontrol', $adminroot);
-
-admin_externalpage_print_header($adminroot);
+admin_externalpage_print_header();

 if (!extension_loaded('openssl')) {
-    print_error('requiresopenssl', 'mnet', '', NULL, true);
+    print_error('requiresopenssl', 'mnet');
 }

 $sitecontext = get_context_instance(CONTEXT_SYSTEM);
@@ -41,13 +39,13 @@ if (!empty($action) and confirm_sesskey()) {
    
    // boot if insufficient permission
    if (!has_capability('moodle/user:delete', $sitecontext)) {
-        error(get_string('nomodifyacl','mnet'));
+        print_error('nomodifyacl','mnet');
    }

    // fetch the record in question
    $id = required_param('id', PARAM_INT);
    if (!$idrec = get_record('mnet_sso_access_control', 'id', $id)) {
-        error(get_string('recordnoexists','mnet'), '/admin/mnet/access_control.php');
+        print_error('recordnoexists','mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
    }

    switch ($action) {
@@ -62,7 +60,7 @@ if (!empty($action) and confirm_sesskey()) {
            // require the access parameter, and it must be 'allow' or 'deny'
            $accessctrl = trim(strtolower(required_param('accessctrl', PARAM_ALPHA)));
            if ($accessctrl != 'allow' and $accessctrl != 'deny') {
-                error(get_string('invalidaccessparam', 'mnet') , '/admin/mnet/access_control.php');
+                print_error('invalidaccessparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
            }

            if (mnet_update_sso_access_control($idrec->username, $idrec->mnet_host_id, $accessctrl)) {
@@ -75,7 +73,7 @@ if (!empty($action) and confirm_sesskey()) {
            break;

        default:
-            print_error('invalidactionparam', 'mnet', '/admin/mnet/access_control.php');
+            print_error('invalidactionparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
    }
 }

@@ -86,7 +84,7 @@ if ($form = data_submitted() and confirm_sesskey()) {

    // check permissions and verify form input
    if (!has_capability('moodle/user:delete', $sitecontext)) {
-        error(get_string('nomodifyacl','mnet'), '/admin/mnet/access_control.php');
+        print_error('nomodifyacl','mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
    }
    if (empty($form->username)) {
        $formerror['username'] = get_string('enterausername','mnet');
@@ -127,15 +125,11 @@ $warn = '';
 if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
    $warn = '<p>' . get_string('mnetdisabled','mnet') .'</p>';
 }
-if (empty($CFG->auth_plugins_enabled)) {
+
+if (!is_enabled_auth('mnet')) {
    $warn .= '<p>' .  get_string('authmnetdisabled','mnet').'</p>';
-} else {
-    $auths = explode(',', $CFG->auth_plugins_enabled);
-    if (!in_array('mnet', $auths)) {
-        $warn .= '<p>' .  get_string('authmnetdisabled','mnet').'</p>';
-    }
-    unset($auths);
 }
+
 if (get_config('auth/mnet', 'auto_add_remote_users') != true) {
    $warn .= '<p>' .  get_string('authmnetautoadddisabled','mnet').'</p>';
 }
@@ -238,6 +232,6 @@ foreach ($formerror as $error) {
 }

 print_simple_box_end();
-admin_externalpage_print_footer($adminroot);
+admin_externalpage_print_footer();

 ?>
@@ -29,7 +29,7 @@ function mnet_get_functions($type, $parentname) {
        $docname = 'rpclib.php';
        $relname  = '/mod/'.$parentname.'/'.$docname;
        $filename = $CFG->dirroot.$relname;
-        if (file_exists($filename)) include $filename;
+        if (file_exists($filename)) include_once $filename;
        $mnet_publishes = $parentname.'_mnet_publishes';
        if (function_exists($mnet_publishes)) {
            (array)$publishes = $mnet_publishes();
@@ -38,7 +38,7 @@ function mnet_get_functions($type, $parentname) {
        // auth or enrol
        $relname  = '/'.$type.'/'.$parentname.'/'.$docname;
        $filename = $CFG->dirroot.$relname;
-        if (file_exists($filename)) include $filename;
+        if (file_exists($filename)) include_once $filename;
        $class = $type.($type=='enrol'? 'ment':'').'_plugin_'.$parentname;
        if (class_exists($class)) {
            $object = new $class();
@@ -72,7 +72,7 @@ function mnet_get_functions($type, $parentname) {
    if (!file_exists($filename)) return false;

    if (extension_loaded('tokenizer')) {
-        include_once $CFG->dirroot.'/admin/mnet/MethodTable.php';
+        include_once "$CFG->dirroot/$CFG->admin/mnet/MethodTable.php";
        $functions = (array)MethodTable::create($filename,false);
    }

@@ -1,12 +1,15 @@
 <?php
-print_header("$site->shortname: $strmnetsettings", "$site->fullname",
-             '<a href="'.$CFG->wwwroot.'/admin/index.php">'.$stradministration.'</a> -> '.
-             '<a href="'.$CFG->wwwroot.'/admin/mnet/index.php">'.get_string('mnetsettings', 'mnet').'</a> -> Delete host');
+$navlinks = array();
+$navlinks[] = array('name' => $stradministration, 'link' => "$CFG->wwwroot/$CFG->admin/index.php", 'type' => 'misc');
+$navlinks[] = array('name' => get_string('mnetsettings', 'mnet'), 'link' => "$CFG->wwwroot/$CFG->admin/mnet/index.php", 'type' => 'misc');
+$navlinks[] = array('name' => get_string('deletehost', 'mnet'), 'link' => null, 'type' => 'misc');
+$navigation = build_navigation($navlinks);
+print_header("$site->shortname: $strmnetsettings", "$site->fullname", $navigation);

 print_heading(get_string('mnetsettings', 'mnet'));
 ?>
-<center>
-    <table align="center"   class="generalbox" border="0" cellpadding="5" cellspacing="0">
+<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
+    <table class="generalbox standard" border="0" cellpadding="5" cellspacing="0">
        <tr>
            <td  class="generalboxcontent">
            <table cellpadding="9" cellspacing="0" >
@@ -14,7 +17,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
                    <td colspan="2" class="header" cellpadding="0"><span><?php print_string('deleteaserver', 'mnet'); ?>Deleting a Server</span></td>
                </tr>
                <?php
-                if (count($warn) > 0):
+                if (count($warn) > 0){
                ?>
                <tr valign="top">
                    <td align="right" colspan="2"><?php print_string('receivedwarnings','mnet'); ?>:<br />
@@ -22,7 +25,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
                    </td>
                </tr>
                <?php
-                endif;
+                }
                ?>
                <tr valign="top">
                    <td colspan="2"><?php print_string('reallydeleteserver','mnet'); ?>: "<?php echo $mnet_peer->name; ?>"?</td>
@@ -46,7 +49,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
            </td>
        </tr>
    </table>
-</center>
+</div>
 <?php
 print_footer();
 ?>
@@ -1,10 +1,11 @@

 <form id="assignform" method="post" action="">
+<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
 <input type="hidden" name="previoussearch" value="<?php p($previoussearch) ?>" />
 <input type="hidden" name="courseid" value="<?php p($courseid) ?>" />
 <input type="hidden" name="host" value="<?php p($mnet_peer->id) ?>" />
 <input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
-  <table align="center" border="0" cellpadding="5" cellspacing="0">
+  <table class="generaltable" border="0" cellpadding="5" cellspacing="0">
    <tr>
      <td valign="top">
          <?php print_string('existingusers', 'role', count($mnetenrolledusers)); ?>
@@ -99,4 +100,5 @@
      <td valign="top"></td>
    </tr>
  </table>
+  </div>
 </form>
@@ -7,11 +7,10 @@
    include_once($CFG->dirroot.'/mnet/xmlrpc/client.php');

    if (!confirm_sesskey()) {
-        error(get_string('confirmsesskeybad', 'error'));
+        print_error('confirmsesskeybad', 'error');
    }

-    $adminroot = admin_get_root();
-    admin_externalpage_setup('mnetenrol', $adminroot);
+    admin_externalpage_setup('mnetenrol');
    $CFG->pagepath = 'admin/mnet';

    require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
@@ -244,7 +243,6 @@
 $str = get_strings(array('enrolmentplugins', 'configuration', 'users', 'administration'));
 /// Get some language strings

-$strassignusers = get_string('assignusers', 'role');
 $strpotentialusers = get_string('potentialusers', 'role');
 $strexistingusers = get_string('existingusers', 'role');
 $straction = get_string('assignroles', 'role');
@@ -255,10 +253,10 @@ $strshowall = get_string('showall');
 $strparticipants = get_string('participants');
 $strsearchresults = get_string('searchresults');

-admin_externalpage_print_header($adminroot);
+admin_externalpage_print_header();

 print_box('<strong>' . s($mnet_peer->name) . ' : ' 
-          . s($course->shortname) .' '. s($course->fullname) 
+          . format_string($course->shortname) .' '. format_string($course->fullname) 
          . '</strong><br />'
          . get_string("enrolcourseenrol_desc", "mnet"));

@@ -276,6 +274,6 @@ if (!empty($errors)) {
 }


-admin_externalpage_print_footer($adminroot);
+admin_externalpage_print_footer();

 ?>
@@ -6,12 +6,11 @@
    require_once($CFG->libdir.'/adminlib.php');

    if (!confirm_sesskey()) {
-        error(get_string('confirmsesskeybad', 'error'));
+        print_error('confirmsesskeybad', 'error');
    }


-    $adminroot = admin_get_root();
-    admin_externalpage_setup('mnetenrol', $adminroot);
+    admin_externalpage_setup('mnetenrol');
    $CFG->pagepath = 'admin/mnet';

    require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
@@ -24,34 +23,35 @@

    /// Print the page

-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();

    print_box('<strong>' . s($host->name) . ' </strong><br />'
              . get_string("enrolcourses_desc", "mnet"));

-    echo "<hr />";
+    echo '<hr />';

-    print ('<table align="center" >');
+    echo '<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->'
+           . '<table class="generaltable">';

    $icon  = "<img src=\"$CFG->pixpath/i/course.gif\"".
    " class=\"icon\" alt=\"".get_string("course")."\" />";

    foreach ($courses as $course) {
-        $link = $CFG->wwwroot . '/admin/mnet/enr_course_enrol.php?'
+        $link = "$CFG->wwwroot/$CFG->admin/mnet/enr_course_enrol.php?"
            . "host={$mnethost}&amp;courseid={$course->id}&amp;sesskey={$USER->sesskey}";
-        print ('<tr>'
+        echo '<tr>'
               . "<td>$icon</td>"
-               . "<td><a href=\"$link\">".s($course->fullname). "</a></td>"
+               . "<td><a href=\"$link\">".format_string($course->fullname). "</a></td>"
               . '</tr><tr>'
               . '<td></td>'
-               . '<td>'.s($course->shortname). ' - ' .s($course->cat_name).'</td>'
+               . '<td>'.format_string($course->shortname). ' - ' .format_string($course->cat_name).'</td>'
               . '</tr><tr>'
               . '<td></td>'
               . "<td align=\"left\" >{$course->summary}</td>"
-               . '</tr>');
+               . '</tr>';
    }
-    print ('</table>');
+    echo '</table></div>';

-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();

 ?>
@@ -5,8 +5,7 @@
    require_once(dirname(__FILE__) . "/../../config.php");
    require_once($CFG->libdir.'/adminlib.php');

-    $adminroot = admin_get_root();
-    admin_externalpage_setup('mnetenrol', $adminroot);
+    admin_externalpage_setup('mnetenrol');
    $CFG->pagepath = 'admin/mnet';


@@ -18,43 +17,45 @@

    /// get language strings

-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();

    print_box(get_string("remoteenrolhosts_desc", "mnet"));

-    echo "<hr />";
+    echo '<hr />';

    if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
        print_box(get_string('mnetdisabled','mnet'));
    }

-    print ('<table align="center" cellspacing="0" cellpadding="5"  width="500" id="hosts" class="generaltable generalbox" >'
+    echo '<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->'
+           . '<table cellspacing="0" cellpadding="5" id="hosts" class="generaltable generalbox" >'
           . '<tr>'
           . '<th class="header c0"> '.get_string('host', 'mnet').' </th>'
           . '<th class="header c1"> '.get_string('enrolments', 'mnet').' </th>'
           . '<th class="header c2"> '.get_string('courses', 'mnet').' </th>'
           // . '<th class="header c3"> &nbsp; </th>'
-           . '</tr>');
+           . '</tr>';
    $hosts = $enrolment->list_remote_servers();
    foreach ($hosts as $host) {
-        $coursesurl = "{$CFG->wwwroot}/admin/mnet/enr_courses.php?host={$host->id}&amp;sesskey={$USER->sesskey}";
+        $coursesurl = "$CFG->wwwroot/$CFG->admin/mnet/enr_courses.php?host={$host->id}&amp;sesskey={$USER->sesskey}";
        $coursecount = get_field_sql("SELECT count(id) FROM {$CFG->prefix}mnet_enrol_course WHERE hostid={$host->id}");
        if (empty($coursecount)) {
            $coursecount = '?';
        }
        $enrolcount = get_field_sql("SELECT count(id) FROM {$CFG->prefix}mnet_enrol_assignments WHERE hostid={$host->id}");

-        print ('<tr>'
+        echo '<tr>'
               . "<td><a href=\"{$coursesurl}\">{$host->name}</a></td>"
               . "<td align=\"center\" >$enrolcount</td>"
               . "<td align=\"center\" >$coursecount - <a href=\"{$coursesurl}\">".get_string('editenrolments', 'mnet')."</a></td>"
               // TODO: teach report/log/index.php to show per-host-logs
-               // . '<td align="center" ><a href="{$CFG->wwwroot}/admin/report/log/index.php?course_host={$host->id}">'
+               // . '<td align="center" ><a href="$CFG->wwwroot/$CFG->admin/report/log/index.php?course_host={$host->id}">'
               // . get_string('logs', 'mnet').'</a> </td>'
-               . '</tr>');
+               . '</tr>';
    }
-    print ('</table>');
+    echo '</table>'
+       . '</div>';

-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();

 ?>
@@ -7,8 +7,7 @@
    include_once($CFG->dirroot.'/mnet/lib.php');

    require_login();
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('net', $adminroot);
+    admin_externalpage_setup('net');

    $context = get_context_instance(CONTEXT_SYSTEM);

@@ -16,19 +15,19 @@


    if (!extension_loaded('openssl')) {
-        admin_externalpage_print_header($adminroot);
+        admin_externalpage_print_header();
        set_config('mnet_dispatcher_mode', 'off');
        print_error('requiresopenssl', 'mnet', '', NULL, true);
    }

    if (!$site = get_site()) {
-        admin_externalpage_print_header($adminroot);
+        admin_externalpage_print_header();
        set_config('mnet_dispatcher_mode', 'off');
        print_error('nosite', '', '', NULL, true);
    }

    if (!function_exists('curl_init') ) {
-        admin_externalpage_print_header($adminroot);
+        admin_externalpage_print_header();
        set_config('mnet_dispatcher_mode', 'off');
        print_error('nocurl', 'mnet', '', NULL, true);
    }
@@ -40,7 +39,7 @@
 /// If data submitted, process and store
    if (($form = data_submitted()) && confirm_sesskey()) {
        if (!empty($form->submit) && $form->submit == get_string('savechanges')) {
-            if (in_array($form->mode, array("off", "strict", "promiscuous"))) {
+            if (in_array($form->mode, array("off", "strict", "dangerous"))) {
                if (set_config('mnet_dispatcher_mode', $form->mode)) {
                    redirect('index.php', get_string('changessaved'));
                } else {
@@ -90,7 +89,7 @@
    }
    $hosts = get_records_select('mnet_host', " id != '{$CFG->mnet_localhost_id}' AND deleted = '0' ",'wwwroot ASC' );

-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();
 ?>
 <center>
 <form method="post" action="index.php">
@@ -112,8 +111,8 @@
                <tr valign="top">
                    <td align="right"><?php print_string('net', 'mnet'); ?>:</td>
                    <td><input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-                        <input type="radio" name="mode" value="off" <?php echo ("off" == $CFG->mnet_dispatcher_mode)? 'checked="true"' : '' ?> /> <?php print_string('off', 'mnet'); ?> <br />
-                        <input type="radio" name="mode" value="strict" <?php echo ("strict" == $CFG->mnet_dispatcher_mode)? 'checked="true"' : '' ?> /> <?php print_string('on', 'mnet'); ?><br />
+                        <input type="radio" name="mode" value="off" <?php echo ("off" == $CFG->mnet_dispatcher_mode)? 'checked="checked"' : '' ?> /> <?php print_string('off', 'mnet'); ?> <br />
+                        <input type="radio" name="mode" value="strict" <?php echo ("strict" == $CFG->mnet_dispatcher_mode)? 'checked="checked"' : '' ?> /> <?php print_string('on', 'mnet'); ?><br />
                        <input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" />
                    </td>
                </tr>
@@ -148,5 +147,5 @@
 </center>

 <?php
-admin_externalpage_print_footer($adminroot);
+admin_externalpage_print_footer();
 ?>
@@ -5,12 +5,15 @@ $logurl = $CFG->wwwroot.
          '&amp;date=0'.
          '&amp;modid=&amp;modaction=0&amp;logformat=showashtml';

-admin_externalpage_print_header($adminroot);
+admin_externalpage_print_header();

 if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
    $tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
    $tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
-    $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
+    $tabs[] = new tabobject('mnetthemes', 'mnet_themes.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetthemes, $strmnetthemes, false);
+    if ($mnet_peer->application->name == 'moodle') {
+        $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
+    }
 } else {
    $tabs[] = new tabobject('mnetdetails', '#', $strmnetedithost, $strmnetedithost, false);
 }
@@ -19,10 +22,13 @@ print_tabs(array($tabs), 'mnetdetails');
 print_simple_box_start("center", "");
 ?>
 <form method="post" action="peers.php">
+<div>
 <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
 <input type="hidden" name="step" value="commit" />
 <input type="hidden" name="last_connect_time" value="<?php echo $mnet_peer->last_connect_time; ?>" />
 <input type="hidden" name="id" value="<?php echo isset($mnet_peer->id)?  $mnet_peer->id : '0' ; ?>" />
+<input type="hidden" name="applicationid" value="<?php echo isset($mnet_peer->applicationid)?  $mnet_peer->applicationid : '0' ; ?>" />
+<input type="hidden" name="applicationname" value="<?php echo isset($mnet_peer->application->name)?  $mnet_peer->application->name : '' ; ?>" />
 <table cellpadding="9" cellspacing="0" width="635">

 <tr>
@@ -47,7 +53,7 @@ if (empty($mnet_peer->public_key)) $mnet_peer->public_key = '';


 if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) {
-    $key = mnet_get_public_key($mnet_peer->wwwroot);
+    $key = mnet_get_public_key($mnet_peer->wwwroot, $mnet_peer->application->xmlrpc_server_url);
    $mnet_peer->public_key = clean_param($key, PARAM_PEM);
 }
 ?>
@@ -74,7 +80,7 @@ if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) {
 </tr>
 <?php

-if(!empty($currentkey)):
+if(!empty($currentkey)) {
 ?>
    <tr>
        <td align="right" valign="top"></td>
@@ -85,30 +91,30 @@ if(!empty($currentkey)):
        <td valign="top"><pre style="font-size: 8px;"><?php echo $currentkey;?></pre></td>
    </tr>
 <?php
-endif;
+}

-if (isset($mnet_peer->id) && $mnet_peer->id > 0):
+if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
 ?>
    <tr>
        <td align="right" valign="top"><?php print_string('last_connect_time', 'mnet'); ?>:</td>
        <td valign="top"><?php echo ($mnet_peer->last_connect_time == 0)? get_string('never','mnet') : date('H:i:s d/m/Y',$mnet_peer->last_connect_time);?></td>
    </tr>
 <?php
-endif;
+}

-if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0):
+if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0){
 ?>
    <tr>
        <td align="right" valign="top"><?php print_string('deleted'); ?>:</td>
        <td valign="top">
-            <input type="radio" name="deleted" value="0" checked="true" /> <?php print_string('reenableserver','mnet'); ?><br />
+            <input type="radio" name="deleted" value="0" checked="checked" /> <?php print_string('reenableserver','mnet'); ?><br />
            <input type="radio" name="deleted" value="1"  /> <?php print_string('yes'); ?><br />
        </td>
    </tr>
 <?php
-endif;
+}

-if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address):
+if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address){
 ?>
    <tr>
        <td align="right" valign="top"><?php print_string('ipaddress', 'mnet');
@@ -119,15 +125,16 @@ if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address):
    </tr>

 <?php
-endif;
+}
 ?>
 <tr>
    <td></td>
    <td><input type="submit" value="<?php print_string("savechanges"); ?>" /></td>
 </tr>
 </table>
+</div>
 </form>
 <?php
 print_simple_box_end();
-admin_externalpage_print_footer($adminroot);
+admin_externalpage_print_footer();
 ?>
@@ -1,8 +1,9 @@
 <?php
-admin_externalpage_print_header($adminroot);
+admin_externalpage_print_header();

 $tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
 $tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
+$tabs[] = new tabobject('mnetthemes', 'mnet_themes.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetthemes, $strmnetthemes, false);
 print_tabs(array($tabs), 'mnetdetails');

 print_simple_box_start("center", "");
@@ -18,5 +19,5 @@ print_simple_box_start("center", "");
 </table>
 <?php
 print_simple_box_end();
-admin_externalpage_print_footer($adminroot);
+admin_externalpage_print_footer();
 ?>
@@ -1,5 +1,5 @@
 <?php
-admin_externalpage_print_header($adminroot);
+admin_externalpage_print_header();

 $logurl = $CFG->wwwroot.
          '/course/report/log/index.php?chooselog=1&amp;showusers=1&amp;showcourses=1&amp;host_course='.$mnet_peer->id.
@@ -9,28 +9,32 @@ $logurl = $CFG->wwwroot.

 $tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
 $tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
-if ($mnet_peer->id != $CFG->mnet_all_hosts_id) $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
+$tabs[] = new tabobject('mnetthemes', 'mnet_themes.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetthemes, $strmnetthemes, false);
+if ($mnet_peer->id != $CFG->mnet_all_hosts_id && $mnet_peer->application->name == 'moodle') {
+    $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
+}
 print_tabs(array($tabs), 'mnetservices');
 print_simple_box_start("center", "");

 ?>

 <form method="post" action="mnet_services.php">
+<div>
 <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
 <input type="hidden" name="step" value="<?php echo $mnet_peer->nextstep; ?>" />
 <input type="hidden" name="hostid" value="<?php echo ($mnet_peer->id)?  $mnet_peer->id : '0' ; ?>" />
 <table cellpadding="9" cellspacing="0" >
 <?php 
-    foreach($myservices as $name => $versions):
+    foreach($myservices as $name => $versions) {
    $version = current($versions);
 ?>
 <tr>
    <td align="left" valign="top" colspan="2">
    <h3><?php echo get_string($name.'_name', $version['parent_type'].'_'.$version['parent'] , $mnet_peer->name); ?></h3>
-    <p><?php echo get_string($name.'_description', $version['parent_type'].'_'.$version['parent'], $mnet_peer->name); ?></p>
+    <?php echo get_string($name.'_description', $version['parent_type'].'_'.$version['parent'], $mnet_peer->name); ?>
 <?php
        $breakstring = '';
-        foreach($versions as $version):
+        foreach($versions as $version){
            if (count($versions) > 1) {
                $versionstring = '('.get_string('version','mnet') .' '.$version['apiversion'].')';
            } else {
@@ -40,16 +44,37 @@ print_simple_box_start("center", "");
            echo $breakstring;
 ?>
    <input type="hidden" name="exists[<?php echo  $version['serviceid']; ?>]" value="1" />
-    <input type="checkbox" name="publish[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_publish']))? 'checked="checked" ': '' ; ?>/><?php print_string('publish','mnet'); ?><?php echo $versionstring; if (!empty($version['hostsubscribes'])) echo '<a href="#" title="'.get_string('issubscribed','mnet', $mnet_peer->name).'">&radic;</a> '; if (!empty($version['allhosts_publish'])) print_string("enabled_for_all",'mnet',!empty($version['I_publish']));  ?><br />
-    <input type="checkbox" name="subscribe[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_subscribe']))? 'checked="checked" ': '' ; ?>/><?php print_string('subscribe','mnet'); ?><?php echo $versionstring; if (!empty($version['hostpublishes'])) echo '<a href="#" title="'.get_string('ispublished','mnet', $mnet_peer->name).'">&radic;</a> '; if (!empty($version['allhosts_subscribe'])) print_string("enabled_for_all",'mnet',!empty($version['I_subscribe'])); ?><br />
-<?php
+    <input type="checkbox" name="publish[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_publish']))? 'checked="checked" ': '' ; ?>/>
+<?php 
+            print_string('publish','mnet');
+            echo $versionstring; 
+            if (!empty($version['hostsubscribes'])) { 
+                echo '<a href="#" title="'.get_string('issubscribed','mnet', $mnet_peer->name).'">&radic;</a> '; 
+            }
+            if (!empty($version['allhosts_publish'])) { 
+                print_string("enabled_for_all",'mnet',!empty($version['I_publish']));
+            } 
+            echo '<br />';
+?>
+    <input type="checkbox" name="subscribe[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_subscribe']))? 'checked="checked" ': '' ; ?>/>
+<?php 
+            print_string('subscribe','mnet');
+            echo $versionstring; 
+            if (!empty($version['hostpublishes'])) { 
+                echo '<a href="#" title="'.get_string('ispublished','mnet', $mnet_peer->name).'">&radic;</a> ';
+            } 
+            if (!empty($version['allhosts_subscribe'])) {
+                print_string("enabled_for_all",'mnet',!empty($version['I_subscribe']));
+            }
+            
+            echo '<br />';  
            $breakstring = '. . . . . . . . . . . . . . . . . . . . . . . . <br>';
-        endforeach;
+        } // end foreach
 ?>
    </td>
 </tr>
 <?php
-    endforeach;
+    } // end foreach
 ?>
 <tr>
    <td align="left" valign="top" colspan="2">
@@ -70,8 +95,9 @@ print_simple_box_start("center", "");
    </td>
 </tr>
 </table>
+</div>
 </form>
 <?php
 print_simple_box_end();
-admin_externalpage_print_footer($adminroot);
+admin_externalpage_print_footer();
 ?>
@@ -6,8 +6,7 @@
    include_once($CFG->dirroot.'/mnet/lib.php');

    require_login();
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('mnetpeers', $adminroot);
+    admin_externalpage_setup('mnetpeers');

    $context = get_context_instance(CONTEXT_SYSTEM);

@@ -34,6 +33,7 @@
    $strconfiguration    = get_string('configuration');
    $strmnetsettings     = get_string('mnetsettings', 'mnet');
    $strmnetservices     = get_string('mnetservices', 'mnet');
+    $strmnetthemes       = get_string('mnetthemes', 'mnet');
    $strmnetlog          = get_string('mnetlog', 'mnet');
    $strmnetedithost     = get_string('reviewhostdetails', 'mnet');
    $strmneteditservices = get_string('reviewhostservices', 'mnet');
@@ -48,7 +48,14 @@
            $publish        = (isset($_POST['publish'][$key]) && $_POST['publish'][$key] == 'on')? 1 : 0;
            $subscribe      = (isset($_POST['subscribe'][$key]) && $_POST['subscribe'][$key] == 'on')? 1 : 0;

-            if (false == $host2service && ($publish == 1 || $subscribe == 1)) {
+            if ($publish != 1 && $subscribe != 1) {
+                if (false == $host2service) {
+                    // We don't have or need a record - do nothing!
+                } else {
+                    // We don't need the record - delete it
+                    delete_records('mnet_host2service', 'hostid', $_POST['hostid'], 'serviceid', $key);
+                }
+            } elseif (false == $host2service && ($publish == 1 || $subscribe == 1)) {
                $host2service = new stdClass();
                $host2service->hostid = $_POST['hostid'];
                $host2service->serviceid = $key;
@@ -0,0 +1,127 @@
+<?php
+admin_externalpage_print_header();
+print_heading(get_string('themes'));
+$original_theme = fullclone($THEME);
+
+$logurl = $CFG->wwwroot.
+          '/course/report/log/index.php?chooselog=1&amp;showusers=1&amp;showcourses=1&amp;host_course='.$mnet_peer->id.
+          '%2F1&amp;user='.'0'.
+          '&amp;date=0'.
+          '&amp;modid=&amp;modaction=0&amp;logformat=showashtml';
+
+$tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
+$tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
+$tabs[] = new tabobject('mnetthemes', 'mnet_themes.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetthemes, $strmnetthemes, false);
+if ($mnet_peer->id != $CFG->mnet_all_hosts_id) {
+    $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
+}
+    print_tabs(array($tabs), 'mnetthemes');
+
+    $themes = get_list_of_plugins("theme");
+    $sesskey = !empty($USER->id) ? $USER->sesskey : '';
+
+    echo "<table style=\"margin-left:auto;margin-right:auto;\" cellpadding=\"7\" cellspacing=\"5\">";
+
+    if (count($report)) {
+        echo '<tr>';
+        echo '<td align="center" colspan="2">';
+        echo '<span class="'.$report[1].'">'.$report[0].'</span>';
+        echo '</td>';
+        echo '</tr>';
+    }
+
+    if (!$USER->screenreader) {
+        echo "<tr class=\"generaltableheader\"><th scope=\"col\">$strtheme</th>";
+        echo "<th scope=\"col\">$strinfo</th></tr>";
+    }
+
+    echo "<tr>";
+    echo '<td align="center"><span class="informationbox">Choose this option to use your site\'s default theme: <strong>'.$CFG->theme.'</strong>.</span></td>';
+    if ($mnet_peer->theme == '') {
+        echo '<td valign="top" style="border-style:solid; border-width:1px; border-color=#555555">';
+    } else {
+        echo '<td valign="top">';
+    }
+    echo '<p style="font-size:1.5em;font-style:bold;">Site Theme</p>';
+    $options = null;
+    $options['choose'] = $unlikely_name;// Something unlikely to ever be a theme name... initially $unlikely_name = 'ZoqZoqZ';
+    $options['sesskey'] = $sesskey;
+    $options['hostid'] = $mnet_peer->id;
+    print_single_button('mnet_themes.php', $options, $strchoose);
+    echo '</td>';
+    echo "</tr>";
+
+    foreach ($themes as $theme) {
+
+        unset($THEME);
+
+        if (!file_exists($CFG->themedir.'/'.$theme.'/config.php')) {   // bad folder
+            continue;
+        }
+
+        include($CFG->themedir.'/'.$theme.'/config.php');
+
+        $readme = '';
+        $screenshot = '';
+        $screenshotpath = '';
+
+        if (file_exists($CFG->themedir.'/'.$theme.'/README.html')) {
+            $readme =  '<li>'.
+            link_to_popup_window($CFG->themewww .'/'. $theme .'/README.html', $theme, $strinfo, 400, 500, '', 'none', true).'</li>';
+        } else if (file_exists($CFG->themedir.'/'.$theme.'/README.txt')) {
+            $readme =  '<li>'.
+            link_to_popup_window($CFG->themewww .'/'. $theme .'/README.txt', $theme, $strinfo, 400, 500, '', 'none', true).'</li>';
+        }
+        if (file_exists("$theme/screenshot.png")) {
+            $screenshotpath = "$theme/screenshot.png";
+        } else if (file_exists("$theme/screenshot.jpg")) {
+            $screenshotpath = "$theme/screenshot.jpg";
+        }
+
+        echo "<tr>";
+             
+        // no point showing this if user is using screen reader
+        if (!$USER->screenreader) {
+            echo "<td align=\"center\">";
+            if ($screenshotpath) {
+                $screenshot = '<li><a href='.$CFG->wwwroot .'/theme/'. $theme.'/screenshot.jpg">'.$strscreenshot.'</a></li>';
+                echo "<object type=\"text/html\" data=\"$screenshotpath\" height=\"200\" width=\"400\">$theme</object></td>";
+            } else {
+                echo '<object type="text/html" data="'.$CFG->wwwroot.'/theme/preview.php?preview='.$theme.'" height="200" width="400">'.$theme.'</object></td>';
+            }
+        }
+
+        if ($mnet_peer->theme == $theme) {
+            echo '<td valign="top" style="border-style:solid; border-width:1px; border-color=#555555">';
+        } else {
+            echo '<td valign="top">';
+        }
+
+        if (isset($THEME->sheets)) {
+            echo '<p style="font-size:1.5em;font-style:bold;">'.$theme.'</p>';
+        } else {
+            echo '<p style="font-size:1.5em;font-style:bold;color:red;">'.$theme.' (Moodle 1.4)</p>';
+        }
+          
+        if ($screenshot or $readme) {
+            echo '<ul>';      
+            if (!$USER->screenreader) {
+                echo '<li><a href="'.$CFG->wwwroot.'/theme/preview.php?preview='.$theme.'">'.$strpreview.'</a></li>';
+            }
+            echo $screenshot.$readme;
+            echo '</ul>';
+        }
+
+        $options = null;
+        $options['choose'] = $theme;
+        $options['sesskey'] = $sesskey;
+        $options['hostid'] = $mnet_peer->id;
+        print_single_button('mnet_themes.php', $options, $strchoose);
+        echo '</td>';
+        echo "</tr>";
+    }
+    echo "</table>";
+
+$THEME = $original_theme;
+admin_externalpage_print_footer();
+?>
@@ -0,0 +1,81 @@
+<?php
+    // Allows the admin to configure services for remote hosts
+
+    require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    include_once($CFG->dirroot.'/mnet/lib.php');
+    require_login();
+    admin_externalpage_setup('mnetpeers');
+
+    $context = get_context_instance(CONTEXT_SYSTEM);
+
+    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
+
+    if (!$site = get_site()) {
+        print_error('nosite', '', '', NULL, true);
+    }
+
+/// Initialize variables.
+
+    $hostid = required_param('hostid', PARAM_INT);
+
+    $stradministration   = get_string('administration');
+    $strconfiguration    = get_string('configuration');
+
+    $strmnetedithost   = get_string('reviewhostdetails', 'mnet');
+    $strmnetsettings     = get_string('mnetsettings', 'mnet');
+    $strmnetservices     = get_string('mnetservices', 'mnet');
+    $strmnetthemes       = get_string('mnetthemes', 'mnet');
+    $strmnetlog          = get_string('mnetlog', 'mnet');
+
+
+    $mnet_peer = new mnet_peer();
+    if (is_int($hostid)) {
+        $mnet_peer->set_id($hostid);
+    }
+
+    $choose = optional_param("choose",'',PARAM_FILE);   // set this theme as default
+    $stradministration = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strthemes = get_string("themes");
+    $strpreview = get_string("preview");
+    $strchoose = get_string("choose");
+    $strinfo = get_string("info");
+    $strtheme = get_string("theme");
+    $strthemesaved = get_string("themesaved");
+    $strscreenshot = get_string("screenshot");
+    $stroldtheme = get_string("oldtheme");
+    $report = array();
+    $unlikely_name = 'ZoqZoqZ'; // Something unlikely to ever be a theme name
+
+    if ($choose) {
+        if (confirm_sesskey()) {
+            if ($choose == $unlikely_name) {
+                $mnet_peer->force_theme = 1;
+                $mnet_peer->updateparams->force_theme = 1;
+                $mnet_peer->theme = '';
+                $mnet_peer->updateparams->theme = '';
+                if ($mnet_peer->commit()) {
+                    $report = array(get_string('themesaved'), 'informationbox');
+                } else {
+                    $report = array(get_string('themesavederror', 'mnet'), 'errorbox');
+                }
+            } elseif (!is_dir($CFG->themedir .'/'. $choose) || !file_exists($CFG->themedir .'/'. $choose .'/config.php')) {
+                        echo 'CHOOSE -'.$choose.' '. $CFG->themedir .'/'. $choose .'/config.php' ;
+                $report = array('This theme is not installed!'.'3', 'errorbox');
+            } else {
+                $mnet_peer->force_theme = 1;
+                $mnet_peer->theme = $choose;
+                $mnet_peer->updateparams->theme = addslashes($choose);
+                if ($mnet_peer->commit()) {
+                    $report = array(get_string('themesaved').'1', 'informationbox');
+                } else {
+                    $report = array(get_string('themesavederror', 'mnet').'2', 'errorbox');
+                }
+            }
+        }
+    }
+
+    $adminroot = admin_get_root();
+    require('./mnet_themes.html');
+?>
@@ -1,40 +1,42 @@
 <?php
-admin_externalpage_print_header($adminroot);
+admin_externalpage_print_header();

 if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
    print_box(get_string('mnetdisabled','mnet'));
 }
 ?>
-<center>
-<form  method="post" action="peers.php">
-<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-<input type="hidden" name="updateregisterall" value="1" />
-<table cellspacing="0" cellpadding="5"  width="500" id="hosts" class="generaltable generalbox" >
-    <tr>
-        <th class="header c0" nowrap="nowrap" colspan="2"><?php print_string('registerallhosts', 'mnet'); ?></th>
-    </tr>
-    <tr>
-        <td class="cell c1" colspan="2"><?php print_string('registerallhostsexplain', 'mnet'); ?></td>
-    </tr>
-    <tr>
-        <td class="cell c1"><input type="checkbox" name="registerallhosts" <?php if (!empty($CFG->mnet_register_allhosts)) echo 'checked="checked" '; ?>/></td>
-        <td class="cell c1"> <?php print_string('registerallhosts', 'mnet'); ?> </td>
-    </tr>
-    <tr>
-        <td align="right" colspan="2"><input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" /></td>
-    </tr>
-</table>
-</form>
-<table cellspacing="0" cellpadding="5" id="hosts" class="generaltable generalbox" >
-    <tr>
-        <th class="header c0" nowrap="nowrap"><?php print_string('site'); ?></th>
-        <th class="header c1" nowrap="nowrap"><?php print_string('system','mnet'); ?></th>
-        <th class="header c2" nowrap="nowrap"><?php print_string('last_connect_time', 'mnet'); ?></th>
-        <th class="header c3" nowrap="nowrap"></th>
-    </tr>
+<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
+    <form  method="post" action="peers.php">
+        <div>
+            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+            <input type="hidden" name="updateregisterall" value="1" />
+            <table cellspacing="0" cellpadding="5" class="generaltable generalbox" >
+                <tr>
+                    <th class="header c0" colspan="2"><?php print_string('registerallhosts', 'mnet'); ?></th>
+                </tr>
+                <tr>
+                    <td class="cell c1" colspan="2"><?php print_string('registerallhostsexplain', 'mnet'); ?></td>
+                </tr>
+                <tr>
+                    <td class="cell c1"><input type="checkbox" name="registerallhosts" <?php if (!empty($CFG->mnet_register_allhosts)) echo 'checked="checked" '; ?>/></td>
+                    <td class="cell c1"> <?php print_string('registerallhosts', 'mnet'); ?> </td>
+                </tr>
+                <tr>
+                    <td align="right" colspan="2"><input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" /></td>
+                </tr>
+            </table>
+        </div>
+    </form>
+    <table cellspacing="0" cellpadding="5" class="generaltable generalbox standard" >
+        <tr>
+            <th class="header c0"><?php print_string('site'); ?></th>
+            <th class="header c1"><?php print_string('system','mnet'); ?></th>
+            <th class="header c2"><?php print_string('last_connect_time', 'mnet'); ?></th>
+            <th class="header c3"></th>
+        </tr>
 <?php

-    foreach($hosts as $host):
+    foreach($hosts as $host) {

        if ($host->last_connect_time == 0) {
            $last_connect = get_string('never');
@@ -46,43 +48,54 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
    <tr>
        <td class="cell c0"><a href="peers.php?step=update&amp;hostid=<?php echo $host->id; ?>"><?php echo $host->name; ?></a></td>
        <td class="cell c1"><a href="peers.php?step=update&amp;hostid=<?php echo $host->id; ?>"><?php echo $host->wwwroot; ?></a></td>
-        <td class="cell c2" nowrap="nowrap"><?php if ($host->id != $CFG->mnet_all_hosts_id) echo $last_connect; ?></td>
+        <td class="cell c2"><?php if ($host->id != $CFG->mnet_all_hosts_id) echo $last_connect; ?></td>
        <td class="cell c3">
-<?php   if ($host->id != $CFG->mnet_all_hosts_id): ?>
+<?php   if ($host->id != $CFG->mnet_all_hosts_id){ ?>
            <form method="post" action="delete.php">
+                <div>
                <input type="hidden" name="hostid" value="<?php echo $host->id; ?>" />
                <input type="hidden" name="step" value="verify" />
                <input type="submit" name="submit" value="<?php print_string('delete'); ?>"/>
+                </div>
            </form>
-<?php   endif; ?>
+<?php   } ?>
        </td>
    </tr>
 <?php
-    endforeach;
+    }
 ?>
-    <tr>
-        <td class="cell c4" colspan="4">&nbsp;</td>
-    </tr>
+    </table>
    <form method="post" action="peers.php">
-    <tr>
-        <th class="header c4" nowrap="nowrap" colspan="4">
-            <?php print_string('addnewhost', 'mnet'); ?>
-            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-            <input type="hidden" name="step" value="input" />
-        </th>
-    </tr>
-    <tr>
-        <td class="cell c0"></td>
-        <td class="cell c1"><input type="text" name="wwwroot" value="" /></td>
-        <td class="cell c2"></td>
-        <td class="cell c3"></td>
-    </tr>
-    <tr>
-        <td class="cell c4" align="right" colspan="4"><input type="submit" value="<?php print_string('addhost','mnet'); ?>" /></td>
-    </tr>
-    </form>
-</table>
-</center>
+        <table cellspacing="0" cellpadding="5" class="generaltable generalbox standard" >
+            
+            <tr>
+                <th class="header c4" colspan="4">
+                    <?php print_string('addnewhost', 'mnet'); ?>
+                    <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                    <input type="hidden" name="step" value="input" />
+                </th>
+            </tr>
+            <tr>
+                <td class="cell c0">wwwroot:</td>
+                <td class="cell c1"><input type="text" name="wwwroot" value="" /></td>
+                <td class="cell c2">
+                    <select name="applicationid">
 <?php
-admin_externalpage_print_footer($adminroot);
-?>
+                foreach($applications as $application) {
+                    echo '                <option value="'.$application->id.'">'.$application->display_name."</option>\n";
+                }
+?>
+                    </select>
+                </td>
+                <td class="cell c3"></td>
+            </tr>
+            <tr>
+                <td class="cell c4" align="right" colspan="4"><input type="submit" value="<?php print_string('addhost','mnet'); ?>" /></td>
+            </tr>
+        
+        </table>
+    </form>
+</div>
+<?php
+admin_externalpage_print_footer();
+?>
@@ -7,26 +7,25 @@ require_once($CFG->libdir.'/adminlib.php');
 include_once($CFG->dirroot.'/mnet/lib.php');

 require_login();
-$adminroot = admin_get_root();
-admin_externalpage_setup('mnetpeers', $adminroot);
+admin_externalpage_setup('mnetpeers');

 $context = get_context_instance(CONTEXT_SYSTEM);

 require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");

 if (!extension_loaded('openssl')) {
-    admin_externalpage_print_header($adminroot);
-    print_error('requiresopenssl', 'mnet', '', NULL, true);
+    admin_externalpage_print_header();
+    print_error('requiresopenssl', 'mnet');
 }

 if (!$site = get_site()) {
-    admin_externalpage_print_header($adminroot);
-    print_error('nosite', '', '', NULL, true);
+    admin_externalpage_print_header();
+    print_error('nosite', '');
 }

 if (!function_exists('curl_init') ) {
-    admin_externalpage_print_header($adminroot);
-    print_error('nocurl', 'mnet', '', NULL, true);
+    admin_externalpage_print_header();
+    print_error('nocurl', 'mnet');
 }

 /// Initialize variables.
@@ -41,6 +40,7 @@ $hostid = optional_param('hostid', NULL, PARAM_INT);
 $strmnetservices   = get_string('mnetservices', 'mnet');
 $strmnetlog        = get_string('mnetlog', 'mnet');
 $strmnetedithost   = get_string('reviewhostdetails', 'mnet');
+$strmnetthemes     = get_string('mnetthemes', 'mnet');

 if (!isset($CFG->mnet_dispatcher_mode)) set_config('mnet_dispatcher_mode', 'off');

@@ -50,7 +50,19 @@ if (($form = data_submitted()) && confirm_sesskey()) {
    if (!empty($form->wwwroot)) {
        // ensure we remove trailing slashes
        $form->wwwroot = preg_replace(':/$:', '', $form->wwwroot);
+
+        // ensure the wwwroot starts with a http or https prefix
+        if (strtolower(substr($form->wwwroot, 0, 4)) != 'http') {
+            $form->wwwroot = 'http://'.$form->wwwroot;
+        }
    }
+
+    if(!function_exists('xmlrpc_encode_request')) {
+        trigger_error("You must have xml-rpc enabled in your PHP build to use this feature.");
+        print_error('xmlrpc-missing', 'mnet','peers.php');
+        exit;
+    }
+
    if (!empty($form->updateregisterall)) {
        if (!empty($form->registerallhosts)) {
            set_config('mnet_register_allhosts',1);
@@ -70,38 +82,43 @@ if (($form = data_submitted()) && confirm_sesskey()) {
            $temp_wwwroot = clean_param($form->wwwroot, PARAM_URL);
            if ($temp_wwwroot !== $form->wwwroot) {
                trigger_error("We now parse the wwwroot with PARAM_URL. Your URL will need to have a valid TLD, etc.");
-                error(get_string("invalidurl", 'mnet'),'peers.php');
+                print_error("invalidurl", 'mnet','peers.php');
                exit;
            }
            unset($temp_wwwroot);
-            $mnet_peer->bootstrap($form->wwwroot);
+            $mnet_peer->set_applicationid($form->applicationid);
+            $application = get_field('mnet_application', 'name', 'id', $form->applicationid);
+            $mnet_peer->bootstrap($form->wwwroot, null, $application);
        }
-    
+
        if (isset($form->name) && $form->name != $mnet_peer->name) {
            $form->name = clean_param($form->name, PARAM_NOTAGS);
            $mnet_peer->set_name($form->name);
        }
    
        if (isset($form->deleted) && ($form->deleted == '0' || $form->deleted == '1')) {
+            $mnet_peer->updateparams->deleted = $form->deleted;
            $mnet_peer->deleted = $form->deleted;
        }
    
        if (isset($form->public_key)) {
            $form->public_key = clean_param($form->public_key, PARAM_PEM);
            if (empty($form->public_key)) {
-                error(get_string("invalidpubkey", 'mnet'),'peers.php?step=update&amp;hostid='.$mnet_peer->id);
+                print_error("invalidpubkey", 'mnet', 'peers.php?step=update&amp;hostid='.$mnet_peer->id);
                exit;
            } else {
                $oldkey = $mnet_peer->public_key;
                $mnet_peer->public_key = $form->public_key;
-                $mnet_peer->public_key_expires   = $mnet_peer->check_common_name($form->public_key);
+                $mnet_peer->updateparams->public_key = addslashes($form->public_key);
+                $mnet_peer->public_key_expires = $mnet_peer->check_common_name($form->public_key);
+                $mnet_peer->updateparams->public_key_expires = $mnet_peer->check_common_name($form->public_key);
                if ($mnet_peer->public_key_expires == false) {
-                    $mnet_peer->public_key == $oldkey;
                    $errmsg = '<br />';
                    foreach ($mnet_peer->error as $err) {
                        $errmsg .= $err['code'] . ': ' . $err['text'].'<br />';
                    }
                    error(get_string("invalidpubkey", 'mnet') . $errmsg ,'peers.php?step=update&amp;hostid='.$mnet_peer->id);
+                    //print_error("invalidpubkey", 'mnet', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $errmsg);
                    exit;
                }
            }
@@ -110,7 +127,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
        // PREVENT DUPLICATE RECORDS ///////////////////////////////////////////
        if ('input' == $form->step) {
            if ( isset($mnet_peer->id) && $mnet_peer->id > 0 ) {
-                error(get_string("hostexists", 'mnet', $mnet_peer->id),'peers.php?step=update&amp;hostid='.$mnet_peer->id);
+                print_error("hostexists", 'mnet', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $mnet_peer->id);
            }
        }

@@ -128,7 +145,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
 } elseif (is_int($hostid)) {
    $mnet_peer = new mnet_peer();
    $mnet_peer->set_id($hostid);
-    $currentkey = mnet_get_public_key($mnet_peer->wwwroot);
+    $currentkey = mnet_get_public_key($mnet_peer->wwwroot, $mnet_peer->application);
    if($currentkey == $mnet_peer->public_key) unset($currentkey);
    $form = new stdClass();
    if ($hostid != $CFG->mnet_all_hosts_id) {
@@ -137,8 +154,31 @@ if (($form = data_submitted()) && confirm_sesskey()) {
        include('./mnet_review_allhosts.html');
    }
 } else {
-    $hosts = get_records_select('mnet_host', " id != '{$CFG->mnet_localhost_id}' AND deleted = '0' ",'wwwroot ASC' );
+    $hosts = get_records_sql('  SELECT 
+                                    h.id, 
+                                    h.wwwroot, 
+                                    h.ip_address, 
+                                    h.name, 
+                                    h.public_key, 
+                                    h.public_key_expires, 
+                                    h.transport, 
+                                    h.portno, 
+                                    h.last_connect_time, 
+                                    h.last_log_id, 
+                                    h.applicationid, 
+                                    a.name as app_name, 
+                                    a.display_name as app_display_name, 
+                                    a.xmlrpc_server_url
+                                FROM  
+                                    '.$CFG->prefix.'mnet_host h,  
+                                    '.$CFG->prefix.'mnet_application a  
+                                WHERE 
+                                    h.id != \''.$CFG->mnet_localhost_id.'\' AND  
+                                    h.deleted = \'0\' AND  
+                                    h.applicationid=a.id');
+
    if (empty($hosts)) $hosts = array();
+    $applications = get_records('mnet_application');
    include('./peers.html');
 }
 ?>
@@ -1,36 +1,39 @@
 <?php
-admin_externalpage_print_header($adminroot);
+admin_externalpage_print_header();
 ?>
-<center>
-<table cellspacing="0" cellpadding="5"  width="500" id="hosts" class="generaltable generalbox" >
+<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
+<table cellspacing="0" cellpadding="5"  class="generaltable generalbox" >
    <tr>
-        <th class="header c0" nowrap="nowrap" colspan="2"><?php print_string('trustedhosts', 'mnet'); ?></th>
+        <th class="header c0" colspan="2"><?php print_string('trustedhosts', 'mnet'); ?></th>
    </tr>
    <tr>
        <td class="cell c1" colspan="2"><?php print_string('trustedhostsexplain', 'mnet'); ?></td>
    </tr>
    <tr>
-        <td class="cell c1" colspan="2"><form  method="post" action="trustedhosts.php">
-            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-            <textarea name="hostlist" cols="40" rows="20"><?php echo $trusted_hosts; ?></textarea><br />
-            <input type="submit" value="<?php print_string('savechanges'); ?>" />
+        <td class="cell c1" colspan="2">
+            <form  method="post" action="trustedhosts.php">
+            <div>
+                <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                <textarea name="hostlist" cols="40" rows="20"><?php echo $trusted_hosts; ?></textarea><br />
+                <input type="submit" value="<?php print_string('savechanges'); ?>" />
+            </div>
            </form>
        </td>
    </tr>
 </table>
-<table cellspacing="0" cellpadding="5"  width="500" id="hosts" class="generaltable generalbox" >
+<table cellspacing="0" cellpadding="5" class="generaltable generalbox" >
    <tr>
-        <th class="header c0" nowrap="nowrap" colspan="2"><?php print_string('testtrustedhosts', 'mnet'); ?></th>
+        <th class="header c0" colspan="2"><?php print_string('testtrustedhosts', 'mnet'); ?></th>
    </tr>
 <?php 
-    if (!empty($test_ip_address)):
+    if (!empty($test_ip_address)){
 ?>
    <tr>
        <td class="cell c1" colspan="2">
            <?php
                if ($in_range) {
                    print_string('is_in_range',  'mnet', $test_ip_address);
-                    echo '<br>';
+                    echo '<br />';
                    print_string('validated_by', 'mnet', $validated_by);
                } else {
                    print_string('not_in_range',  'mnet', $test_ip_address);
@@ -39,24 +42,27 @@ admin_externalpage_print_header($adminroot);
        </td>
    </tr>
 <?php
-    else:
+   } else {
 ?>
    <tr>
        <td class="cell c1" colspan="2"><?php print_string('testtrustedhostsexplain', 'mnet'); ?></td>
    </tr>
 <?php
-    endif;
+   } 
 ?>
    <tr>
-        <td class="cell c1" colspan="2"><form  method="get" action="trustedhosts.php">
-            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-            <input type="text" name="testipaddress" value="<?php echo $test_ip_address; ?>" />
-            <input type="submit" value="<?php print_string('go'); ?>" />
+        <td class="cell c1" colspan="2">
+            <form  method="get" action="trustedhosts.php">
+            <div>
+                <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                <input type="text" name="testipaddress" value="<?php echo $test_ip_address; ?>" />
+                <input type="submit" value="<?php print_string('go'); ?>" />
+            </div>
            </form>
        </td>
    </tr>
 </table>
-</center>
+</div>
 <?php
-admin_externalpage_print_footer($adminroot);
-?>
+admin_externalpage_print_footer();
+?>
@@ -6,20 +6,19 @@
    include_once($CFG->dirroot.'/mnet/lib.php');

    require_login();
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('trustedhosts', $adminroot);
+    admin_externalpage_setup('trustedhosts');

    $context = get_context_instance(CONTEXT_SYSTEM);

    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");

    if (!extension_loaded('openssl')) {
-        admin_externalpage_print_header($adminroot);
+        admin_externalpage_print_header();
        print_error('requiresopenssl', 'mnet', '', NULL, true);
    }
    
    if (!$site = get_site()) {
-        admin_externalpage_print_header($adminroot);
+        admin_externalpage_print_header();
        print_error('nosite', '', '', NULL, true);
    }

@@ -49,7 +48,6 @@

    /// If data submitted, process and store
    if (($form = data_submitted()) && confirm_sesskey()) {
-        echo 'a';
        $hostlist = preg_split("/[\s,]+/", $form->hostlist);
        foreach($hostlist as $host) {
            list($address, $mask) = explode('/', $host.'/');
@@ -3,8 +3,6 @@

    require_once('../config.php');
    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('managemodules', $adminroot);

 /// If data submitted, then process and store.

@@ -12,11 +10,12 @@
        $module = optional_param('module', '', PARAM_SAFEDIR);

        if (!confirm_sesskey()) {
-            error(get_string('confirmsesskeybad', 'error'));
+            print_error('confirmsesskeybad', 'error');
        }

        if ($module != '') {
-            require_once("$CFG->dirroot/mod/$module/lib.php");
+            include_once("$CFG->dirroot/mod/$module/lib.php");
+            admin_externalpage_setup('modsetting'.$module);
            // if the config.html contains a hidden form field giving
            // the module name then the form does not have to prefix all
            // its variable names, we will do it here.
@@ -28,6 +27,8 @@
                $moduleconfig($config);
            }
        } else {
+            admin_externalpage_setup('managemodules');
+
            $moduleprefix = '';
        }

@@ -43,7 +44,8 @@

 /// Otherwise print the form.
    $module = required_param('module', PARAM_SAFEDIR);
-    require_once("$CFG->dirroot/mod/$module/lib.php");
+    include_once("$CFG->dirroot/mod/$module/lib.php");
+    admin_externalpage_setup('modsetting'.$module);

    $strmodulename = get_string("modulename", $module);

@@ -51,17 +53,17 @@
    // of the page. It is also used to generate the link to the Moodle Docs for this view.
    $CFG->pagepath = 'mod/' . $module . '/config';

-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();

    print_heading($strmodulename);

-    print_simple_box("<center>".get_string("configwarning", 'admin')."</center>", "center", "60%");
+    print_simple_box(get_string("configwarning", 'admin'), "center", "60%");
    echo "<br />";

    print_simple_box_start("center", "");
    include("$CFG->dirroot/mod/$module/config.html");
    print_simple_box_end();

-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();

 ?>
@@ -2,10 +2,15 @@
      // Allows the admin to manage activity modules

    require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('managemodules', $adminroot);
    require_once('../course/lib.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    require_once($CFG->libdir.'/tablelib.php');
+    require_once($CFG->libdir.'/ddllib.php');
+
+    // defines
+    define('MODULE_TABLE','module_administration_table');
+
+    admin_externalpage_setup('managemodules');

    $show    = optional_param('show', '', PARAM_SAFEDIR);
    $hide    = optional_param('hide', '', PARAM_SAFEDIR);
@@ -23,13 +28,7 @@
    $strsettings = get_string("settings");
    $stractivities = get_string("activities");
    $stractivitymodule = get_string("activitymodule");
-
-    admin_externalpage_print_header($adminroot);
-
-    print_heading($stractivities);
-
-    $coursesaffected = false;
-
+    $strshowmodulecourse = get_string('showmodulecourse');

 /// If data submitted, then process and store.

@@ -37,23 +36,46 @@
        if (!$module = get_record("modules", "name", $hide)) {
            error("Module doesn't exist!");
        }
-        set_field("modules", "visible", "0", "id", $module->id);                               // Hide main module
-        set_field('course_modules', 'visibleold', '1', 'visible' ,'1', 'module', $module->id); // Remember the previous visible state so we can toggle this back if the module is unhidden.
-        set_field('course_modules', 'visibleold', '0', 'visible' ,'0', 'module', $module->id);
-        set_field("course_modules", "visible", "0", "module", $module->id);                    // Hide all related activity modules
-        $coursesaffected = true;
+        set_field("modules", "visible", "0", "id", $module->id); // Hide main module
+        // Remember the visibility status in visibleold
+        // and hide...
+        $sql = "UPDATE {$CFG->prefix}course_modules
+                SET visibleold=visible,
+                    visible=0
+                WHERE  module={$module->id}";
+        execute_sql($sql, false);
+        // clear the course modinfo cache for courses
+        // where we just deleted something
+        $sql = "UPDATE {$CFG->prefix}course
+                SET modinfo=''
+                WHERE id IN (SELECT DISTINCT course
+                             FROM {$CFG->prefix}course_modules
+                             WHERE visibleold=1 AND module={$module->id})";
+        execute_sql($sql, false);
+        admin_get_root(true, false);  // settings not required - only pages
    }

    if (!empty($show) and confirm_sesskey()) {
        if (!$module = get_record("modules", "name", $show)) {
            error("Module doesn't exist!");
        }
-        set_field("modules", "visible", "1", "id", $module->id);                               // Show main module
-        set_field('course_modules', 'visible', '1', 'visibleold', '1', 'module', $module->id); // Get the previous saved visible state for the course module.
-        $coursesaffected = true;
+        set_field("modules", "visible", "1", "id", $module->id); // Show main module
+        set_field('course_modules', 'visible', '1', 'visibleold',
+                  '1', 'module', $module->id); // Get the previous saved visible state for the course module.
+        // clear the course modinfo cache for courses
+        // where we just made something visible
+        $sql = "UPDATE {$CFG->prefix}course
+                SET modinfo=''
+                WHERE id IN (SELECT DISTINCT course
+                             FROM {$CFG->prefix}course_modules
+                             WHERE visible=1 AND module={$module->id})";
+        execute_sql($sql, false);
+        admin_get_root(true, false);  // settings not required - only pages
    }

    if (!empty($delete) and confirm_sesskey()) {
+        admin_externalpage_print_header();
+        print_heading($stractivities);

        $strmodulename = get_string("modulename", "$delete");

@@ -61,7 +83,7 @@
            notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename),
                         "modules.php?delete=$delete&amp;confirm=1&amp;sesskey=$USER->sesskey",
                         "modules.php");
-            admin_externalpage_print_footer($adminroot);
+            admin_externalpage_print_footer();
            exit;

        } else {  // Delete everything!!
@@ -83,10 +105,31 @@
                }
            }

+            // delete calendar events
+            if (!delete_records("event", "modulename", $delete)) {
+                notify("Error occurred while deleting all $strmodulename records in calendar event table");
+            }
+
+            // clear course.modinfo for courses
+            // that used this module...
+            $sql = "UPDATE {$CFG->prefix}course
+                    SET modinfo=''
+                    WHERE id IN (SELECT DISTINCT course
+                                 FROM {$CFG->prefix}course_modules
+                                 WHERE module={$module->id})";
+            execute_sql($sql, false);
+
            // Now delete all the course module records
            if (!delete_records("course_modules", "module", $module->id)) {
                notify("Error occurred while deleting all $strmodulename records in course_modules table");
            }
+            if ($coursemods) {
+                foreach ($coursemods as $coursemod) {
+                    if (!delete_context(CONTEXT_MODULE, $coursemod->id)) {
+                        notify("Could not delete the context for $strmodulename with id = $coursemod->id");
+                    }
+                }
+            }

            // Then delete all the logs
            if (!delete_records("log", "module", $module->name)) {
@@ -103,23 +146,34 @@
                notify("Error occurred while deleting the $strmodulename record from modules table");
            }

-            // Then the tables themselves
-
-            if ($tables = $db->Metatables()) {
-                $prefix = $CFG->prefix.$module->name;
-                foreach ($tables as $table) {
-                    if (strpos($table, $prefix) === 0) {
-                        if (!execute_sql("DROP TABLE $table", false)) {
-                            notify("ERROR: while trying to drop table $table");
-                        }
-                    }
-                }
+            // And the module configuration records
+            if (!execute_sql("DELETE FROM {$CFG->prefix}config WHERE name LIKE '{$module->name}_%'")) {
+                notify("Error occurred while deleting the $strmodulename records from the config table");
            }
+
+            // cleanup the gradebook
+            require_once($CFG->libdir.'/gradelib.php');
+            grade_uninstalled_module($module->name);
+
+            // Then the tables themselves
+            drop_plugin_tables($module->name, "$CFG->dirroot/mod/$module->name/db/install.xml", false);
+
            // Delete the capabilities that were defined by this module
            capabilities_cleanup('mod/'.$module->name);

-            // rebuild_course_cache();  // Because things have changed
-            $coursesaffected = true;
+            // remove entent handlers and dequeue pending events
+            events_uninstall('mod/'.$module->name);
+
+            // Perform any custom uninstall tasks
+            if (file_exists($CFG->dirroot . '/mod/' . $module->name . '/lib.php')) {
+                require_once($CFG->dirroot . '/mod/' . $module->name . '/lib.php');
+                $uninstallfunction = $module->name . '_uninstall';
+                if (function_exists($uninstallfunction)) {
+                    if (! $uninstallfunction() ) {
+                        notify('Encountered a problem running uninstall function for '. $module->name.'!');
+                    }
+                }
+            }

            $a->module = $strmodulename;
            $a->directory = "$CFG->dirroot/mod/$delete";
@@ -127,10 +181,8 @@
        }
    }

-    if ($coursesaffected) {
-        rebuild_course_cache();  // Because things have changed
-    }
-
+    admin_externalpage_print_header();
+    print_heading($stractivities);

 /// Get and sort the existing modules

@@ -146,15 +198,17 @@
        }
        $modulebyname[$strmodulename] = $module;
    }
-    ksort($modulebyname);
+    ksort($modulebyname, SORT_LOCALE_STRING);

 /// Print the table of all modules
-
-    $table->head  = array ($stractivitymodule, $stractivities, $strversion, "$strhide/$strshow", $strdelete, $strsettings);
-    $table->align = array ("left", "right", "left", "center", "center", "center");
-    $table->wrap  = array ("nowrap", "", "", "", "","");
-    $table->size  = array ("100%", "10", "10", "10", "10","12");
-    $table->width = "100";
+    // construct the flexible table ready to display
+    $table = new flexible_table(MODULE_TABLE);
+    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'delete', 'settings'));
+    $table->define_headers(array($stractivitymodule, $stractivities, $strversion, "$strhide/$strshow", $strdelete, $strsettings));
+    $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/modules.php');
+    $table->set_attribute('id', 'modules');
+    $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
+    $table->setup();

    foreach ($modulebyname as $modulename => $module) {

@@ -163,13 +217,22 @@

        $delete = "<a href=\"modules.php?delete=$module->name&amp;sesskey=$USER->sesskey\">$strdelete</a>";

-        if (file_exists("$CFG->dirroot/mod/$module->name/config.html")) {
+        if (file_exists("$CFG->dirroot/mod/$module->name/settings.php")) {
+            $settings = "<a href=\"settings.php?section=modsetting$module->name\">$strsettings</a>";
+        } else if (file_exists("$CFG->dirroot/mod/$module->name/config.html")) {
            $settings = "<a href=\"module.php?module=$module->name\">$strsettings</a>";
        } else {
            $settings = "";
        }

-        $count = count_records("$module->name");
+        $count = count_records_select("$module->name",'course<>0');
+        if ($count>0) {
+            $countlink = "<a href=\"{$CFG->wwwroot}/course/search.php?modulelist=$module->name" .
+                "&amp;sesskey={$USER->sesskey}\" title=\"$strshowmodulecourse\">$count</a>";
+        }
+        else {
+            $countlink = "$count";
+        }

        if ($module->visible) {
            $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=$USER->sesskey\" title=\"$strhide\">".
@@ -178,19 +241,31 @@
        } else {
            $visible = "<a href=\"modules.php?show=$module->name&amp;sesskey=$USER->sesskey\" title=\"$strshow\">".
                       "<img src=\"$CFG->pixpath/i/show.gif\" class=\"icon\" alt=\"$strshow\" /></a>";
-            $class = "class=\"dimmed_text\"";
+            $class = " class=\"dimmed_text\"";
        }
        if ($module->name == "forum") {
            $delete = "";
            $visible = "";
            $class = "";
        }
-        $table->data[] = array ("<span $class>$icon $modulename</span>", $count, $module->version, $visible, $delete, $settings);
+
+        $extra = '';
+        if (!file_exists("$CFG->dirroot/mod/$module->name/lib.php")) {
+            $extra = ' <span class="notifyproblem">('.get_string('missingfromdisk').')</span>';
+        }
+
+        $table->add_data(array(
+            '<span'.$class.'>'.$icon.' '.$modulename.$extra.'</span>',
+            $countlink,
+            '<span'.$class.'>'.$module->version.'</span>',
+            $visible,
+            $delete,
+            $settings
+        ));
    }
-    print_table($table);

-    echo "<br /><br />";
+    $table->print_html();

-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();

 ?>
@@ -4,17 +4,13 @@
 require_once('../config.php');
 require_once($CFG->dirroot.'/course/lib.php');
 require_once($CFG->libdir.'/adminlib.php');
-$adminroot = admin_get_root();
-admin_externalpage_setup('multilangupgrade', $adminroot);
+
+admin_externalpage_setup('multilangupgrade');

 $go = optional_param('go', 0, PARAM_BOOL);

-require_login();
-
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
-
 ###################################################################
-admin_externalpage_print_header($adminroot);
+admin_externalpage_print_header();

 print_heading(get_string('multilangupgrade', 'admin'));

@@ -23,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($adminroot);
+    admin_externalpage_print_footer();
    die;
 }

@@ -42,7 +38,7 @@ while(@ob_end_flush());

 echo '<strong>Progress:</strong>';
 $i = 0;
-$skiptables = array($CFG->prefix.'config');//, $CFG->prefix.'sessions2');
+$skiptables = array($CFG->prefix.'config', $CFG->prefix.'user_students', $CFG->prefix.'user_teachers');//, $CFG->prefix.'sessions2');

 foreach ($tables as $table) {
    if (($CFG->prefix && strpos($table, $CFG->prefix) !== 0)
@@ -60,15 +56,11 @@ foreach ($tables as $table) {
            if (in_array($data->type, array('text','mediumtext','longtext','varchar'))) {  // Text stuff only
                // first find candidate records
                $rs = get_recordset_sql("SELECT id, $column FROM $table WHERE $column LIKE '%</lang>%' OR $column LIKE '%<span lang=%'");
-                if ($rs and $rs->RecordCount() > 0) {
+                if ($rs) {
                    while (!$rs->EOF) {
                        $text = $rs->fields[$column];
-                        $search = '/(<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)(\s*<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)+/is';
-                        $newtext = preg_replace_callback($search, 'multilangupgrade_impl', $text);
-                        if ($newtext != $text) {
-                            $newtext = addslashes($newtext);
-                            execute_sql("UPDATE $table SET $column='$newtext' WHERE id=".$rs->fields['id'], false);
-                        }
+                        $id   = $rs->fields['id'];
+
                        if ($i % 600 == 0) {
                            echo '<br />';
                        }
@@ -77,7 +69,24 @@ foreach ($tables as $table) {
                        }
                        $i++;
                        $rs->MoveNext();
+
+                        if (empty($text) or is_numeric($text)) {
+                            continue; // nothing to do
+                        }
+
+                        $search = '/(<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)(\s*<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)+/is';
+                        $newtext = preg_replace_callback($search, 'multilangupgrade_impl', $text);
+
+                        if (is_null($newtext)) {
+                            continue; // regex error
+                        }
+
+                        if ($newtext != $text) {
+                            $newtext = addslashes($newtext);
+                            execute_sql("UPDATE $table SET $column='$newtext' WHERE id=$id", false);
+                        }
                    }
+                    rs_close($rs);
                }
            }
        }
@@ -96,7 +105,7 @@ notify('...finished', 'notifysuccess');

 print_continue('index.php');

-admin_externalpage_print_footer($adminroot);
+admin_externalpage_print_footer();
 die;


@@ -4,16 +4,12 @@ if (!isset($CFG)) {

    require('../config.php');
    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('oacleanup', $adminroot);

-    require_login();
+    admin_externalpage_setup('oacleanup');

-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
-
-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();
    online_assignment_cleanup(true);
-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();

 }

@@ -46,7 +42,7 @@ function online_assignment_cleanup($output=false) {


    /// get a list of all courses on this site
-    $courses = get_courses();
+    $courses = get_records('course');

    /// cycle through each course
    foreach ($courses as $course) {
@@ -99,7 +95,7 @@ function online_assignment_cleanup($output=false) {

                        /// grab the section record
                        if (!($section = get_record('course_sections', 'id', $newsection))) {
-                            if ($output) echo 'Serious error: Cannot retrieve section: '.$newsection.' for course: '.$course->fullname.'<br />';
+                            if ($output) echo 'Serious error: Cannot retrieve section: '.$newsection.' for course: '. format_string($course->fullname) .'<br />';
                            continue;
                        }

@@ -15,68 +15,63 @@ define('BLOCK_L_MIN_WIDTH', $lmin);
 define('BLOCK_L_MAX_WIDTH', $lmax);
 define('BLOCK_R_MIN_WIDTH', $rmin);
 define('BLOCK_R_MAX_WIDTH', $rmax);
-  
+
 page_map_class(PAGE_ADMIN, 'page_admin');

 class page_admin extends page_base {

-    var $section;
-    var $pathtosection;
+    var $section = '';
    var $visiblepathtosection;
+    var $extraurlparams = array();
+    var $extrabutton = '';
+    var $url = '';

    // hack alert!
    // this function works around the inability to store the section name
    // in default block, maybe we should "improve" the blocks a bit?
-    function init_extra($section) { 
+    function init_extra($section) {
        global $CFG;

        if($this->full_init_done) {
            return;
        }

-        $adminroot = admin_get_root();
+        $adminroot =& admin_get_root(false, false); //settings not required - only pages

        // fetch the path parameter
        $this->section = $section;
-
-        $this->visiblepathtosection = array();
-        
-        // this part is (potentially) processor-intensive... there's gotta be a better way
-        // of handling this
-        if ($this->pathtosection = $adminroot->path($this->section)) {
-            foreach($this->pathtosection as $element) {
-                if ($pointer = $adminroot->locate($element)) {
-                    array_push($this->visiblepathtosection, $pointer->visiblename);
-                }
-            }
-        }
+        $current =& $adminroot->locate($section, true);
+        $this->visiblepathtosection = array_reverse($current->visiblepath);

        // all done
        $this->full_init_done = true;
    }
-    
+
    function blocks_get_default() {
        return 'admin_tree,admin_bookmarks';
    }

    // seems reasonable that the only people that can edit blocks on the admin pages
    // are the admins... but maybe we want a role for this?
-    function user_allowed_editing() { 
-        return has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    function user_allowed_editing() {
+        return has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM));
    }

    // has to be fixed. i know there's a "proper" way to do this
-    function user_is_editing() { 
+    function user_is_editing() {
        global $USER;
        return $USER->adminediting;
    }

-    function url_get_path() { 
+    function url_get_path() {
        global $CFG;
+        if (!empty($this->url)) {
+            return $this->url;
+        }

-        $adminroot = admin_get_root();
+        $adminroot =& admin_get_root(false, false); //settings not required - only pages

-        $root = $adminroot->locate($this->section);
+        $root =& $adminroot->locate($this->section);
        if (is_a($root, 'admin_externalpage')) {
            return $root->url;
        } else {
@@ -84,15 +79,36 @@ class page_admin extends page_base {
        }
    }

-    function url_get_parameters() {  // only handles parameters relevant to the admin pagetype
-        return array('section' => (isset($this->section) ? $this->section : ''));
+    /**
+     * Use this to pass extra HTML that is added after the turn blocks editing on/off button.
+     *
+     * @param string $extrabutton HTML code.
+     */
+    function set_extra_button($extrabutton) {
+        $this->extrabutton = $extrabutton;
    }

-    function blocks_get_positions() { 
+    /**
+     * Use this to pass extra URL parameters that, for example, the blocks editing controls need to reload the current page accurately.
+     *
+     * @param array $extraurlparams paramname => value array.
+     */
+    function set_extra_url_params($extraurlparams, $actualurl = '') {
+        $this->extraurlparams = $extraurlparams;
+        if (!empty($actualurl)) {
+            $this->url = $actualurl;
+        }
+    }
+
+    function url_get_parameters() {  // only handles parameters relevant to the admin pagetype
+        return array_merge($this->extraurlparams, array('section' => $this->section));
+    }
+
+    function blocks_get_positions() {
        return array(BLOCK_POS_LEFT, BLOCK_POS_RIGHT);
    }

-    function blocks_default_position() { 
+    function blocks_default_position() {
        return BLOCK_POS_LEFT;
    }

@@ -110,23 +126,35 @@ class page_admin extends page_base {
        parent::init_quick($data);
    }

-    function print_header($section = '') {
+    function print_header($section = '', $focus='') {
        global $USER, $CFG, $SITE;

        $this->init_full($section); // we're trusting that init_full() has already been called by now; it should have.
                                    // if not, print_header() has to be called with a $section parameter

-        if ($this->user_allowed_editing()) {
-            $buttons = '<div><form '.$CFG->frametarget.' method="get" action="' . $this->url_get_path() . '">'.
-                       '<fieldset class="invisiblefieldset"><input type="hidden" name="adminedit" value="'.($this->user_is_editing()?'off':'on').'" />'.
-                       '<input type="hidden" name="section" value="'.$this->section.'" />'.
-                       '<input type="submit" value="'.get_string($this->user_is_editing()?'blockseditoff':'blocksediton').'" /></fieldset></form></div>';
+        // The search page currently doesn't handle block editing
+        if ($this->section != 'search' and $this->user_allowed_editing()) {
+            $options = $this->url_get_parameters();
+            if ($this->user_is_editing()) {
+                $caption = get_string('blockseditoff');
+                $options['adminedit'] = 'off';
+            } else {
+                $caption = get_string('blocksediton');
+                $options['adminedit'] = 'on';
+            }
+            $buttons = print_single_button($this->url_get_path(), $options, $caption, 'get', '', true);
        } else {
            $buttons = '&nbsp;';
        }
-        
-        print_header("$SITE->shortname: " . implode(": ",$this->visiblepathtosection), $SITE->fullname, 
-                       implode(" -> ",$this->visiblepathtosection),'', '', true, $buttons, '');
+        $buttons .= $this->extrabutton;
+
+        $navlinks = array();
+        foreach ($this->visiblepathtosection as $element) {
+            $navlinks[] = array('name' => $element, 'link' => null, 'type' => 'misc');
+        }
+        $navigation = build_navigation($navlinks);
+
+        print_header("$SITE->shortname: " . implode(": ",$this->visiblepathtosection), $SITE->fullname, $navigation, $focus, '', true, $buttons, '');
    }

    function get_type() {
@@ -4,14 +4,9 @@
    require_once("../config.php");
    require_once($CFG->libdir.'/adminlib.php');

-    $adminroot = admin_get_root();
-    admin_externalpage_setup('phpinfo', $adminroot);
+    admin_externalpage_setup('phpinfo');

-    require_login();
-
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
-
-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();

    echo '<div class="phpinfo">';

@@ -33,6 +28,6 @@

    echo '</div>';

-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();

 ?>
@@ -16,8 +16,8 @@ if ($_ENV['RECIPIENT'] == $CFG->noreplyaddress) {
    }
    
    $site = get_site();
-    $subject = get_string('noreplybouncesubject','moodle',$site->fullname);
-    $body = get_string('noreplybouncemessage','moodle',$site->fullname)."\n\n";
+    $subject = get_string('noreplybouncesubject','moodle',format_string($site->fullname));
+    $body = get_string('noreplybouncemessage','moodle',format_string($site->fullname))."\n\n";
    
    $fd = fopen('php://stdin','r');
    if ($fd) {
@@ -54,7 +54,7 @@ if ($modid == '0') { // special
 }
 else {
    $modname = get_field("modules","name","id",$modid);
-    require_once('mod/'.$modname.'/lib.php');
+    include_once('mod/'.$modname.'/lib.php');
 }
 $function = $modname.'_process_email';

@@ -5,14 +5,14 @@

    require_login();

-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));

    if (!$site = get_site()) {
        redirect("index.php");
    }

    if (!confirm_sesskey()) {
-        error(get_string('confirmsesskeybad', 'error'));
+        print_error('confirmsesskeybad', 'error');
    }

    if (!$admin = get_admin()) {
@@ -23,19 +23,15 @@
        $admin->country = $CFG->country;
    }

-    if (empty($CFG->siteidentifier)) {    // Unique site identification code
-        set_config('siteidentifier', random_string(32).$_SERVER['HTTP_HOST']);
-    }
-
-
 /// Print headings
-
    $stradministration = get_string("administration");
    $strregistration = get_string("registration");
    $strregistrationinfo = get_string("registrationinfo");
-
-    print_header("$site->shortname: $strregistration", "$site->fullname", 
-                 "<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> $strregistration");
+    $navlinks = array();
+    $navlinks[] = array('name' => $stradministration, 'link' => "../$CFG->admin/index.php", 'type' => 'misc');
+    $navlinks[] = array('name' => $strregistration, 'link' => null, 'type' => 'misc');
+    $navigation = build_navigation($navlinks);
+    print_header("$site->shortname: $strregistration", $site->fullname, $navigation);

    print_heading($strregistration);

@@ -52,7 +48,7 @@
    echo "<!-- Together they form a key.  If any of these change between updates then the entry  -->\n";
    echo "<!-- is flagged as a new entry and will be manually checked by the list maintainer -->\n";
    echo "<input type=\"hidden\" name=\"url\" value=\"$CFG->wwwroot\" />\n";
-    echo "<input type=\"hidden\" name=\"secret\" value=\"$CFG->siteidentifier\" />\n";
+    echo "<input type=\"hidden\" name=\"secret\" value=\"" . get_site_identifier() . "\" />\n";
    echo "<input type=\"hidden\" name=\"host\" value=\"".$_SERVER["HTTP_HOST"]."\" />\n";
    echo "<input type=\"hidden\" name=\"lang\" value=\"".current_language()."\" />\n";

@@ -63,16 +59,16 @@
    echo '<div class="fitemtitle"><label>URL</label></div>';
    echo '<div class="felement ftext">'.$CFG->wwwroot.'</div>';
    echo '</div>';
-            
+
    echo '<div class="fitem">';
    echo '<div class="fitemtitle"><label>'.get_string("currentversion").'</label></div>';
    echo '<div class="felement ftext">'."$CFG->release ($CFG->version)".'</div>';
    echo '</div>';
-            
+
    echo '<div class="fitem">';
    echo '<div class="fitemtitle"><label for="sitename">'.get_string("fullsitename").'</label></div>';
    echo '<div class="felement ftext">';
-    echo '<input size="50" id="sitename" type="text" name="sitename" value="'.$site->fullname.'" />';
+    echo '<input size="50" id="sitename" type="text" name="sitename" value="'.format_string($site->fullname).'" />';
    echo '</div>';
    echo '</div>';

@@ -103,7 +99,7 @@
    unset($options);
    echo '</div>';
    echo '</div>';
-            
+
    echo '<div class="fitem">';
    echo '<div class="fitemtitle"><label>'.get_string("statistics")."<br />(".get_string("notpublic").')'.'</label></div>';
    echo '<div class="felement ftext">';
@@ -119,7 +115,7 @@
    echo '<br />';

    // total number of role assignments
-    $count = count_records('role_assignments'); 
+    $count = count_records('role_assignments');
    echo get_string('roleassignments', 'role').": ".$count;
    echo "<input type=\"hidden\" name=\"roleassignments\" value=\"$count\" />\n";
    echo '<br />';
@@ -127,13 +123,13 @@
    // first find all distinct roles with mod/course:update
    // please change the name and strings to something appropriate to reflect the new data collected
    $sql = "SELECT COUNT(DISTINCT u.id)
-            FROM {$CFG->prefix}role_capabilities rc, 
+            FROM {$CFG->prefix}role_capabilities rc,
                 {$CFG->prefix}role_assignments ra,
                 {$CFG->prefix}user u
            WHERE (rc.capability = 'moodle/course:update' or rc.capability='moodle/site:doanything')
                   AND rc.roleid = ra.roleid
                   AND u.id = ra.userid";
-    
+
    $count = count_records_sql($sql);
    echo get_string("teachers").": ".$count;
    echo "<input type=\"hidden\" name=\"courseupdaters\" value=\"$count\" />\n";
@@ -154,7 +150,7 @@
    echo "<input type=\"hidden\" name=\"resources\" value=\"$count\" />\n";
    echo '</div>';
    echo '</div>';
-            
+
    echo '<div class="fitem">';
    echo '<div class="fitemtitle"><label for="adminname">'.get_string("administrator").'</label></div>';
    echo '<div class="felement ftext">';
@@ -4,18 +4,14 @@
 require_once('../config.php');
 require_once($CFG->dirroot.'/course/lib.php');
 require_once($CFG->libdir.'/adminlib.php');
-$adminroot = admin_get_root();
-admin_externalpage_setup('replace', $adminroot);
+
+admin_externalpage_setup('replace');

 $search  = optional_param('search', '', PARAM_RAW);
 $replace = optional_param('replace', '', PARAM_RAW);

-require_login();
-
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
-
 ###################################################################
-admin_externalpage_print_header($adminroot);
+admin_externalpage_print_header();

 print_heading('Search and replace text throughout the whole database');

@@ -23,7 +19,7 @@ print_heading('Search and replace text throughout the whole database');
 if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Print a form

    print_simple_box_start('center');
-    echo '<div align="center">';
+    echo '<div class="mdl-align">';
    echo '<form action="replace.php" method="post">';
    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
    echo 'Search whole database for: <input type="text" name="search" /><br />';
@@ -32,36 +28,14 @@ if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Pr
    echo '</form>';
    echo '</div>';
    print_simple_box_end();
-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();
    die;
 }

-
-if (!$tables = $db->Metatables() ) {    // No tables yet at all.
-    error("no tables");
-}
-
 print_simple_box_start('center');

-/// Turn off time limits, sometimes upgrades can be slow.
-
-@set_time_limit(0);
-@ob_implicit_flush(true);
-while(@ob_end_flush());
-
-foreach ($tables as $table) {
-    if (in_array($table, array($CFG->prefix.'config'))) {      // Don't process these
-        continue;
-    }
-    if ($columns = $db->MetaColumns($table, false)) {
-        foreach ($columns as $column => $data) {
-            if (in_array($data->type, array('text','mediumtext','longtext','varchar'))) {  // Text stuff only
-                $db->debug = true;
-                execute_sql("UPDATE $table SET $column = REPLACE($column, '$search', '$replace');");
-                $db->debug = false;
-            }
-        }
-    }
+if (!db_replace($search, $replace)) {
+    error('An error has occured during this process'); 
 }

 print_simple_box_end();
@@ -73,6 +47,6 @@ notify('...finished');

 print_continue('index.php');

-admin_externalpage_print_footer($adminroot);
+admin_externalpage_print_footer();

 ?>
@@ -0,0 +1,135 @@
+<?php // $Id$
+      // index.php - scheduled backup logs
+
+    require_once('../../../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    require_once($CFG->dirroot.'/backup/lib.php');
+
+    $courseid = optional_param('courseid', 0, PARAM_INT);
+
+    admin_externalpage_setup('reportbackups');
+    admin_externalpage_print_header();
+
+/// Scheduled backups are disabled by the server admin
+    if (!empty($CFG->disablescheduledbackups)) {
+        print_error('scheduledbackupsdisabled', '', '', NULL, true);
+    }
+
+/// Scheduled backups aren't active by the site admin
+    $backup_config = backup_get_config();
+    if (empty($backup_config->backup_sche_active)) {
+        notify(get_string('scheduledbackupsinactive'));
+    }
+
+/// Get needed strings
+    $backuploglaststatus = get_string("backuploglaststatus");
+    $backuplogdetailed = get_string("backuplogdetailed");
+    $stradmin = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strbackup = get_string("backup");
+    $strbackupdetails = get_string("backupdetails");
+    $strlogs = get_string("logs");
+    $strftimedatetime = get_string("strftimerecent");
+    $strftimetime = get_string("strftimetime").":%S";
+    $strerror = get_string("error");
+    $strok = get_string("ok");
+    $strunfinished = get_string("unfinished");
+    $strskipped = get_string("skipped");
+    $strcourse = get_string("course");
+    $strtimetaken = get_string("timetaken","quiz");
+    $strstatus = get_string("status");
+    $strnext = get_string("next");
+
+/// Decide when to show last execution logs or detailed logs
+/// Lastlog view
+    if (!$courseid) {
+        print_heading($backuploglaststatus);
+        print_simple_box_start('center');
+    /// Now, get every record from backup_courses
+        $courses = get_records("backup_courses");
+
+        if (!$courses) {
+            notify(get_string('nologsfound'));
+        } else {
+            echo "<table border=\"0\" align=\"center\" cellpadding=\"3\" cellspacing=\"3\">";
+            //Print table header
+            echo "<tr>";
+            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strcourse</font></td>";
+            echo "<td nowrap=\"nowrap\" align=\"center\" colspan=\"3\"><font size=\"3\">$strtimetaken</font></td>";
+            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strstatus</font></td>";
+            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strnext</font></td></tr>";
+            foreach ($courses as $course) {
+            /// Get the course shortname
+                $coursename = get_field ("course","fullname","id",$course->courseid);
+                if ($coursename) {
+                    echo "<tr>";
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\"><a href=\"index.php?courseid=$course->courseid\">".$coursename."</a></font></td>";
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->laststarttime,$strftimedatetime)."</font></td>";
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\"> - </font></td>";
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->lastendtime,$strftimedatetime)."</font></td>";
+                    if ($course->laststatus == 1) {
+                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"green\">".$strok."</font></td>";
+                    } else if ($course->laststatus == 2) {
+                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"red\">".$strunfinished."</font></td>";
+                    } else if ($course->laststatus == 3) {
+                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"green\">".$strskipped."</font></td>";
+                    } else {
+                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"red\">".$strerror."</font></td>";
+                    }
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->nextstarttime,$strftimedatetime)."</font></td>";
+                    echo "</tr>";
+                }
+            }
+            echo "</table>";
+        }
+        print_simple_box_end();
+/// Detailed View !!
+    } else {
+        print_heading($backuplogdetailed);
+
+        $coursename = get_field("course","fullname","id","$courseid");
+        print_heading("$strcourse: $coursename");
+
+        print_simple_box_start('center');
+
+    /// First, me get all the distinct backups for that course in backup_log
+        $executions = get_records_sql("SELECT DISTINCT laststarttime,laststarttime
+                                       FROM {$CFG->prefix}backup_log
+                                       WHERE courseid = '$courseid'
+                                       ORDER BY laststarttime DESC");
+
+    /// Iterate over backup executions
+        if (!$executions) {
+            notify(get_string('nologsfound'));
+        } else {
+            echo "<table border=\"0\" align=\"center\" cellpadding=\"3\" cellspacing=\"3\">";
+            foreach($executions as $execution) {
+                echo "<tr>";
+                echo "<td nowrap=\"nowrap\" align=\"center\" colspan=\"3\">";
+                print_simple_box("<center>".userdate($execution->laststarttime)."</center>", "center");
+                echo "</td>";
+                echo "</tr>";
+                $logs = get_records_sql("SELECT *
+                                         FROM {$CFG->prefix}backup_log
+                                         WHERE courseid = '$courseid'  AND
+                                               laststarttime = '$execution->laststarttime'
+                                         ORDER BY id");
+                if ($logs) {
+                    foreach ($logs as $log) {
+                        echo "<tr>";
+                        echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($log->time,$strftimetime)."</font></td>";
+                        $log->info = str_replace("- ERROR!!","- <font color=\"red\">ERROR!!</font>",$log->info);
+                        $log->info = str_replace("- OK","- <font color=\"green\">OK</font>",$log->info);
+                        echo "<td nowrap=\"nowrap\"><font size=\"2\">".str_replace("  ","&nbsp;&nbsp;&nbsp;&nbsp;",$log->info)."</font></td>";
+                        echo "</tr>";
+                    }
+                }
+            }
+            echo "</table>";
+        }
+        print_simple_box_end();
+    }
+
+    print_footer();
+
+?>
@@ -0,0 +1,3 @@
+<?php  // $Id$
+$ADMIN->add('reports', new admin_externalpage('reportbackups', get_string('backups', 'admin'), "$CFG->wwwroot/$CFG->admin/report/backups/index.php",'moodle/site:backup'));
+?>
@@ -0,0 +1,42 @@
+<?php  // $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+$report_courseoverview_capabilities = array(
+
+    'report/courseoverview:view' => array(
+        'riskbitmask' => RISK_PERSONAL,
+        'captype' => 'read',
+        'contextlevel' => CONTEXT_SYSTEM,
+        'legacy' => array(
+            'teacher' => CAP_ALLOW,
+            'editingteacher' => CAP_ALLOW,
+            'admin' => CAP_ALLOW
+        ),
+
+        'clonepermissionsfrom' => 'moodle/site:viewreports',
+    )
+);
+
+?>
@@ -4,23 +4,21 @@
    require_once($CFG->dirroot.'/lib/statslib.php');
    require_once($CFG->libdir.'/adminlib.php');

-    $adminroot = admin_get_root();
-
-    admin_externalpage_setup('reportcourseoverview', $adminroot);
-
-    admin_externalpage_print_header($adminroot);
-
    $report     = optional_param('report', STATS_REPORT_ACTIVE_COURSES, PARAM_INT);
    $time       = optional_param('time', 0, PARAM_INT);
    $numcourses = optional_param('numcourses', 20, PARAM_INT);

-    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));  // needed?
+    admin_externalpage_setup('reportcourseoverview');
+    admin_externalpage_print_header();

    if (empty($CFG->enablestats)) {
-        redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'));
+        if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
+            redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3);
+        } else {
+            error("Stats is not enabled.");
+        }
    }

-
    $course = get_site();
    stats_check_uptodate($course->id);

@@ -46,11 +44,11 @@
    $timeoptions = stats_get_time_options($now,$lastweekend,$lastmonthend,$earliestday,$earliestweek,$earliestmonth);

    if (empty($timeoptions)) {
-        error(get_string('nostatstodisplay'), $CFG->wwwroot.'/course/view.php?id='.$course->id, $adminroot);
+        print_error('nostatstodisplay', "", $CFG->wwwroot.'/course/view.php?id='.$course->id);
    }

    echo '<form action="index.php" method="post">'."\n";
-    echo '<fieldset class="invisiblefieldset">';
+    echo '<div>';

    $table->width = '*';
    $table->align = array('left','left','left','left','left','left');
@@ -60,17 +58,19 @@
                           '<input type="submit" value="'.get_string('view').'" />') ;

    print_table($table);
-    echo '</fieldset>';
+    echo '</div>';
    echo '</form>';

+    print_heading($reportoptions[$report]);
+
+
    if (!empty($report) && !empty($time)) {
        $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
-
        if (!empty($param->sql)) {
            $sql = $param->sql;
        } else {
            $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
-                ." WHERE timeend >= ".$param->timeafter.' AND stattype = \'activity\''
+                ." WHERE timeend >= $param->timeafter AND stattype = 'activity' AND roleid = 0"
                ." GROUP BY courseid "
                .$param->extras
                ." ORDER BY ".$param->orderby;
@@ -84,9 +84,9 @@

        } else {
            if (empty($CFG->gdversion)) {
-                echo '<div class="boxaligncenter">(' . get_string("gdneed") .')</div>';
+                echo '<div class="graph">(' . get_string("gdneed") .')</div>';
            } else {
-                echo '<div class="boxaligncenter"><img alt="'.get_string('courseoverviewgraph').'" src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></div>';
+                echo '<div class="graph"><img alt="'.get_string('courseoverviewgraph').'" src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></div>';
            }

            $table = new StdClass;
@@ -115,6 +115,6 @@
            print_table($table);
        }
    }
-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();

-?>
+?>
@@ -10,9 +10,9 @@

    require_login();

-    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('report/courseoverview:view', get_context_instance(CONTEXT_SYSTEM));

-    stats_check_uptodate($course->id);
+    stats_check_uptodate();

    $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);

@@ -20,7 +20,7 @@
        $sql = $param->sql;
    } else {
        $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
-            ." WHERE timeend >= ".$param->timeafter.' AND stattype = \'activity\''
+            ." WHERE timeend >= $param->timeafter AND stattype = 'activity' AND roleid = 0"
            ." GROUP BY courseid "
            .$param->extras
            ." ORDER BY ".$param->orderby;
@@ -29,7 +29,7 @@
    $courses = get_records_sql($sql, 0, $numcourses);

    if (empty($courses)) {
-        error(get_string('statsnodata'),$CFG->wwwroot.'/'.$CFG->admin.'/report/course/index.php');
+        print_error('statsnodata', "", $CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/index.php');
    }


@@ -0,0 +1,3 @@
+<?php  // $Id$
+$ADMIN->add('reports', new admin_externalpage('reportcourseoverview', get_string('courseoverview', 'admin'), "$CFG->wwwroot/$CFG->admin/report/courseoverview/index.php",'report/courseoverview:view'));
+?>
@@ -0,0 +1,29 @@
+<?PHP // $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+$plugin->version  = 2007101503;
+$plugin->requires = 2007101532;
+
+?>
@@ -1,33 +0,0 @@
-<?php // $Id$
-
-    require_once('../../../config.php');
-    require_once($CFG->dirroot.'/course/lib.php');
-    require_once($CFG->dirroot.'/course/report/log/lib.php');
-    require_once($CFG->libdir.'/adminlib.php');
-
-    $adminroot = admin_get_root();
-
-    admin_externalpage_setup('reportlog', $adminroot);
-
-    admin_externalpage_print_header($adminroot);
-
-
-    $course = get_site();
-
-    print_heading(get_string('chooselogs') .':');
-
-    print_mnet_log_selector_form($CFG->mnet_localhost_id, $course);
-
-    echo '<br />';
-    print_heading(get_string('chooselivelogs') .':');
-
-    $heading = link_to_popup_window('/course/report/log/live.php?id='. $course->id,
-                                    'livelog', get_string('livelogs'),
-                                    500, 800, '', 'none', true);
-
-    print_heading($heading, 'center', 3);
-
-
-    admin_externalpage_print_footer($adminroot);
-
-?>
@@ -0,0 +1,5 @@
+<?php  // $Id$
+// just a link to course report
+$ADMIN->add('reports', new admin_externalpage('reportlog', get_string('log', 'admin'), "$CFG->wwwroot/course/report/log/index.php?id=".SITEID, 'coursereport/log:view'));
+$ADMIN->add('reports', new admin_externalpage('reportloglive', get_string('loglive', 'coursereport_log'), "$CFG->wwwroot/course/report/log/indexlive.php?id=".SITEID, 'coursereport/log:viewlive'));
+?>
@@ -0,0 +1,73 @@
+<?php // $Id$
+
+    require_once('../../../config.php');
+    require_once($CFG->dirroot.'/question/upgrade.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    admin_externalpage_setup('reportquestion');
+    admin_externalpage_print_header();
+
+    print_heading(get_string('adminreport', 'question'));
+
+    $probstr = '';
+    $contextupgradeversion = 2007081000;
+    if ($CFG->version < $contextupgradeversion){
+        ///cwrqpfs issue
+        $probstr = print_heading(get_string('cwrqpfs', 'question'), '', 3, 'main', true);
+
+        if ($updates = question_cwqpfs_to_update()){
+
+            $probstr .=get_string('cwrqpfsinfo', 'question');
+            $probstr .= '<ul>';
+            $catlist = join(array_keys($updates), ',');
+            //get info about cateogries and no of questions used outside category's course
+            $categories = get_records_sql('SELECT qc.*, c.fullname as coursename FROM '.$CFG->prefix.'question_categories as qc, '
+                        .$CFG->prefix.'course as c WHERE qc.course = c.id AND qc.id IN ('.$catlist.')');
+            foreach ($updates as $id => $publish){
+                $categories[$id]->caturl = "$CFG->wwwroot/question/category.php?sesskey=".sesskey().
+                            "&amp;edit=$id&amp;courseid=".$categories[$id]->course;
+                if ($categories[$id]->publish){
+                    $categories[$id]->changefrom = get_string('published', 'question');
+                    $categories[$id]->changeto = get_string('unpublished', 'question');
+                } else {
+                    $categories[$id]->changefrom = get_string('unpublished', 'question');
+                    $categories[$id]->changeto = get_string('published', 'question');
+                }
+                $probstr .= '<li>'.get_string('changepublishstatuscat', 'question', $categories[$id]);
+                if ($questions = get_records_sql('SELECT q.*, qui.id as quizid, qui.name as quizname, cm.id as cmid, '
+                               .'qui.course, c.fullname as coursename FROM '.$CFG->prefix.'question q, '
+                               .$CFG->prefix.'quiz_question_instances qqi, '
+                               .$CFG->prefix.'quiz qui, '
+                               .$CFG->prefix.'course_modules cm, '
+                               .$CFG->prefix.'modules m, '
+                               .$CFG->prefix.'course c '
+                            .'WHERE (q.category = '.$id.' AND qqi.question = q.id '
+                            .'AND qqi.quiz = qui.id '
+                            .'AND qui.course = c.id '
+                            .'AND cm.instance = qui.id '
+                            .'AND cm.module = m.id '
+                            .'AND m.name = \'quiz\''
+                            .'AND ('.$categories[$id]->course.' <> qui.course)) ORDER BY qui.id ASC')){
+
+                    $probstr .= '<ul>';
+                    foreach ($questions as $question){
+                        $question->quizurl = "$CFG->wwwroot/mod/quiz/edit.php?cmid=".$question->cmid;
+                        $question->qurl = "$CFG->wwwroot/question/question.php?cmid={$question->cmid}&amp;id={$question->id}&amp;returnurl=".urlencode($FULLME);
+                        $probstr .= '<li>'.get_string('questionaffected', 'question', $question).'</li>';
+                    }
+                    $probstr .= '</ul>';
+                }
+                $probstr .= '</li>';
+            }
+            $probstr .= '</ul>';
+        } else {
+            $probstr .=('<p>'.get_string('cwrqpfsnoprob', 'question').'</p>');
+        }
+    }
+    if ($probstr) {
+        print_box($probstr);
+    } else {
+        print_box(get_string('noprobs', 'question'), 'boxwidthnarrow boxaligncenter generalbox');
+    }
+    admin_externalpage_print_footer();
+?>
@@ -0,0 +1,3 @@
+<?php  // $Id$
+$ADMIN->add('reports', new admin_externalpage('reportquestion', get_string('question', 'admin'), "$CFG->wwwroot/$CFG->admin/report/question/index.php", 'moodle/site:config'));
+?>
@@ -0,0 +1,36 @@
+<?php  // $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+$report_security_capabilities = array(
+
+    'report/security:view' => array(
+        'riskbitmask' => RISK_CONFIG,
+        'captype' => 'read',
+        'contextlevel' => CONTEXT_SYSTEM,
+        'legacy' => array(
+            'admin' => CAP_ALLOW
+        ),
+    )
+);
@@ -0,0 +1,125 @@
+<?php  //$Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.org                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards Martin Dougiamas  http://dougiamas.com     //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+require_once('../../../config.php');
+require_once($CFG->dirroot.'/'.$CFG->admin.'/report/security/lib.php');
+require_once($CFG->libdir.'/adminlib.php');
+
+require_login();
+
+$issue = optional_param('issue', '', PARAM_FILE); // show detailed info about one issue only
+
+$issues = report_security_get_issue_list();
+
+// test if issue valid string
+if (array_search($issue, $issues, true) === false) {
+    $issue = '';
+}
+
+// we may need a bit more memory and this may take a long time to process
+@raise_memory_limit('128M');
+@set_time_limit(0);
+
+// Print the header.
+admin_externalpage_setup('reportsecurity');
+admin_externalpage_print_header();
+
+print_heading(get_string('reportsecurity', 'report_security'));
+
+echo '<div id="timewarning">'.get_string('timewarning', 'report_security').'</div>';
+while(@ob_end_flush());
+@flush();
+
+$strok       = '<span class="statusok">'.get_string('statusok', 'report_security').'</span>';
+$strinfo     = '<span class="statusinfo">'.get_string('statusinfo', 'report_security').'</span>';
+$strwarning  = '<span class="statuswarning">'.get_string('statuswarning', 'report_security').'</span>';
+$strserious  = '<span class="statusserious">'.get_string('statusserious', 'report_security').'</span>';
+$strcritical = '<span class="statuscritical">'.get_string('statuscritical', 'report_security').'</span>';
+
+$strissue    = get_string('issue', 'report_security');
+$strstatus   = get_string('status', 'report_security');
+$strdesc     = get_string('description', 'report_security');
+$strconfig   = get_string('configuration', 'report_security');
+
+$statusarr = array(REPORT_SECURITY_OK       => $strok,
+                   REPORT_SECURITY_INFO     => $strinfo,
+                   REPORT_SECURITY_WARNING  => $strwarning,
+                   REPORT_SECURITY_SERIOUS  => $strserious,
+                   REPORT_SECURITY_CRITICAL => $strcritical);
+
+$url = "$CFG->wwwroot/$CFG->admin/report/security/index.php";
+
+if ($issue and ($result = $issue(true))) {
+    report_security_hide_timearning();
+
+    $table = new object();
+    $table->head  = array($strissue, $strstatus, $strdesc, $strconfig);
+    $table->size  = array('30%', '10%', '50%', '10%' );
+    $table->align = array('left', 'left', 'left', 'left');
+    $table->width = '90%';
+    $table->data  = array();
+
+    // print detail of one issue only
+    $row = array();
+    $row[0] = $result->name;
+    $row[1] = $statusarr[$result->status];
+    $row[2] = $result->info;
+    $row[3] = is_null($result->link) ? '&nbsp;' : $result->link;
+
+    $table->data[] = $row;
+
+    print_table($table);
+
+    print_box($result->details, 'generalbox boxwidthnormal boxaligncenter'); // TODO: add proper css
+
+    print_continue($url);
+
+} else {
+    report_security_hide_timearning();
+
+    $table = new object();
+    $table->head  = array($strissue, $strstatus, $strdesc);
+    $table->size  = array('30%', '10%', '60%' );
+    $table->align = array('left', 'left', 'left');
+    $table->width = '90%';
+    $table->data  = array();
+
+    foreach ($issues as $issue) {
+        $result = $issue(false);
+        if (!$result) {
+            // ignore this test
+            continue;
+        }
+        $row = array();
+        $row[0] = "<a href='$url?issue=$result->issue'>$result->name</a>";
+        $row[1] = $statusarr[$result->status];
+        $row[2] = $result->info;
+
+        $table->data[] = $row;
+    }
+    print_table($table);
+}
+
+print_footer();
@@ -0,0 +1,3 @@
+<?php  //$Id$
+
+$ADMIN->add('reports', new admin_externalpage('reportsecurity', get_string('reportsecurity', 'report_security'), "$CFG->wwwroot/$CFG->admin/report/security/index.php",'report/security:view'));
@@ -0,0 +1,29 @@
+<?PHP // $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+$plugin->version  = 2007101500;
+$plugin->requires = 2007101533;
+
+?>
@@ -1,77 +0,0 @@
-<?php  // $Id$
-
-    require_once('../../../config.php');
-    require_once($CFG->dirroot.'/lib/statslib.php');
-    require_once($CFG->dirroot.'/course/report/stats/lib.php');
-
-    require_once($CFG->libdir.'/adminlib.php');
-
-    $adminroot = admin_get_root();
-
-    admin_externalpage_setup('reportstats', $adminroot);
-
-    admin_externalpage_print_header($adminroot);
-
-
-    $courseid = optional_param('course', SITEID, PARAM_INT);
-    $report   = optional_param('report', 0, PARAM_INT);
-    $time     = optional_param('time', 0, PARAM_INT);
-    $mode     = optional_param('mode', STATS_MODE_GENERAL, PARAM_INT);
-    $userid   = optional_param('userid', 0, PARAM_INT);
-    $roleid   = 0;
-
-    if ($report > 50) {
-        $roleid = substr($report,1);
-        $report = 5;
-    }
-
-    if ($report == STATS_REPORT_USER_LOGINS) {
-        $courseid = SITEID; //override
-    }
-
-    if ($mode == STATS_MODE_RANKED) {
-        redirect($CFG->wwwroot.'/'.$CFG->admin.'/report/stats/index.php?time='.$time);
-    }
-
-    if (!$course = get_record("course","id",$courseid)) {
-        error("That's an invalid course id");
-    }
-
-    if (!empty($userid)) {
-        if (!$user = get_record('user','id',$userid)) {
-            error("That's an invalid user id");
-        }
-    }
-
-    require_login();
-
-    if (empty($CFG->enablestats)) {
-        redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'));
-    }
-
-    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_COURSE, $course->id));
-
-    add_to_log($course->id, "course", "report stats", "report/stats/index.php?course=$course->id", $course->id);
-
-    stats_check_uptodate($course->id);
-
-
-//    $strreports = get_string("reports");
-//    $strstats = get_string('stats');
-//
-//    $menu = report_stats_mode_menu($course, $mode, $time); // add 4th $url parameter if uncommented!
-//
-//
-//    $crumb = "<a href=\"{$CFG->wwwroot}/admin\">".get_string('administration')."</a> ->
-//             <a href=\"{$CFG->wwwroot}/admin/report.php\">$strreports</a> ->
-//             $strstats";
-
-//    print_header("$course->shortname: $strstats", "$course->fullname",
-//                  $crumb, '', '', true, '&nbsp;', $menu);
-
-
-    require_once($CFG->dirroot.'/course/report/stats/report.php');
-
-    admin_externalpage_print_footer($adminroot);
-
-?>
@@ -0,0 +1,4 @@
+<?php  // $Id$
+// just a link to course report
+$ADMIN->add('reports', new admin_externalpage('reportstats', get_string('stats', 'admin'), "$CFG->wwwroot/course/report/stats/index.php", 'coursereport/stats:view'));
+?>
@@ -0,0 +1,40 @@
+<?php  // $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+$report_unittest_capabilities = array(
+
+    'report/unittest:view' => array(
+        'riskbitmask' => RISK_DATALOSS,
+        'captype' => 'read',
+        'contextlevel' => CONTEXT_SYSTEM,
+        'legacy' => array(
+            'admin' => CAP_ALLOW
+        ),
+
+        'clonepermissionsfrom' => 'moodle/site:config',
+    )
+);
+
+?>
@@ -9,9 +9,10 @@
 * @package SimpleTestEx
 */

-/** */
-require_once(dirname(__FILE__) . '/../../../config.php');
-require_once($CFG->libdir . '/moodlelib.php');
+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+}
+
 require_once($CFG->libdir . '/simpletestlib/reporter.php');

 /**
@@ -45,8 +46,7 @@ class ExHtmlReporter extends HtmlReporter {

        $this->strrunonlyfolder = $this->get_string('runonlyfolder');
        $this->strrunonlyfile = $this->get_string('runonlyfile');
-        check_theme_arrows();
-        $this->strseparator = ' <span class="sep">'.$THEME->rarrow.'</span> ';
+        $this->strseparator = get_separator();
    }

    /**
@@ -147,9 +147,9 @@ class ExHtmlReporter extends HtmlReporter {
        $summarydata->exceptions = $this->getExceptionCount();

        if ($summarydata->fails == 0 && $summarydata->exceptions == 0) {
-            $status = "pass";
+            $status = "passed";
        } else {
-            $status = "fail";
+            $status = "failed";
        }
        echo '<div class="unittestsummary ', $status, '">';
        echo $this->get_string('summary', $summarydata);
@@ -10,8 +10,10 @@
 * @package SimpleTestEx
 */

-/** */
-require_once(dirname(__FILE__) . '/../../../config.php');
+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+}
+
 require_once($CFG->libdir . '/simpletestlib/test_case.php');

 /**
@@ -10,20 +10,12 @@
 */

 /** */
-require_once(dirname(__FILE__) . '/../../../config.php');
-require_once($CFG->libdir . '/moodlelib.php');
+require_once(dirname(__FILE__).'/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir.'/simpletestlib.php');
 require_once('ex_simple_test.php');
 require_once('ex_reporter.php');

-require_login();
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
-
-/* The UNITTEST constant can be checked elsewhere if you need to know
- * when your code is being run as part of a unit test. */
-define('UNITTEST', true);
-$langfile = 'simpletest';
-
 // CGI arguments
 $path = optional_param('path', null, PARAM_PATH);
 $showpasses = optional_param('showpasses', false, PARAM_BOOL);
@@ -31,10 +23,16 @@ $showsearch = optional_param('showsearch', false, PARAM_BOOL);
 $thorough = optional_param('thorough', false, PARAM_BOOL);

 // Print the header.
-$adminroot = admin_get_root();
-admin_externalpage_setup('reportsimpletest', $adminroot);
+admin_externalpage_setup('reportunittest', '', array('showpasses' => $showpasses,
+        'showsearch' => $showsearch, 'thorough' => $thorough));
+admin_externalpage_print_header();
+
+/* The UNITTEST constant can be checked elsewhere if you need to know
+ * when your code is being run as part of a unit test. */
+define('UNITTEST', true);
+$langfile = 'simpletest';
+
 $strtitle = get_string('unittests', $langfile);
-admin_externalpage_print_header($adminroot);

 if (!is_null($path)) {
    // Create the group of tests.
@@ -106,6 +104,6 @@ echo '</form>';
 print_simple_box_end();

 // Footer.
-admin_externalpage_print_footer($adminroot);
+admin_externalpage_print_footer();

 ?>
@@ -0,0 +1,3 @@
+<?php  //$Id$
+$ADMIN->add('reports', new admin_externalpage('reportunittest', get_string('simpletest', 'admin'), "$CFG->wwwroot/$CFG->admin/report/unittest/index.php", 'report/unittest:view'));
+?>
@@ -0,0 +1,29 @@
+<?PHP // $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+$plugin->version  = 2007101501;
+$plugin->requires = 2007101532;
+
+?>
@@ -8,14 +8,11 @@
 * then he can modify the roles_allow_assign table via this interface.
 */
    require_once('../../config.php');
-/// check capabilities here
-
    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('defineroles', $adminroot);

+    admin_externalpage_setup('defineroles', '', array(), $CFG->wwwroot . '/' . $CFG->admin . '/roles/allowassign.php');

-    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
    require_capability('moodle/role:manage', $sitecontext);

 /// form processiong here
@@ -47,10 +44,12 @@
                }
            }
        }
+        // updated allowassigns sitewide...
+        mark_context_dirty($sitecontext->path);
    }
 /// displaying form here

-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();

    $currenttab='allowassign';
    require_once('managetabs.php');
@@ -80,11 +79,11 @@

    echo '<form action="allowassign.php" method="post">';
    print_table($table);
-    echo '<div class="singlebutton"><input type="submit" value="'.get_string('savechanges').'"/></div>';
+    echo '<div class="buttons"><input type="submit" value="'.get_string('savechanges').'"/>';
    echo '<input type="hidden" name="dummy" value="1" />'; // this is needed otherwise we do not know a form has been submitted
-    echo '</form>';
+    echo '</div></form>';

-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();



@@ -6,14 +6,11 @@
 * and be in the roles_allow_override table.
 */
    require_once('../../config.php');
-/// check capabilities here
-
    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('defineroles', $adminroot);

+    admin_externalpage_setup('defineroles', '', array(), $CFG->wwwroot . '/' . $CFG->admin . '/roles/allowoverride.php');

-    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
    require_capability('moodle/role:manage', $sitecontext);

 /// form processiong here
@@ -45,10 +42,12 @@
                }
            }
        }
+        // updated allowoverride sitewide...
+        mark_context_dirty($sitecontext->path);
    }
 /// displaying form here

-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header();

    $currenttab='allowoverride';
    require_once('managetabs.php');
@@ -74,15 +73,15 @@
        $table->data[] = array_merge(array(format_string($role->name)), $beta);
    }

-    print_simple_box(get_string('configallowoverride', 'admin'), 'center');
+    print_simple_box(get_string('configallowoverride2', 'admin'), 'center');

    echo '<form action="allowoverride.php" method="post">';
    print_table($table);
-    echo '<div class="singlebutton"><input type="submit" value="'.get_string('savechanges').'"/></div>';
+    echo '<div class="buttons"><input type="submit" value="'.get_string('savechanges').'"/>';
    echo '<input type="hidden" name="dummy" value="1" />'; // this is needed otherwise we do not know a form has been submitted
-    echo '</form>';
+    echo '</div></form>';

-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();

 // returns array
 function get_box_list($roleid, $arraylist){
@@ -1,5 +1,8 @@
 <form id="assignform" method="post" action="">
-<div>
+<div style="text-align:center;">
+<label for="extendperiod"><?php print_string('enrolperiod') ?></label> <?php choose_from_menu($periodmenu, "extendperiod", $defaultperiod, $unlimitedperiod); ?>
+<label for="extendbase"><?php print_string('startingfrom') ?></label> <?php choose_from_menu($basemenu, "extendbase", 3, ""); ?>
+
 <input type="hidden" name="previoussearch" value="<?php p($previoussearch) ?>" />
 <input type="hidden" name="userid" value="<?php p($userid) ?>" />
 <input type="hidden" name="courseid" value="<?php p($courseid) ?>" />
@@ -15,31 +18,36 @@
                  onfocus="getElementById('assignform').add.disabled=true;
                           getElementById('assignform').remove.disabled=false;
                           getElementById('assignform').addselect.selectedIndex=-1;">
-          
+
          <?php
-              foreach ($contextusers as $contextuser) {
-                  $fullname = fullname($contextuser, true);
-                  if ($contextuser->hidden) {
-                      $hidden=' ('.get_string('hiddenassign').') ';
-                  } else {
-                      $hidden="";
-                  }
-                  echo "<option value=\"$contextuser->id\">".$fullname.", ".$contextuser->email.$hidden."</option>\n";
-              }
+            $i = 0;
+            foreach ($contextusers as $contextuser) {
+                $fullname = fullname($contextuser, true);
+                if ($contextuser->hidden) {
+                    $hidden=' ('.get_string('hiddenassign').') ';
+                } else {
+                    $hidden="";
+                }
+                echo "<option value=\"$contextuser->id\">".$fullname.", ".$contextuser->email.$hidden."</option>\n";
+                $i++;    
+            }
+            if ($i==0) {
+                echo '<option/>'; // empty select breaks xhtml strict
+            }
          ?>
-          <option/>
+          
          </select></td>
      <td valign="top">
        <br />
        <label title="<?php print_string('hiddenassign') ?>">
            <input type="checkbox" name="hidden" value="1" />
            <img src="<?php echo $CFG->pixpath; ?>/t/hide.gif" alt="<?php print_string('hiddenassign') ?>" class="hide-show-image" />
+            <?php helpbutton('hiddenassign', get_string('hiddenassign')); ?>
        </label>
        <?php check_theme_arrows(); ?>
        <p class="arrow_button">
-            <input name="add" id="add" type="submit" value="<?php echo '&nbsp;'.$THEME->larrow.' &nbsp; &nbsp; '.get_string('add'); ?>" title="<?php print_string('add'); ?>" />
-            <br />
-            <input name="remove" id="remove" type="submit" value="<?php echo '&nbsp; '.$THEME->rarrow.' &nbsp; &nbsp; '.get_string('remove'); ?>" title="<?php print_string('remove'); ?>" />
+            <input name="add" id="add" type="submit" value="<?php echo $THEME->larrow.'&nbsp;'.get_string('add'); ?>" title="<?php print_string('add'); ?>" /><br />
+            <input name="remove" id="remove" type="submit" value="<?php echo get_string('remove').'&nbsp;'.$THEME->rarrow; ?>" title="<?php print_string('remove'); ?>" />
        </p>
      </td>
      <td valign="top">
@@ -50,32 +58,32 @@
                           getElementById('assignform').remove.disabled=true;
                           getElementById('assignform').removeselect.selectedIndex=-1;">
          <?php
+            $i=0;
+            if (!empty($searchtext)) {
+                echo "<optgroup label=\"$strsearchresults (" . $usercount . ")\">\n";
+                while ($user = rs_fetch_next_record($availableusers)) {
+                    $fullname = fullname($user, true);
+                    echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                    $i++;
+                }
+                echo "</optgroup>\n";

-              if (!empty($searchtext)) {
-                  echo "<optgroup label=\"$strsearchresults (" . $availableusers->_numOfRows . ")\">\n";
-                  while ($user = rs_fetch_next_record($availableusers)) {
-                      if (!isset($contextusers[$user->id])) {
-                          $fullname = fullname($user, true);
-                          echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
-                      }
-                  }
-                  echo "</optgroup>\n";
-
-              } else {
-                  if ($usercount > MAX_USERS_PER_PAGE) {
-                      echo '<optgroup label="'.get_string('toomanytoshow').'"><option></option></optgroup>'."\n"
+            } else {
+                if ($usercount > MAX_USERS_PER_PAGE) {
+                    echo '<optgroup label="'.get_string('toomanytoshow').'"><option></option></optgroup>'."\n"
                          .'<optgroup label="'.get_string('trysearching').'"><option></option></optgroup>'."\n";
-                  } else {
-                      while ($user = rs_fetch_next_record($availableusers)) {
-                          if (!isset($contextusers[$user->id])) {
-                              $fullname = fullname($user, true);
-                              echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
-                          }
-                      }
-                  }
-              }
+                } else {
+                    while ($user = rs_fetch_next_record($availableusers)) {
+                        $fullname = fullname($user, true);
+                        echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                        $i++;
+                    }
+                }
+            }
+            if ($i==0) {
+                echo '<option/>'; // empty select breaks xhtml strict
+            }
          ?>
-         <option/>
         </select>
         <br />
         <label for="searchtext" class="accesshide"><?php p($strsearch) ?></label>
@@ -6,6 +6,7 @@
    require_once($CFG->libdir.'/adminlib.php');

    define("MAX_USERS_PER_PAGE", 5000);
+    define("MAX_USERS_TO_LIST_PER_ROLE", 10);

    $contextid      = required_param('contextid',PARAM_INT); // context id
    $roleid         = optional_param('roleid', 0, PARAM_INT); // required role id
@@ -15,11 +16,11 @@
    $searchtext     = optional_param('searchtext', '', PARAM_RAW); // search string
    $previoussearch = optional_param('previoussearch', 0, PARAM_BOOL);
    $hidden         = optional_param('hidden', 0, PARAM_BOOL); // whether this assignment is hidden
-    $timestart      = optional_param('timestart', 0, PARAM_INT);
-    $timeend        = optional_param('timened', 0, PARAM_INT);
+    $extendperiod   = optional_param('extendperiod', 0, PARAM_INT);
+    $extendbase     = optional_param('extendbase', 0, PARAM_INT);
    $userid         = optional_param('userid', 0, PARAM_INT); // needed for user tabs
    $courseid       = optional_param('courseid', 0, PARAM_INT); // needed for user tabs
-    
+
    $errors = array();

    $previoussearch = ($searchtext != '') or ($previoussearch) ? 1:0;
@@ -44,43 +45,68 @@
        } else {
            error('Invalid course id');
        }
+
    } else if (!empty($courseid)){ // we need this for user tabs in user context
        if (!$course = get_record('course', 'id', $courseid)) {
            error('Invalid course id');
        }
+
    } else {
        $courseid = SITEID;
-        $course = get_site();
+        $course = clone($SITE);
    }

-    if ($context->contextlevel == CONTEXT_COURSE) {
-        require_login($context->instanceid);
-    } else {
-        require_login();
-    }
+    require_login($course);

    require_capability('moodle/role:assign', $context);

-    $assignableroles = get_assignable_roles($context);
+/// needed for tabs.php
+
+    $overridableroles = get_overridable_roles($context, 'name', ROLENAME_BOTH);
+    $assignableroles  = get_assignable_roles($context, 'name', ROLENAME_BOTH);
+
 /// Get some language strings

-    $strassignusers = get_string('assignusers', 'role');
    $strpotentialusers = get_string('potentialusers', 'role');
    $strexistingusers = get_string('existingusers', 'role');
    $straction = get_string('assignroles', 'role');
    $strroletoassign = get_string('roletoassign', 'role');
-    $strcurrentcontext = get_string('currentcontext', 'role');
    $strsearch = get_string('search');
    $strshowall = get_string('showall');
    $strparticipants = get_string('participants');
    $strsearchresults = get_string('searchresults');

+    $unlimitedperiod = get_string('unlimited');
+    $defaultperiod = $course->enrolperiod;
+    for ($i=1; $i<=365; $i++) {
+        $seconds = $i * 86400;
+        $periodmenu[$seconds] = get_string('numdays', '', $i);
+    }

+    $timeformat = get_string('strftimedate');
+    $today = time();
+    $today = make_timestamp(date('Y', $today), date('m', $today), date('d', $today), 0, 0, 0);
+
+    // MDL-12420, preventing course start date showing up as an option at system context and front page roles.
+    if ($course->startdate > 0) {
+        $basemenu[0] = get_string('startdate') . ' (' . userdate($course->startdate, $timeformat) . ')';
+    }
+    if ($course->enrollable != 2 || ($course->enrolstartdate == 0 || $course->enrolstartdate <= $today) && ($course->enrolenddate == 0 || $course->enrolenddate > $today)) {
+        $basemenu[3] = get_string('today') . ' (' . userdate($today, $timeformat) . ')' ;
+    }
+    if($course->enrollable == 2) {
+        if($course->enrolstartdate > 0) {
+            $basemenu[4] = get_string('courseenrolstartdate') . ' (' . userdate($course->enrolstartdate, $timeformat) . ')';
+        }
+        if($course->enrolenddate > 0) {
+            $basemenu[5] = get_string('courseenrolenddate') . ' (' . userdate($course->enrolenddate, $timeformat) . ')';
+        }
+    }

 /// Make sure this user can assign that role

    if ($roleid) {
-        if (!user_can_assign($context, $roleid)) {
+        if (!isset($assignableroles[$roleid])) {
            error ('you can not override this role in this context');
        }
    }
@@ -95,46 +121,49 @@

    if ($context->contextlevel == CONTEXT_USER) {
        /// course header
+        $navlinks = array();
        if ($courseid != SITEID) {
-            print_header("$fullname", "$fullname",
-                     "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->
-                      <a href=\"$CFG->wwwroot/user/index.php?id=$course->id\">$strparticipants</a> -> <a href=\"$CFG->wwwroot/user/view.php?id=$userid&amp;course=$courseid\">$fullname</a> ->".$straction,
-                      "", "", true, "&nbsp;", navmenu($course));
+            if (has_capability('moodle/course:viewparticipants', get_context_instance(CONTEXT_COURSE, $course->id))) {
+                $navlinks[] = array('name' => $strparticipants, 'link' => "$CFG->wwwroot/user/index.php?id=$course->id", 'type' => 'misc');
+            }
+            $navlinks[] = array('name' => $fullname, 'link' => "$CFG->wwwroot/user/view.php?id=$userid&amp;course=$courseid", 'type' => 'misc');
+            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
+            $navigation = build_navigation($navlinks);
+
+            print_header("$fullname", "$fullname", $navigation, "", "", true, "&nbsp;", navmenu($course));

        /// site header
        } else {
-            print_header("$course->fullname: $fullname", "$course->fullname",
-                        "<a href=\"$CFG->wwwroot/user/view.php?id=$userid&amp;course=$courseid\">$fullname</a> -> $straction", "", "", true, "&nbsp;", navmenu($course));
+            $navlinks[] = array('name' => $fullname, 'link' => "$CFG->wwwroot/user/view.php?id=$userid&amp;course=$courseid", 'type' => 'misc');
+            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
+            $navigation = build_navigation($navlinks);
+            print_header("$course->fullname: $fullname", $course->fullname, $navigation, "", "", true, "&nbsp;", navmenu($course));
        }

        $showroles = 1;
        $currenttab = 'assign';
        include_once($CFG->dirroot.'/user/tabs.php');
    } else if ($context->contextlevel == CONTEXT_SYSTEM) {
-        $adminroot = admin_get_root();
-        admin_externalpage_setup('assignroles', $adminroot);
-        admin_externalpage_print_header($adminroot);
+        admin_externalpage_setup('assignroles', '', array('contextid' => $contextid, 'roleid' => $roleid));
+        admin_externalpage_print_header('');
    } else if ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID) {
-        $adminroot = admin_get_root();
-        admin_externalpage_setup('frontpageroles', $adminroot);
-        admin_externalpage_print_header($adminroot);
-        $currenttab = '';
-        $tabsmode = 'assign';
+        admin_externalpage_setup('frontpageroles', '', array('contextid' => $contextid, 'roleid' => $roleid));
+        admin_externalpage_print_header('');
+        $currenttab = 'assign';
        include_once('tabs.php');
    } else {
-        $currenttab = '';
-        $tabsmode = 'assign';
+        $currenttab = 'assign';
        include_once('tabs.php');
    }

+
+
 /// Process incoming role assignment

    if ($frm = data_submitted()) {

        if ($add and !empty($frm->addselect) and confirm_sesskey()) {

-            $timemodified = time();
-
            foreach ($frm->addselect as $adduser) {
                if (!$adduser = clean_param($adduser, PARAM_INT)) {
                    continue;
@@ -153,17 +182,39 @@
                    }
                }
                if ($allow) {
+                    switch($extendbase) {
+                        case 0:
+                            $timestart = $course->startdate;
+                            break;
+                        case 3:
+                            $timestart = $today;
+                            break;
+                        case 4:
+                            $timestart = $course->enrolstartdate;
+                            break;
+                        case 5:
+                            $timestart = $course->enrolenddate;
+                            break;
+                    }
+
+                    if($extendperiod > 0) {
+                        $timeend = $timestart + $extendperiod;
+                    } else {
+                        $timeend = 0;
+                    }
                    if (! role_assign($roleid, $adduser, 0, $context->id, $timestart, $timeend, $hidden)) {
                        $errors[] = "Could not add user with id $adduser to this role!";
                    }
                }
            }
-
+            
+            $rolename = get_field('role', 'name', 'id', $roleid);
+            add_to_log($course->id, 'role', 'assign', 'admin/roles/assign.php?contextid='.$context->id.'&roleid='.$roleid, $rolename, '', $USER->id);
        } else if ($remove and !empty($frm->removeselect) and confirm_sesskey()) {

            $sitecontext = get_context_instance(CONTEXT_SYSTEM);
            $topleveladmin = false;
-   
+
            // we only worry about this if the role has doanything capability at site level
            if ($context->id == $sitecontext->id && $adminroles = get_roles_with_capability('moodle/site:doanything', CAP_ALLOW, $sitecontext)) {
                foreach ($adminroles as $adminrole) {
@@ -172,7 +223,7 @@
                    }
                }
            }
-            
+
            foreach ($frm->removeselect as $removeuser) {
                $removeuser = clean_param($removeuser, PARAM_INT);

@@ -192,17 +243,26 @@
                    }
                }
            }
-
+            
+            $rolename = get_field('role', 'name', 'id', $roleid);
+            add_to_log($course->id, 'role', 'unassign', 'admin/roles/assign.php?contextid='.$context->id.'&roleid='.$roleid, $rolename, '', $USER->id);
        } else if ($showall) {
            $searchtext = '';
            $previoussearch = 0;
        }
+        
+        
+    
    }

    if ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID) {
        print_heading_with_help(get_string('frontpageroles', 'admin'), 'assignroles');
    } else {
-        print_heading_with_help(get_string('assignroles', 'role'), 'assignroles');
+        print_heading_with_help(get_string('assignrolesin', 'role', print_context_name($context)), 'assignroles');
+    }
+
+    if ($context->contextlevel==CONTEXT_SYSTEM) {
+        print_box(get_string('globalroleswarning', 'role'));
    }

    if ($roleid) {        /// prints a form to swap roles
@@ -210,12 +270,12 @@
    /// Get all existing participants in this context.
        // Why is this not done with get_users???

-        if (!$contextusers = get_role_users($roleid, $context, false, 'u.id, u.firstname, u.lastname, u.email, r.hidden')) {
+        if (!$contextusers = get_role_users($roleid, $context, false, 'u.id, u.firstname, u.lastname, u.email, ra.hidden')) {
            $contextusers = array();
        }

        $select  = "username <> 'guest' AND deleted = 0 AND confirmed = 1";
-    
+
        $usercount = count_records_select('user', $select) - count($contextusers);

        $searchtext = trim($searchtext);
@@ -224,21 +284,101 @@
            $LIKE      = sql_ilike();
            $FULLNAME  = sql_fullname();

-            $select  .= " AND ($FULLNAME $LIKE '%$searchtext%' OR email $LIKE '%$searchtext%') ";
+            $selectsql = " AND ($FULLNAME $LIKE '%$searchtext%' OR email $LIKE '%$searchtext%') ";
+            $select  .= $selectsql;
+        } else {
+            $selectsql = "";
        }

-        $availableusers = get_recordset_sql('SELECT id, firstname, lastname, email 
-                                               FROM '.$CFG->prefix.'user 
-                                              WHERE '.$select.'
-                                            ORDER BY lastname ASC, firstname ASC');
+        if ($context->contextlevel > CONTEXT_COURSE && !is_inside_frontpage($context)) { // mod or block (or group?)

-        /// In the .html file below we loop through these results and exclude any in $contextusers
+            /************************************************************************
+             *                                                                      *
+             * context level is above or equal course context level                 *
+             * in this case we pull out all users matching search criteria (if any) *
+             *                                                                      *
+             * MDL-11324                                                            *
+             * a mini get_users_by_capability() call here, this is done instead of  *
+             * get_users_by_capability() because                                    *
+             * 1) get_users_by_capability() does not deal with searching by name    *
+             * 2) exceptions array can be potentially large for large courses       *
+             * 3) get_recordset_sql() is more efficient                             *
+             *                                                                      *
+             ************************************************************************/

-        echo '<div style="text-align:center">'.$strcurrentcontext.': '.print_context_name($context).'<br/>';
-        echo '<label>'.$strroletoassign.'</label>: ';
-        $assignableroles = array('0'=>get_string('listallroles', 'role').'...') + $assignableroles; 
+            if ($possibleroles = get_roles_with_capability('moodle/course:view', CAP_ALLOW, $context)) {
+
+                $doanythingroles = get_roles_with_capability('moodle/site:doanything', CAP_ALLOW, get_context_instance(CONTEXT_SYSTEM));
+
+                $validroleids = array();
+                foreach ($possibleroles as $possiblerole) {
+                    if (isset($doanythingroles[$possiblerole->id])) {  // We don't want these included
+                            continue;
+                    }
+                    if ($caps = role_context_capabilities($possiblerole->id, $context, 'moodle/course:view')) { // resolved list
+                        if (isset($caps['moodle/course:view']) && $caps['moodle/course:view'] > 0) { // resolved capability > 0
+                            $validroleids[] = $possiblerole->id;
+                        }
+                    }
+                }
+
+                if ($validroleids) {
+                    $roleids =  '('.implode(',', $validroleids).')';
+
+                    $select = " SELECT u.id, u.firstname, u.lastname, u.email";
+                    $countselect = "SELECT COUNT(u.id)";
+                    $from   = " FROM {$CFG->prefix}user u
+                                INNER JOIN {$CFG->prefix}role_assignments ra ON ra.userid = u.id
+                                INNER JOIN {$CFG->prefix}role r ON r.id = ra.roleid";
+                    $where  = " WHERE ra.contextid ".get_related_contexts_string($context)."
+                                AND u.deleted = 0
+                                AND ra.roleid in $roleids";
+                    $excsql = " AND u.id NOT IN (
+                                    SELECT u.id
+                                    FROM {$CFG->prefix}role_assignments r,
+                                    {$CFG->prefix}user u
+                                    WHERE r.contextid = $contextid
+                                    AND u.id = r.userid
+                                    AND r.roleid = $roleid
+                                    $selectsql)";
+
+                    $availableusers = get_recordset_sql($select . $from . $where . $selectsql . $excsql);
+                }
+
+                $usercount =  $availableusers->_numOfRows;
+            }
+
+        } else {
+
+            /************************************************************************
+             *                                                                      *
+             * context level is above or equal course context level                 *
+             * in this case we pull out all users matching search criteria (if any) *
+             *                                                                      *
+             ************************************************************************/
+
+            /// MDL-11111 do not include user already assigned this role in this context as available users
+            /// so that the number of available users is right and we save time looping later
+            $availableusers = get_recordset_sql('SELECT id, firstname, lastname, email
+                                                FROM '.$CFG->prefix.'user
+                                                WHERE '.$select.'
+                                                AND id NOT IN (
+                                                    SELECT u.id
+                                                    FROM '.$CFG->prefix.'role_assignments r,
+                                                    '.$CFG->prefix.'user u
+                                                    WHERE r.contextid = '.$contextid.'
+                                                    AND u.id = r.userid
+                                                    AND r.roleid = '.$roleid.'
+                                                    '.$selectsql.')
+                                                ORDER BY lastname ASC, firstname ASC');
+
+            $usercount = $availableusers->_numOfRows;         
+        }
+
+        echo '<div class="selector">';
+        $assignableroles = array('0'=>get_string('listallroles', 'role').'...') + $assignableroles;
        popup_form("$CFG->wwwroot/$CFG->admin/roles/assign.php?userid=$userid&amp;courseid=$courseid&amp;contextid=$contextid&amp;roleid=",
-            $assignableroles, 'switchrole', $roleid, '');
+            $assignableroles, 'switchrole', $roleid, '', '', '', false, 'self', $strroletoassign);
        echo '</div>';

        print_simple_box_start('center');
@@ -263,6 +403,34 @@
            sync_metacourse($course);
        }

+        // Get the names of role holders for roles with between 1 and MAX_USERS_TO_LIST_PER_ROLE users,
+        // and so determine whether to show the extra column. 
+        $rolehodlercount = array();
+        $rolehodlernames = array();
+        $strmorethanten = get_string('morethan', 'role', MAX_USERS_TO_LIST_PER_ROLE);
+        $showroleholders = false;
+        foreach ($assignableroles as $roleid => $rolename) {
+            $countusers = count_role_users($roleid, $context);
+            $rolehodlercount[$roleid] = $countusers;
+            $roleusers = '';
+            if (0 < $countusers && $countusers <= MAX_USERS_TO_LIST_PER_ROLE) {
+                $roleusers = get_role_users($roleid, $context, false, 'u.id, u.lastname, u.firstname');
+                if (!empty($roleusers)) {
+                    $strroleusers = array();
+                    foreach ($roleusers as $user) {
+                        $strroleusers[] = '<a href="' . $CFG->wwwroot . '/user/view.php?id=' . $user->id . '" >' . fullname($user) . '</a>';
+                    }
+                    $rolehodlernames[$roleid] = implode('<br />', $strroleusers);
+                    $showroleholders = true;
+                }
+            } else if ($countusers > MAX_USERS_TO_LIST_PER_ROLE) {
+                $rolehodlernames[$roleid] = '<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$strmorethanten.'</a>';
+            } else {
+                $rolehodlernames[$roleid] = '';
+            }
+        }
+
+        // Print overview table
        $table->tablealign = 'center';
        $table->cellpadding = 5;
        $table->cellspacing = 0;
@@ -270,20 +438,24 @@
        $table->head = array(get_string('roles', 'role'), get_string('description'), get_string('users'));
        $table->wrap = array('nowrap', '', 'nowrap');
        $table->align = array('right', 'left', 'center');
+        if ($showroleholders) {
+            $table->head[] = '';
+            $table->wrap[] = 'nowrap';
+            $table->align[] = 'left';
+        }

        foreach ($assignableroles as $roleid => $rolename) {
-            $countusers = count_role_users($roleid, $context);
            $description = format_string(get_field('role', 'description', 'id', $roleid));
-            $table->data[] = array('<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$rolename.'</a>',$description, $countusers);
+            $row = array('<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$rolename.'</a>',$description, $rolehodlercount[$roleid]);
+            if ($showroleholders) {
+                $row[] = $rolehodlernames[$roleid];
+            }
+            $table->data[] = $row;
        }

        print_table($table);
    }

-    if ($context->contextlevel == CONTEXT_SYSTEM or ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID)) {
-        admin_externalpage_print_footer($adminroot);
-    } else {
-        print_footer($course);
-    }
+    print_footer($course);

 ?>
@@ -4,67 +4,98 @@
        case 'add':
            $submitlabel = get_string('addrole', 'role');
            break;
-        case 'view':
-            $submitlabel = get_string('listallroles', 'role');
-            break;
        case 'edit':
        default:
            $submitlabel = get_string('savechanges');
    }

+    if ($action == 'view') {
+?>
+<?php
+    }
 ?>
-
-<div align="right">
-<a href="manage.php?roleid=<?php p($roleid); ?>&amp;action=duplicate"><?php print_string('duplicaterole'); ?></a>
-</div>
 <form id="rolesform" action="manage.php" method="post">
+<fieldset class="invisiblefieldset">
 <input type="hidden" name="roleid" value="<?php p($roleid) ?>" />
 <input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
 <input type="hidden" name="action" value="<?php if ($action != 'view') { echo p($action); } ?>" />
-
-<table cellpadding="9" cellspacing="0" align="center">
-<tr valign="top">
-    <td align="right"><?php print_string('name') ?>:</td>
-    <td><?php
-    if ($action == 'view') {
-        p($role->name);
-    } else {
-        echo '<input type="text" name="name" maxlength="254" size="50" value="'.s($role->name).'" />';
-        if (isset($errors["name"])) formerr($errors["name"]);
-    } ?></td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string('shortname') ?>:</td>
-    <td><?php
-    if ($action == 'view') {
-        p($role->shortname);
-    } else {
-        echo '<input type="text" name="shortname" maxlength="20" size="15" value="'.s($role->shortname).'" />';
-        if (isset($errors["shortname"])) formerr($errors["shortname"]);
-    } ?></td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string('description') ?>:</td>
-    <td><?php
-    if ($action == 'view') {
-        p($role->description);
-        $usehtmleditor = false;
-    } else {
-        print_textarea($usehtmleditor, 10, 50, 50, 10, 'description', $role->description);
-    } ?></td>
-</tr>
+</fieldset>
+<table class="roledesc" cellpadding="9" cellspacing="0">
+<?php if ($action == 'view') { ?>
+    <tr valign="top">
+        <td align="right"><?php print_string('name') ?>:</td>
+        <td><?php p(format_string($role->name)); ?></td>
+    </tr>
+    <tr valign="top">
+        <td align="right"><?php print_string('shortname') ?>:</td>
+        <td><?php p($role->shortname); ?></td>
+    </tr>
+    <tr valign="top">
+        <td align="right"><?php print_string('description') ?>:</td>
+        <td><?php p(format_text($role->description, FORMAT_HTML)); $usehtmleditor = false; ?></td>
+    </tr>
+    <tr valign="top">
+        <td align="right"><?php print_string('legacytype', 'role') ?>:</td>
+        <td><?php
+                $usehtmleditor = false;
+                if (empty($role->legacytype)) {
+                    print_string('none');
+                } else {
+                    print_string('legacy:'.$role->legacytype, 'role');
+                }
+            ?>
+        </td>
+    </tr>
+<?php } else { ?>
+    <tr valign="top">
+        <td align="right"><label for="name"><?php print_string('name') ?></label></td>
+        <td><?php
+            echo '<input type="text" id="name" name="name" maxlength="254" size="50" value="'.s($role->name).'" />';
+            if (isset($errors["name"])) formerr($errors["name"]);
+            ?>
+        </td>
+    </tr>
+    <tr valign="top">
+        <td align="right"><label for="shortname"><?php print_string('shortname') ?></label></td>
+        <td><?php
+            echo '<input type="text" id="shortname" name="shortname" maxlength="100" size="15" value="'.s($role->shortname).'" />';
+            if (isset($errors["shortname"])) formerr($errors["shortname"]);
+            ?>
+        </td>
+    </tr>
+    <tr valign="top">
+        <td align="right"><label for="edit-description"><?php print_string('description') ?></label></td>
+        <td><?php
+            print_textarea($usehtmleditor, 10, 50, 50, 10, 'description', $role->description);
+            ?>
+        </td>
+    </tr>
+    <tr valign="top">
+        <td align="right"><label for="menulegacytype"><?php print_string('legacytype', 'role') ?></label></td>
+        <td><?php
+            $options = array();
+            $options[''] = get_string('none');
+            $legacyroles = get_legacy_roles();
+            foreach($legacyroles as $ltype=>$lcap) {
+                $options[$ltype] = get_string('legacy:'.$ltype, 'role');
+            }
+            choose_from_menu($options, 'legacytype', $role->legacytype, '');
+            ?>
+        </td>
+    </tr>
+<?php } ?>
 </table>

-<?php 
+<?php
    print_heading_with_help(get_string('permissions','role'), 'permissions');

-    $strinherit = get_string('inherit','role');
+    $strinherit = get_string('notset','role');
    $strallow = get_string('allow','role');
    $strprevent = get_string('prevent','role');
    $strprohibit = get_string('prohibit','role');
 ?>

-<table class="rolecap" align="center">
+<table class="rolecap">

 <tr>
 <th class="name" align="left" scope="col"><?php print_string('capability','role') ?></th>
@@ -82,11 +113,26 @@ $contextlevel = 0;
 $component = '';

 $strrisks = s(get_string('risks', 'role'));
-$strcapabilities = s(get_string('capabilities', 'role'));
+// MDL-11687
+$strcapabilities = 'Capabilities';//s(get_string('capabilities', 'role'));
+
+// prepare legacy defaults
+if (!empty($role->legacytype)) {
+    $defaultcaps = get_default_capabilities($role->legacytype);
+} else {
+    $defaultcaps = false;
+}

 foreach ($capabilities as $capability) {
+
+    //legacy caps have their own selector
+    if (islegacy($capability->name)) {
+        continue;
+    }
+
    // prints a breaker if component or name or context level
-    if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
+    if (component_level_changed($capability, $component, $contextlevel)) {
+    //if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
        echo ('<tr class="rolecapheading header"><td colspan="10" class="header"><strong>'.
               get_component_string($capability->component, $capability->contextlevel).'</strong></td></tr>');
    }
@@ -97,7 +143,6 @@ foreach ($capabilities as $capability) {

    if (empty($errors)) {
       // check the capability override for this cap, this role in this context
-        $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
        $localoverride = get_local_override($roleid, $sitecontext->id, $capability->name);
    } else {
        $localoverride = new object();
@@ -109,44 +154,53 @@ foreach ($capabilities as $capability) {
    $riskinfo = '<td class="risk managetrust">';
    $rowclasses = '';
    if (RISK_MANAGETRUST & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+        $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
        $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_managetrust.gif" alt="'.get_string('riskmanagetrustshort', 'admin').'" /></a>';
        $rowclasses .= ' riskmanagetrust';
    }
    $riskinfo .= '</td><td class="risk config">';
    if (RISK_CONFIG & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+        $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
        $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_config.gif" alt="'.get_string('riskconfigshort', 'admin').'" /></a>';
        $rowclasses .= ' riskconfig';
    }
    $riskinfo .= '</td><td class="risk xss">';
    if (RISK_XSS & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+        $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
        $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_xss.gif" alt="'.get_string('riskxssshort', 'admin').'" /></a>';
        $rowclasses .= ' riskxss';
    }
    $riskinfo .= '</td><td class="risk personal">';
    if (RISK_PERSONAL & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+        $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
        $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_personal.gif" alt="'.get_string('riskpersonalshort', 'admin').'" /></a>';
        $rowclasses .= ' riskpersonal';
    }
    $riskinfo .= '</td><td class="risk spam">';
    if (RISK_SPAM & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+        $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
        $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_spam.gif" alt="'.get_string('riskspamshort', 'admin').'" /></a>';
        $rowclasses .= ' riskspam';
    }
    $riskinfo .= '</td>';

+    $isinherit  = (!isset($defaultcaps[$capability->name]) or $defaultcaps[$capability->name] == CAP_INHERIT) ? 'capdefault' : '';
+    $isallow    = (isset($defaultcaps[$capability->name]) and $defaultcaps[$capability->name] == CAP_ALLOW) ? 'capdefault' : '';
+    $isprevent  = (isset($defaultcaps[$capability->name]) and $defaultcaps[$capability->name] == CAP_PREVENT) ? 'capdefault' : '';
+    $isprohibit = (isset($defaultcaps[$capability->name]) and $defaultcaps[$capability->name] == CAP_PROHIBIT) ? 'capdefault' : '';
+
    ?>

        <tr class="rolecap <?php echo $rowclasses; ?>">
-        <td class="name"><span class="cap-desc"><a target="docspopup" href="<?php echo $CFG->docroot.'/'.$lang.'/'.$strcapabilities.'/'.$capability->name ?>"><?php echo get_capability_string($capability->name); ?></a><span class="cap-name"><?php echo $capability->name ?></span></span></td>
-        <td class="inherit"><input type="radio" title="<?php p($strinherit); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_INHERIT ?>" <?php if (!isset($localoverride->permission) || $localoverride->permission==CAP_INHERIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="allow"><input type="radio" title="<?php p($strallow); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_ALLOW ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_ALLOW){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="prevent" ><input type="radio" title="<?php p($strprevent); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PREVENT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PREVENT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="prohibit" ><input type="radio" title="<?php p($strprohibit); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PROHIBIT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PROHIBIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="name"><span class="cap-desc"><a onclick="this.target='docspopup'" href="<?php echo $CFG->docroot.'/'.$lang.'/'.$strcapabilities.'/'.$capability->name ?>"><?php echo get_capability_string($capability->name); ?></a><span class="cap-name"><?php echo $capability->name ?></span></span></td>
+        <td class="inherit <?php echo $isinherit ?>">
+          <input type="radio" title="<?php p($strinherit); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_INHERIT ?>" <?php if (!isset($localoverride->permission) || $localoverride->permission==CAP_INHERIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="allow <?php echo $isallow ?>">
+          <input type="radio" title="<?php p($strallow); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_ALLOW ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_ALLOW){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="prevent <?php echo $isprevent ?>" >
+          <input type="radio" title="<?php p($strprevent); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PREVENT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PREVENT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="prohibit <?php echo $isprohibit ?>" >
+          <input type="radio" title="<?php p($strprohibit); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PROHIBIT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PROHIBIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>

        <?php echo $riskinfo; ?>

@@ -155,11 +209,11 @@ foreach ($capabilities as $capability) {
 <?php } ?>
 </table>

-<div class="submit" align="center">
-<input type="submit" value="<?php p($submitlabel) ?>" />
 <?php if ($action != 'view') { ?>
+<div class="submit buttons">
+<input type="submit" value="<?php p($submitlabel) ?>" />
 <input type="submit" name="cancel" value="<?php print_string('cancel') ?>" />
-<?php } ?>
 </div>
+<?php } ?>

 </form>
@@ -3,9 +3,6 @@
    require_once('../../config.php');

    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-
-    admin_externalpage_setup('defineroles', $adminroot);

    $roleid      = optional_param('roleid', 0, PARAM_INT);             // if set, we are editing a role
    $name        = optional_param('name', '', PARAM_MULTILANG);        // new role name
@@ -15,7 +12,11 @@
    $confirm     = optional_param('confirm', 0, PARAM_BOOL);
    $cancel      = optional_param('cancel', 0, PARAM_BOOL);

-    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    admin_externalpage_setup('defineroles', '', array('roleid' => $roleid));
+
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+
+    require_capability('moodle/role:manage', $sitecontext);

    if ($cancel) {
        redirect('manage.php');
@@ -55,6 +56,12 @@
            if ($data = data_submitted() and confirm_sesskey()) {

                $shortname = moodle_strtolower(clean_param(clean_filename($shortname), PARAM_SAFEDIR)); // only lowercase safe ASCII characters
+                $legacytype = required_param('legacytype', PARAM_RAW);
+
+                $legacyroles = get_legacy_roles();
+                if (!array_key_exists($legacytype, $legacyroles)) {
+                    $legacytype = '';
+                }

                if (empty($name)) {
                    $errors['name'] = get_string('errorbadrolename', 'role');
@@ -69,12 +76,19 @@
                }

                if (empty($errors)) {
-                    $newrole = create_role($name, $shortname, $description);
+                    $newroleid = create_role($name, $shortname, $description);
+
+                    // set proper legacy type
+                    if (!empty($legacytype)) {
+                        assign_capability($legacyroles[$legacytype], CAP_ALLOW, $newroleid, $sitecontext->id);
+                    }
+
                } else {
                    $newrole = new object();
-                    $newrole->name = $name;
-                    $newrole->shortname = $shortname;
+                    $newrole->name        = $name;
+                    $newrole->shortname   = $shortname;
                    $newrole->description = $description;
+                    $newrole->legacytype  = $legacytype;
                }

                $allowed_values = array(CAP_INHERIT, CAP_ALLOW, CAP_PREVENT, CAP_PROHIBIT);
@@ -84,6 +98,12 @@
                    if (!isset($data->{$cap->name})) {
                        continue;
                    }
+
+                    // legacy caps have their own selector
+                    if (islegacy($data->{$cap->name})) {
+                        continue;
+                    }
+
                    $capname = $cap->name;
                    $value = clean_param($data->{$cap->name}, PARAM_INT);
                    if (!in_array($value, $allowed_values)) {
@@ -91,21 +111,34 @@
                    }

                    if (empty($errors)) {
-                        assign_capability($capname, $value, $newrole, $sitecontext->id);
+                        assign_capability($capname, $value, $newroleid, $sitecontext->id);
                    } else {
                        $newrole->$capname = $value;
                    }
                }
+
+                // added a role sitewide...
+                mark_context_dirty($sitecontext->path);
+
                if (empty($errors)) {
+                    $rolename = get_field('role', 'name', 'id', $newroleid);
+                    add_to_log(SITEID, 'role', 'add', 'admin/roles/manage.php?action=add', $rolename, '', $USER->id);
                    redirect('manage.php');
                }
            }
+            
            break;

        case 'edit':
            if ($data = data_submitted() and confirm_sesskey()) {

                $shortname = moodle_strtolower(clean_param(clean_filename($shortname), PARAM_SAFEDIR)); // only lowercase safe ASCII characters
+                $legacytype = required_param('legacytype', PARAM_RAW);
+
+                $legacyroles = get_legacy_roles();
+                if (!array_key_exists($legacytype, $legacyroles)) {
+                    $legacytype = '';
+                }

                if (empty($name)) {
                    $errors['name'] = get_string('errorbadrolename', 'role');
@@ -126,9 +159,10 @@
                }
                if (!empty($errors)) {
                    $newrole = new object();
-                    $newrole->name = $name;
-                    $newrole->shortname = $shortname;
+                    $newrole->name        = $name;
+                    $newrole->shortname   = $shortname;
                    $newrole->description = $description;
+                    $newrole->legacytype  = $legacytype;
                }

                $allowed_values = array(CAP_INHERIT, CAP_ALLOW, CAP_PREVENT, CAP_PROHIBIT);
@@ -138,6 +172,12 @@
                    if (!isset($data->{$cap->name})) {
                        continue;
                    }
+
+                    // legacy caps have their own selector
+                    if (islegacy($data->{$cap->name}) === 0 ) {
+                        continue;
+                    }
+
                    $capname = $cap->name;
                    $value = clean_param($data->{$cap->name}, PARAM_INT);
                    if (!in_array($value, $allowed_values)) {
@@ -171,6 +211,7 @@
                            assign_capability($capname, $value, $roleid, $sitecontext->id);
                        }
                    }
+
                }

                if (empty($errors)) {
@@ -183,23 +224,47 @@
                    if (!update_record('role', $role)) {
                        error('Could not update role!');
                    }
+
+                    // set proper legacy type
+                    foreach($legacyroles as $ltype=>$lcap) {
+                        if ($ltype == $legacytype) {
+                            assign_capability($lcap, CAP_ALLOW, $roleid, $sitecontext->id);
+                        } else {
+                            unassign_capability($lcap, $roleid);
+                        } 
+                    }                    
+
+                    // edited a role sitewide...
+                    mark_context_dirty($sitecontext->path);
+                    add_to_log(SITEID, 'role', 'edit', 'admin/roles/manage.php?action=edit&roleid='.$role->id, $role->name, '', $USER->id);
+
                    redirect('manage.php');
                }
+
+                // edited a role sitewide - with errors, but still...
+                mark_context_dirty($sitecontext->path);
            }
+
            break;

        case 'delete':
            if (in_array($roleid, $defaultroles)) {
-                error('This role is used as one of the default system roles, it can not be deleted'); 
+                error('This role is used as one of the default system roles, it can not be deleted');
            }
            if ($confirm and data_submitted() and confirm_sesskey()) {
                if (!delete_role($roleid)) {
+
+                    // partially deleted a role sitewide...?
+                    mark_context_dirty($sitecontext->path);
+
                    error('Could not delete role with ID '.$roleid);
                }
+                // deleted a role sitewide...
+                mark_context_dirty($sitecontext->path);

            } else if (confirm_sesskey()){
                // show confirmation
-                admin_externalpage_print_header($adminroot);
+                admin_externalpage_print_header();
                $optionsyes = array('action'=>'delete', 'roleid'=>$roleid, 'sesskey'=>sesskey(), 'confirm'=>1);
                $a = new object();
                $a->id = $roleid;
@@ -207,7 +272,7 @@
                $a->shortname = $roles[$roleid]->shortname;
                $a->count = (int)count_records('role_assignments', 'roleid', $roleid);
                notice_yesno(get_string('deleterolesure', 'role', $a), 'manage.php', 'manage.php', $optionsyes, NULL, 'post', 'get');
-                admin_externalpage_print_footer($adminroot);
+                admin_externalpage_print_footer();
                die;
            }

@@ -243,17 +308,38 @@

            redirect('manage.php');
            break;
+
        case 'duplicate':
+            if (!array_key_exists($roleid, $roles)) {
+                redirect('manage.php');
+            }
+
+            if ($confirm and data_submitted() and confirm_sesskey()) {
+                //ok - lets duplicate!
+            } else {
+                // show confirmation
+                admin_externalpage_print_header();
+                $optionsyes = array('action'=>'duplicate', 'roleid'=>$roleid, 'sesskey'=>sesskey(), 'confirm'=>1);
+                $optionsno  = array('action'=>'view', 'roleid'=>$roleid);
+                $a = new object();
+                $a->id = $roleid;
+                $a->name = $roles[$roleid]->name;
+                $a->shortname = $roles[$roleid]->shortname;
+                notice_yesno(get_string('duplicaterolesure', 'role', $a), 'manage.php', 'manage.php', $optionsyes, $optionsno, 'post', 'get');
+                admin_externalpage_print_footer();
+                die;
+            }
+
            // duplicate current role
            $sourcerole = get_record('role','id',$roleid);
-            
+
            $fullname = $sourcerole->name;
            $shortname = $sourcerole->shortname;
            $currentfullname = "";
            $currentshortname = "";
            $counter = 0;
-            
-            // find a name for the duplicated role  
+
+            // find a name for the duplicated role
            do {
                if ($counter) {
                    $suffixfull = " ".get_string("copyasnoun")." ".$counter;
@@ -263,27 +349,72 @@
                    $suffixshort = "";
                }
                $currentfullname = $fullname.$suffixfull;
-                // Limit the size of shortname - database column accepts <= 15 chars
-                $currentshortname = substr($shortname, 0, 15 - strlen($suffixshort)).$suffixshort;
+                // Limit the size of shortname - database column accepts <= 100 chars
+                $currentshortname = substr($shortname, 0, 100 - strlen($suffixshort)).$suffixshort;
                $coursefull  = get_record("role","name",addslashes($currentfullname));
                $courseshort = get_record("role","shortname",addslashes($currentshortname));
                $counter++;
            } while ($coursefull || $courseshort);
-                
-            $description = 'duplicate of '.$fullname;    
+
+            $description = 'duplicate of '.$fullname;
            if ($newrole = create_role($currentfullname, $currentshortname, $description)) {
                // dupilcate all the capabilities
                role_cap_duplicate($sourcerole, $newrole);
-            }         
+
+                // dup'ed a role sitewide...
+                mark_context_dirty($sitecontext->path);
+
+            }
+            $rolename = get_field('role', 'name', 'id', $newrole);
+            add_to_log(SITEID, 'role', 'duplicate', 'admin/roles/manage.php?roleid='.$newrole.'&action=duplicate', $rolename, '', $USER->id);
            redirect('manage.php');
            break;
+
+        case 'reset':
+            if (!array_key_exists($roleid, $roles)) {
+                redirect('manage.php');
+            }
+
+            if ($confirm and data_submitted() and confirm_sesskey()) {
+                reset_role_capabilities($roleid);
+
+                // reset a role sitewide...
+                mark_context_dirty($sitecontext->path);
+
+                $rolename = get_field('role', 'name', 'id', $roleid);
+                add_to_log(SITEID, 'role', 'reset', 'admin/roles/manage.php?roleid='.$roleid.'&action=reset', $rolename, '', $USER->id);
+
+                redirect('manage.php?action=view&amp;roleid='.$roleid);
+
+            } else {
+                // show confirmation
+                admin_externalpage_print_header();
+                $optionsyes = array('action'=>'reset', 'roleid'=>$roleid, 'sesskey'=>sesskey(), 'confirm'=>1);
+                $optionsno  = array('action'=>'view', 'roleid'=>$roleid);
+                $a = new object();
+                $a->id = $roleid;
+                $a->name = $roles[$roleid]->name;
+                $a->shortname = $roles[$roleid]->shortname;
+                $a->legacytype = get_legacy_type($roleid);
+                if (empty($a->legacytype)) {
+                    $warning = get_string('resetrolesurenolegacy', 'role', $a);
+                } else {
+                    $warning = get_string('resetrolesure', 'role', $a);
+                }
+                notice_yesno($warning, 'manage.php', 'manage.php', $optionsyes, $optionsno, 'post', 'get');
+                admin_externalpage_print_footer();
+                die;
+            }
+
+            break;
+
        default:
            break;
    }

 /// print UI now

-    admin_externalpage_print_header($adminroot);
+    admin_externalpage_print_header('');

    $currenttab = 'manage';
    include_once('managetabs.php');
@@ -294,9 +425,10 @@
            $roleid = 0;
            if (empty($errors) or empty($newrole)) {
                $role = new object();
-                $role->name='';
-                $role->shortname='';
-                $role->description='';
+                $role->name        = '';
+                $role->shortname   = '';
+                $role->description = '';
+                $role->legacytype  = '';
            } else {
                $role = stripslashes_safe($newrole);
            }
@@ -306,6 +438,7 @@
            if(!$role = get_record('role', 'id', $roleid)) {
                error('Incorrect role ID!');
            }
+            $role->legacytype = get_legacy_type($role->id);
        }

        foreach ($roles as $rolex) {
@@ -332,18 +465,28 @@
                break;
        }

-        echo '<div align="center" class="selector">';
+        echo '<div class="selector">';
        if ($action == 'view') {
-            echo get_string('selectrole', 'role').': ';
-            echo '<form style="display:inline;" id="switchrole" action="manage.php" method="get">';
-            echo '<input type="hidden" name="action" value="view" />';
-            choose_from_menu ($roleoptions, 'roleid', $roleid, get_string('listallroles', 'role').'...', $script='switchrole.submit()');
-            echo '</form>';
-            echo '<form style="display:inline;" id="editrole" action="manage.php" method="get">';
-            echo '<input type="hidden" name="roleid" value="'.$roleid.'" />';
-            echo '<input type="hidden" name="action" value="edit" />';
-            echo '<input type="submit" value="'.get_string('edit').'" />';
-            echo '</form>';
+            popup_form('manage.php?action=view&amp;roleid=', $roleoptions, 'switchrole', $roleid, '', '', '',
+                       false, 'self', get_string('selectrole', 'role'));
+
+            echo '<div class="buttons">';
+
+            $legacytype = get_legacy_type($roleid); 
+            $options = array();
+            $options['roleid'] = $roleid;
+            $options['action'] = 'edit';
+            print_single_button('manage.php', $options, get_string('edit'));
+            $options['action'] = 'reset';
+            if (empty($legacytype)) {
+                print_single_button('manage.php', $options, get_string('resetrolenolegacy', 'role'));
+            } else {
+                print_single_button('manage.php', $options, get_string('resetrole', 'role'));
+            }
+            $options['action'] = 'duplicate';
+            print_single_button('manage.php', $options, get_string('duplicaterole', 'role'));
+            print_single_button('manage.php', null, get_string('listallroles', 'role'));
+            echo '</div>';
        }
        echo '</div>';

@@ -419,61 +562,14 @@

        $options = new object();
        $options->action = 'add';
+        echo '<div class="buttons">';
        print_single_button('manage.php', $options, get_string('addrole', 'role'), 'get');
+        echo '</div>';
    }

-    admin_externalpage_print_footer($adminroot);
+    admin_externalpage_print_footer();
    die;


-/// ================ some internal functions ====================////

-function switch_roles($first, $second) {
-    $status = true;
-    //first find temorary sortorder number
-    $tempsort = count_records('role') + 3;
-    while (get_record('role','sortorder', $tempsort)) {
-        $tempsort += 3;
-    }
-
-    $r1 = new object();
-    $r1->id = $first->id;
-    $r1->sortorder = $tempsort;
-    $r2 = new object();
-    $r2->id = $second->id;
-    $r2->sortorder = $first->sortorder;
-
-    if (!update_record('role', $r1)) {
-        debugging("Can not update role with ID $r1->id!");
-        $status = false;
-    }
-
-    if (!update_record('role', $r2)) {
-        debugging("Can not update role with ID $r2->id!");
-        $status = false;
-    }
-
-    $r1->sortorder = $second->sortorder;
-    if (!update_record('role', $r1)) {
-        debugging("Can not update role with ID $r1->id!");
-        $status = false;
-    }
-
-    return $status;
-}
-
-// duplicates all the base definitions of a role
-function role_cap_duplicate($sourcerole, $targetrole) {
-    global $CFG;
-    $systemcontext = get_context_instance(CONTEXT_SYSTEM);
-    $caps = get_records_sql("SELECT * FROM {$CFG->prefix}role_capabilities
-                             WHERE roleid = $sourcerole->id
-                             AND contextid = $systemcontext->id");                                           
-    // adding capabilities
-    foreach ($caps as $cap) {
-        unset($cap->id);
-        $cap->roleid = $targetrole;
-        insert_record('role_capabilities', $cap);
-    }  
-}
 ?>
@@ -1,7 +1,13 @@
 <?php
 // this page deals with the 2 tabs for manage.php and grant.php

-    $toprow[] = new tabobject('manage', $CFG->wwwroot.'/'.$CFG->admin.'/roles/manage.php', get_string('manageroles', 'role'),'', true);
+    if (!defined('MOODLE_INTERNAL')) {
+        die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+    }
+
+    $toprow = array();
+
+    $toprow[] = new tabobject('manage', $CFG->wwwroot.'/'.$CFG->admin.'/roles/manage.php', get_string('manageroles', 'role'));

    $toprow[] = new tabobject('allowassign', $CFG->wwwroot.'/'.$CFG->admin.'/roles/allowassign.php', get_string('allowassign', 'role'));

@@ -3,14 +3,17 @@
    $strallow = get_string('allow','role');
    $strprevent = get_string('prevent','role');
    $strprohibit = get_string('prohibit','role');
+    $strsafewarning = get_string('safeoverridenotice', 'role');
 ?>

 <form id="overrideform" action="override.php" method="post">
+    <fieldset class="invisiblefieldset">
    <input type="hidden" name="contextid" value="<?php p($contextid) ?>" />
    <input type="hidden" name="roleid" value="<?php p($roleid) ?>" />
    <input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
    <input type="hidden" name="userid" value="<?php p($userid) ?>" />
    <input type="hidden" name="courseid" value="<?php p($courseid) ?>" />
+    </fieldset>

    <table class="rolecap">
        <tr>
@@ -28,11 +31,19 @@
        $component = '';

        $strrisks = s(get_string('risks', 'role'));
-        $strcapabilities = s(get_string('capabilities', 'role'));
+        // MDL-11687
+        $strcapabilities = 'Capabilities';//s(get_string('capabilities', 'role'));

        foreach ($capabilities as $capability) {
+
+            // legacy caps should not be overriden - we must use proper capabilities if needed
+            if (islegacy($capability->name)) {
+                continue;
+            }
+
        // prints a breaker if component or name or context level
-            if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
+            //if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
+            if (component_level_changed($capability, $component, $contextlevel)) {
                echo ('<tr class="rolecapheading header"><td colspan="10" class="header"><strong>'.get_component_string($capability->component, $capability->contextlevel).'</strong></td></tr>');
            }

@@ -57,36 +68,36 @@
                $isprohibit = 0;
            }

-            $isdisabled = $isprohibit || islegacy($capability->name);
+            $isdisabled = $isprohibit || $capability->locked;

            $riskinfo = '<td class="risk managetrust">';
            $rowclasses = '';
            if (RISK_MANAGETRUST & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+                $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
                $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_managetrust.gif" alt="'.get_string('riskmanagetrustshort', 'admin').'" /></a>';
                $rowclasses .= ' riskmanagetrust';
            }
            $riskinfo .= '</td><td class="risk config">';
            if (RISK_CONFIG & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+                $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
                $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_config.gif" alt="'.get_string('riskconfigshort', 'admin').'" /></a>';
                $rowclasses .= ' riskconfig';
            }
            $riskinfo .= '</td><td class="risk xss">';
            if (RISK_XSS & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+                $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
                $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_xss.gif" alt="'.get_string('riskxssshort', 'admin').'" /></a>';
                $rowclasses .= ' riskxss';
            }
            $riskinfo .= '</td><td class="risk personal">';
            if (RISK_PERSONAL & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+                $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
                $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_personal.gif" alt="'.get_string('riskpersonalshort', 'admin').'" /></a>';
                $rowclasses .= ' riskpersonal';
            }
            $riskinfo .= '</td><td class="risk spam">';
            if (RISK_SPAM & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+                $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
                $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_spam.gif" alt="'.get_string('riskspamshort', 'admin').'" /></a>';
                $rowclasses .= ' riskspam';
            }
@@ -96,13 +107,7 @@
        ?>

        <tr class="rolecap <?php echo $rowclasses; ?>">
-             <td class="name">
-                 <span class="cap-desc">
-                    <a target="docspopup" href="<?php echo $CFG->docroot.'/'.$lang.'/'.$strcapabilities.'/'.$capability->name ?>">
-                    <?php echo get_capability_string($capability->name); ?></a>
-                 </span>
-                 <span class="cap-name"><?php echo $capability->name ?></span>
-             </td>
+             <td class="name"><span class="cap-desc"><a onclick="this.target='docspopup'" href="<?php echo $CFG->docroot.'/'.$lang.'/'.$strcapabilities.'/'.$capability->name ?>"><?php echo get_capability_string($capability->name); ?></a><span class="cap-name"><?php echo $capability->name ?></span></span></td>

             <td class="inherit">
             <input type="radio" title="<?php p($strinherit); ?>" name="<?php echo $capability->name; ?>" value="0"
@@ -134,11 +139,17 @@
            <?php echo $riskinfo; ?>
        </tr>

-        <?php } ?>
+        <?php }  ?>
    </table>
-    <br />
-    <div align="center">
+    <div class="submit buttons">
        <input type="submit" value="<?php print_string('savechanges') ?>" />
        <input type="submit" name="cancel" value="<?php print_string('cancel') ?>" />
    </div>
+
+    <?php
+    if ($safeoverridenotice) {
+        echo '<div class="sefeoverridenotice">'.$strsafewarning.'</div>';
+    }
+    ?> 
+
 </form>
@@ -2,7 +2,7 @@

    require_once('../../config.php');

-    $contextid = required_param('contextid',PARAM_INT);    // context id
+    $contextid = required_param('contextid', PARAM_INT);   // context id
    $roleid    = optional_param('roleid', 0, PARAM_INT);   // requested role id
    $userid    = optional_param('userid', 0, PARAM_INT);   // needed for user tabs
    $courseid  = optional_param('courseid', 0, PARAM_INT); // needed for user tabs
@@ -12,29 +12,36 @@
        error('Bad context ID');
    }

-    if (!$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID)) {
+    if (!$sitecontext = get_context_instance(CONTEXT_SYSTEM)) {
        error('No site ID');
    }

    if ($context->id == $sitecontext->id) {
-        error ('Can not override base role capabilities');
+        error('Can not override base role capabilities');
    }

-    require_capability('moodle/role:override', $context);   // Just to make sure
+    $canoverride = has_capability('moodle/role:override', $context);
+
+    if (!$canoverride and !has_capability('moodle/role:safeoverride', $context)) {
+        error('You do not have permission to change overrides in this context!');
+    }

    if ($courseid) {
        if (!$course = get_record('course', 'id', $courseid)) {
            error('Bad course ID');
        }
    } else {
-        $course = $SITE;
+        $course = clone($SITE);
+        $courseid = SITEID;
    }

+    require_login($course);
+
    $baseurl = 'override.php?contextid='.$context->id;
    if (!empty($userid)) {
        $baseurl .= '&amp;userid='.$userid;
    }
-    if (!empty($courseid)) {
+    if ($courseid != SITEID) {
        $baseurl .= '&amp;courseid='.$courseid;
    }

@@ -42,19 +49,21 @@
        redirect($baseurl);
    }

+/// needed for tabs.php
+    $overridableroles = get_overridable_roles($context, 'name', ROLENAME_BOTH);
+    $assignableroles  = get_assignable_roles($context, 'name', ROLENAME_BOTH);

 /// Get some language strings

    $strroletooverride = get_string('roletooverride', 'role');
-    $stroverrideusers  = get_string('overrideusers', 'role');
    $straction         = get_string('overrideroles', 'role');
    $strcurrentrole    = get_string('currentrole', 'role');
-    $strcurrentcontext = get_string('currentcontext', 'role');
    $strparticipants   = get_string('participants');

 /// Make sure this user can override that role
+
    if ($roleid) {
-        if (!user_can_override($context, $roleid)) {
+        if (!isset($overridableroles[$roleid])) {
            error ('you can not override this role in this context');
        }
    }
@@ -64,54 +73,74 @@
        $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
    }

+/// get all cababilities
+    $safeoverridenotice = false;
+    if ($roleid) {
+        if ($capabilities = fetch_context_capabilities($context)) {
+            // find out if we need to lock some capabilities
+            foreach ($capabilities as $capname=>$capability) {
+                $capabilities[$capname]->locked = false;
+                if ($canoverride) {
+                    //ok no locking at all
+                    continue;
+                }
+                //only limited safe overrides - spam only allowed
+                if ((RISK_DATALOSS & (int)$capability->riskbitmask)
+                 or (RISK_MANAGETRUST & (int)$capability->riskbitmask)
+                 or (RISK_CONFIG & (int)$capability->riskbitmask)
+                 or (RISK_XSS & (int)$capability->riskbitmask)
+                 or (RISK_PERSONAL & (int)$capability->riskbitmask)) {
+                    $capabilities[$capname]->locked = true;
+                    $safeoverridenotice = true;
+                }
+            }
+        }
+    } else {
+        $capabilities = null;
+    }
+
 /// Process incoming role override
    if ($data = data_submitted() and $roleid and confirm_sesskey()) {
        $allowed_values = array(CAP_INHERIT, CAP_ALLOW, CAP_PREVENT, CAP_PROHIBIT);
-        $capabilities = fetch_context_capabilities($context); // capabilities applicable in this context

        $localoverrides = get_records_select('role_capabilities', "roleid = $roleid AND contextid = $context->id",
                                             '', 'capability, permission, id');

        foreach ($capabilities as $cap) {
-            if (!isset($data->{$cap->name})) {
+            if ($cap->locked) {
+                //user not allowed to change this cap
                continue;
            }
+
+            if (!isset($data->{$cap->name})) {
+                //cap not specified in form
+                continue;
+            }
+
+            if (islegacy($data->{$cap->name})) {
+                continue;
+            }
+
            $capname = $cap->name;
            $value = clean_param($data->{$cap->name}, PARAM_INT);
            if (!in_array($value, $allowed_values)) {
                 continue;
            }

-            if (isset($localoverrides[$capname])) {    // Something exists, so update it
-                if ($value == CAP_INHERIT) {       // inherit = delete
-                    delete_records('role_capabilities', 'roleid', $roleid, 'contextid', $context->id,
-                                                        'capability', $capname);
-                } else {
-                    $localoverride = new object();
-                    $localoverride->id = $localoverrides[$capname]->id;
-                    $localoverride->permission = $value;
-                    $localoverride->timemodified = time();
-                    $localoverride->modifierid = $USER->id;
-                    if (!update_record('role_capabilities', $localoverride)) {
-                        error('Could not update a capability!');
-                    }
-                }
-
+            if (isset($localoverrides[$capname])) {
+                // Something exists, so update it
+                assign_capability($capname, $value, $roleid, $context->id, true);
            } else { // insert a record
                if ($value != CAP_INHERIT) {    // Ignore inherits
-                    $localoverride = new object();
-                    $localoverride->capability = $capname;
-                    $localoverride->contextid = $context->id;
-                    $localoverride->roleid = $roleid;
-                    $localoverride->permission = $value;
-                    $localoverride->timemodified = time();
-                    $localoverride->modifierid = $USER->id;
-                    if (!insert_record('role_capabilities', $localoverride)) {
-                        error('Could not insert a capability!');
-                    }
+                    assign_capability($capname, $value, $roleid, $context->id);
                }
            }
        }
+
+        // force accessinfo refresh for users visiting this context...
+        mark_context_dirty($context->path);
+        $rolename = get_field('role', 'name', 'id', $roleid);
+        add_to_log($course->id, 'role', 'override', 'admin/roles/override.php?contextid='.$context->id.'&roleid='.$roleid, $rolename, '', $USER->id);
        redirect($baseurl);
    }

@@ -119,47 +148,46 @@
 /// Print the header and tabs

    if ($context->contextlevel == CONTEXT_USER) {
-
+        $navlinks = array();
        /// course header
        if ($course->id != SITEID) {
-            print_header("$fullname", "$fullname",
-                     "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->
-                      <a href=\"$CFG->wwwroot/user/index.php?id=$course->id\">$strparticipants</a> -> <a href=\"$CFG->wwwroot/user/view.php?id=$userid&amp;course=$course->id\">$fullname</a> -> $straction",
-                      "", "", true, "&nbsp;", navmenu($course));
+            if (has_capability('moodle/course:viewparticipants', get_context_instance(CONTEXT_COURSE, $course->id))) {
+                $navlinks[] = array('name' => $strparticipants, 'link' => "$CFG->wwwroot/user/index.php?id=$course->id", 'type' => 'misc');
+            }
+            $navlinks[] = array('name' => $fullname, 'link' => "$CFG->wwwroot/user/view.php?id=$userid&amp;course=$courseid", 'type' => 'misc');
+            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
+            $navigation = build_navigation($navlinks);
+            print_header("$fullname", "$fullname", $navigation, "", "", true, "&nbsp;", navmenu($course));

        /// site header
        } else {
-            print_header("$course->fullname: $fullname", "$course->fullname",
-                        "<a href=\"$CFG->wwwroot/user/view.php?id=$userid&amp;course=$course->id\">$fullname</a> -> $straction", "", "", true, "&nbsp;", navmenu($course));
+            $navlinks[] = array('name' => $fullname, 'link' => "$CFG->wwwroot/user/view.php?id=$userid&amp;course=$courseid", 'type' => 'misc');
+            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
+            $navigation = build_navigation($navlinks);
+            print_header("$course->fullname: $fullname", $course->fullname, $navigation, "", "", true, "&nbsp;", navmenu($course));
        }
        $showroles = 1;
        $currenttab = 'override';
        include_once($CFG->dirroot.'/user/tabs.php');
    } else if ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID) {
        require_once($CFG->libdir.'/adminlib.php');
-        $adminroot = admin_get_root();
-        admin_externalpage_setup('frontpageroles', $adminroot);
-        admin_externalpage_print_header($adminroot);
-        $currenttab = '';
-        $tabsmode = 'override';
+        admin_externalpage_setup('frontpageroles', '', array('contextid' => $contextid, 'roleid' => $roleid), $CFG->wwwroot . '/' . $CFG->admin . '/roles/override.php');
+        admin_externalpage_print_header();
+        $currenttab = 'override';
        include_once('tabs.php');
    } else {
-        $currenttab = '';
-        $tabsmode = 'override';
+        $currenttab = 'override';
        include_once('tabs.php');
    }

-    print_heading_with_help(get_string('overrides', 'role'), 'overrides');
-
-    $overridableroles = get_overridable_roles($context);
+    print_heading_with_help(get_string('overridepermissionsin', 'role', print_context_name($context)), 'overrides');

    if ($roleid) {
    /// prints a form to swap roles
-        echo '<div align="center">'.$strcurrentcontext.': '.print_context_name($context).'<br/>';
-        echo $strroletooverride.': ';
-        $overridableroles = array('0'=>get_string('listallroles', 'role').'...') + $overridableroles; 
+        echo '<div class="selector">';
+        $overridableroles = array('0'=>get_string('listallroles', 'role').'...') + $overridableroles;
        popup_form("$CFG->wwwroot/$CFG->admin/roles/override.php?userid=$userid&amp;courseid=$courseid&amp;contextid=$contextid&amp;roleid=",
-            $overridableroles, 'switchrole', $roleid, '');
+            $overridableroles, 'switchrole', $roleid, '', '', '', false, 'self', $strroletooverride);
        echo '</div>';

        $parentcontexts = get_parent_contexts($context);
@@ -177,11 +205,12 @@

        $lang = str_replace('_utf8', '', current_language());

-        // Get the capabilities overrideable in this context
-        if ($capabilities = fetch_context_capabilities($context)) {
+        if (!empty($capabilities)) {
+            // Print the capabilities overrideable in this context
            print_simple_box_start('center');
-            include_once('override.html');
+            include('override.html');
            print_simple_box_end();
+
        } else {
            notice(get_string('nocapabilitiesincontext', 'role'),
                    $CFG->wwwroot.'/'.$CFG->admin.'/roles/'.$baseurl);
@@ -207,10 +236,6 @@
        print_table($table);
    }

-    if ($context->contextlevel == CONTEXT_SYSTEM or ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID)) {
-        admin_externalpage_print_footer($adminroot);
-    } else {
-        print_footer($course);
-    }
+    print_footer($course);

 ?>
@@ -1,16 +1,22 @@
 <?php // $Id$

 // Handles headers and tabs for the roles control at any level apart from SYSTEM level
+// We also assume that $currenttab, $assignableroles and $overridableroles are defined

+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+}
+
+$navlinks = array();
 if ($currenttab != 'update') {
    switch ($context->contextlevel) {

        case CONTEXT_SYSTEM:
            $stradministration = get_string('administration');
-            print_header($SITE->fullname, "$SITE->fullname","<a href=\"../index.php\">$stradministration</a> -> $straction");
-            break;
-
-        case CONTEXT_PERSONAL:
+            $navlinks[] = array('name' => $stradministration, 'link' => '../index.php', 'type' => 'misc');
+            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
+            $navigation = build_navigation($navlinks);
+            print_header($SITE->fullname, "$SITE->fullname", $navigation);
            break;

        case CONTEXT_USER:
@@ -22,18 +28,31 @@ if ($currenttab != 'update') {
            $strcategories = get_string("categories");
            $strcategory = get_string("category");
            $strcourses = get_string("courses");
-            print_header("$SITE->shortname: $category->name", "$SITE->fullname: $strcourses",
-                    "<a href=\"$CFG->wwwroot/course/index.php\">$strcategories</a> -> <a href=\"$CFG->wwwroot/course/category.php?id=$category->id\">$category->name</a> -> $straction", "", "", true);
+
+            $navlinks[] = array('name' => $strcategories,
+                                'link' => "$CFG->wwwroot/course/index.php",
+                                'type' => 'misc');
+            $navlinks[] = array('name' => $category->name,
+                                'link' => "$CFG->wwwroot/course/category.php?id=$category->id",
+                                'type' => 'misc');
+            $navigation = build_navigation($navlinks);
+
+            print_header("$SITE->shortname: $category->name", "$SITE->fullname: $strcourses", $navigation, "", "", true);
            break;

        case CONTEXT_COURSE:
            if ($context->instanceid != SITEID) {
                $streditcoursesettings = get_string("editcoursesettings");
-    
+
                $course = get_record('course', 'id', $context->instanceid);
-                print_header($streditcoursesettings, "$course->fullname",
-                        "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> $straction");
-            }                        
+
+                require_login($course);
+                $navlinks[] = array('name' => get_string('roles'),
+                                    'link' => "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=$context->id",
+                                    'type' => 'misc');
+                $navigation = build_navigation($navlinks);
+                print_header($streditcoursesettings, $course->fullname, $navigation);
+            }
            break;

        case CONTEXT_GROUP:
@@ -54,9 +73,10 @@ if ($currenttab != 'update') {
                error("The required instance of this module doesn't exist");
            }

-            $strnav = "<a href=\"$CFG->wwwroot/mod/$module->name/view.php?id=$cm->id\">$instance->name</a> ->";
-            $fullmodulename = get_string("modulename", $module->name);
-            $streditinga = get_string("editinga", "moodle", $fullmodulename);
+            require_login($course);
+
+            $fullmodulename      = get_string("modulename", $module->name);
+            $streditinga         = get_string("editinga", "moodle", $fullmodulename);
            $strmodulenameplural = get_string("modulenameplural", $module->name);

            if ($module->name == "label") {
@@ -65,10 +85,21 @@ if ($currenttab != 'update') {
                $focuscursor = "form.name";
            }

-            $COURSE = $course;
-            print_header_simple($streditinga, '',
-                    "<a href=\"$CFG->wwwroot/mod/$module->name/index.php?id=$course->id\">$strmodulenameplural</a> ->
-                    $strnav <a href=\"$CFG->wwwroot/course/mod.php?update=$cm->id&amp;sesskey=".sesskey()."\">$streditinga</a> -> $straction", $focuscursor, "", false);
+            $navlinks[] = array('name' => $strmodulenameplural,
+                                'link' => "$CFG->wwwroot/mod/$module->name/index.php?id=$course->id",
+                                'type' => 'misc');
+
+            $navlinks[] = array('name' => $instance->name,
+                                'link' => "$CFG->wwwroot/mod/$module->name/view.php?id=$cm->id",
+                                'type' => 'misc');
+
+            $navlinks[] = array('name' => $streditinga,
+                                'link' => "$CFG->wwwroot/course/mod.php?update=$cm->id&amp;sesskey=".sesskey(),
+                                'type' => 'misc');
+
+            $navigation = build_navigation($navlinks);
+
+            print_header_simple($streditinga, '', $navigation, $focuscursor, "", false);

            break;

@@ -76,26 +107,47 @@ if ($currenttab != 'update') {
            if ($blockinstance = get_record('block_instance', 'id', $context->instanceid)) {
                if ($block = get_record('block', 'id', $blockinstance->blockid)) {
                    $blockname = print_context_name($context);
-                    $navigation = $blockname. ' -> '.$straction;
+

                    switch ($blockinstance->pagetype) {
                        case 'course-view':
                            if ($course = get_record('course', 'id', $blockinstance->pageid)) {
-                                if ($course->id != SITEID) {
-                                    $navigation = "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> $navigation";
-                                }
+
+                                require_login($course);
+
+                                $navlinks[] = array('name' => $blockname, 'link' => null, 'type' => 'misc');
+                                $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
+                                $navigation = build_navigation($navlinks);
                                print_header("$straction: $blockname", $course->fullname, $navigation);
                            }
                            break;

                        case 'blog-view':
                            $strblogs = get_string('blogs','blog');
-                            $navigation = '<a href="'.$CFG->wwwroot.'/blog/index.php">'.
-                                $strblogs.'</a> -> '.$navigation;
+                            $navlinks[] = array('name' => $strblogs,
+                                                 'link' => $CFG->wwwroot.'/blog/index.php',
+                                                 'type' => 'misc');
+                            $navlinks[] = array('name' => $blockname, 'link' => null, 'type' => 'misc');
+                            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
+                            $navigation = build_navigation($navlinks);
                            print_header("$straction: $strblogs", $SITE->fullname, $navigation);
                            break;

+                        case 'tag-index':
+                            $strtags = get_string('tags');
+                            $navlinks[] = array('name' => $strtags,
+                                                 'link' => $CFG->wwwroot.'/tag/index.php',
+                                                 'type' => 'misc');
+                            $navlinks[] = array('name' => $blockname, 'link' => null, 'type' => 'misc');
+                            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
+                            $navigation = build_navigation($navlinks);
+                            print_header("$straction: $strtags", $SITE->fullname, $navigation);
+                            break;
+
                        default:
+                            $navlinks[] = array('name' => $blockname, 'link' => null, 'type' => 'misc');
+                            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
+                            $navigation = build_navigation($navlinks);
                            print_header("$straction: $blockname", $SITE->fullname, $navigation);
                            break;
                    }
@@ -104,66 +156,74 @@ if ($currenttab != 'update') {
            break;

        default:
-            error ('This is an unknown context!');
+            error ('This is an unknown context (' . $context->contextlevel . ') in admin/roles/tabs.php!');
            return false;

    }
 }


+$toprow = array();
+$inactive = array();
+$activetwo = array();
+
+
 if ($context->contextlevel != CONTEXT_SYSTEM) {    // Print tabs for anything except SYSTEM context

-    if ($context->contextlevel == CONTEXT_MODULE) { // only show update button if module?
+    if ($context->contextlevel == CONTEXT_MODULE) {  // Only show update button if module

        $toprow[] = new tabobject('update', $CFG->wwwroot.'/course/mod.php?update='.
-                       $context->instanceid.'&amp;return=true&amp;sesskey='.sesskey(), get_string('update'));
+                        $context->instanceid.'&amp;return=true&amp;sesskey='.sesskey(), get_string('settings'));

    }

-    $toprow[] = new tabobject('roles', $CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.
-                               $context->id, get_string('roles'));
-
-    if (isset($tabsmode)) {
-
-        if (!isset($assignableroles)) {
-            $assignableroles = get_assignable_roles($context);
-        }
-        if (!isset($overridableroles)) {
-            $overridableroles = get_overridable_roles($context);
-        }
-
-        if (!empty($assignableroles)) {
-            $secondrow[] = new tabobject('assign',
-                                         $CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$context->id,
-                                         get_string('assignroles', 'role'),
-                                         get_string('showallroles', 'role'),
-                                         true);
-        }
-
-        if (!empty($overridableroles)) {
-            $secondrow[] = new tabobject('override',
-                               $CFG->wwwroot.'/'.$CFG->admin.'/roles/override.php?contextid='.$context->id,
-                               get_string('overrideroles', 'role'),
-                               get_string('showallroles', 'role'),
-                               true);
-        }
-
-        $inactive[] = 'roles';
-        $activetwo = array('roles');
-        $currenttab = $tabsmode;
-
-    } else {
-        $inactive[] = '';
-        $activetwo = array();
+    if (!empty($assignableroles)) {
+        $toprow[] = new tabobject('assign',
+                        $CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$context->id,
+                        get_string('localroles', 'role'),
+                        get_string('showallroles', 'role'),
+                        true);
    }

-    if (!empty($secondrow)) {
-        $tabs = array($toprow, $secondrow);
-    } else {
-        $tabs = array($toprow);
+    if (!empty($overridableroles)) {
+        $toprow[] = new tabobject('override',
+                        $CFG->wwwroot.'/'.$CFG->admin.'/roles/override.php?contextid='.$context->id,
+                        get_string('overridepermissions', 'role'),
+                        get_string('showallroles', 'role'),
+                        true);
+    }
+
+}
+
+/// Here other core tabs should go (always calling tabs.php files)
+/// All the logic to decide what to show must be self-contained in the tabs file
+/// eg:
+/// include_once($CFG->dirroot . '/grades/tabs.php');
+
+/// Finally, we support adding some 'on-the-fly' tabs here
+/// All the logic to decide what to show must be self-cointained in the tabs file
+    if (isset($CFG->extratabs) && !empty($CFG->extratabs)) {
+        if ($extratabs = explode(',', $CFG->extratabs)) {
+            asort($extratabs);
+            foreach($extratabs as $extratab) {
+            /// Each extra tab must be one $CFG->dirroot relative file
+                if (file_exists($CFG->dirroot . '/' . $extratab)) {
+                    include_once($CFG->dirroot . '/' . $extratab);
+                }
+            }
+        }
+    }
+
+    $inactive[] = $currenttab;
+
+    $tabs = array($toprow);
+
+/// If there are any secondrow defined, let's introduce it
+    if (isset($secondrow) && is_array($secondrow) && !empty($secondrow)) {
+        $tabs[] = $secondrow;
    }

    print_tabs($tabs, $currenttab, $inactive, $activetwo);
-}
+

 ?>
@@ -5,146 +5,58 @@
 require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');

-$query = trim(stripslashes_safe(required_param('query', PARAM_NOTAGS)));  // Search string
+$query = trim(stripslashes(optional_param('query', '', PARAM_NOTAGS)));  // Search string

-$adminroot = admin_get_root();
-admin_externalpage_setup('search', $adminroot); // now hidden page
-
-$CFG->adminsearchquery = $query;  // So we can reference it in search boxes later in this invocation
+$adminroot =& admin_get_root(); // need all settings here
+$adminroot->search = $query; // So we can reference it in search boxes later in this invocation
+$statusmsg = '';
+$errormsg  = '';
+$focus = '';

+admin_externalpage_setup('search'); // now hidden page

 // now we'll deal with the case that the admin has submitted the form with changed settings
-
-$statusmsg = '';
-
-if ($data = data_submitted()) {
-    $unslashed = (array)stripslashes_recursive($data);
-    if (confirm_sesskey()) {
-        $olddbsessions = !empty($CFG->dbsessions);
-        $changedsettings = search_settings(admin_get_root(), $query);
-        $errors = '';
-
-        foreach($changedsettings as $changedsetting) {
-            if (!isset($unslashed['s_' . $changedsetting->name])) {
-                $unslashed['s_' . $changedsetting->name] = ''; // needed for checkboxes
-            }
-            $errors .= $changedsetting->write_setting($unslashed['s_' . $changedsetting->name]);
-        }
-
-        if ($olddbsessions != !empty($CFG->dbsessions)) {
-            require_logout();
-        }
-
-        if (empty($errors)) {
-            $statusmsg = get_string('changessaved');
-        } else {
-            $statusmsg = get_string('errorwithsettings', 'admin') . ' <br />' . $errors;
-        }
-    } else {
-        error(get_string('confirmsesskeybad', 'error'));
+if ($data = data_submitted() and confirm_sesskey()) {
+    if (admin_write_settings($data)) {
+        $statusmsg = get_string('changessaved');
+    }
+    $adminroot =& admin_get_root(true); //reload tree
+
+    if (!empty($adminroot->errors)) {
+        $errormsg = get_string('errorwithsettings', 'admin');
+        $firsterror = reset($adminroot->errors);
+        $focus = $firsterror->id;
    }
-    // now update $SITE - it might have been changed
-    $SITE = get_record('course', 'id', $SITE->id);
-    $COURSE = clone($SITE);
 }

 // and finally, if we get here, then there are matching settings and we have to print a form
 // to modify them
-admin_externalpage_print_header($adminroot);
+admin_externalpage_print_header($focus);

-if ($statusmsg != '') {
-    notify ($statusmsg);
+if ($errormsg !== '') {
+    notify ($errormsg);
+
+} else if ($statusmsg !== '') {
+    notify ($statusmsg, 'notifysuccess');
 }

-$resultshtml = search_settings_html(admin_get_root(), $query);
+$resultshtml = admin_search_settings_html($query); // case insensitive search only

 echo '<form action="search.php" method="post" id="adminsettings">';
-echo '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
-echo '<input type="hidden" name="query" value="' . s($query) . '" />';
+echo '<div>';
+echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
+echo '<input type="hidden" name="query" value="'.s($query).'" />';
+echo '</div>';
 echo '<fieldset>';
 echo '<div class="clearer"><!-- --></div>';
 if ($resultshtml != '') {
    echo $resultshtml;
-    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="' . get_string('savechanges','admin') . '" /></div>';
 } else {
    echo get_string('noresults','admin');
 }
 echo '</fieldset>';
 echo '</form>';

-admin_externalpage_print_footer($adminroot);
-
-
-/**
- * Find settings using a query.
- *
- * @param string &$node The node at which to start searching. Should be $ADMIN for all external calls to this function.
- * @param string $query The search string.
- * @return array An array containing admin_setting objects that match $query.
- */
-function search_settings(&$node, $query) {
-
-    if (is_a($node, 'admin_category')) {
-        $return = array();
-        $entries = array_keys($node->children);
-        foreach ($entries as $entry) {
-            $return = array_merge($return, search_settings($node->children[$entry], $query));
-        }
-        return $return;
-    }
-
-    if (is_a($node, 'admin_settingpage')) {
-        $return = array();
-        foreach ($node->settings as $setting) {
-            if (stristr($setting->name,$query) || stristr($setting->visiblename,$query) || stristr($setting->description,$query)) {
-                $return[] =& $setting;
-            }
-            unset($setting); // needed to prevent odd (imho) reference behaviour
-                             // see http://www.php.net/manual/en/language.references.whatdo.php#AEN6399
-        }
-        return $return;
-    }
-
-    return array();
-
-}
-
-function search_settings_html(&$node, $query) {
-
-    global $CFG;
-    if (is_a($node, 'admin_category')) {
-        $entries = array_keys($node->children);
-        $return = '';
-        foreach ($entries as $entry) {
-            $return .= search_settings_html($node->children[$entry], $query);
-        }
-        return $return;
-    }
-
-    if (is_a($node, 'admin_settingpage')) {
-        $foundsettings = array();
-        foreach ($node->settings as $setting) {
-            if (stristr($setting->name,$query) || stristr($setting->visiblename,$query) || stristr($setting->description,$query)) {
-                $foundsettings[] =& $setting;
-            }
-            unset($setting); // needed to prevent odd (imho) reference behaviour
-                             // see http://www.php.net/manual/en/language.references.whatdo.php#AEN6399
-        }
-        $return = '';
-        if (count($foundsettings) > 0) {
-            $return .= print_heading(get_string('searchresults','admin').' - '. '<a href="' . $CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=' . $node->name . '">' . $node->visiblename . '</a>', '', 2, 'main', true);
-            $return .= '<fieldset class="adminsettings">' . "\n";
-            foreach ($foundsettings as $foundsetting) {
-                $return .= '<div class="clearer"><!-- --></div>' . "\n";
-                $return .= highlight($query,$foundsetting->output_html());
-            }
-            $return .= '</fieldset>';
-        }
-        return $return;
-    }
-
-    return '';
-
-}
+print_footer();

 ?>
@@ -5,21 +5,56 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/blocklib.php');
 require_once($CFG->dirroot.'/'.$CFG->admin.'/pagelib.php');

-if ($site = get_site()) {
-    require_login();
+$section      = required_param('section', PARAM_SAFEDIR);
+$return       = optional_param('return','', PARAM_ALPHA);
+$adminediting = optional_param('adminedit', -1, PARAM_BOOL);
+
+/// no guest autologin
+require_login(0, false);
+
+$adminroot =& admin_get_root(); // need all settings
+$page      =& $adminroot->locate($section);
+
+if (empty($page) or !is_a($page, 'admin_settingpage')) {
+    print_error('sectionerror', 'admin', "$CFG->wwwroot/$CFG->admin/");
+    die;
 }

+if (!($page->check_access())) {
+    print_error('accessdenied', 'admin');
+    die;
+}

+/// WRITING SUBMITTED DATA (IF ANY) -------------------------------------------------------------------------------
+
+$statusmsg = '';
+$errormsg  = '';
+$focus = '';
+
+if ($data = data_submitted() and confirm_sesskey()) {
+    if (admin_write_settings($data)) {
+        $statusmsg = get_string('changessaved');
+    }
+
+    if (empty($adminroot->errors)) {
+        switch ($return) {
+            case 'site':  redirect("$CFG->wwwroot/");
+            case 'admin': redirect("$CFG->wwwroot/$CFG->admin/");
+        }
+    } else {
+        $errormsg = get_string('errorwithsettings', 'admin');
+        $firsterror = reset($adminroot->errors);
+        $focus = $firsterror->id;
+    }
+    $adminroot =& admin_get_root(true); //reload tree
+    $page      =& $adminroot->locate($section);
+}
+
+/// very hacky page setup
 page_map_class(PAGE_ADMIN, 'page_admin');
-
 $PAGE = page_create_object(PAGE_ADMIN, 0); // there must be any constant id number
-
-$section = optional_param('section', '', PARAM_ALPHAEXT);
-
-$PAGE->init_extra($section); // hack alert!
-
-$adminediting = optional_param('adminedit', -1, PARAM_BOOL);
-$return       = optional_param('return','', PARAM_ALPHA);
+$PAGE->init_extra($section);
+$CFG->pagepath = 'admin/setting/'.$section;

 if (!isset($USER->adminediting)) {
    $USER->adminediting = false;
@@ -33,87 +68,36 @@ if ($PAGE->user_allowed_editing()) {
    }
 }

-$adminroot = admin_get_root();
-
-$root = $adminroot->locate($PAGE->section);
-
-if (!is_a($root, 'admin_settingpage')) {
-    error(get_string('sectionerror', 'admin'));
-    die;
-}
-
-if (!($root->check_access())) {
-    error(get_string('accessdenied', 'admin'));
-    die;
-}
-
-$CFG->pagepath = 'admin/setting/'.$section;
-
-
-
-/// WRITING SUBMITTED DATA (IF ANY) -------------------------------------------------------------------------------
-
-$statusmsg = '';
-
-if ($data = data_submitted()) {
-    if (confirm_sesskey()) {
-        $olddbsessions = !empty($CFG->dbsessions);
-        $unslashed = (array)stripslashes_recursive($data);
-        $errors = $root->write_settings($unslashed);
-        //force logout if dbsession setting changes
-        if ($olddbsessions != !empty($CFG->dbsessions)) {
-            require_logout();
-        }
-        if (empty($errors)) {
-            switch ($return) {
-                case 'site':
-                    redirect("$CFG->wwwroot/");
-                case 'admin':
-                    redirect("$CFG->wwwroot/$CFG->admin/");
-                default:
-                    $statusmsg = get_string('changessaved');
-            }
-        } else {
-            $statusmsg = get_string('errorwithsettings', 'admin') . ' <br />' . $errors;
-        }
-    } else {
-        error(get_string('confirmsesskeybad', 'error'));
-    }
-    // now update $SITE - it might have been changed
-    $SITE = get_record('course', 'id', $SITE->id);
-    $COURSE = clone($SITE);
-}
-

 /// print header stuff ------------------------------------------------------------
-// header must be printed after the redirects and require_logout

 if (empty($SITE->fullname)) {
-    print_header();
+    print_header($page->visiblename, $page->visiblename, '', $focus);
    print_simple_box(get_string('configintrosite', 'admin'), 'center', '50%');

-    if ($statusmsg != '') {
-        notify ($statusmsg);
+    if ($errormsg !== '') {
+        notify ($errormsg);
+
+    } else if ($statusmsg !== '') {
+        notify ($statusmsg, 'notifysuccess');
    }

    // ---------------------------------------------------------------------------------------------------------------

    echo '<form action="settings.php" method="post" id="adminsettings">';
-    echo '<div class="settingsform">';
-    echo '<input type="hidden" name="section" value="' . $PAGE->section . '" />';
-    echo '<input type="hidden" name="sesskey" value="' . $USER->sesskey . '" />';
-    echo '<input type="hidden" name="return" value="' . $return . '" />';
-    print_heading($root->visiblename);
+    echo '<div class="settingsform clearfix">';
+    echo '<input type="hidden" name="section" value="'.$PAGE->section.'" />';
+    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '<input type="hidden" name="return" value="'.$return.'" />';

-    echo $root->output_html();
+    echo $page->output_html();

-    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="' . get_string('savechanges','admin') . '" /></div>';
+    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="'.get_string('savechanges','admin').'" /></div>';

    echo '</div>';
    echo '</form>';
-}

-if (!empty($SITE->fullname)) {
+} else {
    $pageblocks = blocks_setup($PAGE);

    $preferred_width_left  = bounded_number(BLOCK_L_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
@@ -121,71 +105,56 @@ if (!empty($SITE->fullname)) {
    $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]),
                                            BLOCK_R_MAX_WIDTH);

-    $PAGE->print_header();
+    $PAGE->print_header('', $focus);

    echo '<table id="layout-table"><tr>';
    $lt = (empty($THEME->layouttable)) ? array('left', 'middle', 'right') : $THEME->layouttable;
    foreach ($lt as $column) {
        switch ($column) {
            case 'left':
-    echo '<td style="width: ' . $preferred_width_left . 'px;" id="left-column">';
-    if (!empty($THEME->roundcorners)) {
-        echo '<div class="bt"><div></div></div>';
-        echo '<div class="i1"><div class="i2"><div class="i3">';
-    }
+    echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
+    print_container_start();
    blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
-    if (!empty($THEME->roundcorners)) {
-        echo '</div></div></div>';
-        echo '<div class="bb"><div></div></div>';
-    }
+    print_container_end();
    echo '</td>';
            break;
            case 'middle':
    echo '<td id="middle-column">';
-    if (!empty($THEME->roundcorners)) {
-        echo '<div class="bt"><div></div></div>';
-        echo '<div class="i1"><div class="i2"><div class="i3">';
-    }
+    print_container_start();
    echo '<a name="startofcontent"></a>';

-    if ($statusmsg != '') {
-        notify ($statusmsg);
+    if ($errormsg !== '') {
+        notify ($errormsg);
+
+    } else if ($statusmsg !== '') {
+        notify ($statusmsg, 'notifysuccess');
    }

    // ---------------------------------------------------------------------------------------------------------------

    echo '<form action="settings.php" method="post" id="adminsettings">';
-    echo '<div class="settingsform">';
-    echo '<input type="hidden" name="section" value="' . $PAGE->section . '" />';
-    echo '<input type="hidden" name="sesskey" value="' . $USER->sesskey . '" />';
-    echo '<input type="hidden" name="return" value="' . $return . '" />';
-    print_heading($root->visiblename);
+    echo '<div class="settingsform clearfix">';
+    echo '<input type="hidden" name="section" value="'.$PAGE->section.'" />';
+    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo '<input type="hidden" name="return" value="'.$return.'" />';
+    print_heading($page->visiblename);

-    echo $root->output_html();
+    echo $page->output_html();

-    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="' . get_string('savechanges','admin') . '" /></div>';
+    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="'.get_string('savechanges','admin').'" /></div>';

    echo '</div>';
    echo '</form>';

-    if (!empty($THEME->roundcorners)) {
-        echo '</div></div></div>';
-        echo '<div class="bb"><div></div></div>';
-    }
+    print_container_end();
    echo '</td>';
            break;
            case 'right':
    if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) {
-        echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">';
-        if (!empty($THEME->roundcorners)) {
-            echo '<div class="bt"><div></div></div>';
-            echo '<div class="i1"><div class="i2"><div class="i3">';
-        }
+        echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
+        print_container_start();
        blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
-        if (!empty($THEME->roundcorners)) {
-            echo '</div></div></div>';
-            echo '<div class="bb"><div></div></div>';
-        }
+        print_container_end();
        echo '</td>';
    }
            break;
@@ -2,107 +2,96 @@

 // This file defines settingpages and externalpages under the "appearance" category

-$ADMIN->add('appearance', new admin_category('themes', get_string('themes')));
-// "themesettings" settingpage
-$temp = new admin_settingpage('themesettings', get_string('themesettings', 'admin'));
-$temp->add(new admin_setting_configtext('themelist', get_string('themelist', 'admin'), get_string('configthemelist','admin'), '', PARAM_NOTAGS));
-$temp->add(new admin_setting_configcheckbox('allowuserthemes', get_string('allowuserthemes', 'admin'), get_string('configallowuserthemes', 'admin'), 0));
-$temp->add(new admin_setting_configcheckbox('allowcoursethemes', get_string('allowcoursethemes', 'admin'), get_string('configallowcoursethemes', 'admin'), 0));
-$temp->add(new admin_setting_configcheckbox('allowuserblockhiding', get_string('allowuserblockhiding', 'admin'), get_string('configallowuserblockhiding', 'admin'), 1));
-$temp->add(new admin_setting_configcheckbox('showblocksonmodpages', get_string('showblocksonmodpages', 'admin'), get_string('configshowblocksonmodpages', 'admin'), 0));
-$temp->add(new admin_setting_configcheckbox('tabselectedtofront', get_string('tabselectedtofronttext', 'admin'), get_string('tabselectedtofront', 'admin'), 0));
-$ADMIN->add('themes', $temp);
-$ADMIN->add('themes', new admin_externalpage('themeselector', get_string('themeselector','admin'), $CFG->wwwroot . '/theme/index.php'));
+if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

+    $ADMIN->add('appearance', new admin_category('themes', get_string('themes')));
+    // "themesettings" settingpage
+    $temp = new admin_settingpage('themesettings', get_string('themesettings', 'admin'));
+    $temp->add(new admin_setting_configtext('themelist', get_string('themelist', 'admin'), get_string('configthemelist','admin'), '', PARAM_NOTAGS));
+    $temp->add(new admin_setting_configcheckbox('allowuserthemes', get_string('allowuserthemes', 'admin'), get_string('configallowuserthemes', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('allowcoursethemes', get_string('allowcoursethemes', 'admin'), get_string('configallowcoursethemes', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('allowcategorythemes',  get_string('allowcategorythemes', 'admin'), get_string('configallowcategorythemes', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('allowuserblockhiding', get_string('allowuserblockhiding', 'admin'), get_string('configallowuserblockhiding', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('showblocksonmodpages', get_string('showblocksonmodpages', 'admin'), get_string('configshowblocksonmodpages', 'admin'), 0));
+    $temp->add(new admin_setting_configselect('hideactivitytypenavlink', get_string('hideactivitytypenavlink', 'admin'), get_string('confighideactivitytypenavlink', 'admin'), 0,
+    array(
+            0 => get_string('hidefromnone', 'admin'),
+            1 => get_string('hidefromstudents', 'admin'),
+            2 => get_string('hidefromall', 'admin')
+        )));
+    $ADMIN->add('themes', $temp);
+    $ADMIN->add('themes', new admin_externalpage('themeselector', get_string('themeselector','admin'), $CFG->wwwroot . '/theme/index.php'));

-// calendar
-$temp = new admin_settingpage('calendar', get_string('calendarsettings','admin'));
-$temp->add(new admin_setting_special_adminseesall());
-$temp->add(new admin_setting_configselect('calendar_startwday', get_string('configstartwday', 'admin'), get_string('helpstartofweek', 'admin'), 0, 
-array(
-        0 => get_string('sunday', 'calendar'),
-        1 => get_string('monday', 'calendar'),
-        2 => get_string('tuesday', 'calendar'),
-        3 => get_string('wednesday', 'calendar'),
-        4 => get_string('thursday', 'calendar'),
-        5 => get_string('friday', 'calendar'),
-        6 => get_string('saturday', 'calendar')
-    )));
-$temp->add(new admin_setting_special_calendar_weekend());
-$temp->add(new admin_setting_configtext('calendar_lookahead',get_string('configlookahead','admin'),get_string('helpupcominglookahead', 'admin'),21,PARAM_INT));
-$temp->add(new admin_setting_configtext('calendar_maxevents',get_string('configmaxevents','admin'),get_string('helpupcomingmaxevents', 'admin'),10,PARAM_INT));
-$ADMIN->add('appearance', $temp);
+    // calendar
+    $temp = new admin_settingpage('calendar', get_string('calendarsettings','admin'));
+    $temp->add(new admin_setting_special_adminseesall());
+    //this is hacky because we do not want to include the stuff from calendar/lib.php
+    $temp->add(new admin_setting_configselect('calendar_site_timeformat', get_string('pref_timeformat', 'calendar'),
+                                              get_string('explain_site_timeformat', 'calendar'), '0',
+                                              array('0'        => get_string('default', 'calendar'),
+                                                    '%I:%M %p' => get_string('timeformat_12', 'calendar'),
+                                                    '%H:%M'    => get_string('timeformat_24', 'calendar'))));
+    $temp->add(new admin_setting_configselect('calendar_startwday', get_string('configstartwday', 'admin'), get_string('helpstartofweek', 'admin'), 0,
+    array(
+            0 => get_string('sunday', 'calendar'),
+            1 => get_string('monday', 'calendar'),
+            2 => get_string('tuesday', 'calendar'),
+            3 => get_string('wednesday', 'calendar'),
+            4 => get_string('thursday', 'calendar'),
+            5 => get_string('friday', 'calendar'),
+            6 => get_string('saturday', 'calendar')
+        )));
+    $temp->add(new admin_setting_special_calendar_weekend());
+    $temp->add(new admin_setting_configtext('calendar_lookahead',get_string('configlookahead','admin'),get_string('helpupcominglookahead', 'admin'),21,PARAM_INT));
+    $temp->add(new admin_setting_configtext('calendar_maxevents',get_string('configmaxevents','admin'),get_string('helpupcomingmaxevents', 'admin'),10,PARAM_INT));
+    $temp->add(new admin_setting_configcheckbox('enablecalendarexport', get_string('enablecalendarexport', 'admin'), get_string('configenablecalendarexport','admin'), 1));
+    $temp->add(new admin_setting_configtext('calendar_exportsalt', get_string('calendarexportsalt','admin'), get_string('configcalendarexportsalt', 'admin'), random_string(60)));
+    $ADMIN->add('appearance', $temp);

-// "filtersettings" settingpage
-$temp = new admin_settingpage('filtersettings', get_string('filtersettings', 'admin'));
-$temp->add(new admin_setting_configselect('cachetext', get_string('cachetext', 'admin'), get_string('configcachetext', 'admin'), 60, array(604800 => get_string('numdays','',7),
-                                                                                                                                       86400 => get_string('numdays','',1),
-                                                                                                                                       43200 => get_string('numhours','',12),
-                                                                                                                                       10800 => get_string('numhours','',3),
-                                                                                                                                       7200 => get_string('numhours','',2),
-                                                                                                                                       3600 => get_string('numhours','',1),
-                                                                                                                                       2700 => get_string('numminutes','',45),
-                                                                                                                                       1800 => get_string('numminutes','',30),
-                                                                                                                                       900 => get_string('numminutes','',15),
-                                                                                                                                       600 => get_string('numminutes','',10),
-                                                                                                                                       540 => get_string('numminutes','',9),
-                                                                                                                                       480 => get_string('numminutes','',8),
-                                                                                                                                       420 => get_string('numminutes','',7),
-                                                                                                                                       360 => get_string('numminutes','',6),
-                                                                                                                                       300 => get_string('numminutes','',5),
-                                                                                                                                       240 => get_string('numminutes','',4),
-                                                                                                                                       180 => get_string('numminutes','',3),
-                                                                                                                                       120 => get_string('numminutes','',2),
-                                                                                                                                       60 => get_string('numminutes','',1),
-                                                                                                                                       30 => get_string('numseconds','',30),
-                                                                                                                                       0 => get_string('no'))));
-$temp->add(new admin_setting_configselect('filteruploadedfiles', get_string('filteruploadedfiles', 'admin'), get_string('configfilteruploadedfiles', 'admin'), 0, array('0' => get_string('none'),
-                                                                                                                                                                     '1' => get_string('allfiles'),
-                                                                                                                                                                        '2' => get_string('htmlfilesonly'))));
-$temp->add(new admin_setting_configcheckbox('filtermatchoneperpage', get_string('filtermatchoneperpage', 'admin'), get_string('configfiltermatchoneperpage', 'admin'), 0));
-$temp->add(new admin_setting_configcheckbox('filtermatchonepertext', get_string('filtermatchonepertext', 'admin'), get_string('configfiltermatchonepertext', 'admin'), 0));
-$temp->add(new admin_setting_configcheckbox('filterall', get_string('filterall', 'admin'), get_string('configfilterall', 'admin'), 0));
-$ADMIN->add('appearance', $temp);
+    // "htmleditor" settingpage
+    $temp = new admin_settingpage('htmleditor', get_string('htmleditor', 'admin'));
+    $temp->add(new admin_setting_configcheckbox('htmleditor', get_string('usehtmleditor', 'admin'), get_string('confightmleditor','admin'), 1));
+    $temp->add(new admin_setting_configtext('editorbackgroundcolor', get_string('editorbackgroundcolor', 'admin'), get_string('edhelpbgcolor'), '#ffffff', PARAM_NOTAGS));
+    $temp->add(new admin_setting_configtext('editorfontfamily', get_string('editorfontfamily', 'admin'), get_string('edhelpfontfamily'), 'Trebuchet MS,Verdana,Arial,Helvetica,sans-serif', PARAM_NOTAGS));
+    $temp->add(new admin_setting_configtext('editorfontsize', get_string('editorfontsize', 'admin'), get_string('edhelpfontsize'), '', PARAM_NOTAGS));
+    $temp->add(new admin_setting_special_editorfontlist());
+    $temp->add(new admin_setting_configcheckbox('editorkillword', get_string('editorkillword', 'admin'), get_string('edhelpcleanword'), 1));
+    if (!empty($CFG->aspellpath)) { // make aspell settings disappear if path isn't set
+      $temp->add(new admin_setting_configcheckbox('editorspelling', get_string('editorspelling', 'admin'), get_string('editorspellinghelp', 'admin'), 0));
+      $temp->add(new admin_setting_special_editordictionary());
+    }
+    $temp->add(new admin_setting_special_editorhidebuttons());
+    $temp->add(new admin_setting_emoticons());
+    $ADMIN->add('appearance', $temp);

+    // "htmlsettings" settingpage
+    $temp = new admin_settingpage('htmlsettings', get_string('htmlsettings', 'admin'));
+    $temp->add(new admin_setting_configcheckbox('formatstringstriptags', get_string('stripalltitletags', 'admin'), get_string('configstripalltitletags', 'admin'), 1));
+    $ADMIN->add('appearance', $temp);

+    // "documentation" settingpage
+    $temp = new admin_settingpage('documentation', get_string('moodledocs'));
+    $temp->add(new admin_setting_configtext('docroot', get_string('docroot', 'admin'), get_string('configdocroot', 'admin'), 'http://docs.moodle.org', PARAM_URL));
+    $temp->add(new admin_setting_configcheckbox('doctonewwindow', get_string('doctonewwindow', 'admin'), get_string('configdoctonewwindow', 'admin'), 0));
+    $ADMIN->add('appearance', $temp);

+    $temp = new admin_settingpage('mymoodle', get_string('mymoodle', 'admin'));
+    $temp->add(new admin_setting_configcheckbox('mymoodleredirect', get_string('mymoodleredirect', 'admin'), get_string('configmymoodleredirect', 'admin'), 0));
+    $ADMIN->add('appearance', $temp);

+    // new CFG variable for coursemanager (what roles to display)
+    $temp = new admin_settingpage('coursemanager', get_string('coursemanager', 'admin'));
+    $temp->add(new admin_setting_special_coursemanager());
+    $ADMIN->add('appearance', $temp);

-// "htmleditor" settingpage
-$temp = new admin_settingpage('htmleditor', get_string('htmleditor', 'admin'));
-$temp->add(new admin_setting_configcheckbox('htmleditor', get_string('usehtmleditor', 'admin'), get_string('confightmleditor','admin'), 1));
-$temp->add(new admin_setting_configtext('editorbackgroundcolor', get_string('editorbackgroundcolor', 'admin'), get_string('edhelpbgcolor'), '#ffffff', PARAM_NOTAGS));
-$temp->add(new admin_setting_configtext('editorfontfamily', get_string('editorfontfamily', 'admin'), get_string('edhelpfontfamily'), 'Trebuchet MS,Verdana,Arial,Helvetica,sans-serif', PARAM_NOTAGS));
-$temp->add(new admin_setting_configtext('editorfontsize', get_string('editorfontsize', 'admin'), get_string('edhelpfontsize'), '', PARAM_NOTAGS));
-$temp->add(new admin_setting_special_editorfontlist());
-$temp->add(new admin_setting_configcheckbox('editorkillword', get_string('editorkillword', 'admin'), get_string('edhelpcleanword'), 1));
-if (!empty($CFG->aspellpath)) { // make aspell settings disappear if path isn't set
-  $temp->add(new admin_setting_configcheckbox('editorspelling', get_string('editorspelling', 'admin'), get_string('editorspellinghelp', 'admin'), 0));
-  $temp->add(new admin_setting_special_editordictionary());
-}
-$temp->add(new admin_setting_special_editorhidebuttons());
-$ADMIN->add('appearance', $temp);
+    $temp = new admin_settingpage('ajax', get_string('ajaxuse'));
+    $temp->add(new admin_setting_configcheckbox('enableajax', get_string('enableajax', 'admin'), get_string('configenableajax', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('disablecourseajax', get_string('disablecourseajax', 'admin'), get_string('configdisablecourseajax', 'admin'),
+                                                isset($CFG->disablecourseajax) ? 1 : empty($CFG->enableajax)));
+    $ADMIN->add('appearance', $temp);

-// "documentation" settingpage
-$temp = new admin_settingpage('documentation', get_string('moodledocs'));
-$temp->add(new admin_setting_configtext('docroot', get_string('docroot', 'admin'), get_string('configdocroot', 'admin'), 'http://docs.moodle.org', PARAM_URL));
-$temp->add(new admin_setting_configcheckbox('doctonewwindow', get_string('doctonewwindow', 'admin'), get_string('configdoctonewwindow', 'admin'), 0));
-$ADMIN->add('appearance', $temp);
-
-$temp = new admin_settingpage('mymoodle', get_string('mymoodle', 'admin'));
-$temp->add(new admin_setting_configcheckbox('mymoodleredirect', get_string('mymoodleredirect', 'admin'), get_string('configmymoodleredirect', 'admin'), 0));
-$ADMIN->add('appearance', $temp);
-
-// new CFG variable for gradebook (what roles to display)
-$temp = new admin_settingpage('gradebook', get_string('gradebook', 'admin'));
-$temp->add(new admin_setting_special_gradebookroles());
-$ADMIN->add('appearance', $temp);
-
-// new CFG variable for coursemanager (what roles to display)
-$temp = new admin_settingpage('coursemanager', get_string('coursemanager', 'admin'));
-$temp->add(new admin_setting_special_coursemanager());
-$ADMIN->add('appearance', $temp);
-
-$ADMIN->add('appearance', new admin_externalpage('stickyblocks', get_string('stickyblocks', 'admin'), "$CFG->wwwroot/$CFG->admin/stickyblocks.php"));
+    // link to tag management interface
+    $ADMIN->add('appearance', new admin_externalpage('managetags', get_string('managetags', 'tag'), "$CFG->wwwroot/tag/manage.php"));

+} // end of speedup
 ?>
@@ -2,49 +2,73 @@

 // This file defines settingpages and externalpages under the "courses" category

+if ($hassiteconfig
+ or has_capability('moodle/site:backup', $systemcontext)
+ or has_capability('moodle/category:manage', $systemcontext)
+ or has_capability('moodle/course:create', $systemcontext)
+ or has_capability('moodle/site:approvecourse', $systemcontext)) { // speedup for non-admins, add all caps used on this page

-$ADMIN->add('courses', new admin_externalpage('coursemgmt', get_string('coursemgmt', 'admin'), $CFG->wwwroot . '/course/index.php?categoryedit=on'));
+    $ADMIN->add('courses', new admin_externalpage('coursemgmt', get_string('coursemgmt', 'admin'), $CFG->wwwroot . '/course/index.php?categoryedit=on',
+            array('moodle/category:manage', 'moodle/course:create')));

-$ADMIN->add('courses', new admin_externalpage('enrolment', get_string('enrolments'), $CFG->wwwroot . '/'.$CFG->admin.'/enrol.php'));
+    $ADMIN->add('courses', new admin_enrolment_page());

-// "courserequests" settingpage
-$temp = new admin_settingpage('courserequest', get_string('courserequest'));
-$temp->add(new admin_setting_configcheckbox('enablecourserequests', get_string('enablecourserequests', 'admin'), get_string('configenablecourserequests', 'admin'), 0));
-require_once($CFG->dirroot.'/course/lib.php');
-$temp->add(new admin_setting_configselect('defaultrequestcategory', get_string('defaultrequestcategory', 'admin'), get_string('configdefaultrequestcategory', 'admin'), 1, make_categories_options()));
-$ADMIN->add('courses', $temp);
+    // "courserequests" settingpage
+    $temp = new admin_settingpage('courserequest', get_string('courserequest'));
+    $temp->add(new admin_setting_configcheckbox('enablecourserequests', get_string('enablecourserequests', 'admin'), get_string('configenablecourserequests', 'admin'), 0));
+    $temp->add(new admin_settings_coursecat_select('defaultrequestcategory', get_string('defaultrequestcategory', 'admin'), get_string('configdefaultrequestcategory', 'admin'), 1));
+    $temp->add(new admin_setting_users_with_capability('courserequestnotify', get_string('courserequestnotify', 'admin'), get_string('configcourserequestnotify2', 'admin'), array(), 'moodle/site:approvecourse'));
+    $ADMIN->add('courses', $temp);

+    // Pending course requests.
+    if (!empty($CFG->enablecourserequests)) {
+        $ADMIN->add('courses', new admin_externalpage('coursespending', get_string('pendingrequests'),
+                $CFG->wwwroot . '/course/pending.php', array('moodle/site:approvecourse')));
+    }

+    // "backups" settingpage
+    if (!empty($CFG->backup_version)) {
+        $bi = array();
+        $bi[] = new admin_setting_configcheckbox('backup_sche_modules', get_string('includemodules'), get_string('backupincludemoduleshelp'), 0);
+        $bi[] = new admin_setting_configcheckbox('backup_sche_withuserdata', get_string('includemoduleuserdata'), get_string('backupincludemoduleuserdatahelp'), 0);
+        $bi[] = new admin_setting_configcheckbox('backup_sche_metacourse', get_string('metacourse'), get_string('backupmetacoursehelp'), 0);
+        $bi[] = new admin_setting_configselect('backup_sche_users', get_string('users'), get_string('backupusershelp'),
+                                               0, array(0 => get_string('all'), 1 => get_string('course')));
+        $bi[] = new admin_setting_configcheckbox('backup_sche_logs', get_string('logs'), get_string('backuplogshelp'), 0);
+        $bi[] = new admin_setting_configcheckbox('backup_sche_userfiles', get_string('userfiles'), get_string('backupuserfileshelp'), 0);
+        $bi[] = new admin_setting_configcheckbox('backup_sche_coursefiles', get_string('coursefiles'), get_string('backupcoursefileshelp'), 0);
+        $bi[] = new admin_setting_configcheckbox('backup_sche_sitefiles', get_string('sitefiles'), get_string('backupsitefileshelp'), 0);
+        $bi[] = new admin_setting_configcheckbox('backup_sche_gradebook_history', get_string('gradebookhistories', 'grades'), get_string('backupgradebookhistoryhelp'), 0);
+        $bi[] = new admin_setting_configcheckbox('backup_sche_messages', get_string('messages', 'message'), get_string('backupmessageshelp','message'), 0);
+        $bi[] = new admin_setting_configcheckbox('backup_sche_blogs', get_string('blogs', 'blog'), get_string('backupblogshelp','blog'), 0);
+        $bi[] = new admin_setting_configselect('backup_sche_keep', get_string('keep'),
+                                               get_string('backupkeephelp'), 1, array(0 => get_string('all'), 1 => '1',
+                                                                                                              2 => '2',
+                                                                                                              5 => '5',
+                                                                                                              10 => '10',
+                                                                                                              20 => '20',
+                                                                                                              30 => '30',
+                                                                                                              40 => '40',
+                                                                                                              50 => '50',
+                                                                                                              100 => '100',
+                                                                                                              200 => '200',
+                                                                                                              300 => '300',
+                                                                                                              400 => '400',
+                                                                                                              500 => '500'));
+        $bi[] = new admin_setting_configcheckbox('backup_sche_active', get_string('active'), get_string('backupactivehelp'), 0);
+        $bi[] = new admin_setting_special_backupdays();
+        $bi[] = new admin_setting_configtime('backup_sche_hour', 'backup_sche_minute', get_string('executeat'),
+                                             get_string('backupexecuteathelp'), array('h' => 0, 'm' => 0));
+        $bi[] = new admin_setting_configdirectory('backup_sche_destination', get_string('saveto'), get_string('backupsavetohelp'), '');

-// "backups" settingpage
-$temp = new admin_settingpage('backups', get_string('backups','admin'));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_modules', get_string('includemodules'), get_string('backupincludemoduleshelp'), 0));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_withuserdata', get_string('includemoduleuserdata'), get_string('backupincludemoduleuserdatahelp'), 0));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_metacourse', get_string('metacourse'), get_string('backupmetacoursehelp'), 0));
-$temp->add(new admin_setting_backupselect('backup_sche_users', get_string('users'), get_string('backupusershelp'), 0, array(0 => get_string('all'),
-                                                                                                                            1 => get_string('course'))));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_logs', get_string('logs'), get_string('backuplogshelp'), 0));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_userfiles', get_string('userfiles'), get_string('backupuserfileshelp'), 0));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_coursefiles', get_string('coursefiles'), get_string('backupcoursefileshelp'), 0));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_messages', get_string('messages', 'message'), get_string('backupmessageshelp','message'), 0));
-$temp->add(new admin_setting_backupselect('backup_sche_keep', get_string('keep'), get_string('backupkeephelp'), 1, array(0 => get_string('all'),
-                                                                                                                         1 => '1',
-                                                                                                                         2 => '2',
-                                                                                                                         5 => '5',
-                                                                                                                         10 => '10',
-                                                                                                                         20 => '20',
-                                                                                                                         30 => '30',
-                                                                                                                         40 => '40',
-                                                                                                                         50 => '50',
-                                                                                                                         100 => '100',
-                                                                                                                         200 => '200',
-                                                                                                                         300 => '300',
-                                                                                                                         400 => '400',
-                                                                                                                         500 => '500')));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_active', get_string('active'), get_string('backupactivehelp'), 0));
-$temp->add(new admin_setting_special_backupdays());
-$temp->add(new admin_setting_special_backuptime());
-$temp->add(new admin_setting_special_backupsaveto());
-$ADMIN->add('courses', $temp);
+        $temp = new admin_settingpage('backups', get_string('backups','admin'), 'moodle/site:backup');
+        foreach ($bi as $backupitem) {
+            $backupitem->plugin = 'backup';
+            $temp->add($backupitem);
+        }
+        $ADMIN->add('courses', $temp);
+    }
+
+} // end of speedup

 ?>
@@ -4,42 +4,80 @@

 if (get_site()) { //do not use during installation
    $frontpagecontext = get_context_instance(CONTEXT_COURSE, SITEID);
-    $frontpagecontextid = $frontpagecontext->id; 
-} else {
-    $frontpagecontext = NULL;
-    $frontpagecontextid = 0; 
+
+    if ($hassiteconfig or has_any_capability(array(
+            'moodle/course:update',
+            'moodle/role:assign',
+            'moodle/site:restore',
+            'moodle/site:backup',
+            'moodle/course:managefiles',
+            'moodle/question:add',
+            'moodle/question:editmine',
+            'moodle/question:editall',
+            'moodle/question:viewmine',
+            'moodle/question:viewall',
+            'moodle/question:movemine',
+            'moodle/question:moveall'), $frontpagecontext)) {
+
+        // "frontpage" settingpage
+        $temp = new admin_settingpage('frontpagesettings', get_string('frontpagesettings','admin'), 'moodle/course:update', false, $frontpagecontext);
+        $temp->add(new admin_setting_sitesettext('fullname', get_string('fullsitename'), '', NULL)); // no default
+        $temp->add(new admin_setting_sitesettext('shortname', get_string('shortsitename'), '', NULL)); // no default
+        $temp->add(new admin_setting_special_frontpagedesc());
+        $temp->add(new admin_setting_courselist_frontpage(false)); // non-loggedin version of the setting (that's what the parameter is for :) )
+        $temp->add(new admin_setting_courselist_frontpage(true)); // loggedin version of the setting
+        
+        $options = array();
+        $options[] = get_string('unlimited');
+        for ($i=1; $i<100; $i++) {
+            $options[$i] = $i;
+        }
+        $temp->add(new admin_setting_configselect('maxcategorydepth', get_string('configsitemaxcategorydepth','admin'), get_string('configsitemaxcategorydepthhelp','admin'), 0, $options));
+        
+        $temp->add(new admin_setting_sitesetcheckbox('numsections', get_string('sitesection'), get_string('sitesectionhelp','admin'), 1));
+        $temp->add(new admin_setting_sitesetselect('newsitems', get_string('newsitemsnumber'), '', 3,
+             array('0' => '0',
+                   '1' => '1',
+                   '2' => '2',
+                   '3' => '3',
+                   '4' => '4',
+                   '5' => '5',
+                   '6' => '6',
+                   '7' => '7',
+                   '8' => '8',
+                   '9' => '9',
+                   '10' => '10')));
+        $temp->add(new admin_setting_configtext('coursesperpage', get_string('coursesperpage', 'admin'), get_string('configcoursesperpage', 'admin'), 20, PARAM_INT));
+        $temp->add(new admin_setting_configcheckbox('allowvisiblecoursesinhiddencategories', get_string('allowvisiblecoursesinhiddencategories', 'admin'), get_string('configvisiblecourses', 'admin'), 0));
+
+        // front page default role
+        $roleoptions = array(0=>get_string('none')); // roles to choose from
+        if ($roles = get_all_roles()) {
+            foreach ($roles as $role) {
+                $roleoptions[$role->id] = strip_tags(format_string($role->name, true));
+            }
+        }
+        $temp->add(new admin_setting_configselect('defaultfrontpageroleid', get_string('frontpagedefaultrole', 'admin'), '', 0, $roleoptions));
+
+        $ADMIN->add('frontpage', $temp);
+
+        $ADMIN->add('frontpage', new admin_externalpage('frontpageroles', get_string('frontpageroles', 'admin'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=" . $frontpagecontext->id, 'moodle/role:assign', false, $frontpagecontext));
+
+        $ADMIN->add('frontpage', new admin_externalpage('frontpagebackup', get_string('frontpagebackup', 'admin'), $CFG->wwwroot.'/backup/backup.php?id='.SITEID, 'moodle/site:backup', false, $frontpagecontext));
+
+        $ADMIN->add('frontpage', new admin_externalpage('frontpagerestore', get_string('frontpagerestore', 'admin'), $CFG->wwwroot.'/files/index.php?id='.SITEID.'&amp;wdir=/backupdata', 'moodle/site:restore', false, $frontpagecontext));
+
+        $questioncapabilites = array(
+                'moodle/question:add',
+                'moodle/question:editmine',
+                'moodle/question:editall',
+                'moodle/question:viewmine',
+                'moodle/question:viewall',
+                'moodle/question:movemine',
+                'moodle/question:moveall');
+        $ADMIN->add('frontpage', new admin_externalpage('frontpagequestions', get_string('frontpagequestions', 'admin'), $CFG->wwwroot.'/question/edit.php?courseid='.SITEID, $questioncapabilites, false, $frontpagecontext));
+
+        $ADMIN->add('frontpage', new admin_externalpage('sitefiles', get_string('sitefiles'), $CFG->wwwroot . '/files/index.php?id=' . SITEID, 'moodle/course:managefiles', false, $frontpagecontext));
+    }
 }
-
-// "frontpage" settingpage
-$temp = new admin_settingpage('frontpagesettings', get_string('frontpagesettings','admin'), 'moodle/course:update', false, $frontpagecontext);
-$temp->add(new admin_setting_sitesettext('fullname', get_string('fullsitename'), '', ''));
-$temp->add(new admin_setting_sitesettext('shortname', get_string('shortsitename'), '', ''));
-$temp->add(new admin_setting_special_frontpagedesc());
-$temp->add(new admin_setting_courselist_frontpage(false)); // non-loggedin version of the setting (that's what the parameter is for :) )
-$temp->add(new admin_setting_courselist_frontpage(true)); // loggedin version of the setting
-$temp->add(new admin_setting_sitesetcheckbox('numsections', get_string('sitesection'), get_string('sitesectionhelp','admin'), 1));
-$temp->add(new admin_setting_sitesetselect('newsitems', get_string('newsitemsnumber'), '', 3,
-     array('0' => '0',
-           '1' => '1',
-           '2' => '2',
-           '3' => '3',
-           '4' => '4',
-           '5' => '5',
-           '6' => '6',
-           '7' => '7',
-           '8' => '8',
-           '9' => '9',
-           '10' => '10')));
-$temp->add(new admin_setting_configtext('coursesperpage', get_string('coursesperpage', 'admin'), get_string('configcoursesperpage', 'admin'), 20, PARAM_INT));
-$temp->add(new admin_setting_configcheckbox('allowvisiblecoursesinhiddencategories', get_string('allowvisiblecoursesinhiddencategories', 'admin'), get_string('configvisiblecourses', 'admin'), 0));
-$ADMIN->add('frontpage', $temp);
-
-$ADMIN->add('frontpage', new admin_externalpage('frontpageroles', get_string('frontpageroles', 'admin'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=" . $frontpagecontextid, 'moodle/role:assign', false, $frontpagecontext));
-
-$ADMIN->add('frontpage', new admin_externalpage('frontpagebackup', get_string('frontpagebackup', 'admin'), $CFG->wwwroot.'/backup/backup.php?id='.SITEID, 'moodle/site:backup', false, $frontpagecontext));
-
-$ADMIN->add('frontpage', new admin_externalpage('frontpagerestore', get_string('frontpagerestore', 'admin'), $CFG->wwwroot.'/files/index.php?id='.SITEID.'&amp;wdir=/backupdata', 'moodle/site:restore', false, $frontpagecontext));
-
-$ADMIN->add('frontpage', new admin_externalpage('sitefiles', get_string('sitefiles'), $CFG->wwwroot . '/files/index.php?id=' . SITEID, 'moodle/course:managefiles', false, $frontpagecontext));
-
-?>
+?>
@@ -0,0 +1,201 @@
+<?php // $Id$
+
+// This file defines settingpages and externalpages under the "grades" section
+
+if (has_capability('moodle/grade:manage', $systemcontext)
+ or has_capability('moodle/grade:manageletters', $systemcontext)) { // speedup for non-admins, add all caps used on this page
+
+    require_once $CFG->libdir.'/grade/constants.php';
+    $display_types = array(GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
+                           GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
+                           GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades'),
+                           GRADE_DISPLAY_TYPE_REAL_PERCENTAGE => get_string('realpercentage', 'grades'),
+                           GRADE_DISPLAY_TYPE_REAL_LETTER => get_string('realletter', 'grades'),
+                           GRADE_DISPLAY_TYPE_LETTER_REAL => get_string('letterreal', 'grades'),
+                           GRADE_DISPLAY_TYPE_LETTER_PERCENTAGE => get_string('letterpercentage', 'grades'),
+                           GRADE_DISPLAY_TYPE_PERCENTAGE_LETTER => get_string('percentageletter', 'grades'),
+                           GRADE_DISPLAY_TYPE_PERCENTAGE_REAL => get_string('percentagereal', 'grades')
+                           );
+    asort($display_types);
+
+    // General settings
+
+    $temp = new admin_settingpage('gradessettings', get_string('generalsettings', 'grades'), 'moodle/grade:manage');
+    if ($ADMIN->fulltree) {
+
+        // new CFG variable for gradebook (what roles to display)
+        $temp->add(new admin_setting_special_gradebookroles());
+
+        // enable outcomes checkbox
+        $temp->add(new admin_setting_configcheckbox('enableoutcomes', get_string('enableoutcomes', 'grades'), get_string('configenableoutcomes', 'grades'), 0, PARAM_INT));
+
+        $temp->add(new admin_setting_grade_profilereport());
+
+        $temp->add(new admin_setting_configselect('grade_aggregationposition', get_string('aggregationposition', 'grades'),
+                                                  get_string('configaggregationposition', 'grades'), GRADE_REPORT_AGGREGATION_POSITION_LAST,
+                                                  array(GRADE_REPORT_AGGREGATION_POSITION_FIRST => get_string('positionfirst', 'grades'),
+                                                        GRADE_REPORT_AGGREGATION_POSITION_LAST => get_string('positionlast', 'grades'))));
+
+        $temp->add(new admin_setting_regradingcheckbox('grade_includescalesinaggregation', get_string('includescalesinaggregation', 'grades'), get_string('configincludescalesinaggregation', 'grades'), 1));
+
+        $temp->add(new admin_setting_configcheckbox('grade_hiddenasdate', get_string('hiddenasdate', 'grades'), get_string('confighiddenasdate', 'grades'), 0));
+
+        // enable publishing in exports/imports
+        $temp->add(new admin_setting_configcheckbox('gradepublishing', get_string('gradepublishing', 'grades'), get_string('configgradepublishing', 'grades'), 0));
+
+        $temp->add(new admin_setting_configselect('grade_export_displaytype', get_string('gradeexportdisplaytype', 'grades'),
+                                                  get_string('configgradeexportdisplaytype', 'grades'), GRADE_DISPLAY_TYPE_REAL, $display_types));
+
+        $temp->add(new admin_setting_configselect('grade_export_decimalpoints', get_string('gradeexportdecimalpoints', 'grades'),
+                                                  get_string('configexportdecimalpoints', 'grades'), 2,
+                                                  array( '0' => '0',
+                                                         '1' => '1',
+                                                         '2' => '2',
+                                                         '3' => '3',
+                                                         '4' => '4',
+                                                         '5' => '5')));
+
+        $temp->add(new admin_setting_special_gradeexport());
+    }
+    $ADMIN->add('grades', $temp);
+
+    /// Grade category settings
+    $temp = new admin_settingpage('gradecategorysettings', get_string('gradecategorysettings', 'grades'), 'moodle/grade:manage');
+    if ($ADMIN->fulltree) {
+        $temp->add(new admin_setting_configcheckbox('grade_hideforcedsettings', get_string('hideforcedsettings', 'grades'), get_string('confighideforcedsettings', 'grades'), '1'));
+
+        $strnoforce = get_string('noforce', 'grades');
+
+        // Aggregation type
+        $options = array(GRADE_AGGREGATE_MEAN            =>get_string('aggregatemean', 'grades'),
+                         GRADE_AGGREGATE_WEIGHTED_MEAN   =>get_string('aggregateweightedmean', 'grades'),
+                         GRADE_AGGREGATE_WEIGHTED_MEAN2  =>get_string('aggregateweightedmean2', 'grades'),
+                         GRADE_AGGREGATE_EXTRACREDIT_MEAN=>get_string('aggregateextracreditmean', 'grades'),
+                         GRADE_AGGREGATE_MEDIAN          =>get_string('aggregatemedian', 'grades'),
+                         GRADE_AGGREGATE_MIN             =>get_string('aggregatemin', 'grades'),
+                         GRADE_AGGREGATE_MAX             =>get_string('aggregatemax', 'grades'),
+                         GRADE_AGGREGATE_MODE            =>get_string('aggregatemode', 'grades'),
+                         GRADE_AGGREGATE_SUM             =>get_string('aggregatesum', 'grades'));
+        $defaults = array('value'=>GRADE_AGGREGATE_WEIGHTED_MEAN2, 'forced'=>false, 'adv'=>false);
+        $temp->add(new admin_setting_gradecat_combo('grade_aggregation', get_string('aggregation', 'grades'), get_string('aggregationhelp', 'grades'), $defaults, $options));
+
+        $options = array(0 => get_string('no'), 1 => get_string('yes'));
+
+        $defaults = array('value'=>1, 'forced'=>false, 'adv'=>true);
+        $temp->add(new admin_setting_gradecat_combo('grade_aggregateonlygraded', get_string('aggregateonlygraded', 'grades'),
+                    get_string('aggregateonlygradedhelp', 'grades'), $defaults, $options));
+        $defaults = array('value'=>0, 'forced'=>false, 'adv'=>true);
+        $temp->add(new admin_setting_gradecat_combo('grade_aggregateoutcomes', get_string('aggregateoutcomes', 'grades'),
+                    get_string('aggregateoutcomeshelp', 'grades'), $defaults, $options));
+        $temp->add(new admin_setting_gradecat_combo('grade_aggregatesubcats', get_string('aggregatesubcats', 'grades'),
+                    get_string('aggregatesubcatshelp', 'grades'), $defaults, $options));
+
+        $options = array(0 => get_string('none'));
+        for ($i=1; $i<=20; $i++) {
+            $options[$i] = $i;
+        }
+
+        $defaults['value'] = 0;
+        $defaults['forced'] = true;
+        $temp->add(new admin_setting_gradecat_combo('grade_keephigh', get_string('keephigh', 'grades'),
+                    get_string('keephighhelp', 'grades'), $defaults, $options));
+        $defaults['forced'] = false;
+        $temp->add(new admin_setting_gradecat_combo('grade_droplow', get_string('droplow', 'grades'),
+                    get_string('droplowhelp', 'grades'), $defaults, $options));
+    }
+    $ADMIN->add('grades', $temp);
+
+
+    /// Grade item settings
+    $temp = new admin_settingpage('gradeitemsettings', get_string('gradeitemsettings', 'grades'), 'moodle/grade:manage');
+    if ($ADMIN->fulltree) {
+        $temp->add(new admin_setting_configselect('grade_displaytype', get_string('gradedisplaytype', 'grades'),
+                                                  get_string('configgradedisplaytype', 'grades'), GRADE_DISPLAY_TYPE_REAL, $display_types));
+
+        $temp->add(new admin_setting_configselect('grade_decimalpoints', get_string('decimalpoints', 'grades'),
+                                                  get_string('configdecimalpoints', 'grades'), 2,
+                                                  array( '0' => '0',
+                                                         '1' => '1',
+                                                         '2' => '2',
+                                                         '3' => '3',
+                                                         '4' => '4',
+                                                         '5' => '5')));
+
+        $temp->add(new admin_setting_configmultiselect('grade_item_advanced', get_string('gradeitemadvanced', 'grades'), get_string('configgradeitemadvanced', 'grades'),
+                                                       array('iteminfo', 'idnumber', 'gradepass', 'plusfactor', 'multfactor', 'display', 'decimals', 'hiddenuntil', 'locktime'),
+                                                       array('iteminfo' => get_string('iteminfo', 'grades'),
+                                                             'idnumber' => get_string('idnumbermod'),
+                                                             'gradetype' => get_string('gradetype', 'grades'),
+                                                             'scaleid' => get_string('scale'),
+                                                             'grademin' => get_string('grademin', 'grades'),
+                                                             'grademax' => get_string('grademax', 'grades'),
+                                                             'gradepass' => get_string('gradepass', 'grades'),
+                                                             'plusfactor' => get_string('plusfactor', 'grades'),
+                                                             'multfactor' => get_string('multfactor', 'grades'),
+                                                             'display' => get_string('gradedisplaytype', 'grades'),
+                                                             'decimals' => get_string('decimalpoints', 'grades'),
+                                                             'hidden' => get_string('hidden', 'grades'),
+                                                             'hiddenuntil' => get_string('hiddenuntil', 'grades'),
+                                                             'locked' => get_string('locked', 'grades'),
+                                                             'locktime' => get_string('locktime', 'grades'),
+                                                             'aggregationcoef' => get_string('aggregationcoef', 'grades'),
+                                                             'parentcategory' => get_string('parentcategory', 'grades'))));
+    }
+    $ADMIN->add('grades', $temp);
+
+
+    /// Scales and outcomes
+
+    $scales = new admin_externalpage('scales', get_string('scales'), $CFG->wwwroot.'/grade/edit/scale/index.php', 'moodle/grade:manage');
+    $ADMIN->add('grades', $scales);
+    $outcomes = new admin_externalpage('outcomes', get_string('outcomes', 'grades'), $CFG->wwwroot.'/grade/edit/outcome/index.php', 'moodle/grade:manage');
+    $ADMIN->add('grades', $outcomes);
+    $letters = new admin_externalpage('letters', get_string('letters', 'grades'), $CFG->wwwroot.'/grade/edit/letter/edit.php', 'moodle/grade:manageletters');
+    $ADMIN->add('grades', $letters);
+
+    // The plugins must implement a settings.php file that adds their admin settings to the $settings object
+
+    // Reports
+    $ADMIN->add('grades', new admin_category('gradereports', get_string('reportsettings', 'grades')));
+    foreach (get_list_of_plugins('grade/report') as $plugin) {
+     // Include all the settings commands for this plugin if there are any
+        if (file_exists($CFG->dirroot.'/grade/report/'.$plugin.'/settings.php')) {
+            $settings = new admin_settingpage('gradereport'.$plugin, get_string('modulename', 'gradereport_'.$plugin), 'moodle/grade:manage');
+            if ($ADMIN->fulltree) {
+                include($CFG->dirroot.'/grade/report/'.$plugin.'/settings.php');
+            }
+            $ADMIN->add('gradereports', $settings);
+        }
+    }
+
+    // Imports
+    $ADMIN->add('grades', new admin_category('gradeimports', get_string('importsettings', 'grades')));
+    foreach (get_list_of_plugins('grade/import') as $plugin) {
+
+     // Include all the settings commands for this plugin if there are any
+        if (file_exists($CFG->dirroot.'/grade/import/'.$plugin.'/settings.php')) {
+            $settings = new admin_settingpage('gradeimport'.$plugin, get_string('modulename', 'gradeimport_'.$plugin), 'moodle/grade:manage');
+            if ($ADMIN->fulltree) {
+                include($CFG->dirroot.'/grade/import/'.$plugin.'/settings.php');
+            }
+            $ADMIN->add('gradeimports', $settings);
+        }
+    }
+
+
+    // Exports
+    $ADMIN->add('grades', new admin_category('gradeexports', get_string('exportsettings', 'grades')));
+    foreach (get_list_of_plugins('grade/export') as $plugin) {
+     // Include all the settings commands for this plugin if there are any
+        if (file_exists($CFG->dirroot.'/grade/export/'.$plugin.'/settings.php')) {
+            $settings = new admin_settingpage('gradeexport'.$plugin, get_string('modulename', 'gradeexport_'.$plugin), 'moodle/grade:manage');
+            if ($ADMIN->fulltree) {
+                include($CFG->dirroot.'/grade/export/'.$plugin.'/settings.php');
+            }
+            $ADMIN->add('gradeexports', $settings);
+        }
+    }
+
+} // end of speedup
+
+?>
@@ -2,18 +2,28 @@

 // This file defines settingpages and externalpages under the "appearance" category

-// "languageandlocation" settingpage
-$temp = new admin_settingpage('langsettings', get_string('languagesettings', 'admin'));
-$temp->add(new admin_setting_configselect('lang', get_string('lang', 'admin'), get_string('configlang', 'admin'), current_language(), get_list_of_languages())); // $CFG->lang might be set in installer already, default en or en_utf8 is in setup.php
-$temp->add(new admin_setting_configcheckbox('langmenu', get_string('langmenu', 'admin'), get_string('configlangmenu', 'admin'), 1));
-$temp->add(new admin_setting_configtext('langlist', get_string('langlist', 'admin'), get_string('configlanglist', 'admin'), '', PARAM_NOTAGS));
-$temp->add(new admin_setting_configcheckbox('langcache', get_string('langcache', 'admin'), get_string('configlangcache', 'admin'), 1));
-$temp->add(new admin_setting_configtext('locale', get_string('localetext', 'admin'), get_string('configlocale', 'admin'), '', PARAM_FILE));
-$ADMIN->add('language', $temp);
+if ($hassiteconfig
+    or has_capability('moodle/site:langeditmaster', $systemcontext)
+    or has_capability('moodle/site:langeditlocal', $systemcontext)) { // speedup for non-admins, add all caps used on this page
+
+    // "languageandlocation" settingpage
+    $temp = new admin_settingpage('langsettings', get_string('languagesettings', 'admin'));
+    $temp->add(new admin_setting_configcheckbox('autolang', get_string('autolang', 'admin'), get_string('configautolang', 'admin'), 1));
+    $temp->add(new admin_setting_configselect('lang', get_string('lang', 'admin'), get_string('configlang', 'admin'), current_language(), get_list_of_languages())); // $CFG->lang might be set in installer already, default en or en_utf8 is in setup.php
+    $temp->add(new admin_setting_configcheckbox('langmenu', get_string('langmenu', 'admin'), get_string('configlangmenu', 'admin'), 1));
+    $temp->add(new admin_setting_langlist());
+    $temp->add(new admin_setting_configcheckbox('langcache', get_string('langcache', 'admin'), get_string('configlangcache', 'admin'), 1));
+    $temp->add(new admin_setting_configtext('locale', get_string('localetext', 'admin'), get_string('configlocale', 'admin'), '', PARAM_FILE));
+
+    // new CFG variable for excel encoding
+    $temp->add(new admin_setting_configselect('latinexcelexport', get_string('latinexcelexport', 'admin'), get_string('configlatinexcelexport', 'admin'), '0', array('0'=>'Unicode','1'=>'Latin')));


+    $ADMIN->add('language', $temp);

-$ADMIN->add('language', new admin_externalpage('langedit', get_string('langedit', 'admin'), "$CFG->wwwroot/$CFG->admin/lang.php"));
-$ADMIN->add('language', new admin_externalpage('langimport', get_string('langpacks', 'admin'), "$CFG->wwwroot/$CFG->admin/langimport.php"));
+    $ADMIN->add('language', new admin_externalpage('langedit', get_string('langedit', 'admin'), "$CFG->wwwroot/$CFG->admin/lang.php", array('moodle/site:langeditmaster', 'moodle/site:langeditlocal') ));
+    $ADMIN->add('language', new admin_externalpage('langimport', get_string('langpacks', 'admin'), "$CFG->wwwroot/$CFG->admin/langimport.php"));
+
+} // end of speedup

 ?>
@@ -1,28 +1,27 @@
 <?php // $Id$

-// "locations" settingpage
-$temp = new admin_settingpage('locationsettings', get_string('locationsettings', 'admin'));
-$options = get_list_of_timezones();
-$options[99] = get_string('serverlocaltime');
-$temp->add(new admin_setting_configselect('timezone', get_string('timezone','admin'), get_string('configtimezone', 'admin'), 99, $options));
-$options = get_list_of_timezones();
-$options[99] = get_string('timezonenotforced', 'admin');
-$temp->add(new admin_setting_configselect('forcetimezone', get_string('forcetimezone', 'admin'), get_string('helpforcetimezone', 'admin'), 99, $options));
-$options = get_list_of_countries();
-$options[0] = get_string('choose') .'...';
-$temp->add(new admin_setting_configselect('country', get_string('country', 'admin'), get_string('configcountry', 'admin'), 0, $options));
+if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

-$iplookups = array();
-if ($plugins = get_list_of_plugins('iplookup')) {
-    foreach ($plugins as $plugin) {
-        $iplookups[$plugin] = $plugin;
-    }
-}
-$temp->add(new admin_setting_configselect('iplookup', get_string('iplookup', 'admin'), get_string('configiplookup', 'admin'), 'hostip', $iplookups));
+    // "locations" settingpage
+    $temp = new admin_settingpage('locationsettings', get_string('locationsettings', 'admin'));
+    $options = get_list_of_timezones();
+    $options[99] = get_string('serverlocaltime');
+    $temp->add(new admin_setting_configselect('timezone', get_string('timezone','admin'), get_string('configtimezone', 'admin'), 99, $options));
+    $options[99] = get_string('timezonenotforced', 'admin');
+    $temp->add(new admin_setting_configselect('forcetimezone', get_string('forcetimezone', 'admin'), get_string('helpforcetimezone', 'admin'), 99, $options));
+    $options = get_list_of_countries();
+    $options[0] = get_string('choose') .'...';
+    $temp->add(new admin_setting_configselect('country', get_string('country', 'admin'), get_string('configcountry', 'admin'), 0, $options));

-$ADMIN->add('location', $temp);
+    $temp->add(new admin_setting_heading('iplookup', get_string('iplookup', 'admin'), get_string('iplookupinfo', 'admin')));
+    $temp->add(new admin_setting_configfile('geoipfile', get_string('geoipfile', 'admin'), get_string('configgeoipfile', 'admin', $CFG->dataroot.'/geoip/'), $CFG->dataroot.'/geoip/GeoLiteCity.dat'));
+    $temp->add(new admin_setting_configtext('googlemapkey', get_string('googlemapkey', 'admin'), get_string('configgooglemapkey', 'admin', $CFG->wwwroot), ''));
+
+    $ADMIN->add('location', $temp);


-$ADMIN->add('location', new admin_externalpage('timezoneimport', get_string('updatetimezones', 'admin'), "$CFG->wwwroot/$CFG->admin/timezoneimport.php"));
+    $ADMIN->add('location', new admin_externalpage('timezoneimport', get_string('updatetimezones', 'admin'), "$CFG->wwwroot/$CFG->admin/timezoneimport.php"));
+
+} // end of speedup

 ?>
@@ -2,21 +2,32 @@

 // * Miscellaneous settings

-// Experimental settings page
-$temp = new admin_settingpage('experimental', get_string('experimental', 'admin'));
-$temp->add(new admin_setting_configcheckbox('enableajax', get_string('enableajax', 'admin'), get_string('configenableajax', 'admin'), 0));
-$temp->add(new admin_setting_configcheckbox('enableglobalsearch', get_string('enableglobalsearch', 'admin'), get_string('configenableglobalsearch', 'admin'), 0));
-$temp->add(new admin_setting_configcheckbox('smartpix', get_string('smartpix', 'admin'), get_string('configsmartpix', 'admin'), 0));
-$ADMIN->add('misc', $temp);
+if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

-// XMLDB editor
-$ADMIN->add('misc', new admin_externalpage('xmldbeditor', get_string('xmldbeditor'), "$CFG->wwwroot/$CFG->admin/xmldb/"));
+    // Experimental settings page
+    $temp = new admin_settingpage('experimental', get_string('experimental', 'admin'));
+    $temp->add(new admin_setting_configcheckbox('enableglobalsearch', get_string('enableglobalsearch', 'admin'), get_string('configenableglobalsearch', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('smartpix', get_string('smartpix', 'admin'), get_string('configsmartpix', 'admin'), 0));
+    $item = new admin_setting_configcheckbox('enablehtmlpurifier', get_string('enablehtmlpurifier', 'admin'), get_string('configenablehtmlpurifier', 'admin'), 0); 
+    $item->set_updatedcallback('reset_text_filters_cache');
+    $temp->add($item);
+    $temp->add(new admin_setting_configcheckbox('enablegroupings', get_string('enablegroupings', 'admin'), get_string('configenablegroupings', 'admin'), 0));
+    $rqsetting = new admin_setting_configcheckbox('selectmanual', get_string('selectmanualquestions', 'qtype_random'), get_string('configselectmanualquestions', 'qtype_random'), 0);
+    $rqsetting->plugin = 'qtype_random';
+    $temp->add($rqsetting);
+
+    $ADMIN->add('misc', $temp);
+
+    // XMLDB editor
+    $ADMIN->add('misc', new admin_externalpage('xmldbeditor', get_string('xmldbeditor'), "$CFG->wwwroot/$CFG->admin/xmldb/"));


-// hidden scripts linked from elsewhere
-$ADMIN->add('misc', new admin_externalpage('oacleanup', 'Online Assignment Cleanup', $CFG->wwwroot.'/'.$CFG->admin.'/oacleanup.php', 'moodle/site:config', true));
-$ADMIN->add('misc', new admin_externalpage('upgradeforumread', 'Upgrade forum', $CFG->wwwroot.'/'.$CFG->admin.'/upgradeforumread.php', 'moodle/site:config', true));
-$ADMIN->add('misc', new admin_externalpage('upgradelogs', 'Upgrade logs', $CFG->wwwroot.'/'.$CFG->admin.'/upgradelogs.php', 'moodle/site:config', true));
-$ADMIN->add('misc', new admin_externalpage('multilangupgrade', get_string('multilangupgrade', 'admin'), $CFG->wwwroot.'/'.$CFG->admin.'/multilangupgrade.php', 'moodle/site:config', !empty($CFG->filter_multilang_converted)));
+    // hidden scripts linked from elsewhere
+    $ADMIN->add('misc', new admin_externalpage('oacleanup', 'Online Assignment Cleanup', $CFG->wwwroot.'/'.$CFG->admin.'/oacleanup.php', 'moodle/site:config', true));
+    $ADMIN->add('misc', new admin_externalpage('upgradeforumread', 'Upgrade forum', $CFG->wwwroot.'/'.$CFG->admin.'/upgradeforumread.php', 'moodle/site:config', true));
+    $ADMIN->add('misc', new admin_externalpage('upgradelogs', 'Upgrade logs', $CFG->wwwroot.'/'.$CFG->admin.'/upgradelogs.php', 'moodle/site:config', true));
+    $ADMIN->add('misc', new admin_externalpage('multilangupgrade', get_string('multilangupgrade', 'admin'), $CFG->wwwroot.'/'.$CFG->admin.'/multilangupgrade.php', 'moodle/site:config', !empty($CFG->filter_multilang_converted)));
+
+} // end of speedup

 ?>
@@ -2,20 +2,26 @@

 // This file defines settingpages and externalpages under the "mnet" category

-$ADMIN->add('mnet', new admin_externalpage('net', get_string('settings', 'mnet'), 
-                                           $CFG->wwwroot . '/admin/mnet/index.php', 
+if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
+
+
+$ADMIN->add('mnet', new admin_externalpage('net', get_string('settings', 'mnet'),
+                                           "$CFG->wwwroot/$CFG->admin/mnet/index.php",
                                           'moodle/site:config'));

-$ADMIN->add('mnet', new admin_externalpage('mnetpeers', get_string('mnetpeers', 'mnet'), 
-                                           $CFG->wwwroot . '/admin/mnet/peers.php', 
+$ADMIN->add('mnet', new admin_externalpage('mnetpeers', get_string('mnetpeers', 'mnet'),
+                                           "$CFG->wwwroot/$CFG->admin/mnet/peers.php",
                                           'moodle/site:config'));
 $ADMIN->add('mnet', new admin_externalpage('ssoaccesscontrol', get_string('ssoaccesscontrol', 'mnet'),
-                                           $CFG->wwwroot . '/admin/mnet/access_control.php', 
+                                           "$CFG->wwwroot/$CFG->admin/mnet/access_control.php",
                                           'moodle/site:config'));
-$ADMIN->add('mnet', new admin_externalpage('mnetenrol', get_string('mnetenrol', 'mnet'), 
-                                           $CFG->wwwroot . '/admin/mnet/enr_hosts.php', 
+$ADMIN->add('mnet', new admin_externalpage('mnetenrol', get_string('mnetenrol', 'mnet'),
+                                           "$CFG->wwwroot/$CFG->admin/mnet/enr_hosts.php",
                                           'moodle/site:config'));
-$ADMIN->add('mnet', new admin_externalpage('trustedhosts', get_string('trustedhosts', 'mnet'), 
-                                           $CFG->wwwroot . '/admin/mnet/trustedhosts.php', 
+$ADMIN->add('mnet', new admin_externalpage('trustedhosts', get_string('trustedhosts', 'mnet'),
+                                           "$CFG->wwwroot/$CFG->admin/mnet/trustedhosts.php",
                                           'moodle/site:config'));
+
+} // end of speedup
+
 ?>
@@ -0,0 +1,164 @@
+<?php  //$Id$
+
+if ($hassiteconfig) {
+
+    $ADMIN->add('modules', new admin_category('modsettings', get_string('activities')));
+    $ADMIN->add('modsettings', new admin_page_managemods());
+    if ($modules = get_records('modules')) {
+        $modulebyname = array();
+
+        foreach ($modules as $module) {
+            $strmodulename = get_string('modulename', $module->name);
+            // Deal with modules which are lacking the language string
+            if ($strmodulename == '[[modulename]]') {
+                $textlib = textlib_get_instance();
+                $strmodulename = $textlib->strtotitle($module->name);
+            }
+            $modulebyname[$strmodulename] = $module;
+        }
+        ksort($modulebyname);
+
+        foreach ($modulebyname as $strmodulename=>$module) {
+            $modulename = $module->name;
+            if (file_exists($CFG->dirroot.'/mod/'.$modulename.'/settingstree.php')) {
+                include($CFG->dirroot.'/mod/'.$modulename.'/settingstree.php');
+            } else if (file_exists($CFG->dirroot.'/mod/'.$modulename.'/settings.php')) {
+                // do not show disabled modules in tree, keep only settings link on manage page
+                $settings = new admin_settingpage('modsetting'.$modulename, $strmodulename, 'moodle/site:config', !$module->visible);
+                if ($ADMIN->fulltree) {
+                    include($CFG->dirroot.'/mod/'.$modulename.'/settings.php');
+                }
+                $ADMIN->add('modsettings', $settings);
+            } else if (file_exists($CFG->dirroot.'/mod/'.$modulename.'/config.html')) {
+                $ADMIN->add('modsettings', new admin_externalpage('modsetting'.$modulename, $strmodulename, "$CFG->wwwroot/$CFG->admin/module.php?module=$modulename", 'moodle/site:config', !$module->visible));
+            }
+        }
+    }
+
+
+    $ADMIN->add('modules', new admin_category('blocksettings', get_string('blocks')));
+    $ADMIN->add('blocksettings', new admin_page_manageblocks());
+    $ADMIN->add('blocksettings', new admin_externalpage('stickyblocks', get_string('stickyblocks', 'admin'), "$CFG->wwwroot/$CFG->admin/stickyblocks.php"));
+    if (!empty($CFG->blocks_version) and $blocks = get_records('block')) {
+        $blockbyname = array();
+
+        foreach ($blocks as $block) {
+            if(($blockobject = block_instance($block->name)) === false) {
+                // Failed to load
+                continue;
+            }
+            $blockbyname[$blockobject->get_title()] = $block;
+        }
+        ksort($blockbyname);
+
+        foreach ($blockbyname as $strblockname=>$block) {
+            $blockname = $block->name;
+            if (file_exists($CFG->dirroot.'/blocks/'.$blockname.'/settings.php')) {
+                $settings = new admin_settingpage('blocksetting'.$blockname, $strblockname, 'moodle/site:config', !$block->visible);
+                if ($ADMIN->fulltree) {
+                    include($CFG->dirroot.'/blocks/'.$blockname.'/settings.php');
+                }
+                $ADMIN->add('blocksettings', $settings);
+
+            } else if (file_exists($CFG->dirroot.'/blocks/'.$blockname.'/config_global.html')) {
+                $ADMIN->add('blocksettings', new admin_externalpage('blocksetting'.$blockname, $strblockname, "$CFG->wwwroot/$CFG->admin/block.php?block=$block->id", 'moodle/site:config', !$block->visible));
+            }
+        }
+    }
+
+    $ADMIN->add('modules', new admin_category('filtersettings', get_string('managefilters')));
+    // "filtersettings" settingpage
+    $temp = new admin_settingpage('managefilters', get_string('filtersettings', 'admin'));
+    if ($ADMIN->fulltree) {
+        $items = array();
+        $items[] = new admin_setting_managefilters();
+        $items[] = new admin_setting_heading('managefilterscommonheading', get_string('commonsettings', 'admin'), '');
+        $items[] = new admin_setting_configselect('cachetext', get_string('cachetext', 'admin'), get_string('configcachetext', 'admin'), 60, array(604800 => get_string('numdays','',7),
+                                                                                                                                               86400 => get_string('numdays','',1),
+                                                                                                                                               43200 => get_string('numhours','',12),
+                                                                                                                                               10800 => get_string('numhours','',3),
+                                                                                                                                               7200 => get_string('numhours','',2),
+                                                                                                                                               3600 => get_string('numhours','',1),
+                                                                                                                                               2700 => get_string('numminutes','',45),
+                                                                                                                                               1800 => get_string('numminutes','',30),
+                                                                                                                                               900 => get_string('numminutes','',15),
+                                                                                                                                               600 => get_string('numminutes','',10),
+                                                                                                                                               540 => get_string('numminutes','',9),
+                                                                                                                                               480 => get_string('numminutes','',8),
+                                                                                                                                               420 => get_string('numminutes','',7),
+                                                                                                                                               360 => get_string('numminutes','',6),
+                                                                                                                                               300 => get_string('numminutes','',5),
+                                                                                                                                               240 => get_string('numminutes','',4),
+                                                                                                                                               180 => get_string('numminutes','',3),
+                                                                                                                                               120 => get_string('numminutes','',2),
+                                                                                                                                               60 => get_string('numminutes','',1),
+                                                                                                                                               30 => get_string('numseconds','',30),
+                                                                                                                                               0 => get_string('no')));
+        $items[] = new admin_setting_configselect('filteruploadedfiles', get_string('filteruploadedfiles', 'admin'), get_string('configfilteruploadedfiles', 'admin'), 0, array('0' => get_string('none'),
+                                                                                                                                                                                '1' => get_string('allfiles'),
+                                                                                                                                                                                '2' => get_string('htmlfilesonly')));
+        $items[] = new admin_setting_configcheckbox('filtermatchoneperpage', get_string('filtermatchoneperpage', 'admin'), get_string('configfiltermatchoneperpage', 'admin'), 0);
+        $items[] = new admin_setting_configcheckbox('filtermatchonepertext', get_string('filtermatchonepertext', 'admin'), get_string('configfiltermatchonepertext', 'admin'), 0);
+        $items[] = new admin_setting_configcheckbox('filterall', get_string('filterall', 'admin'), get_string('configfilterall', 'admin'), 0);
+        foreach ($items as $item) {
+            $item->set_updatedcallback('reset_text_filters_cache');
+            $temp->add($item);
+        }
+    }
+    $ADMIN->add('filtersettings', $temp);
+
+    if (empty($CFG->textfilters)) {
+        $activefilters = array();
+    } else {
+        $activefilters = explode(',', $CFG->textfilters);
+    }
+    $filterlocations = array('mod','filter');
+    foreach ($filterlocations as $filterlocation) {
+        $filters = get_list_of_plugins($filterlocation);
+
+        $filterbyname = array();
+
+        foreach ($filters as $filter) {
+            $strfiltername = get_string('filtername', $filter);
+            // Deal with filters which are lacking the language string
+            if ($strfiltername == '[[filtername]]') {
+                $textlib = textlib_get_instance();
+                $strfiltername = $textlib->strtotitle($filter);
+            }
+            $filterbyname[$strfiltername] = "$filterlocation/$filter";
+        }
+        ksort($filterbyname);
+
+        foreach ($filterbyname as $strfiltername=>$filterfull) {
+            if (file_exists("$CFG->dirroot/$filterfull/filtersettings.php")) {
+                $settings = new admin_settingpage('filtersetting'.str_replace('/', '', $filterfull), $strfiltername, 'moodle/site:config', !in_array($filterfull, $activefilters));
+                if ($ADMIN->fulltree) {
+                    include("$CFG->dirroot/$filterfull/filtersettings.php");
+                }
+                $ADMIN->add('filtersettings', $settings);
+
+            } else if (file_exists("$CFG->dirroot/$filterfull/filterconfig.html")) {
+                $ADMIN->add('filtersettings', new admin_externalpage('filtersetting'.str_replace('/', '', $filterfull), $strfiltername, "$CFG->wwwroot/$CFG->admin/filter.php?filter=$filterfull", !in_array($filterfull, $activefilters)));
+            }
+        }
+    }
+}
+
+
+/// Now add reports
+
+foreach (get_list_of_plugins($CFG->admin.'/report') as $plugin) {
+    $settings_path = "$CFG->dirroot/$CFG->admin/report/$plugin/settings.php";
+    if (file_exists($settings_path)) {
+        include($settings_path);
+        continue;
+    }
+
+    $index_path = "$CFG->dirroot/$CFG->admin/report/$plugin/index.php";
+    if (!file_exists($index_path)) {
+        continue;
+    }
+    // old style 3rd party plugin without settings.php
+    $www_path = "$CFG->wwwroot/$CFG->admin/report/$plugin/index.php";
+    $ADMIN->add('reports', new admin_externalpage('report'.$plugin, $plugin, $www_path, 'moodle/site:viewreports'));
+}
@@ -1,98 +1,121 @@
 <?php // $Id$

+if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page


-// "sitepolicies" settingpage
-$temp = new admin_settingpage('sitepolicies', get_string('sitepolicies', 'admin'));
-$temp->add(new admin_setting_configcheckbox('protectusernames', get_string('protectusernames', 'admin'), get_string('configprotectusernames', 'admin'), 1));
-$temp->add(new admin_setting_configcheckbox('forcelogin', get_string('forcelogin', 'admin'), get_string('configforcelogin', 'admin'), 0));
-$temp->add(new admin_setting_configcheckbox('forceloginforprofiles', get_string('forceloginforprofiles', 'admin'), get_string('configforceloginforprofiles', 'admin'), 1));
-$temp->add(new admin_setting_configcheckbox('opentogoogle', get_string('opentogoogle', 'admin'), get_string('configopentogoogle', 'admin'), 0));
-$temp->add(new admin_setting_configtext('maxbytes', get_string('maxbytes', 'admin'), get_string('configmaxbytes', 'admin'), 0, PARAM_INT));
-$temp->add(new admin_setting_configcheckbox('messaging', get_string('messaging', 'admin'), get_string('configmessaging','admin'), 1));
-$temp->add(new admin_setting_configcheckbox('allowobjectembed', get_string('allowobjectembed', 'admin'), get_string('configallowobjectembed', 'admin'), 0));
-$temp->add(new admin_setting_configcheckbox('enabletrusttext', get_string('enabletrusttext', 'admin'), get_string('configenabletrusttext', 'admin'), 0));
-$temp->add(new admin_setting_configselect('maxeditingtime', get_string('maxeditingtime','admin'), get_string('configmaxeditingtime','admin'), 1800,
-             array(60 => get_string('numminutes', '', 1),
-                   300 => get_string('numminutes', '', 5),
-                   900 => get_string('numminutes', '', 15),
-                   1800 => get_string('numminutes', '', 30),
-                   2700 => get_string('numminutes', '', 45),
-                   3600 => get_string('numminutes', '', 60))));
-$temp->add(new admin_setting_configselect('fullnamedisplay', get_string('fullnamedisplay', 'admin'), get_string('configfullnamedisplay', 'admin'),
-              'firstname lastname', array('language' => get_string('language'),
-              'firstname lastname' => get_string('firstname') . ' + ' . get_string('lastname'),
-              'lastname firstname' => get_string('lastname') . ' + ' . get_string('firstname'),
-              'firstname' => get_string('firstname'))));
-$temp->add(new admin_setting_configcheckbox('extendedusernamechars', get_string('extendedusernamechars', 'admin'), get_string('configextendedusernamechars', 'admin'), 0));
-$temp->add(new admin_setting_configtext('sitepolicy', get_string('sitepolicy', 'admin'), get_string('configsitepolicy', 'admin'), '', PARAM_URL));
-$temp->add(new admin_setting_configselect('bloglevel', get_string('bloglevel', 'admin'), get_string('configbloglevel', 'admin'), 4, array(5 => get_string('worldblogs','blog'),
-                                                                                                                                          4 => get_string('siteblogs','blog'),
-                                                                                                                                          3 => get_string('courseblogs','blog'),
-                                                                                                                                          2 => get_string('groupblogs','blog'),
-                                                                                                                                          1 => get_string('personalblogs','blog'),
-                                                                                                                                          0 => get_string('disableblogs','blog'))));
+    // "sitepolicies" settingpage
+    $temp = new admin_settingpage('sitepolicies', get_string('sitepolicies', 'admin'));
+    $temp->add(new admin_setting_configcheckbox('protectusernames', get_string('protectusernames', 'admin'), get_string('configprotectusernames', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('forcelogin', get_string('forcelogin', 'admin'), get_string('configforcelogin', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('forceloginforprofiles', get_string('forceloginforprofiles', 'admin'), get_string('configforceloginforprofiles', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('opentogoogle', get_string('opentogoogle', 'admin'), get_string('configopentogoogle', 'admin'), 0));

-$temp->add(new admin_setting_configcheckbox('cronclionly', get_string('cronclionly', 'admin'), get_string('configcronclionly', 'admin'), 0));
-$temp->add(new admin_setting_configtext('cronremotepassword', get_string('cronremotepassword', 'admin'), get_string('configcronremotepassword', 'admin'), '', PARAM_RAW));
+    $max_upload_choices = get_max_upload_sizes();
+    // maxbytes set to 0 will allow the maxium server lmit for uploads
+    $max_upload_choices[0] = get_string('serverlimit', 'admin');
+    $temp->add(new admin_setting_configselect('maxbytes', get_string('maxbytes', 'admin'), get_string('configmaxbytes', 'admin'), 0, $max_upload_choices));

-$ADMIN->add('security', $temp);
+    $temp->add(new admin_setting_configcheckbox('messaging', get_string('messaging', 'admin'), get_string('configmessaging','admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('allowobjectembed', get_string('allowobjectembed', 'admin'), get_string('configallowobjectembed', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('enabletrusttext', get_string('enabletrusttext', 'admin'), get_string('configenabletrusttext', 'admin'), 0));
+    $temp->add(new admin_setting_configselect('maxeditingtime', get_string('maxeditingtime','admin'), get_string('configmaxeditingtime','admin'), 1800,
+                 array(60 => get_string('numminutes', '', 1),
+                       300 => get_string('numminutes', '', 5),
+                       900 => get_string('numminutes', '', 15),
+                       1800 => get_string('numminutes', '', 30),
+                       2700 => get_string('numminutes', '', 45),
+                       3600 => get_string('numminutes', '', 60))));
+    $temp->add(new admin_setting_configselect('fullnamedisplay', get_string('fullnamedisplay', 'admin'), get_string('configfullnamedisplay', 'admin'),
+                  'firstname lastname', array('language' => get_string('language'),
+                                              'firstname lastname' => get_string('firstname').' + '.get_string('lastname'),
+                                              'lastname firstname' => get_string('lastname').' + '.get_string('firstname'),
+                                              'firstname' => get_string('firstname'))));
+    $temp->add(new admin_setting_configcheckbox('extendedusernamechars', get_string('extendedusernamechars', 'admin'), get_string('configextendedusernamechars', 'admin'), 0));
+    $temp->add(new admin_setting_configtext('sitepolicy', get_string('sitepolicy', 'admin'), get_string('configsitepolicy', 'admin'), '', PARAM_RAW));
+    $temp->add(new admin_setting_configselect('bloglevel', get_string('bloglevel', 'admin'), get_string('configbloglevel', 'admin'), 4, array(5 => get_string('worldblogs','blog'),
+                                                                                                                                              4 => get_string('siteblogs','blog'),
+                                                                                                                                              3 => get_string('courseblogs','blog'),
+                                                                                                                                              2 => get_string('groupblogs','blog'),
+                                                                                                                                              1 => get_string('personalblogs','blog'),
+                                                                                                                                              0 => get_string('disableblogs','blog'))));
+    $temp->add(new admin_setting_configcheckbox('usetags', get_string('usetags','admin'),get_string('configusetags', 'admin'),'1'));
+    $temp->add(new admin_setting_configcheckbox('keeptagnamecase', get_string('keeptagnamecase','admin'),get_string('configkeeptagnamecase', 'admin'),'1'));
+
+    $temp->add(new admin_setting_configcheckbox('profilesforenrolledusersonly', get_string('profilesforenrolledusersonly','admin'),get_string('configprofilesforenrolledusersonly', 'admin'),'1'));
+
+    $temp->add(new admin_setting_configcheckbox('cronclionly', get_string('cronclionly', 'admin'), get_string('configcronclionly', 'admin'), 0));
+    $temp->add(new admin_setting_configpasswordunmask('cronremotepassword', get_string('cronremotepassword', 'admin'), get_string('configcronremotepassword', 'admin'), ''));
+
+    $temp->add(new admin_setting_configcheckbox('passwordpolicy', get_string('passwordpolicy', 'admin'), get_string('configpasswordpolicy', 'admin'), 0));
+    $temp->add(new admin_setting_configtext('minpasswordlength', get_string('minpasswordlength', 'admin'), get_string('configminpasswordlength', 'admin'), 8, PARAM_INT));
+    $temp->add(new admin_setting_configtext('minpassworddigits', get_string('minpassworddigits', 'admin'), get_string('configminpassworddigits', 'admin'), 1, PARAM_INT));
+    $temp->add(new admin_setting_configtext('minpasswordlower', get_string('minpasswordlower', 'admin'), get_string('configminpasswordlower', 'admin'), 1, PARAM_INT));
+    $temp->add(new admin_setting_configtext('minpasswordupper', get_string('minpasswordupper', 'admin'), get_string('configminpasswordupper', 'admin'), 1, PARAM_INT));
+    $temp->add(new admin_setting_configtext('minpasswordnonalphanum', get_string('minpasswordnonalphanum', 'admin'), get_string('configminpasswordnonalphanum', 'admin'), 1, PARAM_INT));
+    $temp->add(new admin_setting_configcheckbox('disableuserimages', get_string('disableuserimages', 'admin'), get_string('configdisableuserimages', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('emailchangeconfirmation', get_string('emailchangeconfirmation', 'admin'), get_string('configemailchangeconfirmation', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('enablenotes', get_string('enablenotes', 'notes'), get_string('configenablenotes', 'notes'), 1));
+    $ADMIN->add('security', $temp);




-// "httpsecurity" settingpage
-$temp = new admin_settingpage('httpsecurity', get_string('httpsecurity', 'admin'));
-$temp->add(new admin_setting_configcheckbox('loginhttps', get_string('loginhttps', 'admin'), get_string('configloginhttps', 'admin'), 0));
-$ADMIN->add('security', $temp);
+    // "httpsecurity" settingpage
+    $temp = new admin_settingpage('httpsecurity', get_string('httpsecurity', 'admin'));
+    $temp->add(new admin_setting_configcheckbox('loginhttps', get_string('loginhttps', 'admin'), get_string('configloginhttps', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('cookiesecure', get_string('cookiesecure', 'admin'), get_string('configcookiesecure', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('cookiehttponly', get_string('cookiehttponly', 'admin'), get_string('configcookiehttponly', 'admin'), 0));
+    $ADMIN->add('security', $temp);


-// "modulesecurity" settingpage
-$temp = new admin_settingpage('modulesecurity', get_string('modulesecurity', 'admin'));
-$temp->add(new admin_setting_configselect('restrictmodulesfor', get_string('restrictmodulesfor', 'admin'), get_string('configrestrictmodulesfor', 'admin'), 'none', array('none' => 'No courses',
-                                                                                                                                                                          'all' => 'All courses',
-                                                                                                                                                                          'requested' => 'Requested courses')));
-$temp->add(new admin_setting_configcheckbox('restrictbydefault', get_string('restrictbydefault', 'admin'), get_string('configrestrictbydefault', 'admin'), 0));
-if (!$options = get_records("modules")) {
+    // "modulesecurity" settingpage
+    $temp = new admin_settingpage('modulesecurity', get_string('modulesecurity', 'admin'));
+    $temp->add(new admin_setting_configselect('restrictmodulesfor', get_string('restrictmodulesfor', 'admin'), get_string('configrestrictmodulesfor', 'admin'), 'none', array('none' => 'No courses',
+                                                                                                                                                                              'all' => 'All courses',
+                                                                                                                                                                              'requested' => 'Requested courses')));
+    $temp->add(new admin_setting_configcheckbox('restrictbydefault', get_string('restrictbydefault', 'admin'), get_string('configrestrictbydefault', 'admin'), 0));
+    if (!$options = get_records("modules")) {
+        $options = array();
+    }
+    $options2 = array();
+    foreach ($options as $option) {
+        $options2[$option->id] = $option->name;
+    }
+    $temp->add(new admin_setting_configmultiselect('defaultallowedmodules', get_string('defaultallowedmodules', 'admin'), get_string('configdefaultallowedmodules', 'admin'), array(), $options2));
+    $ADMIN->add('security', $temp);
+
+
+
+    // "notifications" settingpage
+    $temp = new admin_settingpage('notifications', get_string('notifications', 'admin'));
+    $temp->add(new admin_setting_configselect('displayloginfailures', get_string('displayloginfailures', 'admin'), get_string('configdisplayloginfailures', 'admin'), '', array('' => get_string('nobody'),
+                                                                                                                                                                                'admin' => get_string('administrators'),
+                                                                                                                                                                                'teacher' => get_string('administratorsandteachers'),
+                                                                                                                                                                                'everybody' => get_string('everybody'))));
+    $temp->add(new admin_setting_configselect('notifyloginfailures', get_string('notifyloginfailures', 'admin'), get_string('confignotifyloginfailures', 'admin'), '', array('' => get_string('nobody'),
+                                                                                                                                                                             'mainadmin' => get_string('administrator'),
+                                                                                                                                                                             'alladmins' => get_string('administratorsall'))));
    $options = array();
-}
-$options2 = array();
-foreach ($options as $option) {
-    $options2[$option->id] = $option->name;
-}
-$temp->add(new admin_setting_configmultiselect('defaultallowedmodules', get_string('defaultallowedmodules', 'admin'), get_string('configdefaultallowedmodules', 'admin'), array(), $options2));
-$ADMIN->add('security', $temp);
-
-
-
-// "notifications" settingpage
-$temp = new admin_settingpage('notifications', get_string('notifications', 'admin'));
-$temp->add(new admin_setting_configselect('displayloginfailures', get_string('displayloginfailures', 'admin'), get_string('configdisplayloginfailures', 'admin'), '', array('' => get_string('nobody'),
-                                                                                                                                                                            'admin' => get_string('administrators'),
-                                                                                                                                                                            'teacher' => get_string('administratorsandteachers'),
-                                                                                                                                                                            'everybody' => get_string('everybody'))));
-$temp->add(new admin_setting_configselect('notifyloginfailures', get_string('notifyloginfailures', 'admin'), get_string('confignotifyloginfailures', 'admin'), '', array('' => get_string('nobody'),
-                                                                                                                                                                         'mainadmin' => get_string('administrator'),
-                                                                                                                                                                         'alladmins' => get_string('administratorsall'))));
-$options = array();
-for ($i = 1; $i <= 100; $i++) {
-    $options[$i] = $i;
-}
-$temp->add(new admin_setting_configselect('notifyloginthreshold', get_string('notifyloginthreshold', 'admin'), get_string('confignotifyloginthreshold', 'admin'), '10', $options));
-$ADMIN->add('security', $temp);
+    for ($i = 1; $i <= 100; $i++) {
+        $options[$i] = $i;
+    }
+    $temp->add(new admin_setting_configselect('notifyloginthreshold', get_string('notifyloginthreshold', 'admin'), get_string('confignotifyloginthreshold', 'admin'), '10', $options));
+    $ADMIN->add('security', $temp);






-// "antivirus" settingpage
-$temp = new admin_settingpage('antivirus', get_string('antivirus', 'admin'));
-$temp->add(new admin_setting_configcheckbox('runclamonupload', get_string('runclamavonupload', 'admin'), get_string('configrunclamavonupload', 'admin'), 0));
-$temp->add(new admin_setting_configtext('pathtoclam', get_string('pathtoclam', 'admin'), get_string('configpathtoclam', 'admin'), '', PARAM_RAW)); // TODO: add path validation
-$temp->add(new admin_setting_configtext('quarantinedir', get_string('quarantinedir', 'admin'), get_string('configquarantinedir', 'admin'), '', PARAM_RAW)); // TODO: add path validation
-$temp->add(new admin_setting_configselect('clamfailureonupload', get_string('clamfailureonupload', 'admin'), get_string('configclamfailureonupload', 'admin'), 'donothing', array('donothing' => get_string('configclamdonothing', 'admin'),
-                                                                                                                                                                                  'actlikevirus' => get_string('configclamactlikevirus', 'admin'))));
-$ADMIN->add('security', $temp);
+    // "antivirus" settingpage
+    $temp = new admin_settingpage('antivirus', get_string('antivirus', 'admin'));
+    $temp->add(new admin_setting_configcheckbox('runclamonupload', get_string('runclamavonupload', 'admin'), get_string('configrunclamavonupload', 'admin'), 0));
+    $temp->add(new admin_setting_configexecutable('pathtoclam', get_string('pathtoclam', 'admin'), get_string('configpathtoclam', 'admin'), ''));
+    $temp->add(new admin_setting_configdirectory('quarantinedir', get_string('quarantinedir', 'admin'), get_string('configquarantinedir', 'admin'), ''));
+    $temp->add(new admin_setting_configselect('clamfailureonupload', get_string('clamfailureonupload', 'admin'), get_string('configclamfailureonupload', 'admin'), 'donothing', array('donothing' => get_string('configclamdonothing', 'admin'),
+                                                                                                                                                                                      'actlikevirus' => get_string('configclamactlikevirus', 'admin'))));
+    $ADMIN->add('security', $temp);
+
+} // end of speedup

 ?>
@@ -2,27 +2,29 @@

 // This file defines settingpages and externalpages under the "server" category

+if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
+
+
 // "systempaths" settingpage
 $temp = new admin_settingpage('systempaths', get_string('systempaths','admin'));
 $temp->add(new admin_setting_configselect('gdversion', get_string('gdversion','admin'), get_string('configgdversion', 'admin'), check_gd_version(), array('0' => get_string('gdnot'),
                                                                                                                                                          '1' => get_string('gd1'),
                                                                                                                                                          '2' => get_string('gd2'))));
-$temp->add(new admin_setting_configtext('zip', get_string('pathtozip','admin'), get_string('configzip', 'admin'), '', PARAM_RAW)); // TODO: add path validation
-$temp->add(new admin_setting_configtext('unzip', get_string('pathtounzip','admin'), get_string('configunzip', 'admin'), '', PARAM_RAW)); // TODO: add path validation
-$temp->add(new admin_setting_configtext('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'), '', PARAM_RAW)); // TODO: add path validation
-$temp->add(new admin_setting_configtext('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'), '', PARAM_RAW)); // TODO: add path validation
+$temp->add(new admin_setting_configexecutable('zip', get_string('pathtozip','admin'), get_string('configzip', 'admin'), ''));
+$temp->add(new admin_setting_configexecutable('unzip', get_string('pathtounzip','admin'), get_string('configunzip', 'admin'), ''));
+$temp->add(new admin_setting_configexecutable('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'), ''));
+$temp->add(new admin_setting_configexecutable('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'), ''));
 $ADMIN->add('server', $temp, 0);



 // "email" settingpage
 $temp = new admin_settingpage('mail', get_string('mail','admin'));
-$temp->add(new admin_setting_configtext('smtphosts', get_string('smtphosts', 'admin'), get_string('configsmtphosts', 'admin'), '', PARAM_HOST));
+$temp->add(new admin_setting_configtext('smtphosts', get_string('smtphosts', 'admin'), get_string('configsmtphosts', 'admin'), '', PARAM_RAW));
 $temp->add(new admin_setting_configtext('smtpuser', get_string('smtpuser', 'admin'), get_string('configsmtpuser', 'admin'), '', PARAM_NOTAGS));
-$temp->add(new admin_setting_configtext('smtppass', get_string('smtppass', 'admin'), get_string('configsmtpuser', 'admin'), '', PARAM_RAW));
+$temp->add(new admin_setting_configpasswordunmask('smtppass', get_string('smtppass', 'admin'), get_string('configsmtpuser', 'admin'), ''));
+$temp->add(new admin_setting_configtext('smtpmaxbulk', get_string('smtpmaxbulk', 'admin'), get_string('configsmtpmaxbulk', 'admin'), 1, PARAM_INT));
 $temp->add(new admin_setting_configtext('noreplyaddress', get_string('noreplyaddress', 'admin'), get_string('confignoreplyaddress', 'admin'), 'noreply@' . $_SERVER['HTTP_HOST'], PARAM_NOTAGS));
-$temp->add(new admin_setting_configtext('allowemailaddresses', get_string('allowemailaddresses', 'admin'), get_string('configallowemailaddresses', 'admin'), '', PARAM_NOTAGS));
-$temp->add(new admin_setting_configtext('denyemailaddresses', get_string('denyemailaddresses', 'admin'), get_string('configdenyemailaddresses', 'admin'), '', PARAM_NOTAGS));
 $temp->add(new admin_setting_configselect('digestmailtime', get_string('digestmailtime', 'admin'), get_string('configdigestmailtime', 'admin'), 17, array('00' => '00',
                                                                                                                                                          '01' => '01',
                                                                                                                                                          '02' => '02',
@@ -48,11 +50,27 @@ $temp->add(new admin_setting_configselect('digestmailtime', get_string('digestma
                                                                                                                                                          '22' => '22',
                                                                                                                                                          '23' => '23')));
 $charsets = get_list_of_charsets();
+unset($charsets['UTF-8']); // not needed here
 $options = array();
-$options['0'] = get_string('none');
+$options['0'] = 'UTF-8';
 $options = array_merge($options, $charsets);
-$temp->add(new admin_setting_configselect('sitemailcharset', get_string('sitemailcharset', 'admin'), get_string('configsitemailcharset','admin'), '', $options));
+$temp->add(new admin_setting_configselect('sitemailcharset', get_string('sitemailcharset', 'admin'), get_string('configsitemailcharset','admin'), '0', $options));
 $temp->add(new admin_setting_configcheckbox('allowusermailcharset', get_string('allowusermailcharset', 'admin'), get_string('configallowusermailcharset', 'admin'), 0));
+$options = array('LF'=>'LF', 'CRLF'=>'CRLF');
+$temp->add(new admin_setting_configselect('mailnewline', get_string('mailnewline', 'admin'), get_string('configmailnewline','admin'), 'LF', $options));
+if (isloggedin()) {
+    global $USER;
+    $primaryadminemail = $USER->email;
+    $primaryadminname  = fullname($USER, true);
+
+} else {
+    // no defaults during installation - admin user must be created first
+    $primaryadminemail = NULL;
+    $primaryadminname  = NULL;
+}
+$temp->add(new admin_setting_configtext('supportname', get_string('supportname', 'admin'), get_string('configsupportname', 'admin'), $primaryadminname, PARAM_NOTAGS));
+$temp->add(new admin_setting_configtext('supportemail', get_string('supportemail', 'admin'), get_string('configsupportemail', 'admin'), $primaryadminemail, PARAM_NOTAGS));
+$temp->add(new admin_setting_configtext('supportpage', get_string('supportpage', 'admin'), get_string('configsupportpage', 'admin'), '', PARAM_URL));
 $ADMIN->add('server', $temp, 100);


@@ -71,6 +89,7 @@ $temp->add(new admin_setting_configselect('sessiontimeout', get_string('sessiont
                                                                                                                                                      300 => get_string('numminutes', '', 5))));
 $temp->add(new admin_setting_configtext('sessioncookie', get_string('sessioncookie', 'admin'), get_string('configsessioncookie', 'admin'), '', PARAM_ALPHANUM));
 $temp->add(new admin_setting_configtext('sessioncookiepath', get_string('sessioncookiepath', 'admin'), get_string('configsessioncookiepath', 'admin'), '/', PARAM_LOCALURL));
+$temp->add(new admin_setting_configtext('sessioncookiedomain', get_string('sessioncookiedomain', 'admin'), get_string('configsessioncookiedomain', 'admin'), '', PARAM_TEXT, 50));
 $ADMIN->add('server', $temp, 50);


@@ -84,8 +103,10 @@ $ADMIN->add('server', $temp);
 // "debugging" settingpage
 $temp = new admin_settingpage('debugging', get_string('debugging', 'admin'));
 $temp->add(new admin_setting_special_debug());
-$temp->add(new admin_setting_special_debugdisplay());
-$temp->add(new admin_setting_special_perfdebug());
+$temp->add(new admin_setting_configcheckbox('debugdisplay', get_string('debugdisplay', 'admin'), get_string('configdebugdisplay', 'admin'), ini_get_bool('display_errors')));
+$temp->add(new admin_setting_configcheckbox('xmlstrictheaders', get_string('xmlstrictheaders', 'admin'), get_string('configxmlstrictheaders', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('debugsmtp', get_string('debugsmtp', 'admin'), get_string('configdebugsmtp', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('perfdebug', get_string('perfdebug', 'admin'), get_string('configperfdebug', 'admin'), '7', '15', '7'));
 $ADMIN->add('server', $temp);


@@ -103,7 +124,9 @@ $temp->add(new admin_setting_configselect('statsfirstrun', get_string('statsfirs
                                                                                                                                                           60*60*24*140 => get_string('nummonths','moodle',5),
                                                                                                                                                           60*60*24*168 => get_string('nummonths','moodle',6),
                                                                                                                                                           'all' => get_string('all') )));
-$temp->add(new admin_setting_configselect('statsmaxruntime', get_string('statsmaxruntime', 'admin'), get_string('configstatsmaxruntime', 'admin'), 0, array(0 => get_string('untilcomplete'),
+$temp->add(new admin_setting_configselect('statsmaxruntime', get_string('statsmaxruntime', 'admin'), get_string('configstatsmaxruntime3', 'admin'), 0, array(0 => get_string('untilcomplete'),
+                                                                                                                                                            60*30 => '10 '.get_string('minutes'),
+                                                                                                                                                            60*30 => '30 '.get_string('minutes'),
                                                                                                                                                            60*60 => '1 '.get_string('hour'),
                                                                                                                                                            60*60*2 => '2 '.get_string('hours'),
                                                                                                                                                            60*60*3 => '3 '.get_string('hours'),
@@ -112,17 +135,36 @@ $temp->add(new admin_setting_configselect('statsmaxruntime', get_string('statsma
                                                                                                                                                            60*60*6 => '6 '.get_string('hours'),
                                                                                                                                                            60*60*7 => '7 '.get_string('hours'),
                                                                                                                                                            60*60*8 => '8 '.get_string('hours') )));
+$temp->add(new admin_setting_configtext('statsruntimedays', get_string('statsruntimedays', 'admin'), get_string('configstatsruntimedays', 'admin'), 31, PARAM_INT));
 $temp->add(new admin_setting_configtime('statsruntimestarthour', 'statsruntimestartminute', get_string('statsruntimestart', 'admin'), get_string('configstatsruntimestart', 'admin'), array('h' => 0, 'm' => 0)));
 $temp->add(new admin_setting_configtext('statsuserthreshold', get_string('statsuserthreshold', 'admin'), get_string('configstatsuserthreshold', 'admin'), 0, PARAM_INT));
+
+$options = array(0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6);
+$temp->add(new admin_setting_configselect('statscatdepth', get_string('statscatdepth', 'admin'), get_string('configstatscatdepth', 'admin'), 1, $options));
 $ADMIN->add('server', $temp);


 // "http" settingpage
 $temp = new admin_settingpage('http', get_string('http', 'admin'));
 $temp->add(new admin_setting_configtext('framename', get_string('framename', 'admin'), get_string('configframename', 'admin'), '_top', PARAM_ALPHAEXT));
-$temp->add(new admin_Setting_configcheckbox('slasharguments', get_string('slasharguments', 'admin'), get_string('configslasharguments', 'admin'), 1));
+$temp->add(new admin_setting_configcheckbox('slasharguments', get_string('slasharguments', 'admin'), get_string('configslasharguments', 'admin'), 1));
+$temp->add(new admin_setting_heading('reverseproxy', get_string('reverseproxy', 'admin'), '', ''));
+$options = array(
+    0 => 'HTTP_CLIENT_IP, HTTP_X_FORWARDED_FOR, REMOTE_ADDR',
+    GETREMOTEADDR_SKIP_HTTP_CLIENT_IP => 'HTTP_X_FORWARDED_FOR, REMOTE_ADDR',
+    GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR => 'HTTP_CLIENT, REMOTE_ADDR',
+    GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR|GETREMOTEADDR_SKIP_HTTP_CLIENT_IP => 'REMOTE_ADDR');
+$temp->add(new admin_setting_configselect('getremoteaddrconf', get_string('getremoteaddrconf', 'admin'), get_string('configgetremoteaddrconf', 'admin'), 0, $options));
+$temp->add(new admin_setting_heading('webproxy', get_string('webproxy', 'admin'), get_string('webproxyinfo', 'admin')));
 $temp->add(new admin_setting_configtext('proxyhost', get_string('proxyhost', 'admin'), get_string('configproxyhost', 'admin'), '', PARAM_HOST));
 $temp->add(new admin_setting_configtext('proxyport', get_string('proxyport', 'admin'), get_string('configproxyport', 'admin'), 0, PARAM_INT));
+$options = array('HTTP'=>'HTTP');
+if (defined('CURLPROXY_SOCKS5')) {
+    $options['SOCKS5'] = 'SOCKS5';
+}
+$temp->add(new admin_setting_configselect('proxytype', get_string('proxytype', 'admin'), get_string('configproxytype','admin'), 'HTTP', $options));
+$temp->add(new admin_setting_configtext('proxyuser', get_string('proxyuser', 'admin'), get_string('configproxyuser', 'admin'), ''));
+$temp->add(new admin_setting_configpasswordunmask('proxypassword', get_string('proxypassword', 'admin'), get_string('configproxypassword', 'admin'), ''));
 $ADMIN->add('server', $temp);

 $ADMIN->add('server', new admin_externalpage('maintenancemode', get_string('sitemaintenancemode', 'admin'), "$CFG->wwwroot/$CFG->admin/maintenance.php"));
@@ -153,6 +195,15 @@ $temp->add(new admin_setting_configselect('deleteunconfirmed', get_string('delet
                                                                                                                                                                    6 => get_string('numhours', '', 6),
                                                                                                                                                                    1 => get_string('numhours', '', 1))));

+$temp->add(new admin_setting_configselect('deleteincompleteusers', get_string('deleteincompleteusers', 'admin'), get_string('configdeleteincompleteusers', 'admin'), 0, array(0 => get_string('never'),
+                                                                                                                                                                    168 => get_string('numdays', '', 7),
+                                                                                                                                                                    144 => get_string('numdays', '', 6),
+                                                                                                                                                                    120 => get_string('numdays', '', 5),
+                                                                                                                                                                    96 => get_string('numdays', '', 4),
+                                                                                                                                                                    72 => get_string('numdays', '', 3),
+                                                                                                                                                                    48 => get_string('numdays', '', 2),
+                                                                                                                                                                    24 => get_string('numdays', '', 1))));
+
 $temp->add(new admin_setting_configselect('loglifetime', get_string('loglifetime', 'admin'), get_string('configloglifetime', 'admin'), 0, array(0 => get_string('neverdeletelogs'),
                                                                                                                                                1000 => get_string('numdays', '', 1000),
                                                                                                                                                365 => get_string('numdays', '', 365),
@@ -161,7 +212,25 @@ $temp->add(new admin_setting_configselect('loglifetime', get_string('loglifetime
                                                                                                                                                120 => get_string('numdays', '', 120),
                                                                                                                                                90 => get_string('numdays', '', 90),
                                                                                                                                                60 => get_string('numdays', '', 60),
-                                                                                                                                                30 => get_string('numdays', '', 30))));
+                                                                                                                                                35 => get_string('numdays', '', 35),
+                                                                                                                                                10 => get_string('numdays', '', 10),
+                                                                                                                                                5 => get_string('numdays', '', 5),
+                                                                                                                                                2 => get_string('numdays', '', 2))));
+
+
+$temp->add(new admin_setting_configcheckbox('disablegradehistory', get_string('disablegradehistory', 'grades'),
+                                            get_string('configdisablegradehistory', 'grades'), 0, PARAM_INT));
+
+$temp->add(new admin_setting_configselect('gradehistorylifetime', get_string('gradehistorylifetime', 'grades'),
+                                          get_string('configgradehistorylifetime', 'grades'), 0, array(0 => get_string('neverdeletehistory', 'grades'),
+                                                                                                   1000 => get_string('numdays', '', 1000),
+                                                                                                    365 => get_string('numdays', '', 365),
+                                                                                                    180 => get_string('numdays', '', 180),
+                                                                                                    150 => get_string('numdays', '', 150),
+                                                                                                    120 => get_string('numdays', '', 120),
+                                                                                                     90 => get_string('numdays', '', 90),
+                                                                                                     60 => get_string('numdays', '', 60),
+                                                                                                     30 => get_string('numdays', '', 30))));

 $ADMIN->add('server', $temp);

@@ -173,17 +242,17 @@ $ADMIN->add('server', new admin_externalpage('phpinfo', get_string('phpinfo'), "

 // "performance" settingpage
 $temp = new admin_settingpage('performance', get_string('performance', 'admin'));
-$temp->add(new admin_setting_configselect('cachetype', get_string('cachetype', 'admin'), 
-                                          get_string('configcachetype', 'admin'), false, 
-                                          array( '' => 'none', 
-                                                 'internal' => 'internal', 
-                                                 'memcached' => 'memcached', 
+$temp->add(new admin_setting_special_selectsetup('cachetype', get_string('cachetype', 'admin'),
+                                          get_string('configcachetype', 'admin'), '',
+                                          array( '' => get_string('none'),
+                                                 'internal' => 'internal',
+                                                 'memcached' => 'memcached',
                                                 'eaccelerator' => 'eaccelerator')));
 // NOTE: $CFG->rcache is forced to bool in lib/setup.php
-$temp->add(new admin_setting_configselect('rcache', get_string('rcache', 'admin'),
-                                          get_string('configrcache', 'admin'), false, 
-                                          array( '0' => 'false', 
-                                                 '1' => 'true')));
+$temp->add(new admin_setting_special_selectsetup('rcache', get_string('rcache', 'admin'),
+                                          get_string('configrcache', 'admin'), 0,
+                                          array( '0' => get_string('no'),
+                                                 '1' => get_string('yes'))));
 $temp->add(new admin_setting_configtext('rcachettl', get_string('rcachettl', 'admin'),
                                        get_string('configrcachettl', 'admin'), 10));
 $temp->add(new admin_setting_configtext('intcachemax', get_string('intcachemax', 'admin'),
@@ -191,13 +260,21 @@ $temp->add(new admin_setting_configtext('intcachemax', get_string('intcachemax',
 $temp->add(new admin_setting_configtext('memcachedhosts', get_string('memcachedhosts', 'admin'),
                                        get_string('configmemcachedhosts', 'admin'), ''));
 $temp->add(new admin_setting_configselect('memcachedpconn', get_string('memcachedpconn', 'admin'),
-                                          get_string('configmemcachedpconn', 'admin'), false, 
-                                          array( '0' => 'false', 
-                                                 '1' => 'true')));
+                                          get_string('configmemcachedpconn', 'admin'), 0,
+                                          array( '0' => get_string('no'),
+                                                 '1' => get_string('yes'))));
 $ADMIN->add('server', $temp);

-if (file_exists("$CFG->dirroot/$CFG->admin/mysql/frame.php")) {
-    $ADMIN->add('server', new admin_externalpage('database', get_string('managedatabase'), "$CFG->wwwroot/$CFG->admin/mysql/frame.php"));
+if ($CFG->dbfamily === 'mysql') {
+    if (file_exists("$CFG->dirroot/$CFG->admin/mysql/frame.php")) {
+        $ADMIN->add('server', new admin_externalpage('database', get_string('managedatabase'), "$CFG->wwwroot/$CFG->admin/mysql/frame.php"));
+    }
+} else if ($CFG->dbfamily === 'postgres') {
+    if (file_exists("$CFG->dirroot/$CFG->admin/pgsql/frame.php")) {
+        $ADMIN->add('server', new admin_externalpage('database', get_string('managedatabase'), "$CFG->wwwroot/$CFG->admin/pgsql/frame.php"));
+    }
 }

+} // end of speedup
+
 ?>
@@ -5,43 +5,37 @@
 // since they need to exist *before* settingpages and externalpages
 // are added to them.

+$systemcontext = get_context_instance(CONTEXT_SYSTEM);
+if (get_site()) {
+    $hassiteconfig = has_capability('moodle/site:config', $systemcontext);
+} else {
+    // installation starts - no permission checks
+    $hassiteconfig = true;
+}
+
 $ADMIN->add('root', new admin_externalpage('adminnotifications', get_string('notifications'), "$CFG->wwwroot/$CFG->admin/index.php"));

 // hidden upgrade script
 $ADMIN->add('root', new admin_externalpage('upgradesettings', get_string('upgradesettings', 'admin'), "$CFG->wwwroot/$CFG->admin/upgradesettings.php", 'moodle/site:config', true));

-// hidden search script
-$ADMIN->add('root', new admin_externalpage('search', get_string('search', 'admin'), "$CFG->wwwroot/$CFG->admin/search.php", 'moodle/site:config', true));
-
 $ADMIN->add('root', new admin_category('users', get_string('users','admin')));
 $ADMIN->add('root', new admin_category('courses', get_string('courses','admin')));
+$ADMIN->add('root', new admin_category('grades', get_string('grades')));
 $ADMIN->add('root', new admin_category('location', get_string('location','admin')));
 $ADMIN->add('root', new admin_category('language', get_string('language')));
-
 $ADMIN->add('root', new admin_category('modules', get_string('plugins', 'admin')));
-$ADMIN->add('modules', new admin_externalpage('managemodules', get_string('activities'), "$CFG->wwwroot/$CFG->admin/modules.php"));
-$ADMIN->add('modules', new admin_externalpage('manageblocks', get_string('blocks'), "$CFG->wwwroot/$CFG->admin/blocks.php"));
-$ADMIN->add('modules', new admin_externalpage('managefilters', get_string('managefilters'), "$CFG->wwwroot/$CFG->admin/filters.php"));
-
 $ADMIN->add('root', new admin_category('security', get_string('security','admin')));
 $ADMIN->add('root', new admin_category('appearance', get_string('appearance','admin')));
 $ADMIN->add('root', new admin_category('frontpage', get_string('frontpage','admin')));
 $ADMIN->add('root', new admin_category('server', get_string('server','admin')));
 $ADMIN->add('root', new admin_category('mnet', get_string('net','mnet')));
-
 $ADMIN->add('root', new admin_category('reports', get_string('reports')));
-foreach (get_list_of_plugins('admin/report') as $plugin) {
-/// This snippet is temporary until simpletest can be fixed to use xmldb.   See MDL-7377   XXX TODO
-    if ($plugin == 'simpletest' && $CFG->dbfamily != 'mysql' && $CFG->dbfamily != 'postgres') {
-        continue;
-    }
-/// End of removable snippet
-    $ADMIN->add('reports', new admin_externalpage('report'.$plugin, get_string($plugin, 'admin'), "$CFG->wwwroot/$CFG->admin/report/$plugin/index.php"));
-}
-
 $ADMIN->add('root', new admin_category('misc', get_string('miscellaneous')));

 // hidden unsupported category
 $ADMIN->add('root', new admin_category('unsupported', get_string('unsupported', 'admin'), true));

+// hidden search script
+$ADMIN->add('root', new admin_externalpage('search', get_string('searchresults'), "$CFG->wwwroot/$CFG->admin/search.php", 'moodle/site:config', true));
+
 ?>
@@ -2,10 +2,13 @@

 // This file defines settingpages and externalpages in the "unsupported" hidden category, use wisely!

-$ADMIN->add('unsupported', new admin_externalpage('purgemoodledata', 'Purge moodledata', $CFG->wwwroot.'/'.$CFG->admin.'/delete.php'));
-$ADMIN->add('unsupported', new admin_externalpage('healthcenter', get_string('healthcenter'), $CFG->wwwroot.'/'.$CFG->admin.'/health.php'));
-$ADMIN->add('unsupported', new admin_externalpage('toinodb', 'Convert to InnoDB', $CFG->wwwroot.'/'.$CFG->admin.'/innodb.php'));
-$ADMIN->add('unsupported', new admin_externalpage('replace', 'Search and replace', $CFG->wwwroot.'/'.$CFG->admin.'/replace.php'));
+if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

+    $ADMIN->add('unsupported', new admin_externalpage('purgemoodledata', 'Purge moodledata', $CFG->wwwroot.'/'.$CFG->admin.'/delete.php', 'moodle/site:config', true));
+    $ADMIN->add('unsupported', new admin_externalpage('healthcenter', get_string('healthcenter'), $CFG->wwwroot.'/'.$CFG->admin.'/health.php', 'moodle/site:config', true));
+    $ADMIN->add('unsupported', new admin_externalpage('toinodb', 'Convert to InnoDB', $CFG->wwwroot.'/'.$CFG->admin.'/innodb.php', 'moodle/site:config', true));
+    $ADMIN->add('unsupported', new admin_externalpage('replace', 'Search and replace', $CFG->wwwroot.'/'.$CFG->admin.'/replace.php', 'moodle/site:config', true));
+
+} // end of speedup

 ?>
--- a/Show More
+++ b/Show More