Moodle 1.9.12 release

weekly release 1.9.11+
Merge branch 'MDL-26937' of git://github.com/timhunt/moodle into MOODLE_19_STABLE
2011-05-09 15:59:53 +02:00 · 2011-05-05 00:38:37 +02:00 · 2011-05-02 11:37:08 +02:00 · 2011-04-29 12:09:05 +01:00 · 2011-04-28 23:54:59 +01:00 · 2011-04-27 12:05:55 +02:00
2998 changed files with 328984 additions and 166652 deletions
@@ -0,0 +1,27 @@
+# This file specifies intentionally untracked files that all Moodle git
+# repositories should ignore. It is recommended not to modify this file in your
+# local clone. Instead, use .git/info/exclude and add new records there as
+# needed.
+#
+# Example: if you deploy a contributed plugin mod/foobar into your site, put
+# the following line into .git/info/exclude file in your Moodle clone:
+# /mod/foobar/
+#
+# See gitignore(5) man page for more details
+#
+/config.php
+/lib/editor/tinymce/extra/tools/temp/
+*~
+*.swp
+/tags
+/TAGS
+/cscope.*
+/.patches/
+/.idea/
+/nbproject/
+CVS
+.DS_Store
+/.settings/
+/.project
+/.buildpath
+/.cache
@@ -1,8 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.

  When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.

 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.

 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 Also add information on how to contact you by electronic and paper mail.

@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
@@ -1,4 +1,4 @@
-README     $Id$
+README      $Id$
 ------

 QUICK INSTALL
@@ -11,7 +11,10 @@ require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/tablelib.php');

-admin_externalpage_setup('userauthentication');
+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);
@@ -19,13 +22,6 @@ $auth   = optional_param('auth', '', PARAM_SAFEDIR);
 // get currently installed and enabled auth plugins
 $authsavailable = get_list_of_plugins('auth');

-//revert auth_plugins_enabled
-if (isset($CFG->auth_plugins_enabled)) {
-    set_config('auth', $CFG->auth_plugins_enabled);
-    delete_records('config', 'name', 'auth_plugins_enabled');
-    unset($CFG->auth_plugins_enabled);
-}
-
 get_enabled_auth_plugins(true); // fix the list of enabled auths
 if (empty($CFG->auth)) {
    $authsenabled = array();
@@ -33,44 +29,18 @@ if (empty($CFG->auth)) {
    $authsenabled = explode(',', $CFG->auth);
 }

-if (!isset($CFG->registerauth)) {
-    set_config('registerauth', '');
-}
-
-if (!isset($CFG->auth_instructions)) {
-    set_config('auth_instructions', '');
-}
-
 if (!empty($auth) and !exists_auth_plugin($auth)) {
-    error(get_string('pluginnotinstalled', 'auth', $auth), $url);
+    print_error('pluginnotinstalled', 'auth', $url, $auth);
 }

-
 ////////////////////////////////////////////////////////////////////////////////
 // process actions

-$status = '';
+if (!confirm_sesskey()) {
+    redirect($returnurl);
+}

 switch ($action) {
-
-    case 'save':
-        if (data_submitted() and confirm_sesskey()) {
-
-            // save settings
-            set_config('guestloginbutton', required_param('guestloginbutton', PARAM_BOOL));
-            set_config('alternateloginurl', stripslashes(trim(required_param('alternateloginurl', PARAM_RAW))));
-            set_config('registerauth', required_param('register', PARAM_SAFEDIR));
-            set_config('auth_instructions', stripslashes(trim(required_param('auth_instructions', PARAM_RAW))));
-
-            // enable registerauth in $CFG->auth if needed
-            if (!empty($CFG->registerauth) and !in_array($CFG->registerauth, $authsenabled)) {
-                $authsenabled[] = $CFG->registerauth;
-                set_config('auth', implode(',', $authsenabled));
-            }
-            $status = get_string('changessaved');
-        }
-        break;
-
    case 'disable':
        // remove from enabled list
        $key = array_search($auth, $authsenabled);
@@ -97,7 +67,7 @@ switch ($action) {
        $key = array_search($auth, $authsenabled);
        // check auth plugin is valid
        if ($key === false) {
-            error(get_string('pluginnotenabled', 'auth', $auth), $url);
+            print_error('pluginnotenabled', 'auth', $url, $auth);
        }
        // move down the list
        if ($key < (count($authsenabled) - 1)) {
@@ -112,7 +82,7 @@ switch ($action) {
        $key = array_search($auth, $authsenabled);
        // check auth is valid
        if ($key === false) {
-            error(get_string('pluginnotenabled', 'auth', $auth), $url);
+            print_error('pluginnotenabled', 'auth', $url, $auth);
        }
        // move up the list
        if ($key >= 1) {
@@ -127,188 +97,6 @@ switch ($action) {
        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[''] = $txt->disable;
-foreach ($authsenabled as $auth) {
-    $authplugin = get_auth_plugin($auth);
-/// Get the auth title (from core or own auth lang files)
-    $authtitle = get_string("auth_{$auth}title", "auth");
-    if ($authtitle == "[[auth_{$auth}title]]") {
-        $authtitle = get_string("auth_{$auth}title", "auth_{$auth}");
-    }
-/// Apply titles
-    $displayauths[$auth] = $authtitle;
-    if ($authplugin->can_signup()) {
-        $registrationauths[$auth] = $authtitle;
-    }
-}
-
-foreach ($authsavailable as $auth) {
-    if (array_key_exists($auth, $displayauths)) {
-        continue; //already in the list
-    }
-    $authplugin = get_auth_plugin($auth);
-/// Get the auth title (from core or own auth lang files)
-    $authtitle = get_string("auth_{$auth}title", "auth");
-    if ($authtitle == "[[auth_{$auth}title]]") {
-        $authtitle = get_string("auth_{$auth}title", "auth_{$auth}");
-    }
-/// Apply titles
-    $displayauths[$auth] = $authtitle;
-    if ($authplugin->can_signup()) {
-        $registrationauths[$auth] = $authtitle;
-    }
-}
-
-// build the display table
-$table = new flexible_table('auth_admin_table');
-$table->define_columns(array('name', 'enable', 'order', 'settings'));
-$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', 'generaltable generalbox boxaligncenter boxwidthwide');
-$table->setup();
-
-//add always enabled plugins first
-$displayname = "<span>".$displayauths['manual']."</span>";
-$settings = "<a href=\"auth_config.php?sesskey={$USER->sesskey}&amp;auth=manual\">{$txt->settings}</a>";
-$table->add_data(array($displayname, '', '', $settings));
-$displayname = "<span>".$displayauths['nologin']."</span>";
-$settings = "<a href=\"auth_config.php?sesskey={$USER->sesskey}&amp;auth=nologin\">{$txt->settings}</a>";
-$table->add_data(array($displayname, '', '', $settings));
-
-
-// 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) {
-    if ($auth == 'manual' or $auth == 'nologin') {
-        continue;
-    }
-    // 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();
-
-//print stus messages
-if ($status !== '') {
-    notify($status, 'notifysuccess');
-}
-
-print_simple_box(get_string('configauthenticationplugins', 'admin'), 'center', '700');
-
-$table->print_html();
-
-////////////////////////////////////////////////////////////////////////////////
-
-$guestoptions = array();
-$guestoptions[0] = get_string("hide");
-$guestoptions[1] = get_string("show");
-
-echo '<hr />';
-
-echo '<form '.$CFG->frametarget.' id="adminsettings" method="post" action="auth.php">';
-echo '<div class="settingsform clearfix">';
-print_heading(get_string('auth_common_settings', 'auth'));
-echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
-echo '<input type="hidden" name="action" value="save" />';
-echo '<fieldset>';
-##echo '<table cellspacing="0" cellpadding="5" border="0" style="margin-left:auto;margin-right:auto">';
-
-// User self registration
-echo '<div class="form-item" id="admin-register">';
-echo '<label for = "menuregister">' . get_string("selfregistration", "auth");
-echo '<span class="form-shortname">registerauth</span>';
-echo '</label>';
-choose_from_menu($registrationauths, "register", $CFG->registerauth, "");
-echo '<div class="description">' . get_string("selfregistration_help", "auth") . '</div>';
-echo '</div>';
-
-// Login as guest button enabled
-echo '<div class="form-item" id="admin-guestloginbutton">';
-echo '<label for = "menuguestloginbutton">' . get_string("guestloginbutton", "auth");
-echo '<span class="form-shortname">guestloginbutton</span>';
-echo '</label>';
-choose_from_menu($guestoptions, "guestloginbutton", $CFG->guestloginbutton, "");
-echo '<div class="description">' . get_string("showguestlogin", "auth") . '</div>';
-echo '</div>';
-
-/// An alternate url for the login form. It means we can use login forms that are integrated
-/// into non-moodle pages
-echo '<div class="form-item" id="admin-alternateloginurl">';
-echo '<label for = "alternateloginurl">' . get_string("alternateloginurl", "auth");
-echo '<span class="form-shortname">alternateloginurl</span>';
-echo '</label>';
-echo '<input type="text" size="60" name="alternateloginurl" id="alternateloginurl" value="'.$CFG->alternateloginurl."\" />\n";
-echo '<div class="description">' . get_string("alternatelogin", "auth", htmlspecialchars($CFG->wwwroot.'/login/index.php')) . '</div>';
-echo '</div>';
-
-/// Instructions about login/password
-/// to be showed to users
-echo '<div class="form-item" id="admin-auth_instructions">';
-echo '<label for = "auth_instructions">' . get_string("instructions", "auth");
-echo '<span class="form-shortname">auth_instructions</span>';
-echo '</label>';
-echo '<textarea cols="30" rows="4" name="auth_instructions" id="auth_instructions">'.s($CFG->auth_instructions)."</textarea>\n";
-echo '<div class="description">' . get_string("authinstructions", "auth") . '</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();
+redirect ($returnurl);

 ?>
@@ -6,18 +6,19 @@
 require_once '../config.php';
 require_once $CFG->libdir.'/adminlib.php';

-admin_externalpage_setup('userauthentication');
 $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 (!confirm_sesskey()) {
-        error(get_string('confirmsesskeybad', 'error'));
-    }
-
+if ($frm = data_submitted() and confirm_sesskey()) {
    $frm = stripslashes_recursive($frm);

    $authplugin->validate_form($frm, $err);
@@ -37,7 +38,7 @@ if ($frm = data_submitted()) {
                    }
                }
            }
-            redirect("auth.php");
+            redirect($returnurl);
            exit;
        }
    } else {
@@ -49,18 +50,13 @@ if ($frm = data_submitted()) {
    $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");

 /// Get the auth title (from core or own auth lang files)
-    $authtitle = get_string("auth_{$auth}title", "auth");
-    if ($authtitle == "[[auth_{$auth}title]]") {
-        $authtitle = get_string("auth_{$auth}title", "auth_{$auth}");
-    }
+    $authtitle = $authplugin->get_title();
 /// Get the auth descriptions (from core or own auth lang files)
-    $authdescription = get_string("auth_{$auth}description", "auth");
-    if ($authdescription == "[[auth_{$auth}description]]") {
-        $authdescription = get_string("auth_{$auth}description", "auth_{$auth}");
-    }
+    $authdescription = $authplugin->get_description();

 // output configuration form
 admin_externalpage_print_header();
@@ -140,10 +136,11 @@ 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);
-        }
-
+        } 
        if ($retrieveopts) {
            $varname = 'field_map_' . $field;

@@ -6,14 +6,14 @@
    require_once($CFG->libdir.'/adminlib.php');
    require_once($CFG->libdir.'/blocklib.php');

-    admin_externalpage_setup('manageblocks');
-
    $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,11 +50,6 @@
    $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();

    print_heading($strblockname);
@@ -70,6 +65,6 @@
    echo '</p>';
    $block->config_print();
    echo '</form>';
-    admin_externalpage_print_footer();
+    print_footer();

 ?>
@@ -29,10 +29,6 @@
    $strmultiple = get_string('blockmultiple', 'admin');
    $strshowblockcourse = get_string('showblockcourse');

-    admin_externalpage_print_header();
-
-    print_heading($strmanageblocks);
-
 /// If data submitted, then process and store.

    if (!empty($hide) && confirm_sesskey()) {
@@ -40,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() ) {
@@ -47,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()) {
@@ -55,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!");
@@ -99,25 +100,9 @@
                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);

@@ -130,6 +115,9 @@
        }
    }

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

 /// Get and sort the existing blocks
@@ -174,21 +162,35 @@
    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\" >$count</a>";
+            $blocklist .= "title=\"$strshowblockcourse\" >$totalcount</a>";
        }
        else {
-            $blocklist = "$count";
+            $blocklist = "$totalcount";
        }
        $class = ''; // Nothing fancy, by default

@@ -40,7 +40,7 @@
    }
    if (!empty($CFG->showcrondebugging)) {
        $CFG->debug = DEBUG_DEVELOPER;
-        $CFG->displaydebug = true;
+        $CFG->debugdisplay = true;
    }

 /// extra safety
@@ -100,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)) {
@@ -108,6 +109,7 @@
                $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);
@@ -128,10 +130,11 @@
            }
        }
    }
+    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) {
@@ -157,6 +160,33 @@
    }
    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(true);
@@ -189,10 +219,13 @@
    }


-    mtrace('Starting grade job ...', '');
+    mtrace('Starting main gradebook job ...');
    grade_cron();
-    mtrace('Done ...');
+    mtrace('done.');

+    mtrace('Starting processing the event queue...');
+    events_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 
@@ -215,7 +248,7 @@
            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("Deleted assignment for user $assign->userid from course $assign->courseid");
+                        mtrace("removing user $assign->userid from course $assign->courseid as they have not accessed the course for over $CFG->longtimenosee days");
                    }
                }
            }
@@ -260,8 +293,8 @@

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

-        if (!empty($CFG->deleteunconfirmed)) {
-            $cuttime = $timenow - ($CFG->deleteunconfirmed * 3600);
+        if (!empty($CFG->deleteincompleteusers)) {
+            $cuttime = $timenow - ($CFG->deleteincompleteusers * 3600);
            $rs = get_recordset_sql ("SELECT id, username
                                        FROM {$CFG->prefix}user
                                       WHERE confirmed = 1
@@ -270,7 +303,7 @@
                                         AND deleted = 0
                                         AND (lastname = '' OR firstname = '' OR email = '')");
            while ($user = rs_fetch_next_record($rs)) {
-                if (delete_records('user', 'id', $user->id)) {
+                if (delete_user($user)) {
                    mtrace("Deleted not fully setup user $user->username ($user->id)");
                }
            }
@@ -320,7 +353,7 @@
                                                p.id as prefid 
                                        FROM {$CFG->prefix}user u 
                                             JOIN {$CFG->prefix}user_preferences p ON u.id=p.userid
-                                        WHERE p.name='create_password' AND p.value=1 AND u.email !='' ");
+                                        WHERE p.name='create_password' AND p.value='1' AND u.email !='' ");

            foreach ($newusers as $newuserid => $newuser) {
                $newuser->emailstop = 0; // send email regardless
@@ -334,7 +367,7 @@
            }
        }
        
-        if(!empty($CFG->usetags)){
+        if (!empty($CFG->usetags)) {
            require_once($CFG->dirroot.'/tag/lib.php');
            tag_cron();
            mtrace ('Executed tag cron');
@@ -395,6 +428,23 @@
        }
    }

+/// Run the auth cron, if any
+/// before enrolments because it might add users that will be needed in enrol plugins
+    $auths = get_enabled_auth_plugins();
+
+    mtrace("Running auth crons if required...");
+    foreach ($auths as $auth) {
+        $authplugin = get_auth_plugin($auth);
+        if (method_exists($authplugin, 'cron')) {
+            mtrace("Running cron for auth/$auth...");
+            $authplugin->cron();
+            if (!empty($authplugin->log)) {
+                mtrace($authplugin->log);
+            }
+        }
+        unset($authplugin);
+    }
+
 /// Run the enrolment cron, if any
    if (!($plugins = explode(',', $CFG->enrol_plugins_enabled))) {
        $plugins = array($CFG->enrol);
@@ -411,107 +461,76 @@
        unset($enrol);
    }

-/// Run the auth cron, if any
-    $auths = get_enabled_auth_plugins();
-
-    mtrace("Running auth crons if required...");
-    foreach ($auths as $auth) {
-        $authplugin = get_auth_plugin($auth);
-        if (method_exists($authplugin, 'cron')) {
-            mtrace("Running cron for auth/$auth...");
-            $authplugin->cron();
-            if (!empty($authplugin->log)) {
-                mtrace($authplugin->log);
-            }
-        }
-        unset($authplugin);
-    }
-
    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();
-                }
-                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);
+            @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();
                }
            }
        }
    }
-    
-    // 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/lib.php')) {
-                require_once($CFG->dirroot.'/grade/import/lib.php');
-                $cron_function = 'gradeimport_'.$gradeimport.'_cron';                                    
-                if (function_exists($cron_function)) {
-                    mtrace("Processing gradebook import function $cron_function ...", '');
-                    $cron_function;  
-                }
-            }
-        }      
-    }

    if ($gradeexports = get_list_of_plugins('grade/export')) {
-        foreach ($gradeexports as $gradeexport) {           
-            if (file_exists($CFG->dirroot.'/grade/export/lib.php')) {
-                require_once($CFG->dirroot.'/grade/export/lib.php');
-                $cron_function = 'gradeexport_'.$gradeexport.'_cron';                                    
+        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;  
+                    $cron_function();
                }
            }
        }
    }
-    
+
    if ($gradereports = get_list_of_plugins('grade/report')) {
-        foreach ($gradereports as $gradereport) {           
-            if (file_exists($CFG->dirroot.'/grade/report/lib.php')) {
-                require_once($CFG->dirroot.'/grade/report/lib.php');
-                $cron_function = 'gradereport_'.$gradereport.'_cron';                                    
+        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;  
+                    $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();
@@ -521,7 +540,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,7 +12,7 @@

    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");
@@ -13,7 +13,7 @@
    $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!

@@ -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,20 +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';

    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();
@@ -34,6 +39,12 @@
        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
@@ -101,6 +112,33 @@
    echo "</div>";
    echo "</form>";

+    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();

-?>
+?>
@@ -19,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);
@@ -7,7 +7,7 @@
 // Moodle - Modular Object-Oriented Dynamic Learning Environment         //
 //          http://moodle.com                                            //
 //                                                                       //
-// Copyright (C) 1999 onwards 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  //
@@ -65,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.'/';
@@ -77,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;
            }
@@ -80,7 +80,6 @@
        <FEEDBACK>
          <ON_ERROR message="mysql416required" />
        </FEEDBACK>
-        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
      </VENDOR>
      <VENDOR name="postgres" version="7.4" />
      <VENDOR name="mssql" version="9.0" />
@@ -117,6 +116,16 @@
          <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">
@@ -130,7 +139,6 @@
        <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" />
@@ -167,6 +175,18 @@
          <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_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
    </PHP_EXTENSIONS>
    <CUSTOM_CHECKS>
      <CUSTOM_CHECK file="question/upgrade.php" function="question_check_no_rqp_questions" level="optional">
@@ -180,6 +200,11 @@
          <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">
@@ -189,24 +214,24 @@
      </FEEDBACK>
    </UNICODE>
    <DATABASE level="required">
-      <VENDOR name="mysql" version="4.1.16">
+      <VENDOR name="mysql" version="5.0.25">
        <FEEDBACK>
          <ON_ERROR message="mysql416required" />
        </FEEDBACK>
-        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
      </VENDOR>
-      <VENDOR name="postgres" version="8.0" />
+      <VENDOR name="postgres" version="8.3" />
      <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="oracle" version="10.2" />
+      <VENDOR name="sqlite" version="2.0" />
    </DATABASE>
-    <PHP version="5.2.0" level="required">
+    <PHP version="5.2.8" level="required">
    </PHP>
    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="optional">
+      <PHP_EXTENSION name="iconv" level="required">
        <FEEDBACK>
-          <ON_CHECK message="iconvrecommended" />
+          <ON_CHECK message="iconvrequired" />
        </FEEDBACK>
      </PHP_EXTENSION>
      <PHP_EXTENSION name="mbstring" level="optional">
@@ -214,9 +239,9 @@
          <ON_CHECK message="mbstringrecommended" />
        </FEEDBACK>
      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="optional">
+      <PHP_EXTENSION name="curl" level="required">
        <FEEDBACK>
-          <ON_CHECK message="curlrecommended" />
+          <ON_CHECK message="curlrequired" />
        </FEEDBACK>
      </PHP_EXTENSION>
      <PHP_EXTENSION name="openssl" level="optional">
@@ -229,14 +254,192 @@
          <ON_CHECK message="tokenizerrecommended" />
        </FEEDBACK>
      </PHP_EXTENSION>
-    </PHP_EXTENSIONS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="question/upgrade.php" function="question_check_no_rqp_questions" level="optional">
+      <PHP_EXTENSION name="xmlrpc" level="optional">
        <FEEDBACK>
-          <ON_CHECK message="qtyperqpwillberemovedanyway" />
-          <ON_OK message="qtyperqpwillberemoved" />
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </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_EXTENSION name="gd" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="gdrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="intlrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="40M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="safe_mode" value="0" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingsafemode" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_php533" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="php533warning" />
        </FEEDBACK>
      </CUSTOM_CHECK>
    </CUSTOM_CHECKS>
  </MOODLE>
+  <MOODLE version="2.1" requires="1.9">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="5.0.25">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+      </VENDOR>
+      <VENDOR name="postgres" version="8.3" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="10.2" />
+      <VENDOR name="sqlite" version="2.0" />
+    </DATABASE>
+    <PHP version="5.3.2" level="required">
+    </PHP>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="iconvrequired" />
+        </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="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </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_EXTENSION name="gd" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="gdrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="intlrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="40M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="safe_mode" value="0" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingsafemode" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -6,20 +6,15 @@
    require_once($CFG->libdir.'/adminlib.php');
    require_once($CFG->libdir.'/tablelib.php');

-    admin_externalpage_setup('managefilters');
+    $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;
@@ -32,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()) {
@@ -61,7 +51,10 @@
                set_config($name, stripslashes($value));
            }
        }
-        redirect("$CFG->wwwroot/$CFG->admin/filters.php");
+
+        reset_text_filters_cache();
+
+        redirect($returnurl);
        exit;
    }

@@ -79,11 +72,11 @@
    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"; ?>

        <input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" />
        <input type="submit" name="reset" value="<?php echo print_string('resettodefaults'); ?>" />
@@ -1,135 +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);

-    admin_externalpage_setup('managefilters');
+    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 {
@@ -137,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 {
@@ -151,126 +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->define_headers(array($txt->name, $txt->hideshow, $txt->updown, $txt->settings));
-    $table->define_baseurl("$CFG->wwwroot/$CFG->admin/filters.php");
-    $table->set_attribute('id', 'filters');
-    $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
-    $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();
-
-    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();
+    // save, reset cache and return
+    set_config('textfilters', implode(',', $activefilters));
+    reset_text_filters_cache();
+    redirect($returnurl);

 ?>
@@ -0,0 +1,275 @@
+<?php
+
+require_once('../config.php');
+/**
+ * SCRIPT CONFIGURATION
+ */
+$starttimer = time()+microtime();
+
+$settings = array();
+$settings['verbose'] = false;
+$settings['username'] = null;
+$settings['password'] = null;
+$settings['eolchar'] = '<br />'; // Character used to break lines
+
+// Argument arrays: 0=>short name, 1=>long name
+$arguments = array(
+ array('short'=>'u', 'long'=>'username', 'help' => 'Your moodle username', 'type'=>'STRING', 'default' => ''),
+ array('short'=>'pw', 'long'=>'password', 'help' => 'Your moodle password', 'type'=>'STRING', 'default' => ''),
+ array('short'=>'v', 'long' => 'verbose', 'help' => 'Display extra information about the process')
+);
+
+// Building the USAGE output of the command line version
+if (isset($argv) && isset($argc)) {
+    $help = "Moodle User Pix Fix. Restores user profile images that were not properly moved during 1.8.2 upgrade to newer versions.\n\n"
+          . "Usage: {$argv[0]}; [OPTION] ...\n"
+          . "Options:\n"
+          . "  -h,    -?, -help, --help               This output\n";
+
+    foreach ($arguments as $arg_array) {
+        $equal = '';
+        if (!empty($arg_array['type'])) {
+            $equal = "={$arg_array['type']}";
+        }
+
+        $padding1 = 5 - strlen($arg_array['short']);
+        $padding2 = 30 - (strlen($arg_array['long']) + strlen($equal));
+        $paddingstr1 = '';
+        for ($i = 0; $i < $padding1; $i++) {
+            $paddingstr1 .= ' ';
+        }
+        $paddingstr2 = '';
+        for ($i = 0; $i < $padding2; $i++) {
+            $paddingstr2 .= ' ';
+        }
+
+        $help .= "  -{$arg_array['short']},$paddingstr1--{$arg_array['long']}$equal$paddingstr2{$arg_array['help']}\n";
+    }
+
+    $help .= "\nEmail nicolasconnault@gmail.com for any suggestions or bug reports.\n";
+
+    if ($argc == 1 || in_array($argv[1], array('--help', '-help', '-h', '-?'))) {
+        echo $help;
+        die();
+
+    } else {
+
+        $settings['eolchar'] = "\n";
+        $argv = arguments($argv);
+        $argscount = 0;
+
+        foreach ($arguments as $arg_array) {
+            $value = null;
+            if (in_array($arg_array['short'], array_keys($argv))) {
+                $value = $argv[$arg_array['short']];
+                unset($argv[$arg_array['short']]);
+            } elseif (in_array($arg_array['long'], array_keys($argv))) {
+                $value = $argv[$arg_array['long']];
+                unset($argv[$arg_array['long']]);
+            }
+            if (!is_null($value)) {
+                $settings[$arg_array['long']] = $value;
+                $argscount++;
+            }
+        }
+
+        // If some params are left in argv, it means they are not supported
+        if ($argscount == 0 || count($argv) > 0) {
+            echo $help;
+            die();
+        }
+    }
+}
+
+/**
+ * SCRIPT SETUP
+ */
+require_once($CFG->libdir . '/formslib.php');
+require_once($CFG->dirroot .'/course/lib.php');
+verbose("Loading libraries...");
+$systemcontext = get_context_instance(CONTEXT_SYSTEM);
+
+/**
+ * WEB INTERFACE FORM
+ */
+
+class pixfix_form extends moodleform {
+    function definition() {
+        global $arguments;
+        $mform =& $this->_form;
+
+        foreach ($arguments as $arg_array) {
+            $type = 'advcheckbox';
+
+            $label = ucfirst(str_replace('-', ' ', $arg_array['long']));
+            if (!empty($arg_array['type'])) {
+                $type = 'text';
+            }
+
+            if ($arg_array['long'] == 'password' || $arg_array['long'] == 'username') {
+                continue;
+            }
+
+            $mform->addElement($type, $arg_array['long'], $label);
+
+            if (isset($arg_array['default'])) {
+                $mform->setDefault($arg_array['long'], $arg_array['default']);
+            }
+        }
+        $this->add_action_buttons(false, 'Restore Images');
+    }
+
+    function definition_after_data() {
+
+    }
+}
+
+$run_script = true;
+$web_interface = false;
+
+// If eolchar is still <br />, load the web interface
+if ($settings['eolchar'] == '<br />') {
+    print_header("User Pix-Fix");
+    print_heading("User Pix-Fix");
+    $mform = new pixfix_form();
+
+    if ($data = $mform->get_data(false)) {
+        foreach ($arguments as $arg_array) {
+            if (!empty($data->{$arg_array['long']})) {
+                $settings[$arg_array['long']] = $data->{$arg_array['long']};
+            }
+        }
+    } else {
+        $run_script = false;
+    }
+
+    if (!has_capability('moodle/site:doanything', $systemcontext)) {
+        // If not logged in, give link to login page for current site
+        notify("You must be logged in as administrator before using this script.");
+        require_login();
+    } else {
+        $mform->display();
+    }
+
+    $web_interface = true;
+}
+
+if ($run_script) {
+
+    // User authentication
+    if (!$web_interface) {
+        if (empty($settings['username'])) {
+            echo "You must enter a valid username for a moodle administrator account on this site.{$settings['eolchar']}";
+            die();
+        } elseif (empty($settings['password'])) {
+            echo "You must enter a valid password for a moodle administrator account on this site.{$settings['eolchar']}";
+            die();
+        } else {
+            if (!$user = authenticate_user_login($settings['username'], $settings['password'])) {
+                echo "Invalid username or password!{$settings['eolchar']}";
+                die();
+            }
+            $USER = complete_user_login($user);
+            if (!has_capability('moodle/site:doanything', $systemcontext)) {
+                echo "You do not have administration privileges on this Moodle site. These are required for running the restore script.{$settings['eolchar']}";
+                die();
+            }
+        }
+    }
+
+    // Script code here
+
+    // Look for old moodledata/users directory
+    $oldusersdir = $CFG->dataroot . '/users';
+
+    if (!file_exists($oldusersdir)) {
+        notify('The old directory for user profile images ('.$oldusersdir.') does not exist. Pictures cannot be restored!');
+    } else {
+        // Find user profile images that are not yet in the new directory
+        $folders = get_directory_list($oldusersdir, '', false, true, false);
+
+        $restored_count = 0;
+
+        foreach ($folders as $userid) {
+            $olddir = $oldusersdir . '/' . $userid;
+            $files = get_directory_list($olddir);
+
+            if (empty($files)) {
+                continue;
+            }
+
+            // Create new user directory
+            if (!$newdir = make_user_directory($userid)) {
+                // some weird directory - do not stop the upgrade, just ignore it
+                continue;
+            }
+
+            // Move contents of old directory to new one
+            if (file_exists($olddir) && file_exists($newdir)) {
+                $restored = false;
+
+                foreach ($files as $file) {
+                    if (!file_exists($newdir . '/' . $file)) {
+                        copy($olddir . '/' . $file, $newdir . '/' . $file);
+                        verbose("Moved $olddir/$file into $newdir/$file");
+                        $restored = true;
+                    }
+                }
+
+                if ($restored) {
+                    $restored_count++;
+                }
+            } else {
+                notify("Could not move the contents of $olddir into $newdir!");
+                $result = false;
+                break;
+            }
+        }
+
+        if ($settings['eolchar'] == '<br />') {
+            print_box_start('generalbox centerpara');
+        }
+        if ($restored_count > 0) {
+            echo "Successfully restored profile images for $restored_count users!" . $settings['eolchar'];
+        } else {
+            echo "Did not find any user profile images in need of restoring." . $settings['eolchar'];
+        }
+        if ($settings['eolchar'] == '<br />') {
+            print_box_end();
+        }
+    }
+}
+
+if ($settings['eolchar'] == '<br />') {
+    print_footer();
+}
+
+/**
+ * Converts the standard $argv into an associative array taking var=val arguments into account
+ * @param array $argv
+ * @return array $_ARG
+ */
+function arguments($argv) {
+    $_ARG = array();
+    foreach ($argv as $arg) {
+        if (ereg('--?([^=]+)=(.*)',$arg,$reg)) {
+            $_ARG[$reg[1]] = $reg[2];
+        } elseif(ereg('-([a-zA-Z0-9]+)',$arg,$reg)) {
+           $_ARG[$reg[1]] = 'true';
+        }
+    }
+    return $_ARG;
+}
+
+/**
+ * If verbose is switched on, prints a string terminated by the global eolchar string.
+ * @param string $string The string to STDOUT
+ */
+function verbose($string) {
+    global $settings;
+    if ($settings['verbose'] && !$settings['quiet']) {
+        echo $string . $settings['eolchar'];
+    }
+}
+
+?>
@@ -24,7 +24,7 @@
    $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();

@@ -363,7 +363,11 @@ class problem_000008 extends problem_base {
        }
        $oldmemlimit = get_real_size($oldmemlimit);
        //now lets change the memory limit to something unique below 128M==134217728
-        @ini_set('memory_limit', 134217720);
+        if (empty($CFG->extramemorylimit)) {
+            raise_memory_limit('128M');
+        } else {
+            raise_memory_limit($CFG->extramemorylimit);
+        }
        $testmemlimit = get_real_size(@ini_get('memory_limit'));
        //verify the change had any effect at all
        if ($oldmemlimit == $testmemlimit) {
@@ -374,7 +378,7 @@ class problem_000008 extends problem_base {
                return false;
            }
        }
-        @ini_set('memory_limit', $oldmemlimit);
+        reduce_memory_limit($oldmemlimit);
        return false;
    }
    function severity() {
@@ -525,11 +529,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;
@@ -157,6 +164,7 @@
            die;
        }

+
        $strdatabasesetup    = get_string("databasesetup");
        $strdatabasesuccess  = get_string("databasesuccess");
        $navigation = build_navigation(array(array('name'=>$strdatabasesetup, 'link'=>null, 'type'=>'misc')));
@@ -202,27 +210,21 @@
            // install core event handlers
            events_update_definition();

-            // 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);
-
            /// 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,
-                                                   'registerauth' => 'email',
                                                   '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 {
@@ -264,8 +266,9 @@
            $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();
            }

@@ -275,6 +278,7 @@
                        "", "", 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)){
@@ -286,23 +290,57 @@

                require_once($CFG->libdir.'/environmentlib.php');
                print_heading(get_string('environment', 'admin'));
+                remove_dir($CFG->dataroot . '/environment'); /// Always delete downloaded env. info to force use of the released one. MDL-9796
                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&confirmrelease=1', 'index.php');
+                                 '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"><input name="autopilot" id="autopilot" type="checkbox" value="1" /><label for="autopilot">'.get_string('unattendedoperation', 'admin').'</label>';
+                    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 '<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();
+    
            } else {
                $strdatabasesuccess  = get_string("databasesuccess");
                $navigation = build_navigation(array(array('name'=>$strdatabasesuccess, 'link'=>null, 'type'=>'misc')));
@@ -315,7 +353,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;
@@ -360,7 +400,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;
                }
@@ -415,6 +455,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");

@@ -424,7 +467,7 @@
    upgrade_local_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
@@ -435,6 +478,12 @@
 /// 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();
@@ -472,6 +521,7 @@

        $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!");
        }
@@ -493,19 +543,19 @@
        //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")) {
@@ -521,16 +571,18 @@
        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)) {
        // probably new installation - lets return to frontpage after this step
+        // remove settings that we want uninitialised
+        unset_config('registerauth');
        redirect('upgradesettings.php?return=site');
    }

@@ -542,10 +594,16 @@
        }
    }

-    $adminroot = admin_get_root();
+/// 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 ) ){
+    if (any_new_admin_settings($adminroot)){
        redirect('upgradesettings.php');
    }

@@ -566,12 +624,31 @@
        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'), 'generalbox adminwarning');
+    if ($register_globals_enabled) {
+        print_box(get_string('globalswarning', 'admin'), 'generalbox adminerror');
    }

-    if (is_dataroot_insecure()) {
+    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 (empty($CFG->passwordsaltmain)) {
+        $path = $CFG->docroot.'/'.str_replace('_utf8', '', current_language()).'/report/security/report_security_check_passwordsaltmain';
+        print_box(get_string('upgrade197notice', 'admin')."\n".get_string('upgrade197salt', 'admin', $path));
+    }
+
+    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
@@ -593,38 +670,30 @@
    }


-/// 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('generalbox adminwarning');
-        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'));
-    }
-
-
    admin_externalpage_print_footer();

-
 ?>
@@ -9,7 +9,7 @@

   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();
   print_heading('Convert all MySQL tables from MYISAM to InnoDB');
@@ -7,26 +7,35 @@
    * @param bool $uselocal save translations into *_local pack?
    */

+    $dbg = '';  // debug output;
+
    require_once('../config.php');
    require_once($CFG->libdir.'/adminlib.php');

    admin_externalpage_setup('langedit');

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

    define('LANG_SUBMIT_REPEAT', 1);            // repeat displaying submit button?
    define('LANG_SUBMIT_REPEAT_EVERY', 20);     // if so, after how many lines?
    define('LANG_DISPLAY_MISSING_LINKS', 1);    // display "go to first/next missing string" links?
    define('LANG_DEFAULT_FILE', '');            // default file to translate. Empty allowed
+    define('LANG_DEFAULT_HELPFILE', '');        // default helpfile to translate. Empty allowed
    define('LANG_LINK_MISSING_STRINGS', 1);     // create links from "missing" page to "compare" page?
    define('LANG_DEFAULT_USELOCAL', 0);         // should *_utf8_local be used by default?
    define('LANG_MISSING_TEXT_MAX_LEN', 60);    // maximum length of the missing text to display
    define('LANG_KEEP_ORPHANS', 1);             // keep orphaned strings (i.e. strings w/o English reference)
    define('LANG_SEARCH_EXTRA', 1);             // search lang files in extra locations
+    define('LANG_ALWAYS_TEXTAREA', 1);          // always use <textarea> even for short strings MDL-15738

-    $mode        = optional_param('mode', '', PARAM_ALPHA);
-    $currentfile = optional_param('currentfile', LANG_DEFAULT_FILE, PARAM_FILE);
-    $uselocal    = optional_param('uselocal', -1, PARAM_INT);
+    $mode = optional_param('mode', '', PARAM_ALPHA);
+    if ($mode == 'helpfiles') {
+        // use different PARAM_ options according to mode
+        $currentfile = optional_param('currentfile', LANG_DEFAULT_HELPFILE, PARAM_PATH);
+    } else {
+        $currentfile = optional_param('currentfile', LANG_DEFAULT_FILE, PARAM_FILE);
+    }
+    $uselocal = optional_param('uselocal', -1, PARAM_INT);

    if ($uselocal == -1) {
        if (isset($SESSION->langtranslateintolocal)) {
@@ -70,6 +79,9 @@
    $strlangpackmaintaining = get_string('langpackmaintaining', 'admin');
    $strnomissingstrings = get_string('nomissingstrings', 'admin');
    $streditingnoncorelangfile = get_string('editingnoncorelangfile', 'admin');
+    $strlanglocalpackage = get_string('langlocalpackage', 'admin');
+    $strlangmasterpackage = get_string('langmasterpackage', 'admin');
+    $strlangmasterenglish = get_string('langmasterenglish', 'admin');

    $currentlang = current_language();

@@ -82,11 +94,13 @@
        case "compare":
            $title = $streditstrings;
            break;
+        case "helpfiles":
+            $title = $stredithelpdocs;
        default:
            $title = $strlanguage;
            break;
    }
-    $navlinks[] = array('name' => $strlanguage, 'link' => "$CFG->wwwroot/admin/lang.php", 'type' => 'misc');
+    $navlinks[] = array('name' => $strlanguage, 'link' => "$CFG->wwwroot/$CFG->admin/lang.php", 'type' => 'misc');
    $navigation = build_navigation($navlinks);

    admin_externalpage_print_header();
@@ -106,24 +120,23 @@
    }
    if (has_capability('moodle/site:langeditlocal', $context, $USER->id, false)) {
        $firstrow[] = new tabobject('uselocal',
-            $CFG->wwwroot."/admin/lang.php?mode=$mode&amp;currentfile=$currentfile&amp;uselocal=1",
+            "$CFG->wwwroot/$CFG->admin/lang.php?mode=$mode&amp;currentfile=$currentfile&amp;uselocal=1",
            $strlocalstringcustomization );
    }
    if (has_capability('moodle/site:langeditmaster', $context, $USER->id, false)) {
        $firstrow[] = new tabobject('usemaster',
-            $CFG->wwwroot."/admin/lang.php?mode=$mode&amp;currentfile=$currentfile&amp;uselocal=0",
+            "$CFG->wwwroot/$CFG->admin/lang.php?mode=$mode&amp;currentfile=$currentfile&amp;uselocal=0",
            $strlangpackmaintaining );
    }
-    $secondrow[] = new tabobject('missing', $CFG->wwwroot.'/admin/lang.php?mode=missing', $strmissingstrings );
-    $secondrow[] = new tabobject('compare', $CFG->wwwroot.'/admin/lang.php?mode=compare', $streditstrings );
-    // TODO
-    // langdoc.php functionality is planned to be merged into lang.php
-    $secondrow[] = new tabobject('langdoc', $CFG->wwwroot.'/admin/langdoc.php', $stredithelpdocs );
+    $secondrow[] = new tabobject('missing', "$CFG->wwwroot/$CFG->admin/lang.php?mode=missing", $strmissingstrings );
+    $secondrow[] = new tabobject('compare', "$CFG->wwwroot/$CFG->admin/lang.php?mode=compare", $streditstrings );
+    $secondrow[] = new tabobject('helpfiles', "$CFG->wwwroot/$CFG->admin/lang.php?mode=helpfiles", $stredithelpdocs );
    $tabs = array($firstrow, $secondrow);
    print_tabs($tabs, $currenttab, $inactive, $activated);


    if (!$mode) {
+        // TODO this is a very nice place to put some translation statistics
        print_box_start();
        $currlang = current_language();
        $langs = get_list_of_languages(false, true);
@@ -143,17 +156,30 @@
        $langdir = "$langbase/$currentlang";
    }
    $locallangdir = "$langbase/{$currentlang}_local";
+    $saveto = $uselocal ? $locallangdir : $langdir;

-    // get the list of all English stringfiles
-    $stringfiles = lang_standard_locations();
-    if (LANG_SEARCH_EXTRA) {
-        $stringfiles += lang_extra_locations();
-    }
-    if (count($stringfiles) == 0) {
-        error("Could not find English language pack!");
+    if (($mode == 'missing') || ($mode == 'compare')) {
+        // get the list of all English stringfiles
+        $stringfiles = lang_standard_locations();
+        if (LANG_SEARCH_EXTRA) {
+            $stringfiles += lang_extra_locations();
+        }
+        if (count($stringfiles) == 0) {
+            error("Could not find English language pack!");
+        }
+    } elseif ($mode == 'helpfiles') {
+        $helpfiles = lang_help_standard_locations();
+        if (LANG_SEARCH_EXTRA) {
+            $helpfiles += lang_help_extra_locations();
+        }
+        if (count($helpfiles) == 0) {
+            error("Could not find help files in the English language pack!");
+        }
    }

-    if ($mode == "missing") {
+
+
+    if ($mode == 'missing') {
        if (!file_exists($langdir)) {
            error ('to edit this language pack, you need to put it in '.$CFG->dataroot.'/lang');
        }
@@ -200,7 +226,7 @@
            }
            // $enstring = English strings distributed either in the core space or in plugin space
            include($enfilepath);
-            $enstring = $string;
+            $enstring = isset($string) ? $string : array();
            unset($string);
            ksort($enstring);
            
@@ -209,7 +235,7 @@
            if (file_exists($lcfilepath)) {
                include($lcfilepath);
                $localfileismissing = 0;
-                if (is_array($string)) {
+                if (isset($string) && is_array($string)) {
                    $lcstring = $string;
                }
                unset($string);
@@ -265,8 +291,11 @@
                        $missingcounter++;
                        $totalcounter->missing++;
                    }
-                    if (LANG_LINK_MISSING_STRINGS && $missingstring) {
-                        $missinglinkstart = "<a href=\"lang.php?mode=compare&amp;currentfile=$filename#missing$missingcounter\">";
+                    if ($translationsdiffer) {
+                        $missingcounter++;
+                    }
+                    if (LANG_LINK_MISSING_STRINGS && ($missingstring || $translationsdiffer)) {
+                        $missinglinkstart = "<a href=\"lang.php?mode=compare&amp;currentfile=$filename#$key\">";
                        $missinglinkend = '</a>';
                    } else {
                        $missinglinkstart = '';
@@ -334,7 +363,7 @@
            notice(get_string("languagegood"), "lang.php" );
        }

-    } else if ($mode == "compare") {
+    } else if ($mode == 'compare') {

        if (!file_exists($langbase) ){
            if (!lang_make_directory($langbase) ){
@@ -410,7 +439,7 @@

        if (isset($_POST['currentfile'])){   // Save a file
            if (!confirm_sesskey()) {
-                error(get_string('confirmsesskeybad', 'error'));
+                print_error('confirmsesskeybad', 'error');
            }

            $newstrings = array();
@@ -436,7 +465,7 @@
            }
             
            if (lang_save_file($saveinto, $currentfile, $newstrings, $uselocal, $packstring)) {
-                notify(get_string("changessaved")." ($saveinto/$currentfile)", "green");
+                notify(get_string("changessaved")." ($saveinto/$currentfile)", "notifysuccess");
            } else {
                error("Could not save the file '$saveinto/$currentfile'!", "lang.php?mode=compare&amp;currentfile=$currentfile");
            }
@@ -458,20 +487,16 @@
            }
            $menufiles[$item_key] = $item_label;
        }
+        $selectionlabel = '<code class="path">';
+        //$selectionlabel .= $strfilestoredin;
+        $selectionlabel .= $uselocal ? "{$currentlang}_local" : $currentlang;
+        $selectionlabel .= '/</code>';
        popup_form("$CFG->wwwroot/$CFG->admin/lang.php?mode=compare&amp;currentfile=", $menufiles, "choosefile",
-            $currentfile, $strchoosefiletoedit);
-
-        echo '<div class="filestorageinfobox">';
-        echo $strfilestoredin;
-        echo '<code class="path">';
-        echo $uselocal ? "{$currentlang}_local" : $currentlang;
-        echo '</code>';
+            $currentfile, $strchoosefiletoedit, '', '', false, 'self', $selectionlabel);
        helpbutton('langswitchstorage', $strfilestoredinhelp, 'moodle');
-        echo '</div>';
        print_box_end();
-
+        
        if ($currentfile <> '') {
-            $saveto = $uselocal ? $locallangdir : $langdir;
            error_reporting(0);
            if (!isset($editable) || $editable) {
                if (!file_exists("$saveto/$currentfile")) {
@@ -498,9 +523,9 @@
            
            unset($string);
            include($enfilepath);
-            $enstring = $string;
+            $enstring = isset($string) ? $string : array();
            //
-            // TODO/FIXME: IMHO following should not be here as the strings have moved into langconfig.php -- mudrd8mz
+            // Following strings have moved into langconfig.php, but keep the here for backward compatibility
            //
            if ($currentlang != 'en' and $currentfile == 'moodle.php') {
                $enstring['thislanguage'] = "<< TRANSLATORS: Specify the name of your language here.  If possible use Unicode Numeric Character References >>";
@@ -531,7 +556,7 @@
                $linescounter++ ;
                if (LANG_SUBMIT_REPEAT &&  $editable && $linescounter % LANG_SUBMIT_REPEAT_EVERY == 0) {
                    $o .= '<tr><td>&nbsp;</td><td><br />';
-                    $o .= '<input type="submit" name="update" value="'.get_string('savechanges').': '.$currentfile.'" />';
+                    $o .= '<input type="submit" tabindex="'.$missingcounter.'" name="update" value="'.get_string('savechanges').': '.$currentfile.'" />';
                    $o .= '<br />&nbsp;</td></tr>';
                }
                $envalue = nl2br(htmlspecialchars($envalue));
@@ -547,7 +572,7 @@
                }
                $o .= '">';
                $o .= '<td dir="ltr" lang="en">';
-                $o .= '<span class="stren">'.$envalue.'</span>';
+                $o .= '<span id="'.$key.'" class="stren">'.$envalue.'</span>';
                $o .= '<br />'."\n";
                $o .= '<span class="strkey">'.$key.'</span>';
                $o .= '</td>'."\n";
@@ -565,16 +590,19 @@
                    $value2 = lang_fix_value_from_file($localstring[$key]);
                }
                error_reporting($CFG->debug);
-
-                // Color highlighting:
-                // red #ef6868 - translation missing in both system and local pack
-                // yellow #feff7f - translation missing in system pack but is translated in local
-                // green #AAFFAA - translation present in both system and local but is different
+                $missingtarget = '';
+                $missingnext = '';
+                $missingprev = '';
+                $cellcolour = '';
+                $usetabindex = false;
                if (!$value) {
+                    // the string is not present in the pack being processed
                    if (!$value2) {
                        $cellcolour = 'class="bothmissing"';
+                        $usetabindex = true;
                    } else {
                        $cellcolour = 'class="mastermissing"';
+                        $usetabindex = true;
                    }
                    $missingcounter++;
                    if (LANG_DISPLAY_MISSING_LINKS) {
@@ -583,20 +611,21 @@
                        '<img src="' . $CFG->pixpath . '/t/down.gif" class="iconsmall" alt="'.$strnext.'" /></a>';
                        $missingprev = '<a href="#missing'.($missingcounter-1).'">'.
                        '<img src="' . $CFG->pixpath . '/t/up.gif" class="iconsmall" alt="'.$strprev.'" /></a>';
-                    } else {
-                        $missingtarget = '';
-                        $missingnext = '';
-                        $missingprev = '';
                    }
                } else {
-                    if ($value <> $value2 && $value2 <> '') {
+                    // the string is translated in the pack being processed
+                    if ($value <> $value2 && ($value2 <> '')) {
                        $cellcolour = 'class="localdifferent"';
-                    } else {
-                        $cellcolour = '';
+                        $usetabindex = true;
+                        $missingcounter++;
+                        if (LANG_DISPLAY_MISSING_LINKS) {
+                            $missingtarget = '<a name="missing'.$missingcounter.'"></a>';
+                            $missingnext = '<a href="#missing'.($missingcounter+1).'">'.
+                            '<img src="' . $CFG->pixpath . '/t/down.gif" class="iconsmall" alt="'.$strnext.'" /></a>';
+                            $missingprev = '<a href="#missing'.($missingcounter-1).'">'.
+                            '<img src="' . $CFG->pixpath . '/t/up.gif" class="iconsmall" alt="'.$strprev.'" /></a>';
+                        }
                    }
-                    $missingtarget = '';
-                    $missingnext = '';
-                    $missingprev = '';
                }

                if ($editable) {
@@ -611,14 +640,23 @@
                        $valuelen = strlen($envalue);
                    }
                    $cols=40;
+                    if ($usetabindex) {
+                        $tabindex = 'tabindex="'.$missingcounter.'"';
+                    } else {
+                        $tabindex = '';
+                    }
                    if (strstr($value, "\r") or strstr($value, "\n") or $valuelen > $cols) {
                        $rows = ceil($valuelen / $cols);
-                        $o .= '<textarea name="stringXXX'.lang_form_string_key($key).'" cols="'.$cols.'" rows="'.$rows.'">'.$value.'</textarea>'."\n";
+                        $o .= '<textarea name="stringXXX'.lang_form_string_key($key).'" cols="'.$cols.'" rows="'.$rows.'" '.$tabindex.'>'.$value.'</textarea>'."\n";
                    } else {
                        if ($valuelen) {
                            $cols = $valuelen + 5;
                        }
-                        $o .= '<input type="text" name="stringXXX'.lang_form_string_key($key).'" value="'.$value.'" size="'.$cols.'" />';
+                        if (LANG_ALWAYS_TEXTAREA) {
+                            $o .= '<textarea name="stringXXX'.lang_form_string_key($key).'" cols="'.$cols.'" rows="1" '.$tabindex.'>'.$value.'</textarea>'."\n";
+                        } else {
+                            $o .= '<input type="text" name="stringXXX'.lang_form_string_key($key).'" value="'.$value.'" size="'.$cols.'" '.$tabindex.' />';
+                        }
                    }
                    if ($value2 <> '' && $value <> $value2) {
                        $o .= '<br /><span style="font-size:small">'.$value2.'</span>';
@@ -635,7 +673,7 @@
                $o .= '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
                $o .= '<input type="hidden" name="currentfile" value="'.$currentfile.'" />';
                $o .= '<input type="hidden" name="mode" value="compare" />';
-                $o .= '<input type="submit" name="update" value="'.get_string('savechanges').': '.$currentfile.'" />';
+                $o .= '<input type="submit" name="update" tabindex="'.$missingcounter.'" value="'.get_string('savechanges').': '.$currentfile.'" />';
                $o .= '</td></tr>';
            }
            $o .= '</table>';
@@ -660,7 +698,212 @@
            // no $currentfile specified
            // no useful information to display - maybe some help? instructions?
        }
-    }
+
+    } elseif ($mode == 'helpfiles') {
+
+        $saveto = $saveto.'/help';                      // the edited content will be saved to
+        $enlangdir = $enlangdir.'/help';                // English master help files localtion
+        $langdir = $langdir.'/help';                    // current language master help files location
+        $locallangdir = $locallangdir.'/help';          // local modifications of help files location
+        $altdir = $uselocal ? $langdir : $locallangdir; // alternative to $saveto
+
+        $fileeditorrows = 10;           // number of textareas' rows
+        $fileeditorcols = 100;          // dtto cols
+        $filemissingmark = ' (***)';    // mark to add to non-existing or zero-length files
+        $fileoldmark = ' (old?)';       // mark to add to filenames in selection form if the English version is newer
+        $filetemplate = '';             // template for new files, e.g. CVS identification
+
+        if (isset($_POST['currentfile'])) {  // Save a file
+            if (!confirm_sesskey()) {
+                print_error('confirmsesskeybad', 'error');
+            }
+            if (lang_help_save_file($saveto, $currentfile, $_POST['filedata'])) {
+                notify(get_string("changessaved")." ($saveto/$currentfile)", "notifysuccess");
+            } else {
+                error("Could not save the file '$currentfile'!", "lang.php?mode=helpfiles&amp;currentfile=$currentfile&amp;sesskey=$USER->sesskey");
+            }
+        }
+
+        print_box_start('generalbox editstrings');
+        $menufiles = array();
+        $menufiles_coregrp = 1;
+        $origlocation = ''; // the location of the currentfile's English source will be stored here
+        $origplugin = '';   // dtto plugin
+        foreach ($helpfiles as $helppath => $helpfile) {
+            $item_key = $helpfile['filename'];
+            $item_label = $helpfile['filename'];
+            if ((!file_exists($saveto.'/'.$helpfile['filename'])) || (filesize($saveto.'/'.$helpfile['filename']) == 0)) {
+                $item_label .= $filemissingmark;
+            } else {
+                if (filemtime($saveto.'/'.$helpfile['filename']) < filemtime($helppath)) {
+                    $item_label .= $fileoldmark;
+                }
+                if ($helpfile['location'] != '' && $helpfile['plugin'] != '') {
+                    $item_label .= ' ('.$helpfile['location'].'/'.$helpfile['plugin'].')';
+                    if ($menufiles_coregrp == 1) {
+                        $menufiles['extra'] = '------------';
+                        $menufiles_coregrp = 0;
+                    }
+                }
+            }
+            $menufiles[$item_key] = $item_label;
+            if ($currentfile == $helpfile['filename']) {
+                $origlocation = $helpfile['location'];
+                $origplugin = $helpfile['plugin'];
+            }
+        }
+        $selectionlabel = '<code class="path">';
+        //$selectionlabel .= $strfilestoredin;
+        $selectionlabel .= $uselocal ? "{$currentlang}_local" : $currentlang;
+        $selectionlabel .= '/help/</code>';
+        popup_form("$CFG->wwwroot/$CFG->admin/lang.php?mode=helpfiles&amp;currentfile=", $menufiles, "choosefile",
+            $currentfile, $strchoosefiletoedit, '', '', false, 'self', $selectionlabel);
+        helpbutton('langswitchstorage', $strfilestoredinhelp, 'moodle');
+        print_box_end();
+
+        if (!empty($currentfile)) {
+
+            if (!file_exists("$saveto/$currentfile")) {
+                $dbg .= "File does not exist: $saveto/$currentfile\n";
+                //check if directory exist
+                if (!file_exists(dirname("$saveto/$currentfile"))) {
+                     if(!lang_make_directory(dirname("$saveto/$currentfile"))) {
+                         echo ('Cannot create directory: '.dirname("$saveto/$currentfile"));
+                     }
+                }
+                //
+                // file doesn't exist - let's check webserver's permission to create it
+                //
+                if (!@touch("$saveto/$currentfile")) {
+                    //
+                    // webserver is unable to create new file
+                    //
+                    notify(get_string('filemissing', '', "$saveto/$currentfile" ));
+                    notify(get_string('makeeditable', '', "$saveto/$currentfile"));
+                    $editable = false;
+                } else {
+                    //
+                    // webserver can create new file - we can delete it now and let
+                    // it create again if its filesize() > 0
+                    //
+                    $editable = true;
+                    unlink("$saveto/$currentfile");
+                }
+            } elseif (is_writable("$saveto/$currentfile")) {
+                $editable = true;
+            } else {
+                //
+                // file exists but it is not writeable by web server process :-(
+                //
+                $editable = false;
+                notify(get_string('makeeditable', '', "$saveto/$currentfile"));
+            }
+
+            // master en_utf8 in dataroot is not editable
+            if ((!$uselocal) && ($currentlang == 'en_utf8')) {
+                $editable = false;
+            }
+
+            echo '<div>';
+
+            if ($uselocal) {
+                $strsavetotitle = $strlanglocalpackage . helpbutton('langpackages', $strlanglocalpackage, 'moodle', true, false, '', true);
+                $straltdirtitle = $strlangmasterpackage . helpbutton('langpackages', $strlangmasterpackage, 'moodle', true, false, '', true);
+            } else {
+                $straltdirtitle = $strlanglocalpackage . helpbutton('langpackages', $strlanglocalpackage, 'moodle', true, false, '', true);
+                $strsavetotitle = $strlangmasterpackage . helpbutton('langpackages', $strlangmasterpackage, 'moodle', true, false, '', true);
+
+            }
+
+            if ($editable) {
+                // generate an editor for the current help file in $saveto
+                echo '<fieldset><legend>'.$strsavetotitle.'</legend>';
+                echo "<form id=\"helpfileeditor\" action=\"lang.php\" method=\"post\">";
+                echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+                echo '<input type="hidden" name="currentfile" value="'.$currentfile.'" />';
+                echo '<input type="hidden" name="mode" value="helpfiles" />';
+                echo "<div class='mdl-align'>\n";
+                echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"filedata\">";
+                if (file_exists("$saveto/$currentfile")) {
+                    echo htmlspecialchars(file_get_contents("$saveto/$currentfile"));
+                } else {
+                    echo ($filetemplate);
+                }
+                echo "</textarea>\n</div>\n";
+                echo '<div class="mdl-align"><input type="submit" value="'.get_string('savechanges').'" /></div>';
+                echo '</form>';
+                $preview_url = lang_help_preview_url($currentfile, !$uselocal);
+                if ($preview_url) {
+                    link_to_popup_window($preview_url, 'popup', get_string('preview'));
+                }
+                echo '</fieldset>';
+            }
+
+            if (is_readable("$altdir/$currentfile")) {
+                // show the content of the same help file in alternative location
+                echo '<fieldset><legend>'.$straltdirtitle.'</legend>';
+                echo "<div class='mdl-align'>\n";
+                echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"\">";
+                if (file_exists("$altdir/$currentfile")) {
+                    echo htmlspecialchars(file_get_contents("$altdir/$currentfile"));
+                } else {
+                    echo ($filetemplate);
+                }
+                echo "</textarea>\n</div>\n";
+                $preview_url = lang_help_preview_url($currentfile, $uselocal);
+                if ($preview_url) {
+                    link_to_popup_window($preview_url, 'popup', get_string('preview'));
+                }
+                echo '</fieldset>';
+            }
+
+            // show the content of the original English file either in core space or plugin space
+            if ($origlocation != '' && $origplugin != '') {
+                // non-core help file
+                $ensrc = "$CFG->dirroot/$origlocation/$origplugin/lang/en_utf8/help/$currentfile";
+            } else {
+                // core help file
+                $ensrc = "$enlangdir/$currentfile";
+            }
+            if (is_readable($ensrc)) {
+                echo '<fieldset><legend>'.$strlangmasterenglish;
+                helpbutton('langpackages', $strlangmasterenglish);
+                echo '</legend>';
+                echo "<div class='mdl-align'>\n<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"\">";
+                echo htmlspecialchars(file_get_contents($ensrc));
+                echo "</textarea>\n</div>\n";
+                $preview_url = lang_help_preview_url($currentfile, true, 'en_utf8');   // do not display en_utf8_local
+                if ($preview_url) {
+                    link_to_popup_window($preview_url, 'popup', get_string('preview'));
+                }
+                echo '</fieldset>';
+            }
+
+            echo '</div>'; // translator box
+            error_reporting($CFG->debug);
+        }
+
+        if (false && $CFG->debugdisplay && debugging('', DEBUG_DEVELOPER) ) {
+            echo '<hr />';
+            print_heading('Debugging info');
+            echo '<pre class="notifytiny">';
+            print_r($dbg);
+            print_r("\n\$currentfile = $currentfile");
+            print_r("\n\$enlangdir = $enlangdir");
+            print_r("\n\$langdir = $langdir");
+            print_r("\n\$locallangdir = $locallangdir");
+            print_r("\n\$saveto = $saveto");
+            print_r("\n\$altdir = $altdir");
+            print_r("\n\$origlocation = $origlocation");
+            print_r("\n\$origplugin = $origplugin");
+            print_r("\n\$ensrc = $ensrc");
+            print_r("\n\$helpfiles = ");
+            print_r($helpfiles);
+            echo '</pre>';
+        }
+
+    } // fi $mode == 'helpfiles'
+

    admin_externalpage_print_footer();

@@ -770,6 +1013,10 @@ function lang_fix_value_before_save($value='') {
    if (ini_get_bool('magic_quotes_sybase')) {          // Unescape escaped sybase quotes
        $value = str_replace("''", "'", $value);
    }
+    // escape all embedded variables
+    $value = str_replace('$', '\$', $value);            // Add slashes for $
+    // unescape placeholders: only $a and $a->something are allowed. All other $variables are left escaped
+    $value = preg_replace('/\\\\\$a($|[^_a-zA-Z0-9\-]|\->[a-zA-Z0-9_]+)/', '$a\\1', $value);
    $value = str_replace("'", "\\'", $value);           // Add slashes for '
    $value = str_replace('"', "\\\"", $value);          // Add slashes for "
    $value = str_replace("%","%%",$value);              // Escape % characters
@@ -781,6 +1028,8 @@ function lang_fix_value_before_save($value='') {
 /**
 * Try and create a new language directory.
 *
+ * Uses PHP>=5.0 syntax of mkdir and tries to create directories recursively.
+ *
 * @uses $CFG
 * @param string $directory full path to the directory under $langbase
 * @return string|false Returns full path to directory if successful, false if not
@@ -789,7 +1038,7 @@ function lang_make_directory($dir, $shownotices=true) {
    global $CFG;
    umask(0000);
    if (! file_exists($dir)) {
-        if (! @mkdir($dir, $CFG->directorypermissions)) {
+        if (! @mkdir($dir, $CFG->directorypermissions, true)) { // recursive=true; PHP>=5.0 needed
            return false;
        }
        //@chmod($dir, $CFG->directorypermissions);  // Just in case mkdir didn't do it
@@ -993,4 +1242,141 @@ function lang_get_file_info($currentfile, $stringfiles) {
    }
 }

+/**
+ * Returns all English help files in the standard lang/en_utf8/help location.
+ *
+ * Core help files should always be stored here and not in the module space (MDL-10920).
+ * The English version of the file may be found in
+ *  $CFG->dirroot/lang/en_utf8/help/filename
+ * The localised version of the found file should be saved into
+ *  $CFG->dataroot/lang/currentlang[_local]/help/filename
+ * where "filename" is returned as a part of the file record.
+ *
+ * @return array Array of a file information. Compatible format with {@link lang_extra_locations()}
+ */
+function lang_help_standard_locations() {
+    global $CFG;
+    $files = array();
+    // Standard location of master English help files.
+    $places = array($CFG->dirroot.'/lang/en_utf8/help');
+        foreach ($places as $place) {
+            foreach (get_directory_list($place, 'CVS') as $file) {
+                if ((substr($file, -5) == '.html') || (substr($file, -4) == '.txt' )) {
+                    $fullpath = $place.'/'.$file;
+                    $files[$fullpath] = array(
+                        'filename' => $file,
+                        'location' => '',
+                        'plugin' => '',
+                        'prefix' => '',
+                    );
+                }
+            }
+        }
+    return $files;
+}
+
+/**
+ * Returns all English help files in non-standard location.
+ *
+ * Searches for lang/en_utf8/help/* files in various types of plugins (blocks, database presets, question types,
+ * 3rd party modules etc.) and returns an array of found files details.
+ *
+ * The English version of the file may be found in
+ *  $CFG->dirroot/location/plugin/lang/en_utf8/help/filename
+ * The localised version of the found file should be saved into
+ *  $CFG->dataroot/lang/currentlang[_local]/help/prefix_plugin/filename (XXX is "prefix" here right?)
+ * where "location", "plugin", "prefix" and "filename" are returned as a part of the file record.
+ *
+ * @return array Array of a file information. Compatible format with {@link lang_standard_locations()}
+ */
+function lang_help_extra_locations() {
+    global $CFG;
+    $files = array();
+    $places = places_to_search_for_lang_strings();
+    foreach ($places as $prefix => $directories) {
+        if ($prefix != '__exceptions') {
+            foreach ($directories as $directory) {
+                foreach (get_list_of_plugins($directory) as $plugin) {
+                    $enlangdirlocation = $CFG->dirroot.'/'.$directory.'/'.$plugin.'/lang/en_utf8/help';
+                    foreach (get_directory_list($enlangdirlocation, 'CVS') as $file) {
+                        if ((substr($file, -5) == '.html') || (substr($file, -4) == '.txt' )) {
+                            $fullpath = $enlangdirlocation.'/'.$file;
+                            $files[$fullpath] = array(
+                                'filename' => $file,
+                                'location' => $directory,
+                                'plugin' => $plugin,
+                                'prefix' => $prefix,
+                            );
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return $files;
+}
+
+/**
+ * Return a preview URL for help file, if available.
+ *
+ * @param string $currentfile The relative path to the help file, e.g. "assignment/types.html" - MDL-12291
+ * @param bool $skiplocal Force displaying the helpfile from a master lang pack
+ * @param string $forcelang Force language of the help, e.g. "en_utf8"
+ * @return string $url
+ */
+function lang_help_preview_url($currentfile, $skiplocal=false, $forcelang = '') {
+    $currentpathexp = explode('/', $currentfile);
+    if (count($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;
+    }
+    if ($skiplocal) {
+        $url .= '&amp;skiplocal=1';
+    }
+    if ($forcelang) {
+        $url .= '&amp;forcelang='.$forcelang;
+    }
+    return $url;
+}
+
+
+/**
+ * Saves (overwrites) translated help file.
+ *
+ * @param string $helproot The path to the "help" folder
+ * @param string $file The relative path to the html help file
+ * @param string $content HTML data to be saved
+ * @return bool False if save failed, true otherwise
+ */
+function lang_help_save_file($helproot, $file, $content) {
+    global $CFG, $USER;
+
+    $content = str_replace("\r", "",$content);              // Remove linefeed characters
+    $content = preg_replace("/\n{3,}/", "\n\n", $content);  // Collapse runs of blank lines
+    $content = trim($content);                              // Delete leading/trailing whitespace
+    if (is_readable("$helproot/$file") && filesize("$helproot/$file") > 0 && $content == '') {
+        notify(get_string('langrmyourself', 'admin'));
+        return true;
+    }
+
+    error_reporting(0);
+    if (!$f = fopen("$helproot/$file","w")) {
+        error_reporting($CFG->debug);
+        return false;
+    }
+    error_reporting($CFG->debug);
+
+    fwrite($f, stripslashes($content));
+    fclose($f);
+
+    // Remove file if its empty
+    if (filesize("$helproot/$file") == 0) {
+        unlink("$helproot/$file");
+    }
+
+    return true;
+}
+
+
 ?>
@@ -33,6 +33,9 @@

    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";
    $enlangdir = "$CFG->dirroot/lang/en_utf8";
@@ -109,7 +112,7 @@
            for ($a=0; $a < count($pathparts)-1 ; $a++) {
                $checkpath .= "/".$pathparts[$a];
                if(!file_exists($checkpath)){
-                     if(!mkdir($checkpath)){
+                     if(!mkdir($checkpath, $CFG->directorypermissions)){
                         echo ("Cannot create directory: $checkpath");
                     }    
                }    
@@ -183,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>';
        }

@@ -243,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,99 +6,105 @@

    require_once('../config.php');
    require_once($CFG->libdir.'/adminlib.php');
+    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');
-
-    $strlanguage = get_string("language");
-    $strthislanguage = get_string("thislanguage");
-    $title = $strlang;
-
-    admin_externalpage_print_header();
+    $strlang         = get_string('langimport','admin');
+    $strlanguage     = get_string('language');
+    $strthislanguage = get_string('thislanguage');
+    $title           = $strlang;

    //reset and diagnose lang cache permissions
    @unlink($CFG->dataroot.'/cache/languages');
    if (file_exists($CFG->dataroot.'/cache/languages')) {
-        notify('Language cache can not be deleted, please check permissions in dataroot.');
+        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()) {
-                @mkdir ($CFG->dataroot.'/temp/');    //make it in case it's a fresh install, it might not be there
-                @mkdir ($CFG->dataroot.'/lang/');
+            if (confirm_sesskey() and !empty($pack)) {
+                set_time_limit(0);
+                @mkdir ($CFG->dataroot.'/temp/', $CFG->directorypermissions);    //make it in case it's a fresh install, it might not be there
+                @mkdir ($CFG->dataroot.'/lang/', $CFG->directorypermissions);

-                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:
-                            get_list_of_languages(true); //refresh lang cache
-                            redirect('langimport.php', get_string('langpackupdated','admin',$pack), -1);
-                        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;
@@ -112,18 +118,18 @@
                get_list_of_languages(true); //refresh lang cache
                //delete the direcotries
                if ($rm1 or $rm2) {
-                    redirect('langimport.php', get_string('langpackremoved','admin'), 3);
+                    $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';
                }
            }
        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?
            $alllangs = array_keys(get_list_of_languages(false, true)); //get all available langs
@@ -131,8 +137,8 @@
            $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
@@ -140,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;

@@ -157,12 +167,13 @@
                }
            }

-            @mkdir ($CFG->dataroot.'/temp/');
-            @mkdir ($CFG->dataroot.'/lang/');
+            @mkdir ($CFG->dataroot.'/temp/', $CFG->directorypermissions);
+            @mkdir ($CFG->dataroot.'/lang/', $CFG->directorypermissions);
            foreach ($packs as $pack){    //for each of the remaining in the list, we
                if ($pack == 'en_utf8') {    // no update for en_utf8
                    continue;
                }
+
                //1. delete old director(ies)

                $dest1 = $CFG->dataroot.'/lang/'.$pack;
@@ -170,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->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;
@@ -213,131 +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().'" />';
-            $installedlangs = get_list_of_languages(false, true);
-
-            /// 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 '<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=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="'.$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_simple_box_end();
-
-        break;
-
    }    //close of main switch

+
+    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 (empty($parent) || 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
+    /**
+     * 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));
            }
@@ -345,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
@@ -360,40 +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");
-
-            $headers_done = false;
-            while(!feof($proxy_fp)) {
-                $string = fgets($proxy_fp, 1024);
-                if(!$headers_done){
-                    // A new line indicates end of HTTP headers
-                    $headers_done = ("\r\n" == $string);
-                } else {
-                    $availablelangs[] = split(',', $string);
+        if ($content = download_file_content($source)) {
+            $alllines = split("\n", $content);
+            foreach($alllines as $line) {
+                if (!empty($line)){
+                    $availablelangs[] = split(',', $line);
                }
            }
-            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);
+}
+
+?>
@@ -33,29 +33,36 @@

    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>';
@@ -65,5 +72,7 @@
        }
    }

+    print_box_end();
+
    admin_externalpage_print_footer();
 ?>
@@ -19,7 +19,7 @@ admin_externalpage_setup('ssoaccesscontrol');
 admin_externalpage_print_header();

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

 $sitecontext = get_context_instance(CONTEXT_SYSTEM);
@@ -39,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) {
@@ -60,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)) {
@@ -73,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");
    }
 }

@@ -84,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');
@@ -178,7 +178,7 @@ if (!$acl) {
        }
        $deletecolumn = "<a href=\"?id={$aclrecord->id}&amp;action=delete&amp;sesskey={$USER->sesskey}\">"
                . get_string('delete') . "</a>";
-        $table->data[] = array ($aclrecord->username, $aclrecord->mnet_host_id, $accesscolumn, $deletecolumn);
+        $table->data[] = array (s($aclrecord->username), $aclrecord->mnet_host_id, $accesscolumn, $deletecolumn);
    }
 }

@@ -64,7 +64,7 @@ function mnet_get_functions($type, $parentname) {
        foreach($rpcrecords as $rpc) {
            if (!array_key_exists($rpc->function_name, $methodServiceArray)) {
                $rpc->enabled = 0;
-                update_record('mnet_rpc', $rpc);
+                update_record('mnet_rpc', addslashes_recursive($rpc));
            }
        }
    }
@@ -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);
    }

@@ -85,7 +85,7 @@ function mnet_get_functions($type, $parentname) {
            } else {
                array_unshift($profile, $details['returns']);
            }
-            $dataobject->profile       = serialize($profile);
+            $dataobject->profile       = addslashes(serialize($profile));
            $dataobject->help          = addslashes($details['description']);
        } else {
            $dataobject->profile       = serialize(array(array('type' => 'void', 'description' => 'No return value')));
@@ -1,7 +1,7 @@
 <?php
 $navlinks = array();
-$navlinks[] = array('name' => $stradministration, 'link' => $CFG->wwwroot.'/admin/index.php', 'type' => 'misc');
-$navlinks[] = array('name' => get_string('mnetsettings', 'mnet'), 'link' => $CFG->wwwroot.'/admin/mnet/index.php', 'type' => 'misc');
+$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);
@@ -49,7 +49,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
            </td>
        </tr>
    </table>
-</center>
+</div>
 <?php
 print_footer();
 ?>
@@ -31,6 +31,8 @@
        redirect('index.php', get_string('postrequired','mnet') ,7);
    }

+    require_sesskey();
+
    if ('verify' == $step) {
        $mnet_peer = new mnet_peer();
        $mnet_peer->set_id($hostid);
@@ -7,7 +7,7 @@
    include_once($CFG->dirroot.'/mnet/xmlrpc/client.php');

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

    admin_externalpage_setup('mnetenrol');
@@ -85,9 +85,21 @@
    $mnet_request->set_method('enrol/mnet/enrol.php/course_enrolments');
    $mnet_request->add_param($course->remoteid, 'int');
    $mnet_request->send($mnet_peer);
-    $all_enrolled_users = $mnet_request->response;
-
+    $raw_all_enrolled_users = $mnet_request->response;
    unset($mnet_request);
+
+    $all_enrolled_users = array();
+    if (!empty($raw_all_enrolled_users)) {
+        // Try to repair keying of remote users array, numeric usernames get lost in the fracas
+        foreach ($raw_all_enrolled_users as $username => $userdetails) {
+            if (empty($userdetails['username']) || !is_numeric($username)) {
+                //Not able to repair, or no need to repair
+                $all_enrolled_users[$username] = $userdetails;
+            } else {
+                $all_enrolled_users[$userdetails['username']] = $userdetails;
+            }
+        }
+    }
    
    $select = '';
    $all_enrolled_usernames = '';
@@ -118,7 +130,7 @@
                a.courseid
            FROM
                {$CFG->prefix}user u
-            LEFT JOIN
+            JOIN
                {$CFG->prefix}mnet_enrol_assignments a
            ON
                a.userid = u.id AND a.courseid={$courseid}
@@ -243,7 +255,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');
@@ -6,7 +6,7 @@
    require_once($CFG->libdir.'/adminlib.php');

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


@@ -37,7 +37,7 @@
    " 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}";
        echo '<tr>'
               . "<td>$icon</td>"
@@ -37,7 +37,7 @@
           . '</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 = '?';
@@ -49,7 +49,7 @@
               . "<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>';
    }
@@ -1,23 +1,9 @@
 <?php
-$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';

 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('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);
-}
-print_tabs(array($tabs), 'mnetdetails');
+$currenttab = 'mnetdetails';
+require_once($CFG->dirroot .'/admin/mnet/tabs.php');

 print_simple_box_start("center", "");
 ?>
@@ -1,10 +1,8 @@
 <?php
 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');
+$currenttab = 'mnetdetails';
+require_once($CFG->dirroot .'/admin/mnet/tabs.php');

 print_simple_box_start("center", "");
 ?>
@@ -14,7 +12,7 @@ print_simple_box_start("center", "");
    <td valign="top"><?php echo $mnet_peer->name; ?></td>
 </tr>
 <tr>
-    <td align="right" valign="top" colspan="2"><?php print_string('allhosts_no_options'); ?>:</td>
+    <td align="right" valign="top" colspan="2"><?php print_string('allhosts_no_options','mnet'); ?></td>
 </tr>
 </table>
 <?php
@@ -1,19 +1,9 @@
 <?php
 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.
-          '%2F1&amp;user='.'0'.
-          '&amp;date=0'.
-          '&amp;modid=&amp;modaction=0&amp;logformat=showashtml';
+$currenttab = 'mnetservices';
+require_once($CFG->dirroot .'/admin/mnet/tabs.php');

-$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 && $mnet_peer->application->name == 'moodle') {
-    $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
-}
-print_tabs(array($tabs), 'mnetservices');
 print_simple_box_start("center", "");

 ?>
@@ -27,11 +17,12 @@ print_simple_box_start("center", "");
 <?php 
    foreach($myservices as $name => $versions) {
    $version = current($versions);
+    $langmodule = ($version['parent_type'] == 'mod' ? '' : ($version['parent_type'] . '_')) . $version['parent'];
 ?>
 <tr>
    <td align="left" valign="top" colspan="2">
-    <h3><?php echo get_string($name.'_name', $version['parent_type'].'_'.$version['parent'] , $mnet_peer->name); ?></h3>
-    <?php echo get_string($name.'_description', $version['parent_type'].'_'.$version['parent'], $mnet_peer->name); ?>
+    <h3><?php echo get_string($name.'_name', $langmodule , $mnet_peer->name); ?></h3>
+    <?php echo get_string($name.'_description', $langmodule, $mnet_peer->name); ?>
 <?php
        $breakstring = '';
        foreach($versions as $version){
@@ -24,6 +24,10 @@
    // force   Go ahead with something we've been warned is strange
    $step   = optional_param('step', NULL, PARAM_ALPHA);
    $hostid = optional_param('hostid', NULL, PARAM_INT);
+    $publishes  = optional_param('publish', null, PARAM_BOOL); // optional_param cleans arrays too
+    $subscribes = optional_param('subscribe', null, PARAM_BOOL); // optional_param cleans arrays too
+    $exists     = optional_param('exists', null, PARAM_BOOL); // optional_param cleans arrays too
+
    $nocertstring = '';
    $nocertmatch  = '';
    $badcert = '';
@@ -43,14 +47,21 @@
    if (($form = data_submitted()) && confirm_sesskey()) {
        $mnet_peer->set_id($hostid);
        $treevals = array();
-        foreach($_POST['exists'] as $key => $value) {
-            $host2service   = get_record('mnet_host2service', 'hostid', $_POST['hostid'], 'serviceid', $key);
-            $publish        = (isset($_POST['publish'][$key]) && $_POST['publish'][$key] == 'on')? 1 : 0;
-            $subscribe      = (isset($_POST['subscribe'][$key]) && $_POST['subscribe'][$key] == 'on')? 1 : 0;
+        foreach($exists as $key => $value) {
+            $host2service   = get_record('mnet_host2service', 'hostid', $hostid, 'serviceid', $key);
+            $publish        = array_key_exists($key, $publishes) ? $publishes[$key] : 0;
+            $subscribe      = array_key_exists($key, $subscribes) ? $subscribes[$key] : 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', $hostid, 'serviceid', $key);
+                }
+            } elseif (false == $host2service && ($publish == 1 || $subscribe == 1)) {
                $host2service = new stdClass();
-                $host2service->hostid = $_POST['hostid'];
+                $host2service->hostid = $hostid;
                $host2service->serviceid = $key;
                
                $host2service->publish = $publish;
@@ -74,7 +85,7 @@
            $id_list .= ', '.$CFG->mnet_all_hosts_id;
        }

-        $concat = sql_concat('COALESCE(h2s.id,0) ', ' \'-\' ', ' svc.id');
+        $concat = sql_concat('COALESCE(h2s.id,0) ', ' \'-\' ', ' svc.id', '\'-\'', 'r.parent_type', '\'-\'', 'r.parent');

        $query = "
            SELECT DISTINCT
@@ -1,22 +1,10 @@
 <?php
-admin_externalpage_print_header($adminroot);
-
-$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');
-print_simple_box_start("center", "");
-
-    print_heading($strthemes);
-
+admin_externalpage_print_header();
+print_heading(get_string('themes'));
+$original_theme = fullclone($THEME);

+    $currenttab = 'mnetthemes';
+    require_once($CFG->dirroot .'/admin/mnet/tabs.php');

    $themes = get_list_of_plugins("theme");
    $sesskey = !empty($USER->id) ? $USER->sesskey : '';
@@ -123,6 +111,6 @@ print_simple_box_start("center", "");
    }
    echo "</table>";

-print_simple_box_end();
-admin_externalpage_print_footer($adminroot);
+$THEME = $original_theme;
+admin_externalpage_print_footer();
 ?>
@@ -4,11 +4,8 @@
    require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
    require_once($CFG->libdir.'/adminlib.php');
    include_once($CFG->dirroot.'/mnet/lib.php');
-error_reporting(E_ALL);
-ini_set('display_errors', true);
    require_login();
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('mnetpeers', $adminroot);
+    admin_externalpage_setup('mnetpeers');

    $context = get_context_instance(CONTEXT_SYSTEM);

@@ -55,7 +52,9 @@ ini_set('display_errors', true);
        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 {
@@ -66,7 +65,8 @@ ini_set('display_errors', true);
                $report = array('This theme is not installed!'.'3', 'errorbox');
            } else {
                $mnet_peer->force_theme = 1;
-                $mnet_peer->theme = addslashes($choose);
+                $mnet_peer->theme = $choose;
+                $mnet_peer->updateparams->theme = addslashes($choose);
                if ($mnet_peer->commit()) {
                    $report = array(get_string('themesaved').'1', 'informationbox');
                } else {
@@ -76,5 +76,6 @@ ini_set('display_errors', true);
        }
    }

-    include('./mnet_themes.html');
+    $adminroot = admin_get_root();
+    require('./mnet_themes.html');
 ?>
@@ -55,6 +55,7 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
                <div>
                <input type="hidden" name="hostid" value="<?php echo $host->id; ?>" />
                <input type="hidden" name="step" value="verify" />
+                <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
                <input type="submit" name="submit" value="<?php print_string('delete'); ?>"/>
                </div>
            </form>
@@ -76,7 +77,7 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
                </th>
            </tr>
            <tr>
-                <td class="cell c0"></td>
+                <td class="cell c0">wwwroot:</td>
                <td class="cell c1"><input type="text" name="wwwroot" value="" /></td>
                <td class="cell c2">
                    <select name="applicationid">
@@ -15,17 +15,17 @@ require_capability('moodle/site:config', $context, $USER->id, true, "nopermissio

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

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

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

 /// Initialize variables.
@@ -50,11 +50,16 @@ 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.");
-        error(get_string('xmlrpc-missing', 'mnet'),'peers.php');
+        print_error('xmlrpc-missing', 'mnet','peers.php');
        exit;
    }

@@ -77,7 +82,7 @@ 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);
@@ -92,25 +97,28 @@ if (($form = data_submitted()) && confirm_sesskey()) {
        }
    
        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;
                }
            }
@@ -119,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);
            }
        }

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Handles tabs for the mnet pages.
+ * We assume that $currenttab is defined
+ *
+ */
+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.'); // It must be included from a Moodle page
+}
+$strmnetservices   = get_string('mnetservices', 'mnet');
+$strmnetlog        = get_string('mnetlog', 'mnet');
+$strmnetedithost   = get_string('reviewhostdetails', 'mnet');
+$strmnetthemes     = get_string('mnetthemes', 'mnet');
+
+$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 = array();
+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('mnetthemes', 'mnet_themes.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetthemes, $strmnetthemes, false);
+    if ($mnet_peer->application->name == 'moodle' && $mnet_peer->id != $CFG->mnet_all_hosts_id) {
+        $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
+    }
+} else {
+    $tabs[] = new tabobject('mnetdetails', '#', $strmnetedithost, $strmnetedithost, false);
+}
+print_tabs(array($tabs), $currenttab);
@@ -4,19 +4,18 @@
    require_once('../config.php');
    require_once($CFG->libdir.'/adminlib.php');

-    admin_externalpage_setup('managemodules');
-
 /// If data submitted, then process and store.

    if ($config = data_submitted()) {
        $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);

@@ -5,6 +5,7 @@
    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');
@@ -29,10 +30,6 @@
    $stractivitymodule = get_string("activitymodule");
    $strshowmodulecourse = get_string('showmodulecourse');

-    admin_externalpage_print_header();
-
-    print_heading($stractivities);
-
 /// If data submitted, then process and store.

    if (!empty($hide) and confirm_sesskey()) {
@@ -55,6 +52,7 @@
                             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()) {
@@ -72,9 +70,12 @@
                             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");

@@ -104,6 +105,11 @@
                }
            }

+            // 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
@@ -117,6 +123,13 @@
            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)) {
@@ -138,30 +151,39 @@
                notify("Error occurred while deleting the $strmodulename records from the config table");
            }

-            // Then the tables themselves
+            // 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);

-            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");
-                        }
-                    }
-                }
-            }
            // Delete the capabilities that were defined by this module
            capabilities_cleanup('mod/'.$module->name);

            // 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";
            notice(get_string("moduledeletefiles", "", $a), "modules.php");
        }
    }

+    admin_externalpage_print_header();
+    print_heading($stractivities);
+
 /// Get and sort the existing modules

    if (!$modules = get_records("modules")) {
@@ -176,7 +198,7 @@
        }
        $modulebyname[$strmodulename] = $module;
    }
-    ksort($modulebyname);
+    ksort($modulebyname, SORT_LOCALE_STRING);

 /// Print the table of all modules
    // construct the flexible table ready to display
@@ -195,7 +217,9 @@

        $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 = "";
@@ -225,12 +249,17 @@
            $class = "";
        }

+        $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.'</span>', 
-            $countlink, 
-            '<span'.$class.'>'.$module->version.'</span>', 
-            $visible, 
-            $delete, 
+            '<span'.$class.'>'.$icon.' '.$modulename.$extra.'</span>',
+            $countlink,
+            '<span'.$class.'>'.$module->version.'</span>',
+            $visible,
+            $delete,
            $settings
        ));
    }
@@ -20,9 +20,11 @@ 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
@@ -34,22 +36,12 @@ class page_admin extends page_base {
            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;
@@ -62,7 +54,7 @@ class page_admin extends page_base {
    // 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));
+        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
@@ -73,10 +65,13 @@ class page_admin extends page_base {

    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,8 +79,29 @@ class page_admin extends page_base {
        }
    }

+    /**
+     * 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;
+    }
+
+    /**
+     * 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('section' => (isset($this->section) ? $this->section : ''));
+        return array_merge($this->extraurlparams, array('section' => $this->section));
    }

    function blocks_get_positions() {
@@ -110,7 +126,7 @@ 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.
@@ -118,13 +134,19 @@ class page_admin extends page_base {

        // The search page currently doesn't handle block editing
        if ($this->section != 'search' and $this->user_allowed_editing()) {
-            $buttons = '<div><form '.$CFG->frametarget.' method="get" action="' . $this->url_get_path() . '">'.
-                '<div><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').'" /></div></form></div>';
+            $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;';
        }
+        $buttons .= $this->extrabutton;

        $navlinks = array();
        foreach ($this->visiblepathtosection as $element) {
@@ -132,7 +154,7 @@ class page_admin extends page_base {
        }
        $navigation = build_navigation($navlinks);

-        print_header("$SITE->shortname: " . implode(": ",$this->visiblepathtosection), $SITE->fullname, $navigation,'', '', true, $buttons, '');
+        print_header("$SITE->shortname: " . implode(": ",$this->visiblepathtosection), $SITE->fullname, $navigation, $focus, '', true, $buttons, '');
    }

    function get_type() {
@@ -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';

@@ -72,7 +72,7 @@ while(!feof($fd)) {

 $function($modargs,$body); 

-fclose($handle);
+fclose($fd);



@@ -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,13 +23,7 @@
        $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");
@@ -48,13 +42,13 @@

    echo "<form id=\"mform1\" class=\"mform\" action=\"http://moodle.org/register/\" method=\"post\">\n";
    echo '<fieldset id="registration">';
-    echo '<legend>Registration Information</legend>';
+    echo '<legend>'.get_string("registrationinfotitle").'</legend>';

    echo "<!-- The following hidden variables are to help prevent fake entries being sent. -->\n";
    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";

@@ -5,6 +5,11 @@ require_once('../config.php');
 require_once($CFG->dirroot.'/course/lib.php');
 require_once($CFG->libdir.'/adminlib.php');

+// workaround for problems with compression
+if (ini_get('zlib.output_compression')) {
+    @ini_set('zlib.output_compression', 'Off');
+}
+
 admin_externalpage_setup('replace');

 $search  = optional_param('search', '', PARAM_RAW);
@@ -19,7 +24,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 +37,28 @@ if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Pr
    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();

+/// Try to replace some well-known serialised contents (html blocks)
+notify('Replacing in html blocks...');
+$sql = "SELECT bi.*
+          FROM {$CFG->prefix}block_instance bi
+          JOIN {$CFG->prefix}block b ON b.id = bi.blockid
+         WHERE b.name = 'html'";
+if ($instances = get_records_sql($sql)) {
+    foreach ($instances as $instance) {
+        $blockobject = block_instance('html', $instance);
+        $blockobject->config->text = str_replace($search, $replace, $blockobject->config->text);
+        $blockobject->instance_config_commit($blockobject->pinned);
+    }
+}
+
 /// Rebuild course cache which might be incorrect now
 notify('Rebuilding course cache...');
 rebuild_course_cache();
@@ -5,15 +5,10 @@
    require_once($CFG->libdir.'/adminlib.php');
    require_once($CFG->dirroot.'/backup/lib.php');

-    $adminroot = admin_get_root();
-
-    admin_externalpage_setup('reportbackups', $adminroot);
-
-    admin_externalpage_print_header($adminroot);
-
    $courseid = optional_param('courseid', 0, PARAM_INT);

-    require_capability('moodle/site:backup', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    admin_externalpage_setup('reportbackups');
+    admin_externalpage_print_header();

 /// Scheduled backups are disabled by the server admin
    if (!empty($CFG->disablescheduledbackups)) {
@@ -43,7 +38,7 @@
    $strcourse = get_string("course");
    $strtimetaken = get_string("timetaken","quiz");
    $strstatus = get_string("status");
-    $strnext = get_string("next");
+    $strnext = get_string("backupnext");

 /// Decide when to show last execution logs or detailed logs
 /// Lastlog view
@@ -98,7 +93,7 @@
        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
+        $executions = get_records_sql("SELECT DISTINCT laststarttime
                                       FROM {$CFG->prefix}backup_log
                                       WHERE courseid = '$courseid'
                                       ORDER BY laststarttime DESC");
@@ -135,6 +130,6 @@
        print_simple_box_end();
    }

-    admin_externalpage_print_footer($adminroot);
+    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,21 +4,21 @@
    require_once($CFG->dirroot.'/lib/statslib.php');
    require_once($CFG->libdir.'/adminlib.php');

-    admin_externalpage_setup('reportcourseoverview');
-
-    admin_externalpage_print_header();
-
    $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'), 3);
+        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);

@@ -44,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);
+        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');
@@ -58,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;
@@ -82,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;
@@ -10,7 +10,7 @@

    require_login();

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

    stats_check_uptodate();

@@ -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,31 +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');
-
-    admin_externalpage_setup('reportlog');
-
-    admin_externalpage_print_header();
-
-
-    $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();
-
-?>
@@ -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'));
+?>
@@ -5,9 +5,9 @@
    require_once($CFG->libdir.'/adminlib.php');

    admin_externalpage_setup('reportquestion');
-
    admin_externalpage_print_header();
-    print_heading(page_doc_link(get_string('adminreport', 'question')));
+
+    print_heading(get_string('adminreport', 'question'));

    $probstr = '';
    $contextupgradeversion = 2007081000;
@@ -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,127 @@
+<?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] = report_security_doc_link($issue, $result->name);
+    $row[1] = $statusarr[$result->status];
+    $row[2] = $result->info;
+    $row[3] = is_null($result->link) ? '&nbsp;' : $result->link;
+
+    $CFG->pagepath = "report/security/$issue"; // help link in footer
+
+    $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;
+
+?>
@@ -0,0 +1,373 @@
+<?php
+
+/**
+ * Spam Cleaner
+ *
+ * Helps an admin to clean up spam in Moodle
+ *
+ * @version $Id$
+ * @authors Dongsheng Cai, Martin Dougiamas, Amr Hourani
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ */
+
+// Configuration
+
+// List of known spammy keywords, please add more here
+
+$autokeywords = array(
+                    "<img",
+                    "fuck",
+                    "casino",
+                    "porn",
+                    "xxx",
+                    "cialis",
+                    "viagra",
+                    "poker",
+                    "warcraft"
+                );
+
+
+/////////////////////////////////////////////////////////////////////////////////
+
+require_once('../../../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+
+require_js(array('yui_dom-event', 'yui_connection', 'yui_json'));
+
+$keyword = optional_param('keyword', '', PARAM_RAW);
+$autodetect = optional_param('autodetect', '', PARAM_RAW);
+$del = optional_param('del', '', PARAM_RAW);
+$delall = optional_param('delall', '', PARAM_RAW);
+$ignore = optional_param('ignore', '', PARAM_RAW);
+$reset = optional_param('reset', '', PARAM_RAW);
+$id = optional_param('id', '', PARAM_INT);
+
+require_login();
+admin_externalpage_setup('reportspamcleaner');
+
+// Implement some AJAX calls 
+
+// Delete one user
+if (!empty($del) && confirm_sesskey() && ($id != $USER->id)) {
+    if (isset($SESSION->users_result[$id])) {
+        $user = $SESSION->users_result[$id];
+        if (delete_user($user)) {
+            unset($SESSION->users_result[$id]);
+            echo json_encode(true);
+        } else {
+            echo json_encode(false);
+        }
+    } else {
+        echo json_encode(false);
+    }
+    exit;
+}
+
+// Delete lots of users
+if (!empty($delall) && confirm_sesskey()) {
+    if (!empty($SESSION->users_result)) {
+        foreach ($SESSION->users_result as $userid => $user) {
+            if ($userid != $USER->id) {
+                if (delete_user($user)) {
+                    unset($SESSION->users_result[$userid]);
+                }
+            }
+        }
+    }
+    echo json_encode(true);
+    exit;
+}
+
+if (!empty($ignore)) {
+    unset($SESSION->users_result[$id]);
+    echo json_encode(true);
+    exit;
+}
+
+
+admin_externalpage_print_header();
+
+// Print headers and things
+
+print_spamcleaner_javascript();
+
+print_box(get_string('spamcleanerintro', 'report_spamcleaner'));
+
+print_box_start();     // The forms section at the top
+
+?>
+
+<div class="mdl-align">
+
+<form method="post" action="index.php">
+  <div>
+    <input type="text" name="keyword" id="keyword_el" value="<?php p($keyword) ?>" /> 
+    <input type="hidden" name="sesskey" value="<?php echo sesskey();?>" />
+    <input type="submit" value="<?php echo get_string('spamsearch', 'report_spamcleaner')?>" />
+  </div>
+</form>
+<p><?php echo get_string('spameg', 'report_spamcleaner');?></p>
+
+<hr />
+
+<form method="post"  action="index.php">
+  <div>
+    <input type="submit" name="autodetect" value="<?php echo get_string('spamauto', 'report_spamcleaner');?>" />
+  </div>
+</form>
+
+
+</div>
+
+<?php
+print_box_end(); 
+
+echo '<div id="result" class="mdl-align">';
+
+// Print list of resulting profiles
+
+if (!empty($keyword)) {               // Use the keyword(s) supplied by the user
+    $keywords = explode(',', $keyword);
+    foreach ($keywords as $key => $keyword) {
+        $keywords[$key] = trim($keyword);
+    }
+    search_spammers($keywords);
+
+} else if (!empty($autodetect)) {     // Use the inbuilt keyword list to detect users
+    search_spammers($autokeywords);
+}
+
+echo '</div>';
+
+/////////////////////////////////////////////////////////////////////////////////
+
+
+///  Functions 
+
+
+function search_spammers($keywords) {
+
+    global $CFG, $USER; 
+
+    if (!is_array($keywords)) {
+        $keywords = array($keywords);    // Make it into an array
+    }
+
+    $like = sql_ilike();
+
+    $keywordfull = array();
+    foreach ($keywords as $keyword) {
+        $keyword = addslashes($keyword);   // Just to be safe
+        $keywordfull[] = " description $like '%$keyword%' ";
+        $keywordfull2[] = " p.summary $like '%$keyword%' ";
+    }
+    $conditions = '( '.implode(' OR ', $keywordfull).' )';
+    $conditions2 = '( '.implode(' OR ', $keywordfull2).' )';
+
+    $sql = "SELECT * FROM {$CFG->prefix}user WHERE deleted = 0 AND id <> {$USER->id} AND $conditions";  // Exclude oneself
+    $sql2= "SELECT u.*, p.summary FROM {$CFG->prefix}user AS u, {$CFG->prefix}post AS p WHERE $conditions2 AND u.deleted = 0 AND u.id=p.userid AND u.id <> {$USER->id}";
+    $spamusers_desc = get_recordset_sql($sql);
+    $spamusers_blog = get_recordset_sql($sql2);
+
+    $keywordlist = implode(', ', $keywords);
+    print_box(get_string('spamresult', 'report_spamcleaner').s($keywordlist)).' ...';
+
+    print_user_list(array($spamusers_desc, $spamusers_blog), $keywords);
+
+}
+
+
+
+function print_user_list($users_rs, $keywords) {
+    global $CFG, $SESSION;
+
+    // reset session everytime this function is called
+    $SESSION->users_result = array();
+    $count = 0;
+
+    foreach ($users_rs as $rs) {
+        while ($user = rs_fetch_next_record($rs)) {
+            if (!$count) {
+                echo '<table border="1" width="100%" id="data-grid"><tr><th>&nbsp;</th><th>'.get_string('user','admin').'</th><th>'.get_string('spamdesc', 'report_spamcleaner').'</th><th>'.get_string('spamoperation', 'report_spamcleaner').'</th></tr>';
+            }
+            $count++;
+            filter_user($user, $keywords, $count);
+        }
+    }
+
+    if (!$count) {
+        echo get_string('spamcannotfinduser', 'report_spamcleaner');
+
+    } else {
+        echo '</table>';
+        echo '<div class="mld-align">
+              <button id="removeall_btn">'.get_string('spamdeleteall', 'report_spamcleaner').'</button>
+              </div>';
+    }
+}
+function filter_user($user, $keywords, $count) {
+    global $CFG;
+    $image_search = false;
+    if (in_array('<img', $keywords)) {
+        $image_search = true;
+    }
+    if (isset($user->summary)) {
+        $user->description = '<h3>'.get_string('spamfromblog', 'report_spamcleaner').'</h3>'.$user->summary;
+        unset($user->summary);
+    }
+    if (preg_match('#<img.*src=[\"\']('.$CFG->pixpath.')#', $user->description, $matches)
+        && $image_search) {
+        $result = false;
+        foreach ($keywords as $keyword) {
+            if (preg_match('#'.$keyword.'#', $user->description)
+                && ($keyword != '<img')) {
+                $result = true;
+            }
+        }
+        if ($result) {
+            echo print_user_entry($user, $keywords, $count);
+        } else {
+            unset($user);
+        }
+    } else {
+        echo print_user_entry($user, $keywords, $count);
+    }
+}
+
+
+function print_user_entry($user, $keywords, $count) {
+
+    global $SESSION, $CFG;
+
+    $smalluserobject = new object;      // All we need to delete them later
+    $smalluserobject->id = $user->id;
+    $smalluserobject->email = $user->email;
+    $smalluserobject->auth = $user->auth;
+    $smalluserobject->firstname = $user->firstname;
+    $smalluserobject->lastname = $user->lastname;
+
+    if (empty($SESSION->users_result[$user->id])) {
+        $SESSION->users_result[$user->id] = $smalluserobject;
+        $html = '<tr valign="top" id="row-'.$user->id.'" class="result-row">';
+        $html .= '<td width="10">'.$count.'</td>';
+        $html .= '<td width="30%" align="left"><a href="'.$CFG->wwwroot."/user/view.php?course=1&amp;id=".$user->id.'" title="'.s($user->username).'">'.fullname($user).'</a>';
+
+        $html .= "<ul>";
+        $profile_set = array('city'=>true, 'country'=>true, 'email'=>true);
+        foreach ($profile_set as $key=>$value) {
+            if (isset($user->$key)){
+                $html .= '<li>'.$user->$key.'</li>';
+            }
+        }
+        $html .= "</ul>";
+        $html .= '</td>';
+
+        foreach ($keywords as $keyword) {
+            $user->description = highlight($keyword, $user->description);
+        }
+
+        $html .= '<td align="left">'.format_text($user->description, FORMAT_MOODLE).'</td>';
+        $html .= '<td width="100px" align="center">';
+        $html .= '<button onclick="del_user(this,'.$user->id.')">'.get_string('deleteuser', 'admin').'</button><br />';
+        $html .= '<button onclick="ignore_user(this,'.$user->id.')">'.get_string('ignore', 'admin').'</button>';
+        $html .= '</td>';
+        $html .= '</tr>';
+        return $html;
+    } else {
+        return null;
+    }
+
+
+}
+
+function print_spamcleaner_javascript()  {
+
+$sesskey = sesskey();
+
+?>
+
+<script type="text/javascript">
+//<![CDATA[
+var row = null;
+var delall_cb = {
+    success: function(o){
+        try {
+            var resp = YAHOO.lang.JSON.parse(o.responseText);
+        } catch(e) {
+            alert('<?php echo get_string('spaminvalidresult', 'report_spamcleaner');?>');
+            return;
+        }
+        if(resp == true){
+            window.location.href=window.location.href;
+        }
+    }
+}
+function init() {
+    YAHOO.util.Event.addListener("removeall_btn", "click", function(){
+        var yes = confirm('<?php echo get_string('spamdeleteallconfirm', 'report_spamcleaner');?>');
+        if(yes){
+            var cObj = YAHOO.util.Connect.asyncRequest('POST', '<?php echo me();?>?delall=yes&sesskey=<?php echo $sesskey;?>', delall_cb); 
+        }
+    });
+}
+var del_cb = {
+    success: function(o) {
+        try {
+            var resp = YAHOO.lang.JSON.parse(o.responseText);
+        } catch(e) {
+            alert('<?php echo get_string('spaminvalidresult', 'report_spamcleaner');?>');
+            return;
+        }
+        if(row) {
+            if(resp == true){
+                while(row.tagName != 'TR') {
+                    row = row.parentNode;
+                }
+                row.parentNode.removeChild(row);
+                row = null;
+            } else {
+                alert('<?php echo get_string('spamcannotdelete', 'report_spamcleaner');?>');
+            }
+        }
+    }
+}
+var ignore_cb = {
+    success: function(o){
+        try {
+            var resp = YAHOO.lang.JSON.parse(o.responseText);
+        } catch(e) {
+            alert('<?php echo get_string('spaminvalidresult', 'report_spamcleaner');?>');
+            return;
+        }
+        if(row) {
+            if(resp == true){
+                while(row.tagName != 'TR') {
+                    row = row.parentNode;
+                }
+                row.parentNode.removeChild(row);
+                row = null;
+            }
+        }
+    }
+}
+function del_user(obj, id) {
+    var yes = confirm('<?php echo get_string('spamdeleteconfirm', 'report_spamcleaner');?>');
+    if(yes){
+        row = obj;
+        var cObj = YAHOO.util.Connect.asyncRequest('POST', '<?php echo me();?>?del=yes&sesskey=<?php echo $sesskey;?>&id='+id, del_cb); 
+    }
+}
+function ignore_user(obj, id) {
+    row = obj;
+    var cObj = YAHOO.util.Connect.asyncRequest('POST', '<?php echo me();?>?ignore=yes&sesskey=<?php echo $sesskey;?>&id='+id, ignore_cb); 
+}
+YAHOO.util.Event.onDOMReady(init);
+//]]>
+</script>
+
+<?php 
+}
+
+admin_externalpage_print_footer();
+
+?>
@@ -0,0 +1,5 @@
+<?php
+
+// spam cleaner
+$ADMIN->add('reports', new admin_externalpage('reportspamcleaner', get_string('spamcleaner','report_spamcleaner'), "$CFG->wwwroot/$CFG->admin/report/spamcleaner/index.php", 'moodle/site:config'));
+
@@ -1,75 +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');
-
-    admin_externalpage_setup('reportstats');
-
-    admin_externalpage_print_header();
-
-
-    $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, '', 3);
-    }
-
-    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'), 3);
-    }
-
-    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();
-
-?>
@@ -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',
+    )
+);
+
+?>
@@ -66,22 +66,39 @@ class ExHtmlReporter extends HtmlReporter {
    function paintFail($message) {
        // Explicitly call grandparent, not parent::paintFail.
        SimpleScorer::paintFail($message);
-        $this->_paintPassFail('fail', $message);
+        $this->_paintPassFail('fail', $message, debug_backtrace());
    }

    /**
     * Called when an error (uncaught exception or PHP error) needs to be output.
     */
    function paintError($message) {
-        // Explicitly call grandparent, not parent::paintFail.
+        // Explicitly call grandparent, not parent::paintError.
        SimpleScorer::paintError($message);
        $this->_paintPassFail('exception', $message);
    }

    /**
-     * Private method. Used by printPass/Fail/Error.
+     * Called when a caught exception needs to be output.
     */
-    function _paintPassFail($passorfail, $message) {
+    function paintException($exception) {
+        // Explicitly call grandparent, not parent::paintException.
+        SimpleScorer::paintException($exception);
+        $message = 'Unexpected exception of type [' . get_class($exception) .
+                '] with message ['. $exception->getMessage() .
+                '] in ['. $exception->getFile() .
+                ' line ' . $exception->getLine() . ']';
+        $stacktrace = null;
+        if (method_exists($exception, 'getTrace')) {
+            $stacktrace = $exception->getTrace();
+        }
+        $this->_paintPassFail('exception', $message, $stacktrace);
+    }
+
+    /**
+     * Private method. Used by printPass/Fail/Error/Exception.
+     */
+    function _paintPassFail($passorfail, $message, $stacktrace = null) {
        global $FULLME, $CFG;

        print_simple_box_start('', '100%', '', 5, $passorfail . ' generalbox');
@@ -100,6 +117,25 @@ class ExHtmlReporter extends HtmlReporter {
        echo "<a href=\"{$url}path=$folder$file\" title=\"$this->strrunonlyfile\">$file</a>";
        echo $this->strseparator, implode($this->strseparator, $breadcrumb);
        echo $this->strseparator, '<br />', $this->_htmlEntities($message), "\n\n";
+        if ($stacktrace) {
+            $dotsadded = false;
+            $interestinglines = 0;
+            $filteredstacktrace = array();
+            foreach ($stacktrace as $frame) {
+                if (empty($frame['file']) || (strpos($frame['file'], 'simpletestlib') === false
+                        && strpos($frame['file'], 'report/unittest') === false)) {
+                    $filteredstacktrace[] = $frame;
+                    $interestinglines += 1;
+                    $dotsadded = false;
+                } else if (!$dotsadded) {
+                    $filteredstacktrace[] = array('line' => '...', 'file' => '...');
+                    $dotsadded = true;
+                }
+            }
+            if ($interestinglines > 1 || $passorfail == 'exception') {
+                echo '<div class="notifytiny">' . format_backtrace($filteredstacktrace) . "</div>\n\n";
+            }
+        }
        print_simple_box_end();
        flush();
    }
@@ -193,4 +229,45 @@ class ExHtmlReporter extends HtmlReporter {
        return get_string($identifier, 'simpletest', $a);
    }
 }
+
+/**
+ * Formats a backtrace ready for output.
+ *
+ * @param array $callers backtrace array, as returned by debug_backtrace().
+ * @param boolean $plaintext if false, generates HTML, if true generates plain text.
+ * @return string formatted backtrace, ready for output.
+ */
+function format_backtrace($callers, $plaintext = false) {
+    // do not use $CFG->dirroot because it might not be available in destructors
+    $dirroot = dirname(dirname(__FILE__));
+
+    if (empty($callers)) {
+        return '';
+    }
+
+    $from = $plaintext ? '' : '<ul style="text-align: left">';
+    foreach ($callers as $caller) {
+        if (!isset($caller['line'])) {
+            $caller['line'] = '?'; // probably call_user_func()
+        }
+        if (!isset($caller['file'])) {
+            $caller['file'] = 'unknownfile'; // probably call_user_func()
+        }
+        $from .= $plaintext ? '* ' : '<li>';
+        $from .= 'line ' . $caller['line'] . ' of ' . str_replace($dirroot, '', $caller['file']);
+        if (isset($caller['function'])) {
+            $from .= ': call to ';
+            if (isset($caller['class'])) {
+                $from .= $caller['class'] . $caller['type'];
+            }
+            $from .= $caller['function'] . '()';
+        } else if (isset($caller['exception'])) {
+            $from .= ': '.$caller['exception'].' thrown';
+        }
+        $from .= $plaintext ? "\n" : '</li>';
+    }
+    $from .= $plaintext ? '' : '</ul>';
+
+    return $from;
+}
 ?>
@@ -22,13 +22,13 @@ require_once($CFG->libdir . '/simpletestlib/test_case.php');
 * them into a group test.
 * @package SimpleTestEx
 */
-class AutoGroupTest extends GroupTest {
+class AutoGroupTest extends TestSuite {

    var $thorough;
    var $showsearch;

    function AutoGroupTest($showsearch, $thorough, $test_name = null) {
-        $this->GroupTest($test_name);
+        $this->TestSuite($test_name);
        $this->showsearch = $showsearch;
        $this->thorough = $thorough;
    }
@@ -56,7 +56,7 @@ class AutoGroupTest extends GroupTest {
            }
            $file_path = $path . '/' . $file;
            if (is_dir($file_path)) {
-                if ($file != 'CVS' && !in_array($file_path, $this->ignorefolders)) {
+                if ($file != 'CVS' && $file != '.git' && !in_array($file_path, $this->ignorefolders)) {
                    $this->_recurseFolders($file_path);
                }
            } elseif (preg_match('/simpletest(\/|\\\\)test.*\.php$/', $file_path) ||
@@ -16,14 +16,6 @@ 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,17 @@ $showsearch = optional_param('showsearch', false, PARAM_BOOL);
 $thorough = optional_param('thorough', false, PARAM_BOOL);

 // Print the header.
-admin_externalpage_setup('reportsimpletest');
-$strtitle = get_string('unittests', $langfile);
+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);
+
 if (!is_null($path)) {
    // Create the group of tests.
    $test =& new AutoGroupTest($showsearch, $thorough);
@@ -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;
+
+?>
@@ -10,10 +10,9 @@
    require_once('../../config.php');
    require_once($CFG->libdir.'/adminlib.php');

-    admin_externalpage_setup('defineroles');
+    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
@@ -22,10 +21,10 @@

    $roles = get_all_roles();

-    if ($grant = data_submitted()) {
+    if ($grant = data_submitted() and confirm_sesskey()) {

        foreach ($grant as $grole => $val) {
-            if ($grole == 'dummy') {
+            if ($grole == 'dummy' or !strpos($grole, '_')) {
                continue;
            }

@@ -82,6 +81,7 @@
    print_table($table);
    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 '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
    echo '</div></form>';

    admin_externalpage_print_footer();
@@ -8,10 +8,9 @@
    require_once('../../config.php');
    require_once($CFG->libdir.'/adminlib.php');

-    admin_externalpage_setup('defineroles');
+    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
@@ -20,10 +19,10 @@

    $roles = get_all_roles();

-    if ($grant = data_submitted()) {
+    if ($grant = data_submitted() and confirm_sesskey()) {

        foreach ($grant as $grole => $val) {
-            if ($grole == 'dummy') {
+            if ($grole == 'dummy' or !strpos($grole, '_')) {
                continue;
            }

@@ -74,12 +73,13 @@
        $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="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 '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
    echo '</div></form>';

    admin_externalpage_print_footer();
@@ -46,9 +46,8 @@
        </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">
@@ -61,7 +60,7 @@
          <?php
            $i=0;
            if (!empty($searchtext)) {
-                echo "<optgroup label=\"$strsearchresults (" . $availableusers->_numOfRows . ")\">\n";
+                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";
@@ -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
@@ -44,13 +45,11 @@
        } else {
            error('Invalid course id');
        }
-        $coursecontext = $context;

    } else if (!empty($courseid)){ // we need this for user tabs in user context
        if (!$course = get_record('course', 'id', $courseid)) {
            error('Invalid course id');
        }
-        $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);

    } else {
        $courseid = SITEID;
@@ -59,27 +58,19 @@

    require_login($course);

-    if ($context->contextlevel == CONTEXT_COURSE) {
-        require_login($context->instanceid);
-    } else {
-        require_login();
-    }
-
    require_capability('moodle/role:assign', $context);

 /// needed for tabs.php
-    $overridableroles = get_overridable_roles($context);
-    $assignableroles  = get_assignable_roles($context);    // Plain role names, may be altered later

+    $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');
@@ -96,7 +87,10 @@
    $today = time();
    $today = make_timestamp(date('Y', $today), date('m', $today), date('d', $today), 0, 0, 0);

-    $basemenu[0] = get_string('startdate') . ' (' . userdate($course->startdate, $timeformat) . ')';
+    // 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) . ')' ;
    }
@@ -112,7 +106,7 @@
 /// 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');
        }
    }
@@ -129,7 +123,9 @@
        /// course header
        $navlinks = array();
        if ($courseid != SITEID) {
-            $navlinks[] = array('name' => $strparticipants, 'link' => "$CFG->wwwroot/user/index.php?id=$course->id", 'type' => 'misc');
+            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);
@@ -148,32 +144,19 @@
        $currenttab = 'assign';
        include_once($CFG->dirroot.'/user/tabs.php');
    } else if ($context->contextlevel == CONTEXT_SYSTEM) {
-        admin_externalpage_setup('assignroles');
-        admin_externalpage_print_header();
+        admin_externalpage_setup('assignroles', '', array('contextid' => $contextid, 'roleid' => $roleid));
+        admin_externalpage_print_header('');
    } else if ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID) {
-        admin_externalpage_setup('frontpageroles');
-        admin_externalpage_print_header();
-        $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');
    }


-/// Rename some of the role names if needed
-    if (isset($coursecontext)) {
-        if ($aliasnames = get_records('role_names', 'contextid', $coursecontext->id)) {
-            foreach ($aliasnames as $alias) {
-                if (isset($assignableroles[$alias->roleid])) {
-                    $assignableroles[$alias->roleid] = $alias->text.' ('.$assignableroles[$alias->roleid].')';
-                }
-            }
-        }
-    }
-

 /// Process incoming role assignment

@@ -224,7 +207,9 @@
                    }
                }
            }
-
+            
+            $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);
@@ -258,17 +243,22 @@
                    }
                }
            }
-
+            
+            $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) {
@@ -300,7 +290,7 @@
            $selectsql = "";
        }

-        if ($context->contextlevel > CONTEXT_COURSE) { // mod or block (or group?)
+        if ($context->contextlevel > CONTEXT_COURSE && !is_inside_frontpage($context)) { // mod or block (or group?)

            /************************************************************************
             *                                                                      *
@@ -335,7 +325,7 @@
                if ($validroleids) {
                    $roleids =  '('.implode(',', $validroleids).')';

-                    $select = " SELECT u.id, u.firstname, u.lastname, u.email";
+                    $select = " SELECT DISTINCT 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
@@ -355,7 +345,7 @@
                    $availableusers = get_recordset_sql($select . $from . $where . $selectsql . $excsql);
                }

-                $usercount =  count_records_sql($countselect . $from . $where) - count($contextusers);
+                $usercount =  $availableusers->_numOfRows;
            }

        } else {
@@ -381,11 +371,11 @@
                                                    AND r.roleid = '.$roleid.'
                                                    '.$selectsql.')
                                                ORDER BY lastname ASC, firstname ASC');
-            $usercount = count_records_select('user', $select) - count($contextusers);

+            $usercount = $availableusers->_numOfRows;         
        }

-        echo '<div style="text-align:center">'.$strcurrentcontext.': '.print_context_name($context).'<br/>';
+        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, '', '', '', false, 'self', $strroletoassign);
@@ -405,6 +395,12 @@
            notify($msg);
            print_simple_box_end();
        }
+		
+		//Back to Assign Roles button
+		echo "<br/>";
+		echo "<div class='continuebutton'>";
+		print_single_button('assign.php', array('contextid' => $contextid), get_string('assignrolesin', 'role', print_context_name($context)));
+		echo "</div>";

    } else {   // Print overview table

@@ -413,6 +409,35 @@
            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;
@@ -420,16 +445,28 @@
        $table->head = array(get_string('roles', 'role'), get_string('description'), get_string('users'));
        $table->wrap = array('nowrap', '', 'nowrap');
        $table->align = array('right', 'left', 'center');
-
-        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);
+        if ($showroleholders) {
+            $table->head[] = '';
+            $table->wrap[] = 'nowrap';
+            $table->align[] = 'left';
        }

+        foreach ($assignableroles as $roleid => $rolename) {
+            $description = format_string(get_field('role', 'description', 'id', $roleid));
+            $row = array('<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$rolename.'</a>',$description, $rolehodlercount[$roleid]);
+            if ($showroleholders) {
+                $row[] = $rolehodlernames[$roleid];
+            }
+            $table->data[] = $row;
+        }
        print_table($table);
+		
+	   //Continue to Course Button
+	   echo "<br/>";
+	   echo "<div class='continuebutton'>";
+	   print_single_button($CFG->wwwroot.'/course/view.php', array('id' => $courseid), get_string('continuetocourse'));
+	   echo "</div>";
    }
-
+	
    print_footer($course);
-
 ?>
@@ -24,7 +24,7 @@
 <?php if ($action == 'view') { ?>
    <tr valign="top">
        <td align="right"><?php print_string('name') ?>:</td>
-        <td><?php p($role->name); ?></td>
+        <td><?php p(format_string($role->name)); ?></td>
    </tr>
    <tr valign="top">
        <td align="right"><?php print_string('shortname') ?>:</td>
@@ -32,11 +32,11 @@
    </tr>
    <tr valign="top">
        <td align="right"><?php print_string('description') ?>:</td>
-        <td><?php p($role->description); $usehtmleditor = false; ?></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 
+        <td><?php
                $usehtmleditor = false;
                if (empty($role->legacytype)) {
                    print_string('none');
@@ -58,7 +58,7 @@
    <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="20" size="15" value="'.s($role->shortname).'" />';
+            echo '<input type="text" id="shortname" name="shortname" maxlength="100" size="15" value="'.s($role->shortname).'" />';
            if (isset($errors["shortname"])) formerr($errors["shortname"]);
            ?>
        </td>
@@ -113,7 +113,8 @@ $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)) {
@@ -4,8 +4,6 @@

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

-    admin_externalpage_setup('defineroles');
-
    $roleid      = optional_param('roleid', 0, PARAM_INT);             // if set, we are editing a role
    $name        = optional_param('name', '', PARAM_MULTILANG);        // new role name
    $shortname   = optional_param('shortname', '', PARAM_RAW);         // new role shortname, special cleaning before storage
@@ -14,6 +12,8 @@
    $confirm     = optional_param('confirm', 0, PARAM_BOOL);
    $cancel      = optional_param('cancel', 0, PARAM_BOOL);

+    admin_externalpage_setup('defineroles', '', array('roleid' => $roleid));
+
    $sitecontext = get_context_instance(CONTEXT_SYSTEM);

    require_capability('moodle/role:manage', $sitecontext);
@@ -121,9 +121,12 @@
                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':
@@ -233,6 +236,7 @@

                    // 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');
                }
@@ -240,6 +244,7 @@
                // edited a role sitewide - with errors, but still...
                mark_context_dirty($sitecontext->path);
            }
+
            break;

        case 'delete':
@@ -344,8 +349,8 @@
                    $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++;
@@ -360,6 +365,8 @@
                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;

@@ -374,6 +381,9 @@
                // 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 {
@@ -404,7 +414,7 @@

 /// print UI now

-    admin_externalpage_print_header();
+    admin_externalpage_print_header('');

    $currenttab = 'manage';
    include_once('managetabs.php');
@@ -561,54 +571,5 @@
    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);
-    }
-}
 ?>
@@ -3,6 +3,7 @@
    $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">
@@ -30,7 +31,8 @@
        $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) {

@@ -66,7 +68,7 @@
                $isprohibit = 0;
            }

-            $isdisabled = $isprohibit;
+            $isdisabled = $isprohibit || $capability->locked;

            $riskinfo = '<td class="risk managetrust">';
            $rowclasses = '';
@@ -137,10 +139,17 @@
            <?php echo $riskinfo; ?>
        </tr>

-        <?php } ?>
+        <?php }  ?>
    </table>
    <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>
@@ -20,7 +20,9 @@
        error('Can not override base role capabilities');
    }

-    if (!has_capability('moodle/role:override', $context)) {
+    $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!');
    }

@@ -28,9 +30,6 @@
        if (!$course = get_record('course', 'id', $courseid)) {
            error('Bad course ID');
        }
-
-        $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
-
    } else {
        $course = clone($SITE);
        $courseid = SITEID;
@@ -51,22 +50,20 @@
    }

 /// needed for tabs.php
-    $overridableroles = get_overridable_roles($context);
-    $assignableroles  = get_assignable_roles($context);
+    $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');
        }
    }
@@ -77,7 +74,30 @@
    }

 /// get all cababilities
-    $capabilities = fetch_context_capabilities($context);
+    $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()) {
@@ -87,6 +107,10 @@
                                             '', 'capability, permission, id');

        foreach ($capabilities as $cap) {
+            if ($cap->locked) {
+                //user not allowed to change this cap
+                continue;
+            }

            if (!isset($data->{$cap->name})) {
                //cap not specified in form
@@ -115,7 +139,8 @@

        // 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);
    }

@@ -126,8 +151,9 @@
        $navlinks = array();
        /// course header
        if ($course->id != SITEID) {
-            $navlinks[] = array('name' => $course->shortname, 'link' => "$CFG->wwwroot/course/view.php?id=$course->id", 'type' => 'course');
-            $navlinks[] = array('name' => $strparticipants, 'link' => "$CFG->wwwroot/user/index.php?id=$course->id", 'type' => 'misc');
+            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);
@@ -145,35 +171,20 @@
        include_once($CFG->dirroot.'/user/tabs.php');
    } else if ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID) {
        require_once($CFG->libdir.'/adminlib.php');
-        admin_externalpage_setup('frontpageroles');
+        admin_externalpage_setup('frontpageroles', '', array('contextid' => $contextid, 'roleid' => $roleid), $CFG->wwwroot . '/' . $CFG->admin . '/roles/override.php');
        admin_externalpage_print_header();
-        $currenttab = '';
-        $tabsmode = 'override';
+        $currenttab = 'override';
        include_once('tabs.php');
    } else {
-        $currenttab = '';
-        $tabsmode = 'override';
+        $currenttab = 'override';
        include_once('tabs.php');
    }

-/// Rename some of the role names if needed
-    if (isset($coursecontext)) {
-        if ($aliasnames = get_records('role_names', 'contextid', $coursecontext->id)) {
-            foreach ($aliasnames as $alias) {
-                if (isset($overridableroles[$alias->roleid])) {
-                    $overridableroles[$alias->roleid] = $alias->text.' ('.$overridableroles[$alias->roleid].')';
-                }
-            }
-        }
-    }
-
-
-    print_heading_with_help(get_string('overrides', 'role'), 'overrides');
+    print_heading_with_help(get_string('overridepermissionsin', 'role', print_context_name($context)), 'overrides');

    if ($roleid) {
    /// prints a form to swap roles
        echo '<div class="selector">';
-        echo $strcurrentcontext.': '.print_context_name($context).'<br/>';
        $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, '', '', '', false, 'self', $strroletooverride);
@@ -197,7 +208,7 @@
        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 {
@@ -19,9 +19,6 @@ if ($currenttab != 'update') {
            print_header($SITE->fullname, "$SITE->fullname", $navigation);
            break;

-        case CONTEXT_PERSONAL:
-            break;
-
        case CONTEXT_USER:
            print_header();
            break;
@@ -38,6 +35,9 @@ if ($currenttab != 'update') {
            $navlinks[] = array('name' => $category->name,
                                'link' => "$CFG->wwwroot/course/category.php?id=$category->id",
                                'type' => 'misc');
+            $navlinks[] = array('name' => get_string("roles"),
+                                'link' => null,
+                                'type' => 'misc');
            $navigation = build_navigation($navlinks);

            print_header("$SITE->shortname: $category->name", "$SITE->fullname: $strcourses", $navigation, "", "", true);
@@ -50,17 +50,14 @@ if ($currenttab != 'update') {
                $course = get_record('course', 'id', $context->instanceid);

                require_login($course);
-                $navlinks[] = array('name' => $course->shortname,
-                                    'link' => "$CFG->wwwroot/course/view.php?id=$course->id",
+                $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:
-            break;
-
        case CONTEXT_MODULE:
            // get module type?
            if (!$cm = get_record('course_modules','id',$context->instanceid)) {
@@ -78,8 +75,6 @@ if ($currenttab != 'update') {

            require_login($course);

-            $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);   // for role names later
-
            $fullmodulename      = get_string("modulename", $module->name);
            $streditinga         = get_string("editinga", "moodle", $fullmodulename);
            $strmodulenameplural = get_string("modulenameplural", $module->name);
@@ -113,9 +108,6 @@ if ($currenttab != 'update') {
                if ($block = get_record('block', 'id', $blockinstance->blockid)) {
                    $blockname = print_context_name($context);

-                    // Prepare the last part of the breadcrumbs first
-                    $navlinks[98] = array('name' => $blockname, 'link' => null, 'type' => 'misc');
-                    $navlinks[99] = array('name' => $straction, 'link' => null, 'type' => 'misc');

                    switch ($blockinstance->pagetype) {
                        case 'course-view':
@@ -123,12 +115,8 @@ if ($currenttab != 'update') {

                                require_login($course);

-                                if ($course->id != SITEID) {
-                                    $navlinks[0] = array('name' => $course->shortname,
-                                                        'link' => "$CFG->wwwroot/course/view.php?id=$course->id",
-                                                        'type' => 'misc');
-                                    $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);   // for role names later
-                                }
+                                $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);
                            }
@@ -136,14 +124,30 @@ if ($currenttab != 'update') {

                        case 'blog-view':
                            $strblogs = get_string('blogs','blog');
-                            $navlinks[0] = array('name' => $strblogs,
+                            $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;
                    }
@@ -159,48 +163,41 @@ if ($currenttab != 'update') {
 }


+$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 (!empty($tabsmode)) {
-
-        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($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-cointained in the tabs file
-/// ej.:
+/// 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
@@ -209,7 +206,7 @@ if ($context->contextlevel != CONTEXT_SYSTEM) {    // Print tabs for anything ex
        if ($extratabs = explode(',', $CFG->extratabs)) {
            asort($extratabs);
            foreach($extratabs as $extratab) {
-            /// Each extra tab mus be one $CFG->dirroot relative file
+            /// Each extra tab must be one $CFG->dirroot relative file
                if (file_exists($CFG->dirroot . '/' . $extratab)) {
                    include_once($CFG->dirroot . '/' . $extratab);
                }
@@ -217,13 +214,16 @@ if ($context->contextlevel != CONTEXT_SYSTEM) {    // Print tabs for anything ex
        }
    }

-    if (!empty($secondrow)) {
-        $tabs = array($toprow, $secondrow);
-    } else {
-        $tabs = array($toprow);
+    $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,152 +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(); // 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

-$CFG->adminsearchquery = $query;  // So we can reference it in search boxes later in this invocation
-
-
 // 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();
+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 '<div>';
-echo '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
-echo '<input type="hidden" name="query" value="' . s($query) . '" />';
+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();
-
-
-/**
- * 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 ($query == ''){
-        return '';
-    }
-
-    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,25 +5,56 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/blocklib.php');
 require_once($CFG->dirroot.'/'.$CFG->admin.'/pagelib.php');

-if (!empty($THEME->customcorners)) {
-    require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
-}
-
-if ($site = get_site()) {
-    require_login();
-}
-
-
-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);
+$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
+$PAGE->init_extra($section);
+$CFG->pagepath = 'admin/setting/'.$section;

 if (!isset($USER->adminediting)) {
    $USER->adminediting = false;
@@ -37,86 +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($root->visiblename, $root->visiblename);
+    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 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 '<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]),
@@ -124,53 +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->customcorners)) print_custom_corners_start();
+    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->customcorners)) print_custom_corners_end();
+    print_container_end();
    echo '</td>';
            break;
            case 'middle':
    echo '<td id="middle-column">';
-    if (!empty($THEME->customcorners)) print_custom_corners_start();
+    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 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($root->visiblename);
+    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->customcorners)) print_custom_corners_end();
+    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->customcorners)) print_custom_corners_start();
+        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->customcorners)) print_custom_corners_end();
+        print_container_end();
        echo '</td>';
    }
            break;
@@ -2,126 +2,97 @@

 // 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('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'));
+if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

-# for CALENDAR_TF_12 and CALENDAR_TF_24 ...
-require_once($CFG->dirroot . '/calendar/lib.php');
+    $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_site_timeformat', get_string('pref_timeformat', 'calendar'), get_string('explain_site_timeformat', 'calendar'), '0',
-array(  0              => get_string('default', 'calendar'),
-        CALENDAR_TF_12 => get_string('timeformat_12', 'calendar'),
-        CALENDAR_TF_24 => 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));
-$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));
+    $temp->add(new admin_setting_configtext('mycoursesperpage', get_string('mycoursesperpage', 'admin'), get_string('configmycoursesperpage', 'admin'), 21, PARAM_INT));
+    $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);
+    // link to tag management interface
+    $ADMIN->add('appearance', new admin_externalpage('managetags', get_string('managetags', 'tag'), "$CFG->wwwroot/tag/manage.php"));

-$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"));
-
-$temp = new admin_settingpage('ajax', get_string('ajaxuse'));
-$temp->add(new admin_setting_configcheckbox('enableajax', get_string('enableajax', 'admin'), get_string('configenableajax', 'admin'), 0));
-$ADMIN->add('appearance', $temp);
-
-// 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,51 +2,109 @@

 // 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','moodle/category:update'));
+    $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);
+/// Course Default Settings Page
+/// NOTE: these settings must be applied after all other settings because they depend on them
+/// NOTE: these are a subset of the complete defaults available in 2.0
+    ///general course settings
+    $temp = new admin_settingpage('coursesettings', get_string('coursesettings'));
+    $courseformats = get_list_of_plugins('course/format');
+    $formcourseformats = array();
+    foreach ($courseformats as $courseformat) {
+        $formcourseformats["$courseformat"] = get_string("format$courseformat","format_$courseformat");
+        if ($formcourseformats["$courseformat"]=="[[format$courseformat]]") {
+            $formcourseformats["$courseformat"] = get_string("format$courseformat");
+        }
+    }
+    $temp->add(new admin_setting_configselect('moodlecourse/format', get_string('format'), get_string('coursehelpformat'), 'weeks',$formcourseformats));
+    for ($i=1; $i<=52; $i++) {
+        $sectionmenu[$i] = "$i";
+    }
+    $temp->add(new admin_setting_configselect('moodlecourse/numsections', get_string('numberweeks'), get_string('coursehelpnumberweeks'), 10, $sectionmenu));
+    $choices = array();
+    $choices['0'] = get_string('hiddensectionscollapsed');
+    $choices['1'] = get_string('hiddensectionsinvisible');
+    $temp->add(new admin_setting_configselect('moodlecourse/hiddensections', get_string('hiddensections'), get_string('coursehelphiddensections'), 0,$choices));
+    $options = range(0, 10);
+    $temp->add(new admin_setting_configselect('moodlecourse/newsitems', get_string('newsitemsnumber'), get_string('coursehelpnewsitemsnumber'), 5,$options));
+    $temp->add(new admin_setting_configselect('moodlecourse/showgrades', get_string('showgrades'), get_string('coursehelpshowgrades'), 1,array(0 => get_string('no'), 1 => get_string('yes'))));
+    $temp->add(new admin_setting_configselect('moodlecourse/showreports', get_string('showreports'), '', 0,array(0 => get_string('no'), 1 => get_string('yes'))));
+    if (isset($CFG->maxbytes)) {
+        $choices = get_max_upload_sizes($CFG->maxbytes);
+    } else {
+        $choices = get_max_upload_sizes();
+    }
+    $temp->add(new admin_setting_configselect('moodlecourse/maxbytes', get_string('maximumupload'), get_string('coursehelpmaximumupload'), key($choices), $choices));
+    $temp->add(new admin_setting_configselect('moodlecourse/metacourse', get_string('metacourse'), get_string('coursehelpmetacourse'), 0,array(0 => get_string('no'), 1 => get_string('yes'))));

+    $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);

-// "backups" settingpage
-$temp = new admin_settingpage('backups', get_string('backups','admin'),'moodle/site:backup');
-$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_sitefiles', get_string('sitefiles'), get_string('backupsitefileshelp'), 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);
+    // 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'), '');
+
+        $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

 ?>
@@ -5,13 +5,20 @@
 if (get_site()) { //do not use during installation
    $frontpagecontext = get_context_instance(CONTEXT_COURSE, SITEID);

-    if (has_capability('moodle/site:config',        $systemcontext)
-     or has_capability('moodle/course:update',      $frontpagecontext)
-     or has_capability('moodle/role:assign',        $frontpagecontext)
-     or has_capability('moodle/site:restore',       $frontpagecontext)
-     or has_capability('moodle/site:backup',        $frontpagecontext)
-     or has_capability('moodle/course:managefiles', $frontpagecontext)
-     ) {
+    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
@@ -19,6 +26,14 @@ if (get_site()) { //do not use during installation
        $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',
@@ -52,6 +67,16 @@ if (get_site()) { //do not use during installation

        $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));
    }
 }
@@ -2,153 +2,216 @@

 // This file defines settingpages and externalpages under the "grades" section

-// General settings
+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';
+    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);

-$temp = new admin_settingpage('gradessettings', get_string('gradessettings', 'grades'));
+    // General settings

-// enable outcomes checkbox
-$temp->add(new admin_setting_configcheckbox('enableoutcomes', get_string('enableoutcomes', 'grades'), get_string('configenableoutcomes', 'grades'), 0, PARAM_INT));
-// enable publishing in exports/imports
-$temp->add(new admin_setting_configcheckbox('gradepublishing', get_string('gradepublishing', 'grades'), get_string('configgradepublishing', 'grades'), 0, PARAM_INT));
+    $temp = new admin_settingpage('gradessettings', get_string('generalsettings', 'grades'), 'moodle/grade:manage');
+    if ($ADMIN->fulltree) {

-$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'))));
+        // new CFG variable for gradebook (what roles to display)
+        $temp->add(new admin_setting_special_gradebookroles());

-$temp->add(new admin_setting_configselect('grade_displaytype', get_string('gradedisplaytype', 'grades'),
-                                          get_string('configgradedisplaytype', 'grades'), GRADE_DISPLAY_TYPE_REAL,
-                                          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'))));
+        // 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_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_grade_profilereport());

-$temp->add(new admin_setting_configselect('grade_export_displaytype', get_string('gradeexportdisplaytype', 'grades'),
-                                          get_string('configgradeexportdisplaytype', 'grades'), GRADE_DISPLAY_TYPE_REAL,
-                                          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'))));
+        $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_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);
+        $temp->add(new admin_setting_regradingcheckbox('grade_includescalesinaggregation', get_string('includescalesinaggregation', 'grades'), get_string('configincludescalesinaggregation', 'grades'), 1));

-/// Scales and outcomes
+        $temp->add(new admin_setting_configcheckbox('grade_hiddenasdate', get_string('hiddenasdate', 'grades'), get_string('confighiddenasdate', 'grades'), 0));

-$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);
+        // enable publishing in exports/imports
+        $temp->add(new admin_setting_configcheckbox('gradepublishing', get_string('gradepublishing', 'grades'), get_string('configgradepublishing', 'grades'), 0));

-/// Grade category settings
-$temp = new admin_settingpage('gradecategorysettings', get_string('gradecategorysettings', 'grades'));
+        $temp->add(new admin_setting_configselect('grade_export_displaytype', get_string('gradeexportdisplaytype', 'grades'),
+                                                  get_string('configgradeexportdisplaytype', 'grades'), GRADE_DISPLAY_TYPE_REAL, $display_types));

-$strnoforce = get_string('noforce', 'grades');
+        $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_configselect('grade_navmethod', get_string('navmethod', 'grades'), null, 0,
+                                                  array(GRADE_NAVMETHOD_DROPDOWN => get_string('dropdown', 'grades'),
+                                                        GRADE_NAVMETHOD_TABS => get_string('tabs', 'grades'),
+                                                        GRADE_NAVMETHOD_COMBO => get_string('combo', 'grades'))));

-    // Aggregation type
-$options = array(-1 => $strnoforce,
-                 GRADE_AGGREGATE_MEAN            =>get_string('aggregatemean', '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_WEIGHTED_MEAN   =>get_string('aggregateweightedmean', 'grades'),
-                 GRADE_AGGREGATE_EXTRACREDIT_MEAN=>get_string('aggregateextracreditmean', 'grades'));
-$temp->add(new admin_setting_configselect('grade_aggregation', get_string('aggregation', 'grades'), get_string('aggregationhelp', 'grades'), -1, $options));
+        $temp->add(new admin_setting_special_gradeexport());

-$options = array(-1 => $strnoforce, 0 => get_string('forceoff', 'grades'), 1 => get_string('forceon', 'grades'));
-$temp->add(new admin_setting_configselect('grade_aggregateonlygraded', get_string('aggregateonlygraded', 'grades'),
-            get_string('aggregateonlygradedhelp', 'grades'), -1, $options));
-$temp->add(new admin_setting_configselect('grade_aggregateoutcomes', get_string('aggregateoutcomes', 'grades'),
-            get_string('aggregateoutcomeshelp', 'grades'), -1, $options));
-$temp->add(new admin_setting_configselect('grade_aggregatesubcats', get_string('aggregatesubcats', 'grades'),
-            get_string('aggregatesubcatshelp', 'grades'), -1, $options));
-
-$options = array(-1 => $strnoforce, 0 => get_string('none'));
-for ($i=1; $i<=20; $i++) {
-    $options[$i] = $i;
-}
-
-$temp->add(new admin_setting_configselect('grade_keephigh', get_string('keephigh', 'grades'),
-            get_string('keephighhelp', 'grades'), -1, $options));
-$temp->add(new admin_setting_configselect('grade_droplow', get_string('droplow', 'grades'),
-            get_string('droplowhelp', 'grades'), -1, $options));
-
-$ADMIN->add('grades', $temp);
-
-// The plugins must implement a settings.php file that adds their admin settings to the $settings object
-
-// Reports
-
-$first = true;
-foreach (get_list_of_plugins('grade/report') as $plugin) {
- // Include all the settings commands for this plugin if there are any
-    if ($first) {
-        $ADMIN->add('grades', new admin_category('gradereports', get_string('reportsettings', 'grades')));
-        $first = false;
+        $temp->add(new admin_setting_special_gradelimiting());
    }
+    $ADMIN->add('grades', $temp);

-    if (file_exists($CFG->dirroot.'/grade/report/'.$plugin.'/settings.php')) {
+    /// 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'));

-        $settings = new admin_settingpage('gradereport'.$plugin, get_string('modulename', 'gradereport_'.$plugin));
-        include_once($CFG->dirroot.'/grade/report/'.$plugin.'/settings.php');
-        $ADMIN->add('gradereports', $settings);
-    }
-}
+        $strnoforce = get_string('noforce', 'grades');

-// Imports
+        // 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'));

-$first = true;
-foreach (get_list_of_plugins('grade/import') as $plugin) {
+        $defaultvisible = array(GRADE_AGGREGATE_MEAN, GRADE_AGGREGATE_WEIGHTED_MEAN, GRADE_AGGREGATE_WEIGHTED_MEAN2,
+                                GRADE_AGGREGATE_EXTRACREDIT_MEAN, GRADE_AGGREGATE_MEDIAN, GRADE_AGGREGATE_MIN,
+                                GRADE_AGGREGATE_MAX, GRADE_AGGREGATE_MODE, GRADE_AGGREGATE_SUM);

- // Include all the settings commands for this plugin if there are any
-    if (file_exists($CFG->dirroot.'/grade/import/'.$plugin.'/settings.php')) {
-        if ($first) {
-            $ADMIN->add('grades', new admin_category('gradeimports', get_string('imports')));
-            $first = false;
+        $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));
+
+        $temp->add(new admin_setting_configmultiselect('grade_aggregations_visible', get_string('aggregationsvisible', 'grades'),
+                                                       get_string('aggregationsvisiblehelp', 'grades'), $defaultvisible, $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;
        }

-        $settings = new admin_settingpage('gradeimport'.$plugin, get_string('modulename', 'gradeimport_'.$plugin));
-        include_once($CFG->dirroot.'/grade/import/'.$plugin.'/settings.php');
-        $ADMIN->add('gradeimports', $settings);
+        $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);


-// Exports
+    /// 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));

-$first = true;
-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')) {
-        if ($first) {
-            $ADMIN->add('grades', new admin_category('gradeexports', get_string('exports')));
-            $first = false;
+        $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);
+    if (!empty($CFG->enableoutcomes)) {
+        $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);
        }
-
-        $settings = new admin_settingpage('gradeexport'.$plugin, get_string('modulename', 'gradeexport_'.$plugin));
-        include_once($CFG->dirroot.'/grade/export/'.$plugin.'/settings.php');
-        $ADMIN->add('gradeexports', $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,21 +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_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));
+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

-// 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')));
+    // "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', $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,27 +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[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,23 +2,35 @@

 // * Miscellaneous settings

-// 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));
-$temp->add(new admin_setting_configcheckbox('enablehtmlpurifier', get_string('enablehtmlpurifier', 'admin'), get_string('configenablehtmlpurifier', 'admin'), 0));
-$temp->add(new admin_setting_configcheckbox('enablegroupings', get_string('enablegroupings', 'admin'), get_string('configenablegroupings', 'admin'), 0));
+if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

-$ADMIN->add('misc', $temp);
+    // 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);
+    $temp->add(new admin_setting_configcheckbox('experimentalsplitrestore', get_string('experimentalsplitrestore', 'admin'), get_string('configexperimentalsplitrestore', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('enableimsccimport', get_string('enable_cc_import', 'imscc'), get_string('enable_cc_import_description', 'imscc'), 0));
+    $temp->add(new admin_setting_configcheckbox('enablesafebrowserintegration', get_string('enablesafebrowserintegration', 'admin'), get_string('configenablesafebrowserintegration', 'admin'), 0));

-// XMLDB editor
-$ADMIN->add('misc', new admin_externalpage('xmldbeditor', get_string('xmldbeditor'), "$CFG->wwwroot/$CFG->admin/xmldb/"));
+    $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,165 @@
+<?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", 'moodle/site:config', !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";
+    $reportname = get_string($plugin, 'report_' . $plugin);
+    $ADMIN->add('reports', new admin_externalpage('report'.$plugin, $reportname, $www_path, 'moodle/site:viewreports'));
+}
@@ -1,111 +1,123 @@
 <?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));
+    // "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));

-$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));
+    $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));

-$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'),'0'));
-$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'), '', PARAM_RAW));
+    $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'),
+                  'language', 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('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));
-$ADMIN->add('security', $temp);
+    $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'), 1));
+    $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));
+    $temp->add(new admin_setting_configcheckbox('regenloginsession', get_string('regenloginsession', 'admin'), get_string('configregenloginsession', 'admin'), 1));
+    $temp->add(new admin_setting_configtext('excludeoldflashclients', get_string('excludeoldflashclients', 'admin'), get_string('configexcludeoldflashclients', 'admin'), '10.0.12', PARAM_TEXT));
+    $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' => get_string('nocourses'),
+                                                                                                                                                                              'all' => get_string('fulllistofcourses'),
+                                                                                                                                                                              'requested' => get_string('requestedcourses'))));
+    $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_configpasswordunmask('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',
@@ -50,15 +52,17 @@ $temp->add(new admin_setting_configselect('digestmailtime', get_string('digestma
 $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;
@@ -85,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);


@@ -98,10 +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_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_special_perfdebug());
+$temp->add(new admin_setting_configcheckbox('perfdebug', get_string('perfdebug', 'admin'), get_string('configperfdebug', 'admin'), '7', '15', '7'));
 $ADMIN->add('server', $temp);


@@ -119,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'),
@@ -128,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"));
@@ -169,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),
@@ -177,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);

@@ -189,16 +242,26 @@ $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'), '', 
-                                          array( '' => get_string('none'), 
-                                                 'internal' => 'internal', 
-                                                 'memcached' => 'memcached', 
+
+$temp->add(new admin_setting_configselect('extramemorylimit', get_string('extramemorylimit', 'admin'),
+                                          get_string('configextramemorylimit', 'admin'), '128M',
+                                          // if this option is set to 0, default 128M will be used
+                                          array( '64M' => '64M',
+                                                 '128M' => '128M',
+                                                 '256M' => '256M',
+                                                 '512M' => '512M',
+                                                 '1024M' => '1024M'
+                                             )));
+$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'), 0, 
-                                          array( '0' => get_string('no'), 
+$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));
@@ -207,13 +270,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'), 0, 
-                                          array( '0' => get_string('no'), 
+                                          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
+
 ?>
@@ -6,49 +6,36 @@
 // 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
-    $reportname = get_string($plugin, 'report_' . $plugin);
-    if ($reportname[1] == '[') {
-        $reportname = get_string($plugin, 'admin');
-    }
-    $ADMIN->add('reports', new admin_externalpage('report'.$plugin, $reportname, "$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

 ?>
@@ -2,112 +2,180 @@

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

-if (has_capability('moodle/site:config',$systemcontext)) { // speedup for non-admins
-
-
-$ADMIN->add('users', new admin_externalpage('userauthentication', get_string('authentication','admin'), "$CFG->wwwroot/$CFG->admin/auth.php"));
-
-
-if(empty($CFG->loginhttps)) {
-    $securewwwroot = $CFG->wwwroot;
-} else {
-    $securewwwroot = str_replace('http:','https:',$CFG->wwwroot);
-}
-// stuff under the "accounts" subcategory
+$ADMIN->add('users', new admin_category('authsettings', get_string('authentication','admin')));
 $ADMIN->add('users', new admin_category('accounts', get_string('accounts', 'admin')));
-$ADMIN->add('accounts', new admin_externalpage('editusers', get_string('userlist','admin'), "$CFG->wwwroot/$CFG->admin/user.php", array('moodle/user:update', 'moodle/user:delete')));
-$ADMIN->add('accounts', new admin_externalpage('userbulk', get_string('userbulk','admin'), "$CFG->wwwroot/$CFG->admin/user/user_bulk.php", array('moodle/user:update', 'moodle/user:delete')));
-$ADMIN->add('accounts', new admin_externalpage('addnewuser', get_string('addnewuser'), "$securewwwroot/user/editadvanced.php?id=-1", 'moodle/user:create'));
-$ADMIN->add('accounts', new admin_externalpage('uploadusers', get_string('uploadusers'), "$CFG->wwwroot/$CFG->admin/uploaduser.php", 'moodle/site:uploadusers'));
-$ADMIN->add('accounts', new admin_externalpage('profilefields', get_string('profilefields','admin'), "$CFG->wwwroot/user/profile/index.php", 'moodle/site:config'));
-
-
-// stuff under the "roles" subcategory
 $ADMIN->add('users', new admin_category('roles', get_string('permissions', 'role')));
-$ADMIN->add('roles', new admin_externalpage('defineroles', get_string('defineroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/manage.php"));
-$sitecontext = get_context_instance(CONTEXT_SYSTEM);
-$ADMIN->add('roles', new admin_externalpage('assignroles', get_string('assignglobalroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=" . $sitecontext->id));
+
+if ($hassiteconfig
+ or has_capability('moodle/site:uploadusers', $systemcontext)
+ or has_capability('moodle/user:create', $systemcontext)
+ or has_capability('moodle/user:update', $systemcontext)
+ or has_capability('moodle/user:delete', $systemcontext)
+ or has_capability('moodle/role:manage', $systemcontext)
+ or has_capability('moodle/role:assign', $systemcontext)) { // speedup for non-admins, add all caps used on this page


-// "userpolicies" settingpage
-$temp = new admin_settingpage('userpolicies', get_string('userpolicies', 'admin'));
+    $temp = new admin_settingpage('manageauths', get_string('authsettings', 'admin'));
+    $temp->add(new admin_setting_manageauths());
+    $temp->add(new admin_setting_heading('manageauthscommonheading', get_string('commonsettings', 'admin'), ''));
+    $temp->add(new admin_setting_special_registerauth());
+    $temp->add(new admin_setting_configselect('guestloginbutton', get_string('guestloginbutton', 'auth'),
+                                              get_string('showguestlogin', 'auth'), '1', array('0'=>get_string('hide'), '1'=>get_string('show'))));
+    $temp->add(new admin_setting_configtext('alternateloginurl', get_string('alternateloginurl', 'auth'),
+                                            get_string('alternatelogin', 'auth', htmlspecialchars($CFG->wwwroot.'/login/index.php')), ''));
+    $temp->add(new admin_setting_configtext('forgottenpasswordurl', get_string('forgottenpasswordurl', 'auth'),
+                                            get_string('forgottenpassword', 'auth'), ''));
+    $temp->add(new admin_setting_confightmltextarea('auth_instructions', get_string('instructions', 'auth'),
+                                                get_string('authinstructions', 'auth'), ''));
+    $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_configcheckbox('verifychangedemail', get_string('verifychangedemail', 'admin'), get_string('configverifychangedemail', 'admin'), 1));
+    
+    $temp->add(new admin_setting_configtext('recaptchapublickey', get_string('recaptchapublickey', 'admin'), get_string('configrecaptchapublickey', 'admin'), '', PARAM_NOTAGS));
+    $temp->add(new admin_setting_configtext('recaptchaprivatekey', get_string('recaptchaprivatekey', 'admin'), get_string('configrecaptchaprivatekey', 'admin'), '', PARAM_NOTAGS));
+    $ADMIN->add('authsettings', $temp);

-if (!empty($CFG->rolesactive)) {
-    $context = get_context_instance(CONTEXT_SYSTEM);
-    if (!$guestrole = get_guest_role()) {
-        $guestrole->id = 0;
-    }
-    if ($studentroles = get_roles_with_capability('moodle/legacy:student', CAP_ALLOW)) {
-        $studentrole = array_shift($studentroles);   /// Take the first one
-    } else {
-        $studentrole->id = 0;
-    }
-    if ($userroles = get_roles_with_capability('moodle/legacy:user', CAP_ALLOW)) {
-        $userrole = array_shift($userroles);   /// Take the first one
-    } else {
-        $userrole->id = 0;
-    }
-    if (empty($CFG->creatornewroleid)) {
-        if ($teacherroles = get_roles_with_capability('moodle/legacy:editingteacher', CAP_ALLOW, $context)) {
-            $teachereditrole = array_shift($teacherroles);
-            set_config('creatornewroleid', $teachereditrole->id);
-        } else {
-            set_config('creatornewroleid', 0);
+
+    if ($auths = get_list_of_plugins('auth')) {
+        $authsenabled = get_enabled_auth_plugins();
+        $authbyname = array();
+
+        foreach ($auths as $auth) {
+            $strauthname = auth_get_plugin_title($auth);
+            $authbyname[$strauthname] = $auth;
        }
-    }
-    // we must not use assignable roles here:
-    //   1/ unsetting roles as assignable for admin might bork the settings!
-    //   2/ default user role should not be assignable anyway
-    $allroles = array();
-    if ($roles = get_all_roles()) {
-        foreach ($roles as $role) {
-            $allroles[$role->id] = strip_tags(format_string($role->name, true));
+        ksort($authbyname);
+
+        foreach ($authbyname as $strauthname=>$authname) {
+            if (file_exists($CFG->dirroot.'/auth/'.$authname.'/settings.php')) {
+                // do not show disabled auths in tree, keep only settings link on manage page
+                $settings = new admin_settingpage('authsetting'.$authname, $strauthname, 'moodle/site:config', !in_array($authname, $authsenabled));
+                if ($ADMIN->fulltree) {
+                    include($CFG->dirroot.'/auth/'.$authname.'/settings.php');
+                }
+                // TODO: finish implementation of common settings - locking, etc.
+                $ADMIN->add('authsettings', $settings);
+
+            } else {
+                $ADMIN->add('authsettings', new admin_externalpage('authsetting'.$authname, $strauthname, "$CFG->wwwroot/$CFG->admin/auth_config.php?auth=$authname", 'moodle/site:config', !in_array($authname, $authsenabled)));
+            }
        }
    }

-    $temp->add(new admin_setting_configselect('notloggedinroleid', get_string('notloggedinroleid', 'admin'),
-                  get_string('confignotloggedinroleid', 'admin'), $guestrole->id, $allroles ));
-    $temp->add(new admin_setting_configselect('guestroleid', get_string('guestroleid', 'admin'),
-                  get_string('configguestroleid', 'admin'), $guestrole->id, $allroles));
-    $temp->add(new admin_setting_configselect('defaultuserroleid', get_string('defaultuserroleid', 'admin'),
-                  get_string('configdefaultuserroleid', 'admin'), $userrole->id, $allroles));
-}

-$temp->add(new admin_setting_configcheckbox('nodefaultuserrolelists', get_string('nodefaultuserrolelists', 'admin'), get_string('confignodefaultuserrolelists', 'admin'), 0));
-
-if (!empty($CFG->rolesactive)) {
-    $temp->add(new admin_setting_configselect('defaultcourseroleid', get_string('defaultcourseroleid', 'admin'),
-                  get_string('configdefaultcourseroleid', 'admin'), $studentrole->id, $allroles));
-    $temp->add(new admin_setting_configselect('creatornewroleid', get_string('creatornewroleid', 'admin'),
-                  get_string('configcreatornewroleid', 'admin'), $CFG->creatornewroleid, $allroles));
-}
-
-$temp->add(new admin_setting_configcheckbox('autologinguests', get_string('autologinguests', 'admin'), get_string('configautologinguests', 'admin'), 0));
-
-if (!empty($CFG->rolesactive)) {
-    $temp->add(new admin_setting_configmultiselect('nonmetacoursesyncroleids', get_string('nonmetacoursesyncroleids', 'admin'),
-              get_string('confignonmetacoursesyncroleids', 'admin'), array(), $allroles));
-}
-
-//$temp->add(new admin_setting_configcheckbox('allusersaresitestudents', get_string('allusersaresitestudents', 'admin'), get_string('configallusersaresitestudents','admin'), 1));
-$temp->add(new admin_setting_configmultiselect('hiddenuserfields', get_string('hiddenuserfields', 'admin'),
-           get_string('confighiddenuserfields', 'admin'), array(),
-               array('none' => get_string('none'),
-                     'description' => get_string('description'),
-                     'city' => get_string('city'),
-                     'country' => get_string('country'),
-                     'webpage' => get_string('webpage'),
-                     'icqnumber' => get_string('icqnumber'),
-                     'skypeid' => get_string('skypeid'),
-                     'yahooid' => get_string('yahooid'),
-                     'aimid' => get_string('aimid'),
-                     'msnid' => get_string('msnid'),
-                     'lastaccess' => get_string('lastaccess'))));
-//$temp->add(new admin_setting_special_adminseesall());
+    if(empty($CFG->loginhttps)) {
+        $securewwwroot = $CFG->wwwroot;
+    } else {
+        $securewwwroot = str_replace('http:','https:',$CFG->wwwroot);
+    }
+    // stuff under the "accounts" subcategory
+    $ADMIN->add('accounts', new admin_externalpage('editusers', get_string('userlist','admin'), "$CFG->wwwroot/$CFG->admin/user.php", array('moodle/user:update', 'moodle/user:delete')));
+    $ADMIN->add('accounts', new admin_externalpage('userbulk', get_string('userbulk','admin'), "$CFG->wwwroot/$CFG->admin/user/user_bulk.php", array('moodle/user:update', 'moodle/user:delete')));
+    $ADMIN->add('accounts', new admin_externalpage('addnewuser', get_string('addnewuser'), "$securewwwroot/user/editadvanced.php?id=-1", 'moodle/user:create'));
+    $ADMIN->add('accounts', new admin_externalpage('uploadusers', get_string('uploadusers'), "$CFG->wwwroot/$CFG->admin/uploaduser.php", 'moodle/site:uploadusers'));
+    $ADMIN->add('accounts', new admin_externalpage('uploadpictures', get_string('uploadpictures','admin'), "$CFG->wwwroot/$CFG->admin/uploadpicture.php", 'moodle/site:uploadusers'));
+    $ADMIN->add('accounts', new admin_externalpage('profilefields', get_string('profilefields','admin'), "$CFG->wwwroot/user/profile/index.php", 'moodle/site:config'));


-$ADMIN->add('roles', $temp);
+    // stuff under the "roles" subcategory
+    $ADMIN->add('roles', new admin_externalpage('defineroles', get_string('defineroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/manage.php", 'moodle/role:manage'));
+    $ADMIN->add('roles', new admin_externalpage('assignroles', get_string('assignglobalroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=".$systemcontext->id, 'moodle/role:assign'));

-} // end of admin tree capability if
+
+    // "userpolicies" settingpage
+    $temp = new admin_settingpage('userpolicies', get_string('userpolicies', 'admin'));
+    if ($ADMIN->fulltree) {
+        if (!empty($CFG->rolesactive)) {
+            $context = get_context_instance(CONTEXT_SYSTEM);
+            if (!$guestrole = get_guest_role()) {
+                $guestrole->id = 0;
+            }
+            if ($studentroles = get_roles_with_capability('moodle/legacy:student', CAP_ALLOW)) {
+                $studentrole = array_shift($studentroles);   /// Take the first one
+            } else {
+                $studentrole->id = 0;
+            }
+            if ($userroles = get_roles_with_capability('moodle/legacy:user', CAP_ALLOW)) {
+                $userrole = array_shift($userroles);   /// Take the first one
+            } else {
+                $userrole->id = 0;
+            }
+            if (empty($CFG->creatornewroleid)) {
+                if ($teacherroles = get_roles_with_capability('moodle/legacy:editingteacher', CAP_ALLOW, $context)) {
+                    $teachereditrole = array_shift($teacherroles);
+                    set_config('creatornewroleid', $teachereditrole->id);
+                } else {
+                    set_config('creatornewroleid', 0);
+                }
+            }
+            if (!$guestroles = get_roles_with_capability('moodle/legacy:guest', CAP_ALLOW)) {
+                $guestroles = array();
+                $defaultguestid = null;
+            } else {
+                $defaultguestid = reset($guestroles);
+                $defaultguestid = $defaultguestid->id;
+            }
+            
+            // we must not use assignable roles here:
+            //   1/ unsetting roles as assignable for admin might bork the settings!
+            //   2/ default user role should not be assignable anyway
+            $allroles = array();
+            $nonguestroles = array();
+            if ($roles = get_all_roles()) {
+                foreach ($roles as $role) {
+                    $rolename = strip_tags(format_string($role->name, true));
+                    $allroles[$role->id] = $rolename;
+                    if (!isset($guestroles[$role->id])) {
+                        $nonguestroles[$role->id] = $rolename;
+                    }
+                }
+            }
+
+            $temp->add(new admin_setting_configselect('notloggedinroleid', get_string('notloggedinroleid', 'admin'),
+                          get_string('confignotloggedinroleid', 'admin'), $defaultguestid, $allroles ));
+            $temp->add(new admin_setting_configselect('guestroleid', get_string('guestroleid', 'admin'),
+                          get_string('configguestroleid', 'admin'), $defaultguestid, $allroles));
+            $temp->add(new admin_setting_configselect('defaultuserroleid', get_string('defaultuserroleid', 'admin'),
+                          get_string('configdefaultuserroleid', 'admin'), $userrole->id, $nonguestroles)); // guest role here breaks a lot of stuff
+        }
+
+        $temp->add(new admin_setting_configcheckbox('nodefaultuserrolelists', get_string('nodefaultuserrolelists', 'admin'), get_string('confignodefaultuserrolelists', 'admin'), 0));
+
+        if (!empty($CFG->rolesactive)) {
+            $temp->add(new admin_setting_configselect('defaultcourseroleid', get_string('defaultcourseroleid', 'admin'),
+                          get_string('configdefaultcourseroleid', 'admin'), $studentrole->id, $allroles));
+            $temp->add(new admin_setting_configselect('creatornewroleid', get_string('creatornewroleid', 'admin'),
+                          get_string('configcreatornewroleid', 'admin'), $CFG->creatornewroleid, $allroles));
+        }
+
+        $temp->add(new admin_setting_configcheckbox('autologinguests', get_string('autologinguests', 'admin'), get_string('configautologinguests', 'admin'), 0));
+
+        if (!empty($CFG->rolesactive)) {
+            $temp->add(new admin_setting_configmultiselect('nonmetacoursesyncroleids', get_string('nonmetacoursesyncroleids', 'admin'),
+                      get_string('confignonmetacoursesyncroleids', 'admin'), array(), $allroles));
+        }
+
+        $temp->add(new admin_setting_configmultiselect('hiddenuserfields', get_string('hiddenuserfields', 'admin'),
+                   get_string('confighiddenuserfields', 'admin'), array(),
+                       array('description' => get_string('description'),
+                             'city' => get_string('city'),
+                             'country' => get_string('country'),
+                             'webpage' => get_string('webpage'),
+                             'icqnumber' => get_string('icqnumber'),
+                             'skypeid' => get_string('skypeid'),
+                             'yahooid' => get_string('yahooid'),
+                             'aimid' => get_string('aimid'),
+                             'msnid' => get_string('msnid'),
+                             'firstaccess' => get_string('firstaccess'),
+                             'lastaccess' => get_string('lastaccess'),
+                             'mycourses' => get_string('mycourses'),
+                             'groups' => get_string('groups'))));
+    }
+
+    $temp->add(new admin_setting_configcheckbox('allowuserswitchrolestheycantassign', get_string('allowuserswitchrolestheycantassign', 'admin'), get_string('configallowuserswitchrolestheycantassign', 'admin'), 0));
+
+    $ADMIN->add('roles', $temp);
+
+} // end of speedup

 ?>
@@ -5,10 +5,6 @@
    require_once($CFG->dirroot.'/lib/pagelib.php');
    require_once($CFG->dirroot.'/lib/blocklib.php');

-    if (!empty($THEME->customcorners)) {
-        require_once($CFG->dirroot.'/lib/custom_corners_lib.php');
-    }
-
    $pt  = optional_param('pt', null, PARAM_SAFEDIR); //alhanumeric and -

    $pagetypes = array(PAGE_MY_MOODLE => array('id' => PAGE_MY_MOODLE,
@@ -28,7 +24,7 @@

    require_login();

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

    // first thing to do is print the dropdown menu

@@ -58,12 +54,12 @@
        echo '<tr valign="top">';

        echo '<td valign="top" style="width: '.$blocks_preferred_width.'px;" id="left-column">';
-        if (!empty($THEME->customcorners)) print_custom_corners_start();
+        print_container_start();
        blocks_print_group($PAGE, $blocks, BLOCK_POS_LEFT);
-        if (!empty($THEME->customcorners)) print_custom_corners_end();
+        print_container_end();
        echo '</td>';
        echo '<td valign="top" id="middle-column">';
-        if (!empty($THEME->customcorners)) print_custom_corners_start();
+        print_container_start();

    } else {
        require_once($CFG->libdir.'/adminlib.php');
@@ -80,12 +76,12 @@


    if (!empty($pt)) {
-        if (!empty($THEME->customcorners)) print_custom_corners_end();
+        print_container_end();
        echo '</td>';
        echo '<td valign="top" style="width: '.$blocks_preferred_width.'px;" id="right-column">';
-        if (!empty($THEME->customcorners)) print_custom_corners_start();
+        print_container_start();
        blocks_print_group($PAGE, $blocks, BLOCK_POS_RIGHT);
-        if (!empty($THEME->customcorners)) print_custom_corners_end();
+        print_container_end();
        echo '</td>';
        echo '</tr></table>';
        print_footer();
@@ -6,7 +6,7 @@

    require_login();

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

    $strtimezone = get_string("timezone");
    $strsavechanges = get_string("savechanges");
--- a/Show More
+++ b/Show More