Release 1.8.6

(mnet-enabled) course. (backport from 1.9)

admin/auth.php

@@ -1,330 +1,315 @@
-<?PHP  // $Id$
-       // config.php - allows admin to edit all configuration variables
+<?php
 
-    require_once('../config.php');
+/**
+ * Allows admin to edit all auth plugin settings.
+ *
+ * JH: copied and Hax0rd from admin/enrol.php and admin/filters.php
+ *
+ */
 
-    require_once($CFG->libdir.'/adminlib.php');
+require_once('../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir.'/tablelib.php');
 
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('userauthentication', $adminroot);
+$adminroot = admin_get_root();
+admin_externalpage_setup('userauthentication', $adminroot);
 
-    $auth = optional_param('auth', '', PARAM_SAFEDIR);
+$action = optional_param('action', '', PARAM_ACTION);
+$auth   = optional_param('auth', '', PARAM_SAFEDIR);
+
+// get currently installed and enabled auth plugins
+$authsavailable = get_list_of_plugins('auth');
+
+//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();
+} else {
+    $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);
+}
 
 
-    $focus = '';
+////////////////////////////////////////////////////////////////////////////////
+// process actions
 
-/// If data submitted, then process and store.
+$status = '';
 
-    if ($config = data_submitted()) {
+switch ($action) {
 
-        if (!confirm_sesskey()) {
-            error(get_string('confirmsesskeybad', 'error'));
-        }
+    case 'save':
+        if (data_submitted() and confirm_sesskey()) {
 
-        $config = (array)$config;
+            // 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))));
 
-        // extract and sanitize the auth key explicitly
-        $modules = get_list_of_plugins("auth");
-        if (in_array($config['auth'], $modules)) {
-            $auth = $config['auth'];
-        } else {
-            notify("Error defining the authentication method");
-        }
-
-        // load the auth plugin library
-        require_once("{$CFG->dirroot}/auth/$auth/lib.php");
-
-        $err = array();
-        if (function_exists('auth_validate_form')) {
-            auth_validate_form($config, $err);
-        }
-
-        if (count($err) == 0) {
-            foreach ($config as $name => $value) {
-                if (preg_match('/^pluginconfig_(.+?)$/', $name, $matches)) {
-                    $plugin = "auth/$auth";
-                    $name   = $matches[1];
-                    if (! set_config($name, $value, $plugin)) {
-                        notify("Problem saving config $name as $value for plugin $plugin");
-                    }
-                } else { // normal handling for
-                    if (! set_config($name, $value)) {
-                        notify("Problem saving config $name as $value");
-                    }
-                }
-            }
-            redirect("auth.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
-            exit;
-
-        } else {
-            foreach ($err as $key => $value) {
-                $focus = "form.$key";
+            // 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;
 
-/// Otherwise fill and print the form.
-
-    if (empty($config)) {
-        $config = $CFG;
-    }
-
-    $modules = get_list_of_plugins("auth");
-    $options = array();
-    foreach ($modules as $module) {
-        $options[$module] = get_string("auth_$module"."title", "auth");
-    }
-    asort($options);
-    if (!empty($auth) && in_array($auth, $modules)) {
-    } else {
-        $auth = $config->auth;
-    }
-
-    // changepassword link replaced by individual auth setting
-    if (!empty($config->changepassword)) {
-        if (empty($config->{'auth_'.$auth.'_changepasswordurl'})) {
-            $config->{'auth_'.$auth.'_changepasswordurl'} = $config->changepassword;
-        }
-        set_config('changepassword','');
-    }
-
-    $auth = clean_param($auth,PARAM_SAFEDIR);
-    require_once("$CFG->dirroot/auth/$auth/lib.php"); //just to make sure that current authentication functions are loaded
-    if (! isset($config->guestloginbutton)) {
-        $config->guestloginbutton = 1;
-    }
-    if (! isset($config->alternateloginurl)) {
-        $config->alternateloginurl = '';
-    }
-    if (! isset($config->auth_instructions)) {
-        $config->auth_instructions = "";
-    }
-    if (! isset($config->changepassword)) {
-        $config->changepassword = "";
-    }
-    if (! isset($config->{'auth_'.$auth.'_changepasswordurl'})) {
-        $config->{'auth_'.$auth.'_changepasswordurl'} = '';
-    }
-    if (! isset($config->{'auth_'.$auth.'_changepasswordhelp'})) {
-        $config->{'auth_'.$auth.'_changepasswordhelp'} = '';
-    }
-    $user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "department", "address", "city", "country", "description", "idnumber", "lang");
-
-    $guestoptions[0] = get_string("hide");
-    $guestoptions[1] = get_string("show");
-
-    $createoptions[0] = get_string("no");
-    $createoptions[1] = get_string("yes");
-
-    $strauthentication        = get_string("authentication");
-    $strauthenticationoptions = get_string("authenticationoptions","auth");
-    $strsettings = get_string("settings");
-    $strusers = get_string("users");
-
-    admin_externalpage_print_header($adminroot);
-
-    echo "<center><b>";
-    echo "<form target=\"{$CFG->framename}\" name=\"authmenu\" method=\"post\" action=\"auth.php\">";
-    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />";
-    print_string("chooseauthmethod","auth");
-
-    echo '&nbsp;&nbsp;';
-
-    choose_from_menu ($options, "auth", $auth, "","document.location='auth.php?sesskey=$USER->sesskey&auth='+document.authmenu.auth.options[document.authmenu.auth.selectedIndex].value", "");
-
-    echo "</b></center><br />";
-
-    print_simple_box_start("center", "100%");
-    print_heading($options[$auth]);
-
-    print_simple_box_start("center", "60%", '', 5, 'informationbox');
-    print_string("auth_$auth"."description", "auth");
-    print_simple_box_end();
-
-    echo "<hr />";
-
-    print_heading($strsettings);
-
-    echo "<table border=\"0\" width=\"100%\" cellpadding=\"4\">";
-
-    require_once("$CFG->dirroot/auth/$auth/config.html");
-    $CFG->pagepath = 'auth/' . $auth;
-
-    echo '<tr><td colspan="3">';
-    print_heading(get_string('auth_common_settings', 'auth'));
-    echo '<td/></tr>';
-
-    if ($auth != "email" and $auth != "none" and $auth != "manual") {
-        // display box for URL to change password. NB now on a per-method basis (multiple auth)
-        echo "<tr valign=\"top\">";
-        echo "<td align=\"right\" nowrap=\"nowrap\">";
-        print_string("changepassword", "auth");
-        echo ":</td>";
-        echo "<td>";
-        $passurl = $config->{'auth_'.$auth.'_changepasswordurl'};
-        echo "<input type=\"text\" name=\"auth_{$auth}_changepasswordurl\" size=\"40\" value=\"$passurl\" />";
-        echo "</td>";
-        echo "<td>";
-        print_string("auth_changepasswordurl_expl","auth",$auth);
-        echo "</td></tr>";
-
-        // display textbox for lost password help. NB now on a per-method basis (multiple auth)
-        echo "<tr valign=\"top\">";
-        echo "<td align=\"right\" nowrap=\"nowrap\">";
-        print_string("auth_changepasswordhelp", "auth");
-        echo ":</td>";
-        echo "<td>";
-        $passhelp = $config->{'auth_'.$auth.'_changepasswordhelp'};
-        echo "<textarea name=\"auth_{$auth}_changepasswordhelp\" cols=\"30\" rows=\"10\" wrap=\"virtual\">";
-        echo $passhelp;
-        echo "</textarea>\n";
-        echo "</td>";
-        echo "<td>";
-        print_string("auth_changepasswordhelp_expl","auth",$auth);
-        echo "</td></tr>";
-
-    }
-
-    echo "<tr valign=\"top\">";
-    echo "<td align=\"right\" nowrap=\"nowrap\">";
-    print_string("guestloginbutton", "auth");
-    echo ":</td>";
-    echo "<td>";
-    choose_from_menu($guestoptions, "guestloginbutton", $config->guestloginbutton, "");
-    echo "</td>";
-    echo "<td>";
-    print_string("showguestlogin","auth");
-    echo "</td></tr>";
-
-    if (function_exists('auth_user_create')){
-        echo "<tr valign=\"top\">";
-        echo "<td align=\"right\" nowrap=\"nowrap\">";
-        print_string("auth_user_create", "auth");
-        echo ":</td>";
-        echo "<td>";
-        choose_from_menu($createoptions, "auth_user_create", $config->auth_user_create, "");
-        echo "</td>";
-        echo "<td>";
-        print_string("auth_user_creation","auth");
-        echo "</td></tr>";
-    }
-
-
-/// An alternate url for the login form. It means we can use login forms that are integrated
-/// into non-moodle pages
-    echo '<tr valign="top">';
-    echo '<td algin="right" nowrap="nowrap">';
-    print_string('alternateloginurl', 'auth');
-    echo '</td>';
-    echo '<td>';
-    echo '<input type="text" size="40" name="alternateloginurl" alt="'.get_string('alternateloginurl', 'auth').'" value="'.$config->alternateloginurl.'" />';
-    echo '</td>';
-    echo '<td>';
-    print_string('alternatelogin', 'auth', htmlspecialchars($CFG->wwwroot.'/login/index.php'));
-    echo '</td>';
-    echo '</tr>';
-
-
-    echo '</table>';
-    echo '<p align="center"><input type="submit" value="'.get_string('savechanges').'"></p>';
-    echo '</form>';
-
-    print_simple_box_end();
-
-    admin_externalpage_print_footer($adminroot);
-    exit;
-
-/// Functions /////////////////////////////////////////////////////////////////
-
-//
-// Good enough for most auth plugins
-// but some may want a custom one if they are offering
-// other options
-// Note: pluginconfig_ fields have special handling.
-function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts, $updateopts) {
-
-    echo '<tr><td colspan="3">';
-    if ($retrieveopts) {
-        print_heading(get_string('auth_data_mapping', 'auth'));
-    } else {
-        print_heading(get_string('auth_fieldlocks', 'auth'));
-    }
-    echo '<td/></tr>';
-
-    $lockoptions = array ('unlocked'        => get_string('unlocked', 'auth'),
-                          'unlockedifempty' => get_string('unlockedifempty', 'auth'),
-                          'locked'          => get_string('locked', 'auth'));
-    $updatelocaloptions = array('oncreate'  => get_string('update_oncreate', 'auth'),
-                                'onlogin'   => get_string('update_onlogin', 'auth'));
-    $updateextoptions = array('0'  => get_string('update_never', 'auth'),
-                              '1'   => get_string('update_onupdate', 'auth'));
-
-    $pluginconfig = get_config("auth/$auth");
-
-    // helptext is on a field with rowspan
-    if (empty($helptext)) {
-                $helptext = '&nbsp;';
-    }
-
-    foreach ($user_fields as $field) {
-
-        // Define some vars we'll work with
-        if(empty($pluginconfig->{"field_map_$field"})) {
-            $pluginconfig->{"field_map_$field"} = '';
-        }
-        if(empty($pluginconfig->{"field_updatelocal_$field"})) {
-            $pluginconfig->{"field_updatelocal_$field"} = '';
-        }
-        if (empty($pluginconfig->{"field_updateremote_$field"})) {
-            $pluginconfig->{"field_updateremote_$field"} = '';
-        }
-        if (empty($pluginconfig->{"field_lock_$field"})) {
-            $pluginconfig->{"field_lock_$field"} = '';
+    case 'disable':
+        // remove from enabled list
+        $key = array_search($auth, $authsenabled);
+        if ($key !== false) {
+            unset($authsenabled[$key]);
+            set_config('auth', implode(',', $authsenabled));
         }
 
-        // define the fieldname we display to the  user
-        $fieldname = $field;
-        if ($fieldname === 'lang') {
-            $fieldname = get_string('language');
-        } elseif (preg_match('/^(.+?)(\d+)$/', $fieldname, $matches)) {
-            $fieldname =  get_string($matches[1]) . ' ' . $matches[2];
-        } else {
-            $fieldname = get_string($fieldname);
+        if ($auth == $CFG->registerauth) {
+            set_config('registerauth', '');
         }
+        break;
 
-        echo '<tr valign="top"><td align="right">';
-        echo $fieldname;
-        echo '</td><td>';
-
-        if ($retrieveopts) {
-            $varname = 'field_map_' . $field;
-
-            echo "<input name=\"pluginconfig_{$varname}\" type=\"text\" size=\"30\" value=\"{$pluginconfig->$varname}\">";
-            echo '<div align="right">';
-            echo  get_string('auth_updatelocal', 'auth') . '&nbsp;&nbsp;';
-            choose_from_menu($updatelocaloptions, "pluginconfig_field_updatelocal_{$field}", $pluginconfig->{"field_updatelocal_$field"}, "");
-            echo '<br />';
-            if ($updateopts) {
-                echo  get_string('auth_updateremote', 'auth') . '&nbsp;&nbsp;';
-                 '&nbsp;&nbsp;';
-                choose_from_menu($updateextoptions, "pluginconfig_field_updateremote_{$field}", $pluginconfig->{"field_updateremote_$field"}, "");
-                echo '<br />';
-
-
-            }
-            echo  get_string('auth_fieldlock', 'auth') . '&nbsp;&nbsp;';
-            choose_from_menu($lockoptions, "pluginconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, "");
-            echo '</div>';
-        } else {
-            choose_from_menu($lockoptions, "pluginconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, "");
+    case 'enable':
+        // add to enabled list
+        if (!in_array($auth, $authsenabled)) {
+            $authsenabled[] = $auth;
+            $authsenabled = array_unique($authsenabled);
+            set_config('auth', implode(',', $authsenabled));
         }
-        echo '</td>';
-        if (!empty($helptext)) {
-            echo '<td rowspan="' . count($user_fields) . '">' . $helptext . '</td>';
-            $helptext = '';
+        break;
+
+    case 'down':
+        $key = array_search($auth, $authsenabled);
+        // check auth plugin is valid
+        if ($key === false) {
+            error(get_string('pluginnotenabled', 'auth', $auth), $url);
         }
-        echo '</tr>';
+        // move down the list
+        if ($key < (count($authsenabled) - 1)) {
+            $fsave = $authsenabled[$key];
+            $authsenabled[$key] = $authsenabled[$key + 1];
+            $authsenabled[$key + 1] = $fsave;
+            set_config('auth', implode(',', $authsenabled));
+        }
+        break;
+
+    case 'up':
+        $key = array_search($auth, $authsenabled);
+        // check auth is valid
+        if ($key === false) {
+            error(get_string('pluginnotenabled', 'auth', $auth), $url);
+        }
+        // move up the list
+        if ($key >= 1) {
+            $fsave = $authsenabled[$key];
+            $authsenabled[$key] = $authsenabled[$key - 1];
+            $authsenabled[$key - 1] = $fsave;
+            set_config('auth', implode(',', $authsenabled));
+        }
+        break;
+
+    default:
+        break;
+}
+
+// display strings
+$txt = get_strings(array('authenticationplugins', 'users', 'administration',
+                         'settings', 'edit', 'name', 'enable', 'disable',
+                         'up', 'down', 'none'));
+$txt->updown = "$txt->up/$txt->down";
+
+// construct the display array, with enabled auth plugins at the top, in order
+$displayauths = array();
+$registrationauths = array();
+$registrationauths[''] = $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($adminroot);
+
+//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">';
+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($adminroot);
+
 ?>

admin/auth_config.php

@@ -0,0 +1,186 @@
+<?php
+/**
+ * Edit configuration for an individual auth plugin
+ */
+
+require_once '../config.php';
+require_once $CFG->libdir.'/adminlib.php';
+
+$adminroot = admin_get_root();
+admin_externalpage_setup('userauthentication', $adminroot);
+$auth = required_param('auth', PARAM_SAFEDIR);
+$CFG->pagepath = 'auth/' . $auth;
+$authplugin = get_auth_plugin($auth);
+$err = array();
+
+// save configuration changes
+if ($frm = data_submitted()) {
+
+    if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
+
+    $frm = stripslashes_recursive($frm);
+
+    $authplugin->validate_form($frm, $err);
+
+    if (count($err) == 0) {
+
+        // save plugin config
+        if ($authplugin->process_config($frm)) {
+
+            // save field lock configuration
+            foreach ($frm as $name => $value) {
+                if (preg_match('/^lockconfig_(.+?)$/', $name, $matches)) {
+                    $plugin = "auth/$auth";
+                    $name   = $matches[1];
+                    if (!set_config($name, $value, $plugin)) {
+                        error("Problem saving config $name as $value for plugin $plugin");
+                    }
+                }
+            }
+            redirect("auth.php");
+            exit;
+        }
+    } else {
+        foreach ($err as $key => $value) {
+            $focus = "form.$key";
+        }
+    }
+} else {
+    $frm = get_config("auth/$auth");
+}
+
+$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}");
+    }
+/// 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}");
+    }
+
+// output configuration form
+admin_externalpage_print_header($adminroot);
+
+// choose an authentication method
+echo "<form $CFG->frametarget id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
+echo "<div>\n";
+echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />\n";
+echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";
+
+// auth plugin description
+print_simple_box_start('center', '80%');
+print_heading($authtitle);
+print_simple_box_start('center', '80%', '', 5, 'informationbox');
+echo $authdescription;
+print_simple_box_end();
+echo "<hr />\n";
+$authplugin->config_form($frm, $err, $user_fields);
+print_simple_box_end();
+echo '<p style="text-align: center"><input type="submit" value="' . get_string("savechanges") . "\" /></p>\n";
+echo "</div>\n";
+echo "</form>\n";
+
+admin_externalpage_print_footer($adminroot);
+exit;
+
+/// Functions /////////////////////////////////////////////////////////////////
+
+// Good enough for most auth plugins
+// but some may want a custom one if they are offering
+// other options
+// Note: lockconfig_ fields have special handling.
+function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts, $updateopts) {
+
+    echo '<tr><td colspan="3">';
+    if ($retrieveopts) {
+        print_heading(get_string('auth_data_mapping', 'auth'));
+    } else {
+        print_heading(get_string('auth_fieldlocks', 'auth'));
+    }
+    echo '</td></tr>';
+
+    $lockoptions = array ('unlocked'        => get_string('unlocked', 'auth'),
+                          'unlockedifempty' => get_string('unlockedifempty', 'auth'),
+                          'locked'          => get_string('locked', 'auth'));
+    $updatelocaloptions = array('oncreate'  => get_string('update_oncreate', 'auth'),
+                                'onlogin'   => get_string('update_onlogin', 'auth'));
+    $updateextoptions = array('0'  => get_string('update_never', 'auth'),
+                              '1'   => get_string('update_onupdate', 'auth'));
+
+    $pluginconfig = get_config("auth/$auth");
+
+    // helptext is on a field with rowspan
+    if (empty($helptext)) {
+                $helptext = '&nbsp;';
+    }
+
+    foreach ($user_fields as $field) {
+
+        // Define some vars we'll work with
+        if (!isset($pluginconfig->{"field_map_$field"})) {
+            $pluginconfig->{"field_map_$field"} = '';
+        }
+        if (!isset($pluginconfig->{"field_updatelocal_$field"})) {
+            $pluginconfig->{"field_updatelocal_$field"} = '';
+        }
+        if (!isset($pluginconfig->{"field_updateremote_$field"})) {
+            $pluginconfig->{"field_updateremote_$field"} = '';
+        }
+        if (!isset($pluginconfig->{"field_lock_$field"})) {
+            $pluginconfig->{"field_lock_$field"} = '';
+        }
+
+        // define the fieldname we display to the  user
+        $fieldname = $field;
+        if ($fieldname === 'lang') {
+            $fieldname = get_string('language');
+        } elseif (preg_match('/^(.+?)(\d+)$/', $fieldname, $matches)) {
+            $fieldname =  get_string($matches[1]) . ' ' . $matches[2];
+        } else {
+            $fieldname = get_string($fieldname);
+        }
+
+        if ($retrieveopts) {
+            $varname = 'field_map_' . $field;
+
+            echo '<tr valign="top"><td align="right">';
+            echo '<label for="lockconfig_'.$varname.'">'.$fieldname.'</label>';
+            echo '</td><td>';
+
+            echo "<input id=\"lockconfig_{$varname}\" name=\"lockconfig_{$varname}\" type=\"text\" size=\"30\" value=\"{$pluginconfig->$varname}\" />";
+            echo '<div style="text-align: right">';
+            echo '<label for="menulockconfig_field_updatelocal_'.$field.'">'.get_string('auth_updatelocal', 'auth') . '</label>&nbsp;';
+            choose_from_menu($updatelocaloptions, "lockconfig_field_updatelocal_{$field}", $pluginconfig->{"field_updatelocal_$field"}, "");
+            echo '<br />';
+            if ($updateopts) {
+                echo '<label for="menulockconfig_field_updateremote_'.$field.'">'.get_string('auth_updateremote', 'auth') . '</label>&nbsp;';
+                choose_from_menu($updateextoptions, "lockconfig_field_updateremote_{$field}", $pluginconfig->{"field_updateremote_$field"}, "");
+                echo '<br />';
+
+
+            }
+            echo '<label for="menulockconfig_field_lock_'.$field.'">'.get_string('auth_fieldlock', 'auth') . '</label>&nbsp;';
+            choose_from_menu($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, "");
+            echo '</div>';
+        } else {
+            echo '<tr valign="top"><td align="right">';
+            echo '<label for="menulockconfig_field_lock_'.$field.'">'.$fieldname.'</label>';
+            echo '</td><td>';
+            choose_from_menu($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, "");
+        }
+        echo '</td>';
+        if (!empty($helptext)) {
+            echo '<td rowspan="' . count($user_fields) . '">' . $helptext . '</td>';
+            $helptext = '';
+        }
+        echo '</tr>';
+    }
+}
+
+?>

admin/block.php

@@ -59,7 +59,7 @@
 
     print_heading($strblockname);
 
-    print_simple_box('<center>'.get_string('configwarning', 'admin').'</center>', 'center', '50%');
+    print_simple_box(get_string('configwarning', 'admin'), 'center', '50%');
     echo '<br />';
 
     echo '<form method="post" action="block.php">';

admin/blocks.php

@@ -17,7 +17,6 @@
     $delete   = optional_param('delete', 0, PARAM_INT);
     $multiple = optional_param('multiple', 0, PARAM_INT);
 
-
 /// Print headings
 
     $strmanageblocks = get_string('manageblocks');
@@ -29,6 +28,7 @@
     $strcourses = get_string('blockinstances', 'admin');
     $strname = get_string('name');
     $strmultiple = get_string('blockmultiple', 'admin');
+    $strshowblockcourse = get_string('showblockcourse');
 
     admin_externalpage_print_header($adminroot);
 
@@ -54,7 +54,7 @@
         if (!$block = blocks_get_record($multiple)) {
             error("Block doesn't exist!");
         }
-        $block->multiple = !$block->multiple;
+        $block->multiple = intval(!$block->multiple);
         update_record('block', $block);
     }
 
@@ -165,11 +165,8 @@
     $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'multiple', 'delete', 'settings'));
     $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strmultiple, $strdelete, $strsettings));
     $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
-
-    $table->set_attribute('cellspacing', '0');
     $table->set_attribute('id', 'blocks');
-    $table->set_attribute('class', 'generaltable generalbox');
-
+    $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
     $table->setup();
 
     foreach ($blockbyname as $blockname => $blockid) {
@@ -182,16 +179,28 @@
         if($blockobject->has_config()) {
             $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
+        $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>";
+        }
+        else {
+            $blocklist = "$count";
+        }
         $class = ''; // Nothing fancy, by default
 
         if ($blocks[$blockid]->visible) {
             $visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.$USER->sesskey.'" title="'.$strhide.'">'.
-                       '<img src="'.$CFG->pixpath.'/i/hide.gif" height="16" width="16" alt="" /></a>';
+                       '<img src="'.$CFG->pixpath.'/i/hide.gif" class="icon" alt="'.$strhide.'" /></a>';
         } else {
             $visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.$USER->sesskey.'" title="'.$strshow.'">'.
-                       '<img src="'.$CFG->pixpath.'/i/show.gif" height="16" width="16" alt="" /></a>';
+                       '<img src="'.$CFG->pixpath.'/i/show.gif" class="icon" alt="'.$strshow.'" /></a>';
             $class = ' class="dimmed_text"'; // Leading space required!
         }
         if ($blockobject->instance_allow_multiple()) {
@@ -208,8 +217,8 @@
 
         $table->add_data(array(
             '<span'.$class.'>'.$blockobject->get_title().'</span>',
-            $count,
-            $blockobject->get_version(),
+            $blocklist,
+            '<span'.$class.'>'.$blockobject->get_version().'</span>',
             $visible,
             $multiple,
             $delete,
@@ -228,9 +237,8 @@
         $table->define_headers(array($strname, $strdelete));
         $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
 
-        $table->set_attribute('cellspacing', '0');
         $table->set_attribute('id', 'incompatible');
-        $table->set_attribute('class', 'generaltable generalbox');
+        $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
 
         $table->setup();
 

admin/config.php

@@ -1,185 +0,0 @@
-<?php  // $Id$
-       // config.php - allows admin to edit all configuration variables
-
-    require_once('../config.php');
-
-    $focus = '';
-
-    if ($site = get_site()) {   // If false then this is a new installation
-        require_login();
-        require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
-    }
-
-/// This is to overcome the "insecure forms paradox"
-    if (isset($secureforms) and $secureforms == 0) {
-        $match = 'nomatch';
-    } else {
-        $match = '';
-    }
-
-/// If data submitted, then process and store.
-
-    if ($config = data_submitted($match)) {  
-
-        if (!empty($USER->id)) {            // Additional identity check
-            if (!confirm_sesskey()) {
-                error(get_string('confirmsesskeybad', 'error'));
-            }
-        }
-
-        validate_form($config, $err);
-
-        if (count($err) == 0) {
-            foreach ($config as $name => $value) {
-                if ($name == "sessioncookie") {
-                    $value = eregi_replace("[^a-zA-Z0-9_]", "", $value);
-                }
-                if ($name == "defaultallowedmodules") {
-                    $value = implode(',',$value);
-                }
-                if ($name == 'hiddenuserfields') {
-                    if (in_array('none', $value)) {
-                        $value = '';
-                    } else {
-                        $value = implode(',',$value);
-                    }
-                }
-                if ($name == "locale") {
-                    $value = trim($value);
-                }
-                $conf = new object();
-                $conf->name  = $name;
-                $conf->value = $value;
-                if ($current = get_record('config', 'name', $name)) {
-                    $conf->id = $current->id;
-                    if (! update_record('config', $conf)) {
-                        error("Error: Could not update $name to $value");
-                    }
-                } else {
-                    if (! insert_record('config', $conf)) {
-                        error("Error: could not add new variable $name !");
-                    }
-                }
-            }
-            redirect('index.php');
-            exit;
-
-        } else {
-            foreach ($err as $key => $value) {
-                $focus = "form.$key";
-            }
-        }
-    }
-
-/// Otherwise fill and print the form.
-
-    if (empty($config)) {
-        $config = $CFG;
-    }
-
-    $sesskey = !empty($USER->id) ? $USER->sesskey : '';
-
-
-    $stradmin = get_string('administration');
-    $strconfiguration = get_string('configuration');
-    $strconfigvariables = get_string('configvariables', 'admin');
-
-    if ($site) {
-        print_header("$site->shortname: $strconfigvariables", $site->fullname,
-                      "<a href=\"index.php\">$stradmin</a> -> ".
-                      "<a href=\"configure.php\">$strconfiguration</a> -> $strconfigvariables", $focus);
-        print_heading($strconfigvariables);
-    } else {
-        print_header();
-        print_heading($strconfigvariables);
-        print_simple_box(get_string('configintro', 'admin'), 'center', "50%");
-        echo '<br />';
-    }
-
-
-
-/// Get all the configuration fields and helptext
-    require('configvars.php');
-
-/// Cycle through the sections to get the sectionnames
-    $linktext = '';
-    foreach($configvars as $sectionname=>$section) {
-        if ($linktext !== '') {
-            $linktext .= ' | ';
-        }
-        $linktext .= '<a href="#configsection'.$sectionname.'">'.get_string('configsection'.$sectionname, 'admin').'</a>';
-    }
-        
-    echo "<center>$linktext</center>\n";
-
-    
-    echo '<form method="post" action="config.php" name="form">';
-    echo '<center><input type="submit" value="'.get_string('savechanges').'" /></center>';
-
-/// Cycle through each section of the configuration
-    foreach ($configvars as $sectionname=>$section) {
-
-        print_heading('<a name="configsection'.$sectionname.'"></a>'.get_string('configsection'.$sectionname, 'admin'));
-
-        $table = NULL;
-        $table->data = array();
-        foreach ($section as $configvariable=>$configobject) {
-            $table->data[] = array ( $configvariable.': ',
-                                     $configobject->field
-                                   );
-            if ($configobject->display_warning()) {
-                $table->data[] = array ( '&nbsp;',
-                                         '<span class="configwarning">'.$configobject->warning.'</span>'
-                                       );
-            }
-            $table->data[] = array ( '&nbsp;',
-                                     '<span class="confighelp">'.$configobject->help.'</span>'
-                                   );
-            $table->align = array ('right', 'left');
-        }
-        print_table($table);
-
-    }
-    echo '<center>';
-    echo '<input type="hidden" name="sesskey" value="'.$sesskey.'" />';
-    echo '<input type="submit" value="'.get_string('savechanges').'" />';
-    echo '</center>';
-                
-    echo '</form>';
-    
-
-
-    
-
-    /// Lock some options
-
-    $httpsurl = str_replace('http://', 'https://', $CFG->wwwroot);
-    if ($httpsurl != $CFG->wwwroot) {
-        if (ini_get('allow_url_fopen')) {
-            if ((($fh = @fopen($httpsurl, 'r')) == false) and ($config->loginhttps == 0)) {
-                echo '<script type="text/javascript">'."\n";
-                echo '<!--'."\n";
-                echo "eval('document.form.loginhttps.disabled=true');\n";
-                echo '-->'."\n";
-                echo '</script>'."\n";
-            }
-        }
-    }
-
-
-    if ($site) {
-        print_footer();
-    }
-
-    exit;
-
-/// Functions /////////////////////////////////////////////////////////////////
-
-function validate_form(&$form, &$err) {
-
-    // Currently no checks are needed ...
-
-    return true;
-}
-
-?>

admin/configvars.php

@@ -1,660 +0,0 @@
-<?php // $Id$
-      // Shane Elliott
-defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
-
-/// Add new sitewide configuration variables to this file.
-
-
-/// $configvars is parsed by config.php
-/// It is an array of arrays of objects
-/// $configvars[sectionname][configvariablename] = configvar object
-    $configvars = array();
-
-
-/// no, yes strings and menu options are used in a number of places
-/// so we define them here to save time on repeatedly calling
-/// get_string()
-    $stryes = get_string('yes');
-    $strno  = get_string('no');
-
-    $noyesoptions[0] = $strno;
-    $noyesoptions[1] = $stryes;
-
-
-
-/// A class to hold the configurable information
-/// $field   - the html code for the form field
-/// $help    - help text for the field
-/// $warning - optional warning text to be displayed
-/// method display_warning() - a generic function that can be used in an extended class
-///     e.g. enablerssfeeds
-class configvar {
-
-    var $field;
-    var $help;
-    var $warning;
-
-    function configvar($help, $field, $warning='') {
-        $this->help    = $help;
-        $this->field   = $field;
-        $this->warning = $warning;
-    }
-
-    function display_warning() {
-        return false;
-    }
-}
-
-
-
-
-
-////////////////////////////////////////////////////////////////////
-/// Miscellaneous config variables
-////////////////////////////////////////////////////////////////////
-    $misc = array();
-
-
-/// maxeditingtime
-    unset($options);
-    $options[3600] = get_string('numminutes', '', 60);
-    $options[2700] = get_string('numminutes', '', 45);
-    $options[1800] = get_string('numminutes', '', 30);
-    $options[900]  = get_string('numminutes', '', 15);
-    $options[300]  = get_string('numminutes', '', 5);
-    $options[60]   = get_string('numminutes', '', 1);
-
-    $misc['maxeditingtime'] = new configvar (get_string('configmaxeditingtime', 'admin'),
-        choose_from_menu ($options, 'maxeditingtime', $config->maxeditingtime, '', '', '', true) );
-
-/// debug
-    unset($options);
-    $options[5]  = $strno;
-    $options[15] = $stryes;
-
-    $misc['debug'] = new configvar (get_string('configdebug', 'admin'),
-        choose_from_menu ($options, 'debug', $config->debug, '', '', '', true) );
-
-    $misc['perfdebug'] = new configvar (get_string('configperfdebug', 'admin'),
-        choose_from_menu ($options, 'perfdebug', $config->perfdebug, '', '', '', true) );
-
-/// enablerssfeeds
-class configvarrss extends configvar {
-    function display_warning() {
-        return (!function_exists('utf8_encode'));
-    }
-}
-
-    $misc['enablerssfeeds'] = new configvarrss (get_string('configenablerssfeeds', 'admin'),
-        choose_from_menu ($noyesoptions, 'enablerssfeeds', $config->enablerssfeeds, '', '', '', true),
-        '<font color="red"> You need to add XML support to your PHP installation.</font>' );
-
-    $misc['mymoodleredirect'] = new configvar (get_string('configmymoodleredirect','admin'),
-        choose_from_menu($noyesoptions,'mymoodleredirect',$config->mymoodleredirect,'','','',true));
-
-    unset($options);
-    $options[5] = get_string('worldblogs','blog');
-    $options[4] = get_string('siteblogs','blog');
-    $options[3] = get_string('courseblogs','blog');
-    $options[2] = get_string('groupblogs','blog');
-    $options[1] = get_string('personalblogs','blog');
-    $options[0] = get_string('disableblogs','blog');
-
-    $misc['bloglevel'] = new configvar (get_string('configbloglevel', 'admin'),
-        choose_from_menu ($options, 'bloglevel', $config->bloglevel,'','','',true));
-
-////////////////////////////////////////////////////////////////////
-/// OPERATING SYSTEM config variables
-////////////////////////////////////////////////////////////////////
-    $operatingsystem = array();
-
-/// gdversion
-    unset($options);
-    $options[0] = get_string('gdnot');
-    $options[1] = get_string('gd1');
-    $options[2] = get_string('gd2');
-
-    $installed  = check_gd_version();
-
-    $operatingsystem['gdversion'] = new configvar (get_string('configgdversion', 'admin'),
-        choose_from_menu ($options, 'gdversion', $installed, '', '', '', true) );
-
-/// dbsessions
-    $operatingsystem['dbsessions'] = new configvar (get_string('configdbsessions', 'admin'),
-        choose_from_menu ($noyesoptions, 'dbsessions', $config->dbsessions, '', '', '', true) );
-
-/// sessiontimeout
-    unset($options);
-    $options[14400] = get_string('numhours', '', 4);
-    $options[10800] = get_string('numhours', '', 3);
-    $options[7200]  = get_string('numhours', '', 2);
-    $options[5400]  = get_string('numhours', '', '1.5');
-    $options[3600]  = get_string('numminutes', '', 60);
-    $options[2700]  = get_string('numminutes', '', 45);
-    $options[1800]  = get_string('numminutes', '', 30);
-    $options[900]   = get_string('numminutes', '', 15);
-    $options[300]   = get_string('numminutes', '', 5);
-
-    $operatingsystem['sessiontimeout'] = new configvar (get_string('configsessiontimeout', 'admin'),
-        choose_from_menu ($options, 'sessiontimeout', $config->sessiontimeout, '', '', '', true) );
-
-/// sessioncookie
-    $operatingsystem['sessioncookie'] = new configvar (get_string('configsessioncookie', 'admin'),
-        '<input name="sessioncookie" type="text" size="10" value="'.s($config->sessioncookie).'" alt="sessioncookie" />' );
-    $operatingsystem['sessioncookiepath'] = new configvar (get_string('configsessioncookiepath', 'admin'),
-        '<input name="sessioncookiepath" type="text" size="10" value="'.s($config->sessioncookiepath).'" alt="sessioncookiepath" />' );
-
-/// zip
-    $operatingsystem['zip'] = new configvar (get_string('configzip', 'admin'),
-        '<input name="zip" type="text" size="30" value="'.s($config->zip).'" alt="zip" />' );
-
-/// unzip
-    $operatingsystem['unzip'] = new configvar (get_string('configunzip', 'admin'),
-        '<input name="unzip" type="text" size="30" value="'.s($config->unzip).'" alt="unzip" />' );
-
-    $operatingsystem['pathtodu'] = new configvar(get_string('configpathtodu', 'admin'),
-        '<input name="pathtodu" type="text" size="30" value="'.s($config->pathtodu).'" alt="pathtodu" />');                                                
-
-/// slasharguments
-    unset($options);
-    $options[0] = "file.php?file=/1/pic.jpg";
-    $options[1] = "file.php/1/pic.jpg";
-
-    $operatingsystem['slasharguments'] = new configvar (get_string('configslasharguments', 'admin'),
-        choose_from_menu ($options, 'slasharguments', $config->slasharguments, '', '', '', true) );
-
-/// proxyhost
-    $operatingsystem['proxyhost'] = new configvar (get_string('configproxyhost', 'admin'),
-        '<input name="proxyhost" type="text" size="30" value="'.s($config->proxyhost).'" alt="proxyhost" />' );
-
-/// proxyport
-    $operatingsystem['proxyport'] = new configvar ('',
-        '<input name="proxyport" type="text" size="5" value="'.s($config->proxyport).'" alt="proxyport" />' );
-
-
-
-////////////////////////////////////////////////////////////////////
-/// PERMISSIONS config variables
-////////////////////////////////////////////////////////////////////
-    $permissions = array();
-
-/// teacherassignteachers
-    $permissions['teacherassignteachers'] = new configvar (get_string('configteacherassignteachers', 'admin'),
-        choose_from_menu ($noyesoptions, 'teacherassignteachers', $config->teacherassignteachers, '', '', '', true) );
-
-/// allowunenroll
-    $permissions['allowunenroll'] = new configvar (get_string('configallowunenroll', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowunenroll', $config->allowunenroll, '', '', '', true) );
-
-/// allusersaresitestudents
-    $permissions['allusersaresitestudents'] = new configvar (get_string('configallusersaresitestudents', 'admin'),
-        choose_from_menu ($noyesoptions, 'allusersaresitestudents', $config->allusersaresitestudents, '', '', '', true) );
-
-/// showsiteparticipantslist
-    unset($options);
-    $options[0]  = get_string('siteteachers');
-    $options[1]  = get_string('allteachers');
-    $options[2]  = get_string('studentsandteachers');
-
-    $permissions['showsiteparticipantslist'] = new configvar (get_string('configshowsiteparticipantslist', 'admin'),
-        choose_from_menu ($options, 'showsiteparticipantslist', $config->showsiteparticipantslist, '', '', '', true) );
-
-/// forcelogin
-    $permissions['forcelogin'] = new configvar (get_string('configforcelogin', 'admin'),
-        choose_from_menu ($noyesoptions, 'forcelogin', $config->forcelogin, '', '', '', true) );
-
-/// forceloginforprofiles
-   $permissions['forceloginforprofiles'] = new configvar (get_string('configforceloginforprofiles', 'admin'),
-        choose_from_menu ($noyesoptions, 'forceloginforprofiles', $config->forceloginforprofiles, '', '', '', true) );
-
-/// opentogoogle
-    $permissions['opentogoogle'] = new configvar (get_string('configopentogoogle', 'admin'),
-        choose_from_menu ($noyesoptions, 'opentogoogle', $config->opentogoogle, '', '', '', true) );
-
-/// maxbytes
-    $options = get_max_upload_sizes();
-
-    $permissions['maxbytes'] = new configvar (get_string('configmaxbytes', 'admin'),
-        choose_from_menu ($options, 'maxbytes', $config->maxbytes, '', '', 0, true) );
-
-/// messaging
-    $permissions['messaging'] = new configvar (get_string('configmessaging', 'admin'),
-        choose_from_menu ($noyesoptions, 'messaging', $config->messaging, '', '', '', true) );
-
-/// allowobjectembed
-    $permissions['allowobjectembed'] = new configvar (get_string('configallowobjectembed', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowobjectembed', $config->allowobjectembed, '', '', '', true) );
-
-/// enabletrusttext
-    $permissions['enabletrusttext'] = new configvar (get_string('configenabletrusttext', 'admin'),
-        choose_from_menu ($noyesoptions, 'enabletrusttext', $config->enabletrusttext, '', '', '', true) );
-
-    unset($options);
-    $options['none'] = 'No courses';
-    $options['all'] = 'All courses';
-    $options['requested'] = 'Requested courses';
-
-    $permissions['restrictmodulesfor'] = new configvar (get_string('configrestrictmodulesfor','admin'),
-   ' <script language="JavaScript">
-    function togglemodules(index) {
-        if (index == 0) {
-            document.getElementById(\'allowedmodules\').disabled=true;
-        }
-        else {
-            document.getElementById(\'allowedmodules\').disabled=false;
-        }
-    }
-    </script>'.
-        choose_from_menu($options,'restrictmodulesfor',$config->restrictmodulesfor,'','togglemodules(this.selectedIndex);','',true) );
-
-    $permissions['restrictbydefault'] = new configvar (get_string('configrestrictbydefault','admin'),
-        choose_from_menu($noyesoptions, 'restrictbydefault',$config->restrictbydefault,'','','',true) );
-
-    $allowstr = '<select name="defaultallowedmodules[]" id="allowedmodules" multiple="multiple" size="10"'.((empty($config->restrictmodulesfor)) ? "disabled=\"disabled\"" : "").'>';
-
-    $allowedmodules = array();
-    if (!empty($config->defaultallowedmodules)) {
-        $allowedmodules = explode(',',$config->defaultallowedmodules);
-    }
-
-//  On a fresh install of Moodle, this could be empty; prevent a warning on the following loop.
-    if (!$mods = get_records("modules")) {
-        $mods = array();
-    }
-    $s = "selected=\"selected\"";
-    $allowstr .= '<option value="0" '.((empty($allowedmodules)) ? $s : '').'>'.get_string('allownone').'</option>'."\n";
-    foreach ($mods as $mod) {
-        $selected = "";
-        if (in_array($mod->id,$allowedmodules)) 
-            $selected = $s;
-        $allowstr .= '<option '.$selected.' value="'.$mod->id.'">'.$mod->name.'</option>'."\n";
-    }  
-    $allowstr .= '</select>';
-
-    $permissions['defaultallowedmodules'] = new configvar (get_string('configdefaultallowedmodules','admin'),$allowstr);
-
-
-/// course requests
-    $reqcourse['enablecourserequests'] = new configvar (get_string('configenablecourserequests', 'admin'),
-        choose_from_menu ($noyesoptions,'enablecourserequests',$config->enablecourserequests,'','','',true) );
-
-/// default category for course requests
-    require_once($CFG->dirroot.'/course/lib.php');
-    $reqcourse['defaultrequestedcategory'] = new configvar (get_string('configdefaultrequestedcategory', 'admin'),
-        choose_from_menu (make_categories_options(), 'defaultrequestedcategory',$config->defaultrequestedcategory,'','','',true) );
-
-    $reqcourse['requestedteachername'] = new configvar (get_string('configrequestedteachername','admin'),
-        '<input type="text" name="requestedteachername" size="20" maxlength="100" value="'.s($config->requestedteachername).'" />');
-
-    $reqcourse['requestedteachersname'] = new configvar (get_string('configrequestedteachersname','admin'),
-        '<input type="text" name="requestedteachersname" size="20" maxlength="100" value="'.s($config->requestedteachersname).'" />');
-
-    $reqcourse['requestedstudentname'] = new configvar (get_string('configrequestedstudentname','admin'),
-        '<input type="text" name="requestedstudentname" size="20" maxlength="100" value="'.s($config->requestedstudentname).'" />');
-
-    $reqcourse['requestedstudentsname'] = new configvar (get_string('configrequestedstudentsname','admin'),
-        '<input type="text" name="requestedstudentsname" size="20" maxlength="100" value="'.s($config->requestedstudentsname).'" />');
-
-////////////////////////////////////////////////////////////////////
-/// INTERFACE config variables
-////////////////////////////////////////////////////////////////////
-    $interface = array();
-
-/// language settings
-    $interface['lang'] = new configvar ( get_string('configlang', 'admin'),
-        choose_from_menu(get_list_of_languages(), 'lang', $config->lang, '', '', '', true) );
-
-/// language menu
-    $interface['langmenu'] = new configvar ( get_string('configlangmenu', 'admin'),
-        choose_from_menu($noyesoptions, 'langmenu', $config->langmenu, '', '', '', true) );
-
-/// language list
-    $interface['langlist'] = new configvar ( get_string('configlanglist', 'admin'),
-        '<input name="langlist" type="text" size="60" value="'.s($config->langlist).'" alt="langlist" />' );
-
-/// language menu
-    $interface['langcache'] = new configvar ( get_string('configlangcache', 'admin'),
-        choose_from_menu($noyesoptions, 'langcache', $config->langcache, '', '', '', true) );
-
-/// locale
-    $interface['locale'] = new configvar ( get_string('configlocale', 'admin'),
-        '<input name="locale" type="text" size="15" value="'.s($config->locale).'" alt="locale" />' );
-
-/// docroot
-    $interface['docroot'] = new configvar ( get_string('configdocroot', 'admin'),
-        '<input name="docroot" type="text" size="60" value="'.s($config->docroot).'" alt="docroot" />' );
-
-/// doctonewwindow
-    $interface['doctonewwindow'] = new configvar ( get_string('configdoctonewwindow', 'admin'),
-        choose_from_menu($noyesoptions, 'doctonewwindow', $config->doctonewwindow, '', '', '', true) );
-
-/// timezone
-    $interface['timezone'] = new configvar ( get_string('configtimezone', 'admin'),
-        choose_from_menu (get_list_of_timezones(), 'timezone', $config->timezone, get_string('serverlocaltime'), '', '99', true ) );
-
-/// country
-    $interface['country'] = new configvar ( get_string('configcountry', 'admin'),
-        choose_from_menu (get_list_of_countries(), 'country', $config->country, get_string('selectacountry'), '', 0, true) );
-
-/// framename
-    if (empty($config->framename)) {
-        $config->framename = "_top";
-    }
-
-    $interface['framename'] = new configvar (get_string('configframename', 'admin'),
-        '<input name="framename" type="text" size="15" value="'.s($config->framename).'" alt="framename" />' );
-
-/// language list
-    $interface['themelist'] = new configvar ( get_string('configthemelist', 'admin'),
-        '<input name="themelist" type="text" size="60" value="'.s($config->themelist).'" alt="themelist" />' );
-
-/// user themes
-    $interface['allowuserthemes'] = new configvar (get_string('configallowuserthemes', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowuserthemes', $config->allowuserthemes, '', '', '', true) );
-
-/// course themes
-    $interface['allowcoursethemes'] = new configvar (get_string('configallowcoursethemes', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowcoursethemes', $config->allowcoursethemes, '', '', '', true) );
-
-/// allowuserblockhiding
-    $interface['allowuserblockhiding'] = new configvar (get_string('configallowuserblockhiding', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowuserblockhiding', $config->allowuserblockhiding, '', '', '', true) );
-
-/// showblocksonmodpages
-    $interface['showblocksonmodpages'] = new configvar (get_string('configshowblocksonmodpages', 'admin'),
-        choose_from_menu ($noyesoptions, 'showblocksonmodpages', $config->showblocksonmodpages, '', '', '', true) );
-
-
-/// tabselectedtofront
-    $interface['tabselectedtofront'] = new configvar (get_string('tabselectedtofront', 'admin'),
-        choose_from_menu ($noyesoptions, 'tabselectedtofront', $config->tabselectedtofront, '', '', '', true) );
-
-
-
-////////////////////////////////////////////////////////////////////
-/// USER config variables
-////////////////////////////////////////////////////////////////////
-    $user = array();
-
-/// sitepolicy
-    $user['sitepolicy'] = new configvar (get_string('configsitepolicy', 'admin'),
-        '<input type="text" name="sitepolicy" size="60" value="'.$config->sitepolicy.'" alt="sitepolicy" />' );
-
-
-/// fullnamedisplay
-    unset($options);
-    $options['language']  = get_string('language');
-    $options['firstname lastname']  = get_string('firstname') . ' + ' . get_string('lastname');
-    $options['lastname firstname']  = get_string('lastname') . ' + ' . get_string('firstname');
-    $options['firstname']  = get_string('firstname');
-
-    $user['fullnamedisplay'] = new configvar (get_string('configfullnamedisplay', 'admin'),
-        choose_from_menu ($options, 'fullnamedisplay', $config->fullnamedisplay, '', '', '', true) );
-
-/// extendedusernamechars
-    $user['extendedusernamechars'] = new configvar (get_string('configextendedusernamechars', 'admin'),
-        choose_from_menu ($noyesoptions, 'extendedusernamechars', $config->extendedusernamechars, '', '', '', true) );
-
-/// autologinguests
-    $user['autologinguests'] = new configvar (get_string('configautologinguests', 'admin'),
-        choose_from_menu ($noyesoptions, 'autologinguests', $config->autologinguests, '', '', '', true) );
-
-/// hiddenuserfields
-    $fields = array('none', 'description', 'city', 'country', 'webpage', 'icqnumber', 'skypeid', 'yahooid', 'aimid', 'msnid', 'lastaccess');
-    if (empty($config->hiddenuserfields)) {
-        $config->hiddenuserfields = 'none';
-    }
-    $configfields = array_flip(explode(',', $config->hiddenuserfields));
-    $fieldoptions = '';
-    foreach ($fields as $value) {
-        $fieldoptions .= '<option value="'.$value.'"';
-        if (isset($configfields[$value])) {
-            $fieldoptions .= ' selected="selected"';
-        }
-        $fieldoptions .= '>'.get_string($value).'</option>';
-    }
-
-    $user['hiddenuserfields'] = new configvar (get_string('confighiddenuserfields', 'admin'),
-        '<select id="menuhiddenuserfields" name="hiddenuserfields[]" size="10" multiple="multiple">'.$fieldoptions.'</select>' );
-
-
-
-
-////////////////////////////////////////////////////////////////////
-/// SECURITY config variables
-////////////////////////////////////////////////////////////////////
-    $security = array();
-
-/// displayloginfailures
-    unset($options);
-    $options[''] = get_string('nobody');
-    $options['admin'] = get_string('administrators');
-    $options['teacher'] = get_string('administratorsandteachers');
-    $options['everybody'] = get_string('everybody');
-
-    $security['displayloginfailures'] = new configvar (get_string('configdisplayloginfailures', 'admin'),
-        choose_from_menu($options, 'displayloginfailures', $config->displayloginfailures, '', '', '', true) );
-
-/// notifyloginfailures
-    unset($options);
-    $options[''] = get_string('nobody');
-    $options['mainadmin'] = get_string('administrator');
-    $options['alladmins'] = get_string('administratorsall');
-
-    $security['notifyloginfailures'] = new configvar (get_string('confignotifyloginfailures', 'admin'),
-        choose_from_menu($options, 'notifyloginfailures', $config->notifyloginfailures, '', '', '', true) );
-
-/// notifyloginthreshold
-    unset($options);
-    for ($i=1; $i<=100; $i++) {
-        $options[$i] = "$i";
-    }
-
-    $security['notifyloginthreshold'] = new configvar (get_string('confignotifyloginthreshold', 'admin'),
-        choose_from_menu($options, 'notifyloginthreshold', $config->notifyloginthreshold, '', '', '', true) );
-
-/// secureforms
-    $security['secureforms'] = new configvar (get_string('configsecureforms', 'admin'),
-        choose_from_menu ($noyesoptions, 'secureforms', $config->secureforms, '', '', '', true) );
-
-/// loginhttps
-    $security['loginhttps'] = new configvar (get_string('configloginhttps', 'admin'),
-        choose_from_menu ($noyesoptions, 'loginhttps', $config->loginhttps, '', '', '', true) );
-
-/// runclamonupload
-    $security['runclamonupload'] = new configvar (get_string('configrunclamonupload', 'admin'),
-        choose_from_menu($noyesoptions, 'runclamonupload', $config->runclamonupload, '', '', '', true) );
-
-/// pathtoclam
-    $security['pathtoclam'] = new configvar (get_string('configpathtoclam', 'admin'),
-        '<input type="text" name="pathtoclam" size="30" value="'.$config->pathtoclam.'" alt="pathtoclam" />' );
-
-/// quarantinedir
-    $security['quarantinedir'] = new configvar (get_string('configquarantinedir', 'admin'),
-        '<input type="text" name="quarantinedir" size="30" value="'.$config->quarantinedir.'" alt="quarantinedir" />' );
-
-/// clamfailureonupload
-    unset($options);
-    $options['donothing'] = get_string('configclamdonothing', 'admin');
-    $options['actlikevirus'] = get_string('configclamactlikevirus', 'admin');
-
-    $security['clamfailureonupload'] = new configvar (get_string('configclamfailureonupload', 'admin'),
-        choose_from_menu($options, 'clamfailureonupload', $config->clamfailureonupload, '', '', '', true) );
-
-
-
-
-////////////////////////////////////////////////////////////////////
-/// MAINTENANCE config variables
-////////////////////////////////////////////////////////////////////
-    $maintenance = array();
-
-/// longtimenosee
-    unset($options);
-    $options[0]    = get_string('never');
-    $options[1000] = get_string('numdays', '', 1000);
-    $options[365]  = get_string('numdays', '', 365);
-    $options[180]  = get_string('numdays', '', 180);
-    $options[150]  = get_string('numdays', '', 150);
-    $options[120]  = get_string('numdays', '', 120);
-    $options[90]   = get_string('numdays', '', 90);
-    $options[60]   = get_string('numdays', '', 60);
-    $options[30]   = get_string('numdays', '', 30);
-    $options[21]   = get_string('numdays', '', 21);
-    $options[14]   = get_string('numdays', '', 14);
-    $options[7]   = get_string('numdays', '', 7);
-
-    $maintenance['longtimenosee'] = new configvar (get_string('configlongtimenosee', 'admin'),
-        choose_from_menu ($options, 'longtimenosee', $config->longtimenosee, '', '', '', true) );
-
-/// deleteunconfirmed
-    unset($options);
-    $options[0]    = get_string('never');
-    $options[168]  = get_string('numdays', '', 7);
-    $options[144]  = get_string('numdays', '', 6);
-    $options[120]  = get_string('numdays', '', 5);
-    $options[96]   = get_string('numdays', '', 4);
-    $options[72]   = get_string('numdays', '', 3);
-    $options[48]   = get_string('numdays', '', 2);
-    $options[24]   = get_string('numdays', '', 1);
-    $options[12]   = get_string('numhours', '', 12);
-    $options[6]    = get_string('numhours', '', 6);
-    $options[1]    = get_string('numhours', '', 1);
-
-    $maintenance['deleteunconfirmed'] = new configvar (get_string('configdeleteunconfirmed', 'admin'),
-        choose_from_menu ($options, 'deleteunconfirmed', $config->deleteunconfirmed, '', '', '', true) );
-
-/// loglifetime
-    unset($options);
-    $options[0]    = get_string('neverdeletelogs');
-    $options[1000] = get_string('numdays', '', 1000);
-    $options[365]  = get_string('numdays', '', 365);
-    $options[180]  = get_string('numdays', '', 180);
-    $options[150]  = get_string('numdays', '', 150);
-    $options[120]  = get_string('numdays', '', 120);
-    $options[90]   = get_string('numdays', '', 90);
-    $options[60]   = get_string('numdays', '', 60);
-    $options[30]   = get_string('numdays', '', 30);
-
-    $maintenance['loglifetime'] = new configvar (get_string('configloglifetime', 'admin'),
-        choose_from_menu ($options, 'loglifetime', $config->loglifetime, '', '', '', true) );
-
-
-////////////////////////////////////////////////////////////////////
-/// MAIL config variables
-////////////////////////////////////////////////////////////////////
-    $mail = array();
-
-/// smtphosts
-    $mail['smtphosts'] = new configvar (get_string('configsmtphosts', 'admin'),
-        '<input name="smtphosts" type="text" size="30" value="'.s($config->smtphosts).'" alt="smtphosts" />' );
-
-/// smtpuser
-    $mail['smtpuser'] = new configvar (get_string('configsmtpuser', 'admin'),
-        '<input name="smtpuser" type="text" size="10" value="'.s($config->smtpuser).'" alt="smtpuser" />' );
-
-/// smtppass
-    $mail['smtppass'] = new configvar ('',
-        '<input name="smtppass" type="password" size="10" value="'.s($config->smtppass).'" alt="smtppass" />' );
-
-/// noreplyaddress
-    $mail['noreplyaddress'] = new configvar (get_string('confignoreplyaddress', 'admin'),
-        '<input name="noreplyaddress" type="text" size="30" value="'.s($config->noreplyaddress).'" alt="noreplyaddress" />' );
-
-/// digestmailtime
-    $hours = array();
-    for ($i=0; $i<=23; $i++) {
-        $hours[$i] = sprintf("%02d",$i);
-    }
-
-    $mail['digestmailtime'] = new configvar (get_string('configdigestmailtime', 'admin'),
-        choose_from_menu($hours, 'digestmailtime', $config->digestmailtime, '', '', 0, true) );
-
-/// allowemailaddresses
-    $mail['allowemailaddresses'] = new configvar (get_string('configallowemailaddresses', 'admin'),
-        '<input name="allowemailaddresses" type="text" size="60" value="'.s($config->allowemailaddresses).'" alt="allowemailaddresses" />' );
-
-/// denyemailaddresses
-    $mail['denyemailaddresses'] = new configvar (get_string('configdenyemailaddresses', 'admin'),
-        '<input name="denyemailaddresses" type="text" size="60" value="'.s($config->denyemailaddresses).'" alt="denyemailaddresses" />' );
-
-    if (!empty($CFG->unicodedb)) { ///These options are only available if running under unicodedb
-    /// sitemailcharset
-        unset($options);
-        unset($charsets);
-        $charsets = get_list_of_charsets();
-        $options['0'] = get_string('none');
-        $options = array_merge($options, $charsets);
-        $mail['sitemailcharset'] = new configvar (get_string('configsitemailcharset', 'admin'),
-            choose_from_menu($options, 'sitemailcharset', $config->sitemailcharset, '', '', '', true));
-
-    /// allowusermailcharset
-        $mail['allowusermailcharset'] = new configvar (get_string('configallowusermailcharset', 'admin'),
-            choose_from_menu($noyesoptions, 'allowusermailcharset', $config->allowusermailcharset, '', '', '', true));
-    }
-    
-/// enable stats
-if (empty($CFG->disablestatsprocessing)) {
-    $stats['enablestats'] = new configvar (get_string('configenablestats','admin'),
-        choose_from_menu($noyesoptions, 'enablestats', $config->enablestats, '', '', '', true) );
-
-    unset($options);
-    $options['none'] = get_string('none');
-    $options[60*60*24*7] = get_string('numweeks','moodle',1);
-    $options[60*60*24*14] = get_string('numweeks','moodle',2);
-    $options[60*60*24*21] = get_string('numweeks','moodle',3);
-    $options[60*60*24*28] = get_string('nummonths','moodle',1);
-    $options[60*60*24*56] = get_string('nummonths','moodle',2);
-    $options[60*60*24*84] = get_string('nummonths','moodle',3);
-    $options[60*60*24*112] = get_string('nummonths','moodle',4);
-    $options[60*60*24*140] = get_string('nummonths','moodle',5);
-    $options[60*60*24*168] = get_string('nummonths','moodle',6);
-    $options['all'] = get_string('all');
-    
-    $stats['statsfirstrun'] = new configvar (get_string('configstatsfirstrun','admin'),
-       choose_from_menu($options,'statsfirstrun',$config->statsfirstrun,'','','',true) );
-
-    unset($options);
-    $options[0] = get_string('untilcomplete');
-    $options[60*60] = '1 '.get_string('hour');
-    $options[60*60*2] = '2 '.get_string('hours');
-    $options[60*60*3] = '3 '.get_string('hours');
-    $options[60*60*4] = '4 '.get_string('hours');
-    $options[60*60*5] = '5 '.get_string('hours');
-    $options[60*60*6] = '6 '.get_string('hours');
-    $options[60*60*7] = '7 '.get_string('hours');
-    $options[60*60*8] = '8 '.get_string('hours');
-
-    if (empty($config->statsruntimestarthour)) {
-        $config->statsruntimestarthour = 0;
-    }
-    if (empty($config->statsruntimestartminute)) {
-        $config->statsruntimestartminute = 0;
-    }
-
-    $stats['statsmaxruntime'] = new configvar (get_string('configstatsmaxruntime','admin'),
-      choose_from_menu($options,'statsmaxruntime',$config->statsmaxruntime,'','','',true) );                                        
-
-    $stats['statsruntimestart'] = new configvar (get_string('configstatsruntimestart','admin'),
-      print_time_selector("statsruntimestarthour","statsruntimestartminute",make_timestamp(2000,1,1,$config->statsruntimestarthour,$config->statsruntimestartminute),5,true) );
-
-    $stats['statsuserthreshold'] = new configvar (get_string('configstatsuserthreshold','admin'),
-      '<input type="text" name="statsuserthreshold" size="4" value="'.$config->statsuserthreshold.'" />');
-}                                        
-
-////////////////////////////////////////////////////////////////////
-
-    $configvars['interface']       = $interface;
-    $configvars['security']        = $security;
-    $configvars['operatingsystem'] = $operatingsystem;
-    $configvars['maintenance']     = $maintenance;
-    $configvars['mail']            = $mail;
-    $configvars['user']            = $user;
-    $configvars['permissions']     = $permissions;
-    $configvars['requestedcourse'] = $reqcourse;
-    $configvars['misc']            = $misc;
-if (empty($CFG->disablestatsprocessing)) {
-    $configvars['stats']           = $stats;
-}
-
-?>

admin/cron.php

@@ -17,7 +17,11 @@
 /// from the command line.
 
     define('FULLME', 'cron');
-    
+
+
+/// Do not set moodle cookie because we do not need it here, it is better to emulate session
+    $nomoodlecookie = true;
+
 /// The current directory in PHP version 4.3.0 and above isn't necessarily the
 /// directory of the script when run from the command line. The require_once()
 /// would fail, so we'll have to chdir()
@@ -29,39 +33,51 @@
     require_once(dirname(__FILE__) . '/../config.php');
     require_once($CFG->libdir.'/adminlib.php');
 
-    if (!$alreadyadmin = has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
-        unset($_SESSION['USER']);
-        unset($USER);
-        unset($_SESSION['SESSION']);
-        unset($SESSION);
-        $USER = get_admin();      /// Temporarily, to provide environment for this script
-        // we need to override the admin timezone to the moodle timezone!
-        $USER->timezone = $CFG->timezone;
+/// extra safety
+    @session_write_close();
+
+/// check if execution allowed
+    if (isset($_SERVER['REMOTE_ADDR'])) { // if the script is accessed via the web.
+        if (!empty($CFG->cronclionly)) { 
+            // This script can only be run via the cli.
+            print_error('cronerrorclionly', 'admin');
+            exit;
+        }
+        // This script is being called via the web, so check the password if there is one.
+        if (!empty($CFG->cronremotepassword)) {
+            $pass = optional_param('password', '', PARAM_RAW);
+            if($pass != $CFG->cronremotepassword) {
+                // wrong password.
+                print_error('cronerrorpassword', 'admin'); 
+                exit;
+            }
+        }
     }
 
-    //unset test cookie, user must login again anyway
-    setcookie('MoodleSessionTest'.$CFG->sessioncookie, '', time() - 3600, '/');
 
-/// switch to site language and locale
-    if (!empty($CFG->courselang)) {
-        unset ($CFG->courselang);
-    }
-    if (!empty($SESSION->lang)) {
-        unset ($SESSION->lang);
-    }
+/// emulate normal session
+    $SESSION = new object();
+    $USER = get_admin();      /// Temporarily, to provide environment for this script
+
+/// ignore admins timezone, language and locale - use site deafult instead!
+    $USER->timezone = $CFG->timezone;
     $USER->lang = '';
-    moodle_setlocale();
+    $USER->theme = '';
+    course_setup(SITEID);
 
 /// send mime type and encoding
     if (check_browser_version('MSIE')) {
         //ugly IE hack to work around downloading instead of viewing
-        @header('Content-Type: text/html; charset='.current_charset());
+        @header('Content-Type: text/html; charset=utf-8');
         echo "<xmp>"; //<pre> is not good enough for us here
     } else {
         //send proper plaintext header
-        @header('Content-Type: text/plain; charset='.current_charset());
+        @header('Content-Type: text/plain; charset=utf-8');
     }
 
+/// no more headers and buffers
+    while(@ob_end_flush());
+
 /// increase memory limit (PHP 5.2 does different calculation, we need more memory now)
     @raise_memory_limit('128M');
 
@@ -82,11 +98,21 @@
                 $cron_function = $mod->name."_cron";
                 if (function_exists($cron_function)) {
                     mtrace("Processing module function $cron_function ...", '');
+                    if (!empty($PERF->dbqueries)) {
+                        $pre_dbqueries = $PERF->dbqueries;
+                        $pre_time      = microtime(1);
+                    }
                     if ($cron_function()) {
                         if (! set_field("modules", "lastcron", $timenow, "id", $mod->id)) {
                             mtrace("Error: could not update timestamp for $mod->fullname");
                         }
                     }
+                    if (isset($pre_dbqueries)) {
+                        mtrace("... used " . ($PERF->dbqueries - $pre_dbqueries) . " dbqueries");
+                        mtrace("... used " . (microtime(1) - $pre_time) . " seconds");
+                    }
+                /// Reset possible changes by modules to time_limit. MDL-11597
+                    @set_time_limit(0);
                     mtrace("done.");
                 }
             }
@@ -111,6 +137,8 @@
                             mtrace('Error: could not update timestamp for '.$block->name);
                         }
                     }
+                /// Reset possible changes by blocks to time_limit. MDL-11597
+                    @set_time_limit(0);
                     mtrace('done.');
                 }
             }
@@ -121,18 +149,31 @@
 
     if (!empty($CFG->langcache)) {
         mtrace('Updating languages cache');
-        get_list_of_languages();
+        get_list_of_languages(true);
     }
 
     mtrace('Removing expired enrolments ...', '');     // See MDL-8785
     $timenow = time();
-    if ($oldenrolments = get_records_select('role_assignments', "timeend > 0 AND timeend < '$timenow'")) {
-        mtrace(count($oldenrolments).' to delete');
-        foreach ($oldenrolments as $oldenrolment) {
-            if (role_unassign($oldenrolment->roleid, $oldenrolment->userid, 0, $oldenrolment->contextid)) {
-                mtrace("Deleted expired role assignment $oldenrolment->roleid for user $oldenrolment->userid from context $oldenrolment->contextid");
-            }
-        }
+    $somefound = false;
+    // The preferred way saves memory, dmllib.php
+    // find courses where limited enrolment is enabled
+    global $CFG;
+    $rs_enrol = get_recordset_sql("SELECT ra.roleid, ra.userid, ra.contextid
+        FROM {$CFG->prefix}course c
+        INNER JOIN {$CFG->prefix}context cx ON cx.instanceid = c.id
+        INNER JOIN {$CFG->prefix}role_assignments ra ON ra.contextid = cx.id
+        WHERE cx.contextlevel = '".CONTEXT_COURSE."'
+        AND ra.timeend > 0
+        AND ra.timeend < '$timenow'
+        AND c.enrolperiod > 0
+        ");
+    mtrace($rs_enrol->RecordCount().' to delete');
+    while ($oldenrolment = rs_fetch_next_record($rs_enrol)) {
+        role_unassign($oldenrolment->roleid, $oldenrolment->userid, 0, $oldenrolment->contextid);
+        $somefound = true;
+    }
+    rs_close($rs_enrol);
+    if($somefound) {
         mtrace('Done');
     } else {
         mtrace('none found');
@@ -157,7 +198,7 @@
                 foreach ($assigns as $assign) {
                     if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
                         if (role_unassign(0, $assign->id, 0, $context->id)) {
-                            mtrace("Deleted student enrolment for user $assign->id from course $assign->courseid");
+                            mtrace("Deleted assignment for user $assign->id from course $assign->courseid");
                         }
                     }
                 }
@@ -183,8 +224,8 @@
 
         /// Delete users who haven't completed profile within required period
 
-        if (!empty($CFG->deleteunconfirmed)) {
-            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+        if (!empty($CFG->deleteincompleteusers)) {
+            $cuttime = $timenow - ($CFG->deleteincompleteusers * 3600);
             if ($users = get_users_not_fully_set_up($oneweek)) {
                 foreach ($users as $user) {
                     if (delete_records('user', 'id', $user->id)) {
@@ -304,10 +345,26 @@
         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)) {
 
         // check we're not before our runtime
-        $timetocheck = strtotime("$CFG->statsruntimestarthour:$CFG->statsruntimestartminute today");
+        $timetocheck = strtotime("today $CFG->statsruntimestarthour:$CFG->statsruntimestartminute");
 
         if (time() > $timetocheck) {
             $time = 60*60*20; // set it to 20 here for first run... (overridden by $CFG)

admin/dbperformance.php

@@ -20,7 +20,7 @@
 
     if (!empty($topframe)) {
         print_header("$site->shortname: $strdatabaseperformance", "$site->fullname", 
-                     "<a target=\"$CFG->framename\" href=\"index.php\">$stradministration</a> -> Database performance");
+                     "<a $CFG->frametarget href=\"index.php\">$stradministration</a> -> Database performance");
         exit;
     }
 

admin/delete.php

@@ -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') {

admin/enrol.php

@@ -52,8 +52,9 @@
 
     print_simple_box(get_string('configenrolmentplugins', 'admin'), 'center', '700');
 
-    echo "<form target=\"{$CFG->framename}\" name=\"enrolmenu\" method=\"post\" action=\"enrol.php\">";
-    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">";
+    echo "<form $CFG->frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol.php\">";
+    echo "<div>";
+    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />";
 
     $table = new stdClass();
     $table->head = array(get_string('name'), get_string('enable'), get_string('default'), $str->settings);
@@ -63,6 +64,7 @@
     $table->data = array();
 
     $modules = get_list_of_plugins("enrol");
+    $enabledplugins = explode(',', $CFG->enrol_plugins_enabled);
     foreach ($modules as $module) {
 
         // skip if directory is empty
@@ -73,7 +75,7 @@
         $name = get_string("enrolname", "enrol_$module");
         $plugin = enrolment_factory::factory($module);
         $enable = '<input type="checkbox" name="enable[]" value="'.$module.'"';
-        if (stristr($CFG->enrol_plugins_enabled, $module) !== false) {
+        if (in_array($module, $enabledplugins)) {
             $enable .= ' checked="checked"';
         }
         if ($module == 'manual') {
@@ -96,7 +98,8 @@
 
     print_table($table);
 
-    echo "<center><input type=\"submit\" value=\"".get_string("savechanges")."\"></center>\n";
+    echo "<div style=\"text-align:center\"><input type=\"submit\" value=\"".get_string("savechanges")."\" /></div>\n";
+    echo "</div>";
     echo "</form>";
 
     admin_externalpage_print_footer($adminroot);

admin/enrol_config.php

@@ -44,17 +44,10 @@
 
     admin_externalpage_print_header($adminroot);
 
-    echo "<form target=\"{$CFG->framename}\" name=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">";
-    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">";
-    echo "<div align=\"center\"><p><b>";
-
-
-/// Choose an enrolment method
-    echo get_string('chooseenrolmethod').': ';
-    choose_from_menu ($options, "enrol", $enrol, "",
-                      "document.location='enrol_config.php?enrol='+document.enrolmenu.enrol.options[document.enrolmenu.enrol.selectedIndex].value", "");
-
-    echo "</b></p></div>";
+    echo "<form $CFG->frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">";
+    echo "<div>";
+    echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />";
+    echo "<input type=\"hidden\" name=\"enrol\" value=\"".$enrol."\" />";
 
 /// Print current enrolment type description
     print_simple_box_start("center", "80%");
@@ -68,10 +61,10 @@
 
     $enrolment->config_form($frm);
 
-    echo "<center><p><input type=\"submit\" value=\"".get_string("savechanges")."\"></p></center>\n";
-    echo "</form>";
-
+    echo "<p class=\"centerpara\"><input type=\"submit\" value=\"".get_string("savechanges")."\" /></p>\n";
     print_simple_box_end();
+    echo "</div>";
+    echo "</form>";
 
     admin_externalpage_print_footer($adminroot);
 

admin/environment.php

@@ -91,7 +91,7 @@
 /// Start of main box
     print_simple_box_start('center');
 
-    echo "<center>".$stradminhelpenvironment."</center><br />";
+    echo "<div style=\"text-align:center\">".$stradminhelpenvironment."</div><br />";
 
 /// Get current Moodle version
     $current_version = $CFG->release;
@@ -121,11 +121,11 @@
     }
 
 /// Print form and popup menu
-    echo '<center><form method="post" action="environment.php">';
-    echo $strmoodleversion.' ';
-    choose_from_menu ($versions, 'version', $version, null, 'this.form.submit();' );
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
-    echo '</form></center>';
+    echo '<div style="text-align:center">'.$strmoodleversion.' ';
+    popup_form("$CFG->wwwroot/$CFG->admin/environment.php?version=",
+        $versions, 'selectversion', $version, '');
+    echo '</div>';
+
 /// End of main box
     print_simple_box_end();
 

admin/environment.xml

@@ -102,6 +102,171 @@
           <ON_CHECK message="mbstringrecommended" />
         </FEEDBACK>
       </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="curlrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opensslrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ctyperecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
     </PHP_EXTENSIONS>
   </MOODLE>
+  <MOODLE version="1.9">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="4.1.16">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
+      </VENDOR>
+      <VENDOR name="postgres" version="8.0" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="9.0" />
+    </DATABASE>
+    <PHP version="4.3.0" level="required">
+      <RESTRICT function="restrict_php50_version" message="php50restricted" />
+    </PHP>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iconvrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="curlrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opensslrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ctyperecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="question/upgrade.php" function="question_check_no_rqp_questions" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="qtyperqpwillberemovedanyway" />
+          <ON_OK message="qtyperqpwillberemoved" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/upgrade.php" function="question_random_check" level="optional">
+        <FEEDBACK>
+          <ON_OK message="questioncwqpfsok" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
+  <MOODLE version="2.0" requires="1.9">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="4.1.16">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
+      </VENDOR>
+      <VENDOR name="postgres" version="8.0" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="9.0" />
+    </DATABASE>
+    <PHP version="5.2.0" level="required">
+    </PHP>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iconvrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="curlrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opensslrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="question/upgrade.php" function="question_check_no_rqp_questions" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="qtyperqpwillberemovedanyway" />
+          <ON_OK message="qtyperqpwillberemoved" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/filter.php

@@ -74,21 +74,21 @@
     admin_externalpage_print_header($adminroot);
     print_heading( $filtername );
 
-    print_simple_box("<center>".get_string("configwarning", "admin")."</center>", "center", "50%");
+    print_simple_box(get_string("configwarning", "admin"), "center", "50%");
     echo "<br />";
 
     print_simple_box_start("center",'');
 
     ?>
     <form action="filter.php?filter=<?php echo urlencode($param->filter); ?>" method="post">
+    <div style="text-align: center">
     <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
 
     <?php include "$CFG->dirroot/$param->filter/filterconfig.html"; ?>
 
-    <center>
         <input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" />
         <input type="submit" name="reset" value="<?php echo print_string('resettodefaults'); ?>" />
-    </center>
+    </div>
     </form>
 
     <?php

admin/filters.php

@@ -182,15 +182,10 @@
     // construct the flexible table ready to display
     $table = new flexible_table(FILTER_TABLE);
     $table->define_columns(array('name', 'hideshow', 'order', 'settings'));
-    $table->column_style('hideshow', 'text-align', 'center');
-    $table->column_style('order', 'text-align', 'center');
-    $table->column_style('settings', 'text-align', 'center');
     $table->define_headers(array($txt->name, $txt->hideshow, $txt->updown, $txt->settings));
     $table->define_baseurl("$CFG->wwwroot/$CFG->admin/filters.php");
-    $table->set_attribute('id', 'blocks');
-    $table->set_attribute('class', 'flexible generaltable generalbox');
-    $table->set_attribute('style', 'margin:auto;');
-    $table->set_attribute('cellpadding', '5');
+    $table->set_attribute('id', 'filters');
+    $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
     $table->setup();
 
     // iterate through filters adding to display table
@@ -201,13 +196,13 @@
         // 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\" height=\"16\" width=\"16\" alt=\"hide\" /></a>";
+            $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\" height=\"16\" width=\"16\" alt=\"show\" /></a>";
+            $hideshow .= "<img src=\"{$CFG->pixpath}/i/show.gif\" class=\"icon\" alt=\"$txt->show\" /></a>";
             $hidden = true;
             $displayname = "<span class=\"dimmed_text\">$name</span>";
         }
@@ -217,17 +212,17 @@
         if (!$hidden) {
             if ($updowncount>1) {
                 $updown .= "<a href=\"$myurl&amp;action=up&amp;filterpath=$upath\">";
-                $updown .= "<img src=\"$img/up.gif\" alt=\"up\" /></a>&nbsp;";
+                $updown .= "<img src=\"$img/up.gif\" alt=\"$txt->up\" /></a>&nbsp;";
             }
             else {
-                $updown .= "<img src=\"$CFG->pixpath/spacer.gif\" height=\"16\" width=\"16\" alt=\"\" />&nbsp;";
+                $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=\"down\" /></a>";
+                $updown .= "<img src=\"$img/down.gif\" alt=\"$txt->down\" /></a>";
             }
             else {
-                $updown .= "<img src=\"$CFG->pixpath/spacer.gif\" height=\"16\" width=\"16\" alt=\"\" />";
+                $updown .= "<img src=\"$CFG->pixpath/spacer.gif\" class=\"icon\" alt=\"\" />";
             }
             ++$updowncount;
         }

admin/handlevirus.php

@@ -40,7 +40,7 @@ while(!feof($fd)) {
     
     $user = get_record("user","id",$log->userid);
     $course = get_record("course","id",$log->course);
-    $subject = get_string('virusfoundsubject','moodle',$site->fullname);
+    $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
     $a->date = userdate($log->time);
 
     $a->action = $action;
@@ -78,7 +78,7 @@ function notify_admins_unknown($file,$a) {
     global $site;
 
     $admins = get_admins();
-    $subject = get_string('virusfoundsubject','moodle',$site->fullname);
+    $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
     $body = get_string('virusfoundlateradminnolog','moodle',$a);
     foreach ($admins as $admin) {
         email_to_user($admin,$admin,$subject,$body);

admin/index.php

@@ -28,7 +28,8 @@
     $id             = optional_param('id', '', PARAM_ALPHANUM);
     $confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
     $confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL);
-    $agreelicence = optional_param('agreelicence',0, PARAM_BOOL);
+    $agreelicense   = optional_param('agreelicense', 0, PARAM_BOOL);
+    $autopilot      = optional_param('autopilot', 0, PARAM_BOOL);
     $ignoreupgradewarning = optional_param('ignoreupgradewarning', 0, PARAM_BOOL);
 
 /// check upgrade status first
@@ -37,6 +38,11 @@
     }
     upgrade_check_running("Upgrade already running in this session, please wait!<br />Click on the exclamation marks to ignore this warning (<a href=\"index.php?ignoreupgradewarning=1\">!!!</a>).", 10);
 
+/// set install/upgrade autocontinue session flag
+    if ($autopilot) {
+        $_SESSION['installautopilot'] = $autopilot;
+    }
+
 /// Check some PHP server settings
 
     $documentationlink = '<a href="http://docs.moodle.org/en/Installation">Installation docs</a>';
@@ -53,11 +59,11 @@
         error("The PHP server variable 'file_uploads' is not turned On - $documentationlink");
     }
 
-    if (empty($CFG->prefix) && $CFG->dbtype != 'mysql') {  //Enforce prefixes for everybody but mysql
+    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 . ')');
     }
 
-    if ($CFG->dbtype == 'oci8po' && strlen($CFG->prefix) > 2) { //Max prefix length for Oracle is 2cc
+    if ($CFG->dbfamily == 'oracle' && strlen($CFG->prefix) > 2) { //Max prefix length for Oracle is 2cc
         error('$CFG->prefix maximum allowed length for Oracle DBs is 2cc.');
     }
 
@@ -91,6 +97,14 @@
         $CFG->version = "";
     }
 
+    if (is_readable("$CFG->dirroot/version.php")) {
+        include_once("$CFG->dirroot/version.php");              # defines $version
+    }
+
+    if (!$version or !$release) {
+        error('Main version.php was not readable or specified');# without version, stop
+    }
+
 /// Check if the main tables have been installed yet or not.
 
     if (! $tables = $db->Metatables() ) {    // No tables yet at all.
@@ -108,31 +122,43 @@
             }
         }
     }
-
-    $linktoscrolltoerrors = '<script type="text/javascript" src="' . $CFG->wwwroot . '/lib/scroll_to_errors.js"></script>';
     if (! $maintables) {
     /// hide errors from headers in case debug enabled in config.php
         $origdebug = $CFG->debug;
         $CFG->debug = DEBUG_MINIMAL;
         error_reporting($CFG->debug);
-        if (empty($agreelicence)) {
-            $strlicense = get_string("license");
+        if (empty($agreelicense)) {
+            $strlicense = get_string('license');
             print_header($strlicense, $strlicense, $strlicense, "", "", false, "&nbsp;", "&nbsp;");
             print_heading("<a href=\"http://moodle.org\">Moodle</a> - Modular Object-Oriented Dynamic Learning Environment");
-            print_heading(get_string("copyrightnotice"));
-            print_simple_box_start('center');
-            echo text_to_html(get_string("gpl"));
-            print_simple_box_end();
+            print_heading(get_string('copyrightnotice'));
+            print_box(text_to_html(get_string('gpl')), 'copyrightnotice');
             echo "<br />";
-            notice_yesno(get_string("doyouagree"), "index.php?agreelicence=true",
+            notice_yesno(get_string('doyouagree'), "index.php?agreelicense=1",
                                                    "http://docs.moodle.org/en/License");
+            print_footer('none');
             exit;
         }
+        if (empty($confirmrelease)) {
+            $strcurrentrelease = get_string("currentrelease");
+            print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
+            print_heading("Moodle $release");
+            print_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'), 'generalbox boxaligncenter boxwidthwide');
+            echo '<form action="index.php"><div>';
+            echo '<input type="hidden" name="agreelicense" value="1" />';
+            echo '<input type="hidden" name="confirmrelease" value="1" />';
+            echo '</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;
+        }
 
         $strdatabasesetup    = get_string("databasesetup");
         $strdatabasesuccess  = get_string("databasesuccess");
         print_header($strdatabasesetup, $strdatabasesetup, $strdatabasesetup,
-                        "", $linktoscrolltoerrors, false, "&nbsp;", "&nbsp;");
+                        "", upgrade_get_javascript(), false, "&nbsp;", "&nbsp;");
     /// return to original debugging level
         $CFG->debug = $origdebug;
         error_reporting($CFG->debug);
@@ -143,6 +169,11 @@
     /// But we prioritise install.xml (XMLDB) if present
     
         change_db_encoding(); // first try to change db encoding to utf8
+        if (!setup_is_unicodedb()) {
+            // If could not convert successfully, throw error, and prevent installation
+            print_error('unicoderequired', 'admin');  
+        }
+    
         $status = false;
         if (file_exists("$CFG->libdir/db/install.xml")) {
             $status = install_from_xmldb_file("$CFG->libdir/db/install.xml"); //New method
@@ -152,13 +183,22 @@
             error("Error: Your database ($CFG->dbtype) is not yet fully supported by Moodle or install.xml is not present.  See the lib/db directory.");
         }
 
+        // all new installs are in unicode - keep for backwards compatibility and 1.8 upgrade checks
+        set_config('unicodedb', 1);
+
     /// Continue with the instalation
         $db->debug = false;
         if ($status) {
+            //ugly hack - install new groups: MDL-9217
+            require("$CFG->dirroot/group/version.php");
+            set_config('group_version', $group_version);
+            //install_group_db();
+
             // Install the roles system.
             moodle_install_roles();
             set_config('statsrolesupgraded',time());
 
+
             // Write default settings unconditionally (i.e. even if a setting is already set, overwrite it)
             // (this should only have any effect during initial install).
             $adminroot = admin_get_root();
@@ -174,15 +214,19 @@
                                                    'enrol' => 'manual',
                                                    'enrol_plugins_enabled' => 'manual',
                                                    'guestloginbutton' => 1,
+                                                   'registerauth' => 'email',
                                                    'style' => 'default',
                                                    'template' => 'default',
-                                                   'theme' => 'standardwhite'));
+                                                   'theme' => 'standardwhite',
+                                                   'filter_multilang_converted' => 1));
 
             notify($strdatabasesuccess, "green");
+            require_once $CFG->dirroot.'/mnet/lib.php';
         } else {
             error("Error: Main databases NOT set up successfully");
         }
         print_continue('index.php');
+        print_footer('none');
         die;
     }
 
@@ -190,13 +234,6 @@
 /// Check version of Moodle code on disk compared with database
 /// and upgrade if possible.
 
-    if ( is_readable("$CFG->dirroot/version.php")) {
-        include_once("$CFG->dirroot/version.php");              # defines $version
-    }
-    if (!$version) {
-        error('Main version.php was not readable or specified');# without version, stop
-    }
-
     if (file_exists("$CFG->dirroot/lib/db/$CFG->dbtype.php")) {
         include_once("$CFG->dirroot/lib/db/$CFG->dbtype.php");  # defines old upgrades
     }
@@ -209,6 +246,12 @@
     if ($CFG->version) {
         if ($version > $CFG->version) {  // upgrade
 
+        /// If the database is not already Unicode then we do not allow upgrading!
+        /// Instead, we print an error telling them to upgrade to 1.7 first.  MDL-6857
+            if (empty($CFG->unicodedb)) {
+                print_error('unicodeupgradeerror', 'error', '', $version);
+            }
+
             $a->oldversion = "$CFG->release ($CFG->version)";
             $a->newversion = "$release ($version)";
             $strdatabasechecking = get_string("databasechecking", "", $a);
@@ -224,41 +267,46 @@
             }
 
             if (empty($confirmupgrade)) {
-
                 print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
                         "", "", false, "&nbsp;", "&nbsp;");
 
-                notice_yesno(get_string('upgradesure', 'admin', $a->newversion), 'index.php?confirmupgrade=yes', 'index.php');
+                notice_yesno(get_string('upgradesure', 'admin', $a->newversion), 'index.php?confirmupgrade=1', 'index.php');
                 exit;
 
-            } else if (empty($confirmrelease)) {
+            } else if (empty($confirmrelease)){
                 $strcurrentrelease = get_string("currentrelease");
                 print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
                 print_heading("Moodle $release");
-                print_simple_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'), 'center');
+                print_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'));
 
                 require_once($CFG->libdir.'/environmentlib.php');
                 print_heading(get_string('environment', 'admin'));
-                if (check_moodle_environment($release, $environment_results, true)) {
+                if (!check_moodle_environment($release, $environment_results, true)) {
+                    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');
                 } else {
                     notify(get_string('environmentok', 'admin'), 'notifysuccess');
-
-                    echo '<form action="index.php">';
+                    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 class="continuebutton"><input type="submit" value="'.get_string('continue').'" /></div>';
+                    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');
-                exit;
-
+                die;
             } else {
                 $strdatabasesuccess  = get_string("databasesuccess");
                 print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
-                        "", $linktoscrolltoerrors, false, "&nbsp;", "&nbsp;");
+                        "", upgrade_get_javascript(), false, "&nbsp;", "&nbsp;");
 
             /// return to original debugging level
                 $CFG->debug = $origdebug;
@@ -283,6 +331,10 @@
             /// If successful, continue upgrading roles and setting everything properly
                 if ($status) {
                     if (empty($CFG->rolesactive)) {
+                        // ugly hack - upgrade to new groups (from 1.6) : MDL-9217
+                        // require_once("$CFG->dirroot/group/db/upgrade.php");
+                        // MDL-11062, proper group upgrade code is done in lib/db/upgrade.php
+                        // install_group_db();
                         // Upgrade to the roles system.
                         moodle_install_roles();
                         set_config('rolesactive', 1);
@@ -297,13 +349,17 @@
                         remove_dir($CFG->dataroot . '/cache', true); // flush cache
                         notify($strdatabasesuccess, "green");
                         print_continue("upgradesettings.php");
+                        print_footer('none');
                         exit;
                     } else {
-                        notify("Upgrade failed!  (Could not update version in config table)");
+                        error('Upgrade failed!  (Could not update version in config table)');
                     }
             /// Main upgrade not success
                 } else {
-                    notify("Upgrade failed!  See /version.php");
+                    notify('Main Upgrade failed!  See lib/db/upgrade.php');
+                    print_continue('index.php?confirmupgrade=1&amp;confirmrelease=1');
+                    print_footer('none');
+                    die;
                 }
                 upgrade_log_finish();
             }
@@ -326,6 +382,11 @@
         }
     }
 
+/// ugly hack - convert to new groups if upgrading from 1.7; must be reworked
+    require_once("$CFG->dirroot/group/db/upgrade.php");
+    upgrade_group_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
+
+
 /// Find and check all main modules and load them up or upgrade them if necessary
 /// first old *.php update and then the new upgrade.php script
     upgrade_activity_modules("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
@@ -353,14 +414,27 @@
 /// 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");
+
 /// Check for local database customisations
 /// first old *.php update and then the new upgrade.php script
     require_once("$CFG->dirroot/lib/locallib.php");
     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');
+    upgrade_RPC_functions("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
+
+
 /// just make sure upgrade logging is properly terminated
     upgrade_log_finish();
 
+    unset($_SESSION['installautopilot']);
+
 /// Set up the blank site - to be customized later at the end of install.
     if (! $site = get_site()) {
         // We are about to create the site "course"
@@ -424,18 +498,7 @@
 
 /// Check if the guest user exists.  If not, create one.
     if (! record_exists("user", "username", "guest")) {
-        $guest->auth        = "manual";
-        $guest->username    = "guest";
-        $guest->password    = md5("guest");
-        $guest->firstname   = addslashes(get_string("guestuser"));
-        $guest->lastname    = " ";
-        $guest->email       = "root@localhost";
-        $guest->description = addslashes(get_string("guestuserinfo"));
-        $guest->confirmed   = 1;
-        $guest->lang        = $CFG->lang;
-        $guest->timemodified= time();
-
-        if (! $guest->id = insert_record("user", $guest)) {
+        if (! $guest = create_guest_record()) {
             notify("Could not create guest user record !!!");
         }
     }
@@ -443,7 +506,7 @@
 
 /// Set up the admin user
     if (empty($CFG->rolesactive)) {
-        redirect('user.php');
+        create_admin_user();
     }
 
 /// Check for valid admin user
@@ -455,7 +518,7 @@
 
 /// check that site is properly customized
     if (empty($site->shortname) or empty($site->shortname)) {
-        redirect('settings.php?section=frontpage&amp;return=site');
+        redirect('settings.php?section=frontpagesettings&amp;return=site');
     }
 
 /// Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders
@@ -476,43 +539,51 @@
 
 /// Deprecated database! Warning!!
     if (!empty($CFG->migrated_to_new_db)) {
-        print_simple_box_start('center','60%');
-        print_string('dbmigrationdeprecateddb','admin');
-        print_simple_box_end();
+        print_box(print_string('dbmigrationdeprecateddb', 'admin'), 'generalbox adminwarning');
     }
 
 /// Check for any special upgrades that might need to be run
     if (!empty($CFG->upgrade)) {
-        print_simple_box(get_string("upgrade$CFG->upgrade", "admin",
-                                    "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"), "center", '60%');
-        print_spacer(10,10);
+        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_simple_box(get_string('globalsquoteswarning', 'admin'), 'center', '60%');
+    if (ini_get_bool('register_globals')) {
+        print_box(get_string('globalswarning', 'admin'), 'generalbox adminwarning');
     }
 
     if (is_dataroot_insecure()) {
-        print_simple_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'center', '60%');
+        print_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'generalbox adminwarning');
     }
 
-/// If no recently cron run
+    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
     $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
     if (time() - $lastcron > 3600 * 24) {
         $strinstallation = get_string('installation', 'install');
         $helpbutton = helpbutton('install', $strinstallation, 'moodle', true, false, '', true);
-        print_simple_box(get_string('cronwarning', 'admin')."&nbsp;".$helpbutton, 'center', '60%');
+        print_box(get_string('cronwarning', 'admin')."&nbsp;".$helpbutton, 'generalbox adminwarning');
+    }
+
+/// Print multilang upgrade notice if needed
+    if (empty($CFG->filter_multilang_converted)) {
+        print_box(get_string('multilangupgradenotice', 'admin'), 'generalbox adminwarning');
     }
 
 /// Alert if we are currently in maintenance mode
     if (file_exists($CFG->dataroot.'/1/maintenance.html')) {
-        print_simple_box(get_string('sitemaintenancewarning', 'admin') , 'center', '60%');
+        print_box(get_string('sitemaintenancewarning', 'admin'), 'generalbox adminwarning');
     }
 
-/// Alert to display the utf-8 migration button (if !unicode yet and DB is MySQL or PG)
-    if (empty($CFG->unicodedb) && in_array($CFG->dbtype, array('mysql', 'postgres7'))) {
-        print_simple_box(get_string('unicodeupgradenotice', 'admin') , 'center', '60%');
-    }
 
 /// Print slightly annoying registration button every six months   ;-)
 /// You can set the "registered" variable to something far in the future
@@ -520,36 +591,40 @@
     if (!isset($CFG->registered) || $CFG->registered < (time() - 3600*24*30*6)) {
         $options = array();
         $options['sesskey'] = $USER->sesskey;
-        print_simple_box_start('center','60%');
-        echo '<div align="center">';
+        print_box_start('generalbox adminwarning');
         print_string('pleaseregister', 'admin');
         print_single_button('register.php', $options, get_string('registration'));
-        echo '</div>';
-        print_simple_box_end();
+        print_box_end();
         $registrationbuttonshown = true;
     }
 
     //////////////////////////////////////////////////////////////////////////////////////////////////
     ////  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>';
-    echo '<p class="copyright">'.$copyrighttext.'</p>';
+    print_box($copyrighttext, 'copyright');
     //////////////////////////////////////////////////////////////////////////////////////////////////
 
 
     if (empty($registrationbuttonshown)) {
-        echo '<div align="center">';
         $options = array();
         $options['sesskey'] = $USER->sesskey;
         print_single_button('register.php', $options, get_string('registration'));
-        echo '</div>';
     }
 
+
+    if (optional_param('dbmigrate')) {               // ??? Is this actually used?
+        print_box_start();
+        require_once($CFG->dirroot.'/'.$CFG->admin.'/utfdbmigrate.php');
+        db_migrate2utf8();
+        print_box_end();
+    }
+
+
     admin_externalpage_print_footer($adminroot);
 
 
-
 ?>

admin/innodb.php

@@ -14,7 +14,7 @@
    admin_externalpage_print_header($adminroot);
    print_heading('Convert all MySQL tables from MYISAM to InnoDB');
 
-   if ($CFG->dbtype != 'mysql') {
+   if ($CFG->dbfamily != 'mysql') {
         notice('This function is for MySQL databases only!', 'index.php');
    }
 

admin/lang.php

@@ -1,38 +1,6 @@
 <?PHP // $Id$
     /**
     * Display the admin/language menu and process strings translation.
-    *
-    * CHANGES
-    *
-    * 2006/11/07 mudrd8mz
-    * Fixed bug MDL-7361. Thanks to Dan Poltawski for the patch proposal.
-    *
-    * 2006/06/08 mudrd8mz
-    * 1) Fixed bug 5745 reported by Harry Smith so now can edit en_utf8_local pack
-    * 2) More notification messages included
-    *
-    * 2006/05/30 mudrd8mz
-    * Merged with version by Mitsuhiro Yoshida - display icon links instead of text links
-    * (I have changed the position of arrow icons to not to be so close each other)
-    *
-    * 2006/05/19 mudrd8mz
-    * A lot of changes to support translation of *_utf8_local langugage packs. Needs testing
-    *
-    * 2006/05/16 mudrd8mz
-    * 1) LANG_DEFAULT_FILE can be now set. moodle.php used to be opened automatically.
-    *    As it was (and still is) one of the biggest files it usually took a long time to load the page
-    *    even if you just want to choose the file to translate.
-    * 2) added links from "missing" to "compare" mode page
-    * 3) english strings are now key-sorted in "missing" mode
-    * 4) list of files with missing strings is now displayed at the top of "missing" page
-    *
-    * 2006/05/14 mudrd8mz Improvements of lang.php,v 1.65 2006/04/10 22:15:57 stronk7 Exp 
-    *  1) "go to first missing string" link can be displayed (see LANG_DISPLAY_MISSING_LINKS)
-    *  2) "go to next missing" link can be displayed (see LANG_DISPLAY_MISSING_LINKS)
-    *  3) submit button may be repeated (see LANG_SUBMIT_REPEAT*)
-    *  4) added (empty) "summary" attribute for the <table>'s
-    *  5) added error_reporting(E_ALL ^ E_NOTICE); in "compare" mode (even in debug environment
-    *     we know that missing keys are missing strings here, not bugs ;-)
     */
 
     require_once('../config.php');
@@ -46,6 +14,8 @@
     define('LANG_DEFAULT_FILE', '');            // default file 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)
 
     $mode        = optional_param('mode', '', PARAM_ALPHA);
     $currentfile = optional_param('currentfile', LANG_DEFAULT_FILE, PARAM_FILE);
@@ -67,42 +37,37 @@
     $streditstrings = get_string("editstrings", 'admin');
     $stredithelpdocs = get_string("edithelpdocs", 'admin');
     $strthislanguage = get_string("thislanguage");
-    $strgotofirst = get_string('gotofirstmissing','admin');
-    $strfilestoredin = get_string('langstorein', 'admin');
-    $strfilestoredinhelp = get_string('langstoreinhelp', 'admin');
-    $strswitchlangdirbtn = get_string('langstoreswitch', 'admin');
-    $strchoosefiletoedit = get_string('langchoosefile', 'admin');
+    $strgotofirst = get_string('gotofirst','admin');
+    $strfilestoredin = get_string('filestoredin', 'admin');
+    $strfilestoredinhelp = get_string('filestoredinhelp', 'admin');
+    $strswitchlang = get_string('switchlang', 'admin');
+    $strchoosefiletoedit = get_string('choosefiletoedit', 'admin');
     $streditennotallowed = get_string('langnoeditenglish', 'admin');
-    $strfilecreated = get_string('langfilecreated', 'admin');
+    $strfilecreated = get_string('filecreated', 'admin');
+    $strprev = get_string('previous');
+    $strnext = get_string('next');
 
-    // FIXME / TODO
-    // remove following lines after adding string into proper english lang pack
-    $strgotofirst = 'go to first missing string';
-    $strfilestoredin = 'Save file into folder :';
-    $strfilestoredinhelp = 'Where the file will be stored';
-    $strswitchlangdirbtn = 'switch';
-    $strchoosefiletoedit = 'Choose file to edit from the box above';
-    $streditennotallowed = 'Language en_utf8 cannot be edited with this page - switch to local';
-    $strfilecreated = 'New file created';
 
     $currentlang = current_language();
-    
+
     switch ($mode) {
         case "missing":
             // Missing array keys are not bugs here but missing strings
             error_reporting(E_ALL ^ E_NOTICE);
             $navigation = "<a href=\"lang.php\">$strlanguage</a> -> $strmissingstrings";
             $title = $strmissingstrings;
-            $button = '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
+            $button = '<form '.$CFG->frametarget.' method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
+                      '<div>'.
                       '<input type="hidden" name="mode" value="compare" />'.
-                      '<input type="submit" value="'.$streditstrings.'" /></form>';
+                      '<input type="submit" value="'.$streditstrings.'" /></div></form>';
             break;
         case "compare":
             $navigation = "<a href=\"lang.php\">$strlanguage</a> -> $streditstrings";
             $title = $streditstrings;
-            $button = '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
+            $button = '<form  '.$CFG->frametarget.' method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
+                      '<div>'.
                       '<input type="hidden" name="mode" value="missing" />'.
-                      '<input type="submit" value="'.$strmissingstrings.'" /></form>';
+                      '<input type="submit" value="'.$strmissingstrings.'" /></div></form>';
             break;
         default:
             $title = $strlanguage;
@@ -115,21 +80,14 @@
     admin_externalpage_print_header($adminroot);
 
     if (!$mode) {
-        print_simple_box_start('center','80%');
-        echo '<div align="center">';
-        print_string('editlang','admin');
-        echo '<br />';
+        print_box_start();
         $currlang = current_language();
-        $langs = get_list_of_languages();
-        echo "<b>$strcurrentlanguage:</b>";
-        echo '<br />';
-        echo popup_form ("$CFG->wwwroot/$CFG->admin/lang.php?lang=", $langs, "chooselang", $currlang, "", "", "", true);
-        $options["lang"] = $currentlang;
+        $langs = get_list_of_languages(false, true);
+        popup_form ("$CFG->wwwroot/$CFG->admin/lang.php?lang=", $langs, "chooselang", $currlang, "", "", "", false, 'self', $strcurrentlanguage.':');
         print_heading("<a href=\"lang.php?mode=missing\">$strmissingstrings</a>");
         print_heading("<a href=\"lang.php?mode=compare\">$streditstrings</a>");
         print_heading("<a href=\"langdoc.php\">$stredithelpdocs</a>");
-        echo '</div>';
-        print_simple_box_end();
+        print_box_end();
         admin_externalpage_print_footer($adminroot);
         exit;
     }
@@ -183,7 +141,7 @@
             } else {
                 $fileismissing = 1;
                 // notify(get_string("filemissing", "", "$langdir/$file"));
-                $o .= '<div class="notifyproblem" align="center">'.get_string("filemissing", "", "$langdir/$file").'</div><br />';
+                $o .= '<div class="notifyproblem">'.get_string("filemissing", "", "$langdir/$file").'</div><br />';
                 $string = array();
             }
 
@@ -211,6 +169,9 @@
                         $missinglinkstart = '';
                         $missinglinkend = '';
                     }
+                    if (strlen($value) > LANG_MISSING_TEXT_MAX_LEN) {
+                        $value = lang_xhtml_save_substr($value, 0, LANG_MISSING_TEXT_MAX_LEN) . ' ...'; // MDL-8852
+                    }
                     $o .= "$"."string['".$missinglinkstart.$key.$missinglinkend."'] = \"$value\";<br />";
                 }
             }
@@ -220,12 +181,7 @@
         }
   
         if ($m <> '') {
-            echo '<br />';
-            print_simple_box_start("center", "80%");
-            echo '<center><font size="2">';
-            echo $m;
-            echo '</font></center>';
-            print_simple_box_end();
+            print_box($m, 'filenames');
         }
         echo $o;
 
@@ -255,7 +211,7 @@
         if (!empty($somethingfound)) {
             print_continue("lang.php");
         } else {
-            notice(get_string("languagegood"), "lang.php");
+            notice(get_string("languagegood"), "lang.php", '', $adminroot);
         }
 
     } else if ($mode == "compare") {
@@ -264,7 +220,7 @@
             if (!lang_make_directory($langbase) ){
                 error('ERROR: Could not create base lang directory ' . $langbase);
             } else {
-                echo '<div class="notifysuccess" align="center">Created directory '.
+                echo '<div class="notifysuccess">Created directory '.
                                                      $langbase .'</div>'."<br />\n";
             }
         } 
@@ -272,17 +228,17 @@
             if (!lang_make_directory($langdir)) {
                 error('ERROR: Could not create directory '.$langdir);
             } else {
-                echo '<div class="notifysuccess" align="center">Created directory '.
+                echo '<div class="notifysuccess">Created directory '.
                                                      $langdir .'</div>'."<br />\n";
             }
         }
         if ($uselocal && !file_exists($locallangdir)) {
             if (!lang_make_directory($locallangdir)) {
-                echo '<div class="notifyproblem" align="center">ERROR: Could not create directory '.
+                echo '<div class="notifyproblem">ERROR: Could not create directory '.
                                      $locallangdir .'</div>'."<br />\n";
                 $uselocal = 0;
             } else {
-                echo '<div class="notifysuccess" align="center">Created directory '.
+                echo '<div class="notifysuccess">Created directory '.
                                                      $locallangdir .'</div>'."<br />\n";
             }
         }
@@ -325,8 +281,7 @@
 
         print_heading_with_help($streditstrings, "langedit");
 
-        print_simple_box_start("center", "80%");
-        echo '<center><font size="2">';
+        print_box_start('generalbox editstrings');
         foreach ($stringfiles as $file) {
             if ($file == $currentfile) {
                 echo "<b>$file</b> &nbsp; ";
@@ -334,37 +289,37 @@
                 echo "<a href=\"lang.php?mode=compare&amp;currentfile=$file\">$file</a> &nbsp; ";
             }
         }
-        echo '</font></center>';
-        print_simple_box_end();
+        print_box_end();
 
+        print_heading("<a href=\"lang.php?mode=missing\">$strmissingstrings</a>", "center", 4); // one-click way back
 
-        print_simple_box_start("center", "80%");
-        echo '<center>'.$strfilestoredin.' <strong>';
+        print_box_start();
+        echo $strfilestoredin;
         echo $uselocal ? "{$currentlang}_local" : $currentlang;
-        echo '</strong> ';
         helpbutton('langswitchstorage', $strfilestoredinhelp, 'moodle');
         
-        echo '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
+        echo '<form '.$CFG->frametarget.' method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
+             '<div>'.
              '<input type="hidden" name="mode" value="compare" />'.
              '<input type="hidden" name="currentfile" value="'.$currentfile.'" />'.
              '<input type="hidden" name="uselocal" value="'.(1 - $uselocal % 2).'" />'.
-             '<input type="submit" value="'.$strswitchlangdirbtn.'" />'.
-             '</form></center>';
-        print_simple_box_end();
+             '<input type="submit" value="'.$strswitchlang.'" />'.
+             '</div></form>';
+        print_box_end();
        
         if ($currentfile <> '') {
             $saveto = $uselocal ? $locallangdir : $langdir;
             error_reporting(0);
             if (!file_exists("$saveto/$currentfile")) {
                 if (!@touch("$saveto/$currentfile")) {
-                    print_heading(get_string("filemissing", "", "$saveto/$currentfile"), "center", 4, "error");
+                    print_heading(get_string("filemissing", "", "$saveto/$currentfile"), '', 4, 'error');
                 } else {
-                    print_heading($strfilecreated, "center", 4, "notifysuccess");
+                    print_heading($strfilecreated, '', 4, 'notifysuccess');
                 }
             }
             if ($currentlang == "en_utf8" && !$uselocal) {
                 $editable = false;
-                print_heading($streditennotallowed, 'center', 4);
+                print_heading($streditennotallowed, '', 4);
             } elseif ($f = fopen("$saveto/$currentfile","r+")) {
                 $editable = true;
                 fclose($f);
@@ -374,9 +329,9 @@
             }
             error_reporting($CFG->debug);
             
-            print_heading("$currentfile", "center", 4);
+            print_heading("$currentfile", "", 4);
             if (LANG_DISPLAY_MISSING_LINKS && $editable) {
-                print_heading('<a href="#missing1">'.$strgotofirst.'</a>', "center", 4);
+                print_heading('<a href="#missing1">'.$strgotofirst.'</a>', "", 4);
             }
 
             unset($string);
@@ -384,7 +339,7 @@
             $enstring = $string;  
             if ($currentlang != 'en' and $currentfile == 'moodle.php') {
                 $enstring['thislanguage'] = "<< TRANSLATORS: Specify the name of your language here.  If possible use Unicode Numeric Character References >>";
-                $enstring['thischarset'] = "<< TRANSLATORS: Specify the character set of your language here. Note that all text created while this language is active will be stored using this character set, so don't change it once you have set it. Example: iso-8859-1 >>";
+                $enstring['thischarset'] = "<< TRANSLATORS:  Charset encoding - always use utf-8 >>";
                 $enstring['thisdirection'] = "<< TRANSLATORS: This string specifies the direction of your text, either left-to-right or right-to-left.  Insert either 'ltr' or 'rtl' here. >>";
                 $enstring['parentlanguage'] = "<< TRANSLATORS: If your language has a Parent Language that Moodle should use when strings are missing from your language pack, then specify the code for it here.  If you leave this blank then English will be used.  Example: nl >>";
             }
@@ -399,15 +354,16 @@
             @include("$langdir/$currentfile");
 
             if ($editable) {
-                echo "<form name=\"$currentfile\" action=\"lang.php\" method=\"post\">";
+                echo "<form id=\"$currentfile\" action=\"lang.php\" method=\"post\">";
+                echo '<div>';
             }
-            echo "<table summary=\"\" width=\"100%\" cellpadding=\"2\" cellspacing=\"3\" border=\"0\" class=\"generalbox\">";
+            echo "<table summary=\"\" width=\"100%\" class=\"translator\">";
             $linescounter = 0;
             $missingcounter = 0;
             foreach ($enstring as $key => $envalue) {
                 $linescounter++ ;
                 if (LANG_SUBMIT_REPEAT &&  $editable && $linescounter % LANG_SUBMIT_REPEAT_EVERY == 0) {
-                    echo '<tr><td colspan="2">&nbsp;<td><br />';
+                    echo '<tr><td>&nbsp;</td><td><br />';
                     echo '    <input type="submit" name="update" value="'.get_string('savechanges').': '.$currentfile.'" />';
                     echo '<br />&nbsp;</td></tr>';
                 }
@@ -416,9 +372,18 @@
                 $envalue = str_replace("%%","%",$envalue);
                 $envalue = str_replace("\\","",$envalue);              // Delete all slashes
 
-                echo "\n\n".'<tr>';
-                echo '<td dir="ltr" lang="en" width="20%" nowrap="nowrap" valign="top">'.$key.'</td>'."\n";
-                echo '<td dir="ltr" lang="en" width="40%" valign="top">'.$envalue.'</td>'."\n";
+                echo "\n\n".'<tr class="';
+                if ($linescounter % 2 == 0) {
+                    echo 'r0';
+                } else {
+                    echo 'r1';
+                }
+                echo '">';
+                echo '<td dir="ltr" lang="en">';
+                echo '<span class="stren">'.$envalue.'</span>';
+                echo '<br />'."\n";
+                echo '<span class="strkey">'.$key.'</span>';
+                echo '</td>'."\n";
 
                 // Missing array keys are not bugs here but missing strings
                 error_reporting(E_ALL ^ E_NOTICE);
@@ -440,17 +405,17 @@
                 // green #AAFFAA - translation present in both system and local but is different
                 if (!$value) {
                     if (!$value2) {
-                        $cellcolour = 'style="background-color: #ef6868"'; // TODO: replace by CSS class
+                        $cellcolour = 'class="bothmissing"';
                     } else {
-                        $cellcolour = 'style="background-color: #feff7f"'; // TODO: replace by CSS class
+                        $cellcolour = 'class="mastermissing"';
                     }
                     $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" height="11" width="11" border="0" alt="" /></a>';
+                        '<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" height="11" width="11" border="0" alt="" /></a>';
+                        '<img src="' . $CFG->pixpath . '/t/up.gif" class="iconsmall" alt="'.$strprev.'" /></a>';
                     } else {
                         $missingtarget = '';
                         $missingnext = '';
@@ -458,7 +423,7 @@
                     }
                 } else {
                     if ($value <> $value2 && $value2 <> '') {
-                        $cellcolour = 'style="background-color: #AAFFAA"'; // TODO: replace by CSS class
+                        $cellcolour = 'class="localdifferent"';
                     } else {
                         $cellcolour = '';
                     }
@@ -468,13 +433,13 @@
                 }
 
                 if ($editable) {
-                    echo '<td width="40%" '.$cellcolour.' valign="top">'. $missingprev . $missingtarget."\n";
+                    echo '<td '.$cellcolour.' valign="top">'. $missingprev . $missingtarget."\n";
                     if (isset($string[$key])) {
                         $valuelen = strlen($value);
                     } else {
                         $valuelen = strlen($envalue);
                     }
-                    $cols=50;
+                    $cols=40;
                     if (strstr($value, "\r") or strstr($value, "\n") or $valuelen > $cols) {
                         $rows = ceil($valuelen / $cols);
                         echo '<textarea name="stringXXX'.lang_form_string_key($key).'" cols="'.$cols.'" rows="'.$rows.'">'.$value.'</textarea>'."\n";
@@ -490,11 +455,12 @@
                     echo $missingnext . '</td>';
 
                 } else {
-                    echo '<td width="40%" bgcolor="'.$cellcolour.'" valign="top">'.$value.'</td>';
+                    echo '<td '.$cellcolour.' valign="top">'.$value.'</td>';
                 }
+                echo '</tr>'."\n";
             }
             if ($editable) {
-                echo '<tr><td colspan="2">&nbsp;<td><br />';
+                echo '<tr><td>&nbsp;</td><td><br />';
                 echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
                 echo '    <input type="hidden" name="currentfile" value="'.$currentfile.'" />';
                 echo '    <input type="hidden" name="mode" value="compare" />';
@@ -502,11 +468,14 @@
                 echo '</td></tr>';
             }
             echo '</table>';
-            echo '</form>'; 
+            if ($editable) {
+                echo '</div>'; 
+                echo '</form>'; 
+            }
 
         } else {
             // no $currentfile specified
-            print_heading($strchoosefiletoedit, "center", 4);
+            print_heading($strchoosefiletoedit, "", 4);
         }
     }
 
@@ -531,6 +500,18 @@
  */ 
 function lang_save_file($path, $file, $strings, $local, $packstrings) {
     global $CFG, $USER;
+    if (LANG_KEEP_ORPHANS) {
+        // let us load the current content of the file
+        unset($string);
+        @include("$path/$file");
+        if (isset($string)) {
+            $orphans = $string;
+            unset($string);
+        } else {
+            $orphans = array();
+        }
+    }
+    // let us rewrite the file
     if (!$f = @fopen("$path/$file","w")) {
         return false;
     }
@@ -544,18 +525,22 @@ function lang_save_file($path, $file, $strings, $local, $packstrings) {
     ksort($strings);
     foreach ($strings as $key => $value) {
         @list($id, $stringname) = explode('XXX',$key);
-        if ($CFG->lang != "zh_hk" and $CFG->lang != "zh_tw") {  // Some MB languages include backslash bytes
-            $value = str_replace("\\","",$value);           // Delete all slashes
-        }
-        $value = str_replace("'", "\\'", $value);           // Add slashes for '
-        $value = str_replace('"', "\\\"", $value);          // Add slashes for "
-        $value = str_replace("%","%%",$value);              // Escape % characters
-        $value = str_replace("\r", "",$value);              // Remove linefeed characters
-        $value = trim($value);                              // Delete leading/trailing white space
+        $value = lang_fix_value_before_save($value);
         if ($id == "string" and $value != ""){
             if ((!$local) || (lang_fix_value_from_file($packstrings[$stringname]) <> lang_fix_value_from_file($value))) {
+                // Either we are saving the master language pack
+                // or we are saving local language pack and the strings differ.
                 fwrite($f,"\$string['$stringname'] = '$value';\n");
             }
+            if (LANG_KEEP_ORPHANS && isset($orphans[$stringname])) {
+                unset($orphans[$stringname]);
+            }
+        }
+    }
+    if (LANG_KEEP_ORPHANS) {
+        // let us add orphaned strings, i.e. already translated strings without the English referential source
+        foreach ($orphans as $key => $value) {
+            fwrite($f,"\$string['$key'] = '".lang_fix_value_before_save($value)."'; // ORPHANED\n");
         }
     }
     fwrite($f,"\n?>\n");
@@ -564,7 +549,11 @@ function lang_save_file($path, $file, $strings, $local, $packstrings) {
 }
 
 /**
- * Fix value of string to translate.
+ * Fix value of the translated string after it is load from the file.
+ *
+ * These modifications are typically necessary to work with the same string coming from two sources.
+ * We need to compare the content of these sources and we want to have e.g. "This string\r\n"
+ * to be the same as " This string\n". 
  *
  * @param string $value Original string from the file
  * @return string Fixed value
@@ -575,12 +564,36 @@ function lang_fix_value_from_file($value='') {
     $value = trim($value);                             // Delete leading/trailing white space
     $value = str_replace("\\","",$value);              // Delete all slashes
     $value = str_replace("%%","%",$value);
+    $value = str_replace("&","&amp;",$value);          // Fixes MDL-9248
     $value = str_replace("<","&lt;",$value);
     $value = str_replace(">","&gt;",$value);
     $value = str_replace('"',"&quot;",$value);
     return $value;
 }
 
+/**
+ * Fix value of the translated string before it is saved into the file
+ *
+ * @uses $CFG
+ * @param string $value Raw string to be saved into the lang pack
+ * @return string Fixed value
+ */
+function lang_fix_value_before_save($value='') {
+    global $CFG;
+    if ($CFG->lang != "zh_hk" and $CFG->lang != "zh_tw") {  // Some MB languages include backslash bytes
+        $value = str_replace("\\","",$value);           // Delete all slashes
+    }
+    if (ini_get_bool('magic_quotes_sybase')) {          // Unescape escaped sybase quotes
+        $value = str_replace("''", "'", $value);
+    }
+    $value = str_replace("'", "\\'", $value);           // Add slashes for '
+    $value = str_replace('"', "\\\"", $value);          // Add slashes for "
+    $value = str_replace("%","%%",$value);              // Escape % characters
+    $value = str_replace("\r", "",$value);              // Remove linefeed characters
+    $value = trim($value);                              // Delete leading/trailing white space
+    return $value;
+}
+
 /**
  * Try and create a new language directory.
  *
@@ -600,18 +613,99 @@ function lang_make_directory($dir, $shownotices=true) {
     return $dir;
 }
 
-
-
-/// Following functions are required because '.' in form input names
-/// get replaced by '_' by PHP.
-
+/**
+ * Return the string key name for use in HTML form.
+ *
+ * Required because '.' in form input names get replaced by '_' by PHP.
+ *
+ * @param string $keyfromfile The key name containing '.'
+ * @return string The key name without '.'
+ */
 function lang_form_string_key($keyfromfile) {
     return str_replace('.', '##46#', $keyfromfile);  /// Derived from &#46, the ascii value for a period.
 }
 
+/**
+ * Return the string key name for use in file.
+ *
+ * Required because '.' in form input names get replaced by '_' by PHP.
+ *
+ * @param string $keyfromfile The key name without '.'
+ * @return string The key name containing '.'
+ */
 function lang_file_string_key($keyfromform) {
     return str_replace('##46#', '.', $keyfromform);
 }
 
+/**
+ * Return the substring of the string and take care of XHTML compliance.
+ *
+ * There was a problem with pure substr() which could possibly produce XHTML parsing error:
+ *  substr('Marks &amp; Spencer', 0, 9) -> 'Marks &am' ... is not XHTML compliance
+ * This function takes care of these cases. Fixes MDL-8852.
+ *
+ * Thanks to kovacsendre, the author of the function at http://php.net/substr
+ *
+ * @param string $str The original string
+ * @param int $start Start position in the $value string
+ * @param int $length Optional length of the returned substring
+ * @return string The substring as returned by substr() with XHTML compliance
+ * @todo Seems the function does not work with negative $start together with $length being set
+ */
+function lang_xhtml_save_substr($str, $start, $length = NULL) {
+    if ($length === 0) { 
+        //stop wasting our time ;)
+        return "";
+    }
+
+    //check if we can simply use the built-in functions
+    if (strpos($str, '&') === false) {
+        // No entities. Use built-in functions
+        if ($length === NULL) {
+            return substr($str, $start);
+        } else {
+            return substr($str, $start, $length);
+        }
+    }
+
+    // create our array of characters and html entities
+    $chars = preg_split('/(&[^;\s]+;)|/', $str, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE);
+    $html_length = count($chars);
+
+    // check if we can predict the return value and save some processing time, i.e.:
+    // input string was empty OR
+    // $start is longer than the input string OR
+    // all characters would be omitted
+    if (($html_length === 0) or ($start >= $html_length) or (isset($length) and ($length <= -$html_length))) {
+        return '';
+    }
+
+    //calculate start position
+    if ($start >= 0) {
+        $real_start = $chars[$start][1];
+    } else { 
+        //start'th character from the end of string
+        $start = max($start,-$html_length);
+        $real_start = $chars[$html_length+$start][1];
+    }
+
+    if (!isset($length)) {
+        // no $length argument passed, return all remaining characters
+        return substr($str, $real_start);
+    } elseif ($length > 0) { 
+        // copy $length chars
+        if ($start+$length >= $html_length) { 
+            // return all remaining characters
+            return substr($str, $real_start);
+        } else { 
+            //return $length characters
+            return substr($str, $real_start, $chars[max($start,0)+$length][1] - $real_start);
+        }
+    } else { 
+        //negative $length. Omit $length characters from end
+        return substr($str, $real_start, $chars[$html_length+$length][1] - $real_start);
+    }
+}
+
 
 ?>

admin/langdoc.php

@@ -40,7 +40,7 @@
 
 
     if (!file_exists($langdir)) {
-        error ('to edit this language pack, you need to put it in '.$CFG->dataroot.'/lang');
+        error ('to edit this language pack, you need to put it in '.$CFG->dataroot.'/lang','',$adminroot);
     }
     // Shall I save POSTed data?
 
@@ -49,7 +49,7 @@
             if (langdoc_save_file($langdir, $currentfile, $_POST['filedata'])) {
                 notify(get_string("changessaved")." ($langdir/$currentfile)", "green");
             } else {
-                error("Could not save the file '$currentfile'!", "langdoc.php?currentfile=$currentfile&sesskey=$USER->sesskey");
+                error("Could not save the file '$currentfile'!", "langdoc.php?currentfile=$currentfile&sesskey=$USER->sesskey", $adminroot);
             }
         }
     }
@@ -61,7 +61,7 @@
     // Get all files from /docs directory
 
     if (! $files = get_directory_list("$CFG->dirroot/lang/en_utf8/docs", "CVS")) {
-        error("Could not find English language docs files!");
+        error("Could not find English language docs files!",'',$adminroot);
     }
 
     $options = array();
@@ -81,7 +81,7 @@
     // Get all files from /help directory
 
     if (! $files = get_directory_list("$CFG->dirroot/lang/en_utf8/help", "CVS")) {
-        error("Could not find English language help files!");
+        error("Could not find English language help files!",'',$adminroot);
     }
 
     foreach ($files as $filekey => $file) {    // check all the help files.
@@ -169,7 +169,7 @@ $langdir/$currentfile")."</font></p>";
         echo "<td align=\"center\">\n";
 
         if ($editable) {
-            echo "<form name=\"$currentfile\" action=\"langdoc.php\" method=\"post\">";
+            echo "<form id=\"$currentfile\" action=\"langdoc.php\" method=\"post\">";
             echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
             echo '<input type="hidden" name="currentfile" value="'.$currentfile.'" />';
 

admin/langimport.php

@@ -20,34 +20,40 @@
     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($adminroot);
-    
+
+    //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.');
+    }
+    get_list_of_languages(true); //refresh lang cache
 
     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/');
-                
+
                 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) {
 
-                        case ERROR:
+                        case ERROR: 
                             if ($cd->get_error() == 'remotedownloadnotallowed') {
                                 $a = new stdClass();
-                                $a->url = 'http://download.moodle.org/lang16/'.$pack.'zip';
+                                $a->url = 'http://download.moodle.org/lang16/'.$pack.'.zip';
                                 $a->dest= $CFG->dataroot.'/lang';
                                 error(get_string($cd->get_error(), 'error', $a));
                             } else {
@@ -56,8 +62,8 @@
                         break;
 
                         case INSTALLED:
-                            @unlink($CFG->dataroot.'/cache/languages');
-                            redirect('langimport.php', get_string('langpackupdated','admin',$pack));
+                            get_list_of_languages(true); //refresh lang cache
+                            redirect('langimport.php', get_string('langpackupdated','admin',$pack), -1, $adminroot);
                         break;
 
                         case UPTODATE:
@@ -86,7 +92,7 @@
         case DELETION_OF_SELECTED_LANG:    //delete a directory(ies) containing a lang pack completely
 
             if (!$confirm && confirm_sesskey()) {
-                notice_yesno(get_string('uninstallconfirm', 'admin', $uninstalllang), 
+                notice_yesno(get_string('uninstallconfirm', 'admin', $uninstalllang),
                              'langimport.php?mode=4&uninstalllang='.$uninstalllang.'&confirm=1&sesskey='.sesskey(),
                              'langimport.php');
             } else if (confirm_sesskey()) {
@@ -103,16 +109,16 @@
                 if (file_exists($dest2)){
                     $rm2 = remove_dir($dest2);
                 }
+                get_list_of_languages(true); //refresh lang cache
                 //delete the direcotries
                 if ($rm1 or $rm2) {
-                    redirect('langimport.php', get_string('langpackremoved','admin'));
+                    redirect('langimport.php', get_string('langpackremoved','admin'), 3, $adminroot);
                 } else {    //nothing deleted, possibly due to permission error
                     error('An error has occurred, language pack is not completely uninstalled, please check file permissions');
                 }
             }
-            @unlink($CFG->dataroot.'/cache/languages');
         break;
-        
+
         case UPDATE_ALL_LANG:    //1 click update for all updatable language packs
 
             //0th pull a list from download.moodle.org,
@@ -120,8 +126,7 @@
             $source = 'http://download.moodle.org/lang16/languages.md5';
             $md5array = array();
             $updated = 0;    //any packs updated?
-            unset($CFG->langlist);   // ignore admin's langlist
-            $alllangs = array_keys(get_list_of_languages());
+            $alllangs = array_keys(get_list_of_languages(false, true)); //get all available langs
             $lang16 = array();   //all the Moodle 1.6 unicode lang packs (updated and not updated)
             $packs = array();    //all the packs that needs updating
 
@@ -185,7 +190,7 @@
                     case ERROR:
                         if ($cd->get_error() == 'remotedownloadnotallowed') {
                             $a = new stdClass();
-                            $a->url = 'http://download.moodle.org/lang16/'.$pack.'zip';
+                            $a->url = 'http://download.moodle.org/lang16/'.$pack.'.zip';
                             $a->dest= $CFG->dataroot.'/lang';
                             error(get_string($cd->get_error(), 'error', $a));
                         } else {
@@ -208,13 +213,13 @@
             }
 
             if ($updated) {
-                notice(get_string('langupdatecomplete','admin'), 'langimport.php');
+                notice(get_string('langupdatecomplete','admin'), 'langimport.php', NULL, $adminroot);
             } else {
-                notice(get_string('nolangupdateneeded','admin'), 'langimport.php');
+                notice(get_string('nolangupdateneeded','admin'), 'langimport.php', NULL, $adminroot);
             }
 
         break;
-        
+
         default:    //display choice mode
 
             $source = 'http://download.moodle.org/lang16/languages.md5';
@@ -236,72 +241,52 @@
             }
 */
             if (!$remote) {
-                print_simple_box_start('center','60%');
-                echo '<div align="center">';
+                print_box_start();
                 print_string('remotelangnotavailable','admin',$CFG->dataroot.'/lang/');
-                echo '</div>';
-                print_simple_box_end();
+                print_box_end();
             }
-            
-            print_simple_box_start('center','60%');
-            echo '<table width="100%"><tr><td align="center">';
-            echo get_string('installedlangs','admin');
-            echo '</td><td align="center">';
-            echo get_string('availablelangs','admin');
-            echo '</td></tr>';
+
+            print_box_start();
+            echo '<table summary="">';
             echo '<tr><td align="center" valign="top">';
-            echo '<form name="uninstallform" action="langimport.php?mode=4" method="POST">';
+            echo '<form id="uninstallform" action="langimport.php?mode=4" method="post">';
+            echo '<fieldset class="invisiblefieldset">';
             echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
-            unset($CFG->langlist);   // ignore admin's langlist
-            $installedlangs = get_list_of_languages();
+            $installedlangs = get_list_of_languages(false, true);
 
             /// display installed langs here
 
-            echo '<select name="uninstalllang" size="15">';
+            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 name="updateform" action="langimport.php?mode=5" method="POST">';
+            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>';
-            echo '<p />';
-            
+
             /// Display option to change site language
- 
- /// Erm... this doesn't seem to work. Plus it's redundant. -vinkmar
-            
-//            print_string('changesitelang','admin');
-//            $sitelanguage = get_record('config','name','lang');
-//            echo '<form name="changelangform" action="langimport.php?mode=3" method="POST">';
-//            echo '<select name="sitelangconfig">';
-//            
-//            foreach ($installedlangs as $clang =>$ilang) {
-//                if ($clang == $sitelanguage->value){
-//                    echo '<option value="'.$clang.'" selected="selected">'.$ilang.'</option>';
-//                } else {
-//                    echo '<option value="'.$clang.'">'.$ilang.'</option>';
-//                }
-//            }
-//            echo '</select>';
-//            echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
-//            echo '<input type="submit" value="'.get_string('change','admin').'" />';
-//            echo '</form>';
 
             /// display to be installed langs here
 
             echo '</td><td align="center" valign="top">';
-            echo '<table><tr><td valign="top" align="center">';    //availabe langs table
+            //availabe langs table
             $empty = 1;    //something to pring
 
             /// if this language pack is not already installed, then we allow installation
 
-            echo '<form name="installform" method="POST" action="langimport.php?mode=2">';
+            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" size="15">';
+                echo '<select name="pack" id="pack" size="15">';
             }
 
             foreach ($availablelangs as $alang) {
@@ -316,25 +301,24 @@
                             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>';
+                        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="<-- '.get_string('install','admin').'">';
+                echo '<br /><input type="submit" value="'.$THEME->larrow.' '.get_string('install','admin').'" />';
             }
+            echo '</fieldset>';
             echo '</form>';
 
             if ($empty) {
-                echo '<tr><td align="center">';
+                echo '<br />';
                 print_string('nolanguagetodownload','admin');
-                echo '</td></tr>';
             }
 
-            echo '</td><tr></table>';    //close available langs table
-            echo '<form>';
+            //close available langs table
             echo '</td></tr></table>';
             print_simple_box_end();
 
@@ -343,7 +327,7 @@
     }    //close of main switch
 
     admin_externalpage_print_footer($adminroot);
-    
+
     /* 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
@@ -360,8 +344,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
@@ -375,7 +359,7 @@
         }
         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) {
@@ -388,13 +372,16 @@
                 return false;    //failed
             }
             fputs($proxy_fp, "GET $url HTTP/1.0\r\nHost: $CFG->proxyhost\r\n\r\n");
-            $i = 0;
-                while(!feof($proxy_fp)) {
+
+            $headers_done = false;
+            while(!feof($proxy_fp)) {
                 $string = fgets($proxy_fp, 1024);
-                if ($i > 11) {    //12 lines of info skipped
+                if(!$headers_done){
+                    // A new line indicates end of HTTP headers
+                    $headers_done = ("\r\n" == $string);
+                } else {
                     $availablelangs[] = split(',', $string);
                 }
-                $i++;
             }
             fclose($proxy_fp);
 

admin/maintenance.php

@@ -37,27 +37,29 @@
 /// Print the appropriate form
 
     if (file_exists($filename)) {   // We are in maintenance mode
-        echo '<center>';
+        echo '<div style="margin-left:auto;margin-right:auto">';
         echo '<form action="maintenance.php" method="post">';
-        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 '<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 '</form>';
-        echo '</center>';
+        echo '</div>';
     } else {                        // We are not in maintenance mode
         $usehtmleditor = can_use_html_editor();
 
-        echo '<center>';
+        echo '<div style="text-align:center;margin-left:auto;margin-right:auto">';
         echo '<form action="maintenance.php" method="post">';
-        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 '<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>';
         print_textarea($usehtmleditor, 20, 50, 600, 400, "text");
         echo '</td></tr></table>';
+        echo '</div>';
         echo '</form>';
-        echo '</center>';
+        echo '</div>';
 
         if ($usehtmleditor) { 
             use_html_editor();

admin/mnet/MethodTable.php

@@ -0,0 +1,583 @@
+<?php
+/**
+ * Adapted for Moodle from the AMFPHP Project at http://www.amfphp.org/
+ * Creates the methodTable for a service class.
+ *
+ * @usage $this->methodTable = MethodTable::create($this);
+ * @author Christophe Herreman
+ * @since 05/01/2005
+ * @version $id$
+ * 
+ * Special contributions by Allessandro Crugnola and Ted Milker
+ */
+
+if (!defined('T_ML_COMMENT')) {
+   define('T_ML_COMMENT', T_COMMENT);
+} else {
+   define('T_DOC_COMMENT', T_ML_COMMENT);
+}
+
+/**
+ * Return string from start of haystack to first occurance of needle, or whole 
+ * haystack, if needle does not occur
+ *
+ * @access public
+ * @param $haystack(String) Haystack to search in
+ * @param $needle(String) Needle to look for
+ */
+function strrstr($haystack, $needle)
+{
+    return substr($haystack, 0, strpos($haystack.$needle,$needle));
+}
+
+/**
+ * Return substring of haystack from end of needle onwards, or FALSE
+ *
+ * @access public
+ * @param $haystack(String) Haystack to search in
+ * @param $needle(String) Needle to look for
+ */
+function strstrafter($haystack, $needle)
+{
+    return substr(strstr($haystack, $needle), strlen($needle));
+}
+
+class MethodTable
+{
+    /**
+     * Constructor.
+     *
+     * Since this class should only be accessed through the static create() method
+     * this constructor should be made private. Unfortunately, this is not possible
+     * in PHP4.
+     *
+     * @access private
+     */
+    function MethodTable(){
+    }
+
+
+    /**
+     * Creates the methodTable for a passed class.
+     *
+     * @static
+     * @access public
+     * @param $sourcePath(String) The path to the file you want to parse
+     * @param $containsClass(Bool) True if the file is a class definition (optional)
+     */
+    function create($sourcePath, $containsClass = false){
+
+        $methodTable = array();
+        if(!file_exists($sourcePath))
+        {
+            return false;
+        }
+        
+        $source = file_get_contents($sourcePath);
+        $tokens = (array)token_get_all($source);
+        
+        $waitingForOpenParenthesis = false;
+        $waitingForFunction = false;
+        $waitingForClassName = false;
+        $bufferingArgs = false;
+        $argBuffer = "";
+        $lastFunction = "";
+        $lastFunctionComment = "";
+        $lastComment = "";
+        $classMethods = array();
+        $realClassName = "";
+
+        if($containsClass) {
+            $openBraces = -10000;
+        }
+        else
+        {
+            $openBraces = 1;
+        }
+
+        $waitingForEndEncapsedString = false;
+        foreach($tokens as $token)
+        {
+           if (is_string($token)) {
+                if($token == '{')
+                {
+                    $openBraces++;
+                }
+                if($token == '}')
+                {
+                    if($waitingForEndEncapsedString)
+                    {
+                        $waitingForEndEncapsedString = false;
+                    }
+                    else
+                    {
+                        $lastComment = '';
+                        $openBraces--;
+                        
+                        if($openBraces == 0)
+                        {
+                            break;
+                        }
+                    }
+                }
+                elseif($waitingForOpenParenthesis && $token == '(')
+                {
+                    $bufferingArgs = true;
+                    $argBuffer = "";
+                    $waitingForOpenParenthesis = false;
+                }
+                elseif($bufferingArgs)
+                {
+                    if($token != ')')
+                    {
+                        $argBuffer .= $token;
+                    }
+                    else
+                    {
+                        if($lastFunction != $realClassName)
+                        {
+                            $classMethods[] = array("name" => $lastFunction,
+                                               "comment" => $lastFunctionComment,
+                                               "args" => $argBuffer);
+                            
+                            $bufferingArgs = false;
+                            $argBuffer = "";
+                            $lastFunction = "";
+                            $lastFunctionComment = "";
+                        }
+                    }
+                    
+                }
+           } else {
+               // token array
+               list($id, $text) = $token;
+                
+                if($bufferingArgs)
+                {
+                    $argBuffer .= $text;                    
+                }
+               switch ($id) 
+               {
+                    
+                   case T_COMMENT:
+                   case T_ML_COMMENT: // we've defined this
+                   case T_DOC_COMMENT: // and this
+                   // no action on comments
+                        $lastComment = $text;
+                        break;
+                   case T_FUNCTION:
+                        if($openBraces >= 1)
+                        {
+                            $waitingForFunction = true;
+                        }
+                        break;
+                    case T_STRING:
+                        if($waitingForFunction)
+                        {
+                            $waitingForFunction = false;
+                            $waitingForOpenParenthesis = true;
+                            $lastFunction = $text;
+                            $lastFunctionComment = $lastComment;
+                            $lastComment = "";              
+                        }
+                        if($waitingForClassName)
+                        {
+                            $waitingForClassName = false;
+                            $realClassName = $text;
+                        }
+                        break;
+                    case T_CLASS:
+                        $openBraces = 0;
+                        $waitingForClassName = true;
+                        break;
+                    case T_CURLY_OPEN:
+                    case T_DOLLAR_OPEN_CURLY_BRACES:
+                        $waitingForEndEncapsedString = true;
+                        break;
+                }
+            }
+        }
+        
+        foreach ($classMethods as $key => $value) {
+            $methodSignature = $value['args'];
+            $methodName = $value['name'];
+            $methodComment = $value['comment'];
+            
+            $description = MethodTable::getMethodDescription($methodComment) . " " . MethodTable::getMethodCommentAttribute($methodComment, "desc");
+            $description = trim($description);
+            $access = MethodTable::getMethodCommentAttributeFirstWord($methodComment, "access");
+            $roles = MethodTable::getMethodCommentAttributeFirstWord($methodComment, "roles");
+            $instance = MethodTable::getMethodCommentAttributeFirstWord($methodComment, "instance");
+            $returns = MethodTable::getMethodReturnValue($methodComment);
+            $pagesize = MethodTable::getMethodCommentAttributeFirstWord($methodComment, "pagesize");
+            $params = MethodTable::getMethodCommentArguments($methodComment);
+
+                        
+            //description, arguments, access, [roles, [instance, [returns, [pagesize]]]]
+            $methodTable[$methodName] = array();
+            //$methodTable[$methodName]["signature"] = $methodSignature; //debug purposes
+            $methodTable[$methodName]["description"] = ($description == "") ? "No description given." : $description;
+            $methodTable[$methodName]["arguments"] = MethodTable::getMethodArguments($methodSignature, $params);
+            $methodTable[$methodName]["access"] = ($access == "") ? "private" : $access;
+
+            if($roles != "") $methodTable[$methodName]["roles"] = $roles;
+            if($instance != "") $methodTable[$methodName]["instance"] = $instance;
+            if($returns != "") $methodTable[$methodName]["returns"] = $returns;
+            if($pagesize != "") $methodTable[$methodName]["pagesize"] = $pagesize;
+        }
+        
+        return $methodTable;
+        
+    }
+    
+    /**
+     * 
+     */   
+    function getMethodCommentServices($comment)
+    {
+        $pieces = explode('@service', $comment);
+        $args = array();
+        if(is_array($pieces) && count($pieces) > 1)
+        {
+            for($i = 0; $i < count($pieces) - 1; $i++)
+            {
+                $ps = strrstr($pieces[$i + 1], '@');
+                $ps = strrstr($ps, '*/');
+                $args[] = MethodTable::cleanComment($ps);
+            }
+        }
+        return $args;
+    }
+    
+    
+    /**
+     * 
+     */
+    function getMethodCommentArguments($comment)
+    {
+        $pieces = explode('@param', $comment);
+        $args = array();
+        if(is_array($pieces) && count($pieces) > 1)
+        {
+            for($i = 0; $i < count($pieces) - 1; $i++)
+            {
+                $ps = strrstr($pieces[$i + 1], '@');
+                $ps = strrstr($ps, '*/');
+                $args[] = MethodTable::cleanComment($ps);
+            }
+        }
+        return $args;
+    }
+
+    
+    /**
+     * Returns the description from the comment.
+     * The description is(are) the first line(s) in the comment.
+     *
+     * @static
+     * @private
+     * @param $comment(String) The method's comment.
+     */
+    function getMethodDescription($comment){
+        $comment = MethodTable::cleanComment(strrstr($comment, "@"));
+        return trim($comment);
+    }
+    
+    
+    /**
+     * Returns the value of a comment attribute.
+     *
+     * @static
+     * @private
+     * @param $comment(String) The method's comment.
+     * @param $attribute(String) The name of the attribute to get its value from.
+     */
+    function getMethodCommentAttribute($comment, $attribute){
+        $pieces = strstrafter($comment, '@' . $attribute);
+        if($pieces !== FALSE)
+        {
+            $pieces = strrstr($pieces, '@');
+            $pieces = strrstr($pieces, '*/');
+            return MethodTable::cleanComment($pieces);
+        }
+        return "";
+    }
+    
+    /**
+     * Returns the value of a comment attribute.
+     *
+     * @static
+     * @private
+     * @param $comment(String) The method's comment.
+     * @param $attribute(String) The name of the attribute to get its value from.
+     */
+    function getMethodCommentAttributeFirstLine($comment, $attribute){
+        $pieces = strstrafter($comment, '@' . $attribute);
+        if($pieces !== FALSE)
+        {
+            $pieces = strrstr($pieces, '@');
+            $pieces = strrstr($pieces, "*");
+            $pieces = strrstr($pieces, "/");
+            $pieces = strrstr($pieces, "-");
+            $pieces = strrstr($pieces, "\n");
+            $pieces = strrstr($pieces, "\r");
+            $pieces = strrstr($pieces, '*/');
+            return MethodTable::cleanComment($pieces);
+        }
+        return "";
+    }
+    
+    /**
+     * Returns the value of a comment attribute.
+     *
+     * @static
+     * @private
+     * @param $comment(String) The method's comment.
+     * @param $attribute(String) The name of the attribute to get its value from.
+     */
+    function getMethodReturnValue($comment){
+        $result = array('type' => 'void', 'description' => '');
+        $pieces = strstrafter($comment, '@returns');
+        if(FALSE == $pieces) $pieces = strstrafter($comment, '@return');
+        if($pieces !== FALSE)
+        {
+            $pieces = strrstr($pieces, '@');
+            $pieces = strrstr($pieces, "*");
+            $pieces = strrstr($pieces, "/");
+            $pieces = strrstr($pieces, "-");
+            $pieces = strrstr($pieces, "\n");
+            $pieces = strrstr($pieces, "\r");
+            $pieces = strrstr($pieces, '*/');
+            $pieces = trim(MethodTable::cleanComment($pieces));
+            @list($result['type'], $result['description']) = explode(' ', $pieces, 2);
+            $result['type'] = MethodTable::standardizeType($result['type']);
+        }
+        return $result;
+    }
+    
+    function getMethodCommentAttributeFirstWord($comment, $attribute){
+        $pieces = strstrafter($comment, '@' . $attribute);
+        if($pieces !== FALSE)
+        {
+            $val = MethodTable::cleanComment($pieces);
+            return trim(strrstr($val, ' '));
+        }
+        return "";
+    }
+    
+    /**
+     * Returns an array with the arguments of a method.
+     *
+     * @static
+     * @access private
+     * @param $methodSignature(String) The method's signature;
+     */
+    function getMethodArguments($methodSignature, $commentParams){
+        if(strlen($methodSignature) == 0){
+            //no arguments, return an empty array
+            $result = array();
+        }else{
+            //clean the arguments before returning them
+            $result = MethodTable::cleanArguments(explode(",", $methodSignature), $commentParams);
+        }
+        
+        return $result;
+    }
+    
+    /**
+     * Cleans the function or method's return value.
+     *
+     * @static
+     * @access private
+     * @param $value(String) The "dirty" value.
+     */
+    function cleanReturnValue($value){
+        $result = array();
+        $value  = trim($value);
+        
+        list($result['type'], $result['description']) = explode(' ', $value, 2);
+
+        $result['type'] = MethodTable::standardizeType($result['type']);
+
+        return $result;
+    }
+
+
+    /**
+     * Takes a string and returns the XMLRPC type that most closely matches it.
+     *
+     * @static
+     * @access private
+     * @param $type(String) The given type string.
+     */
+    function standardizeType($type) {
+        $type = strtolower($type);
+        if('str'  == $type || 'string'  == $type) return 'string';
+        if('int'  == $type || 'integer' == $type) return 'int';
+        if('bool' == $type || 'boolean' == $type) return 'boolean';
+        
+        // Note that object is not a valid XMLRPC type
+        if('object' == $type || 'class' == $type) return 'object';
+        if('float'  == $type || 'dbl'   == $type || 'double' == $type || 'flt' == $type) return 'double';
+
+        // Note that null is not a valid XMLRPC type. The null type can have 
+        // only one value - null.
+        if('null'   == $type) return 'null';
+
+        // Note that mixed is not a valid XMLRPC type
+        if('mixed'  == $type) return 'mixed';
+        if('array'  == $type || 'arr'    == $type) return 'array';
+        if('assoc'  == $type || 'struct' == $type) return 'struct';
+
+        // Note that this is not a valid XMLRPC type. As references cannot be 
+        // serialized or exported, there is no way this could be XML-RPCed.
+        if('reference' == $type || 'ref' == $type) return 'reference';
+        return 'string';
+    }
+    
+    /**
+     * Cleans the arguments array.
+     * This method removes all whitespaces and the leading "$" sign from each argument
+     * in the array.
+     *
+     * @static
+     * @access private
+     * @param $args(Array) The "dirty" array with arguments.
+     */
+    function cleanArguments($args, $commentParams){
+        $result = array();
+
+        if(!is_array($args)) return array();
+ 
+        foreach($args as $index => $arg){
+            $arg = strrstr(str_replace(array('$','&$'), array('','&'), $arg), '=');
+            if(!isset($commentParams[$index]))
+            {
+                $result[] = trim($arg);
+            }
+            else
+            {
+                $start = trim($arg);
+                $end = trim(str_replace('$', '', $commentParams[$index]));
+                
+                // Suppress Notice of 'Undefined offset' with @ 
+                @list($word0, $word1, $tail) = preg_split("/[\s]+/", $end, 3);
+                $word0 = strtolower($word0);
+                $word1 = strtolower($word1);
+                
+                $wordBase0 = ereg_replace('^[&$]+','',$word0);
+                $wordBase1 = ereg_replace('^[&$]+','',$word1);
+                $startBase = strtolower(ereg_replace('^[&$]+','',$start));
+
+                if ($wordBase0 == $startBase) {
+                    $type = str_replace(array('(',')'),'', $word1);
+                } elseif($wordBase1 == $startBase) {
+                    $type = str_replace(array('(',')'),'', $word0);
+                } elseif( ereg('(^[&$]+)|(\()([a-z0-9]+)(\)$)', $word0, $regs) ) {
+                    $tail = str_ireplace($word0, '', $end);
+                    $type = $regs[3];
+                } else {
+                    // default to string
+                    $type = 'string';
+                }
+
+                $type = MethodTable::standardizeType($type);
+/*
+                if($type == 'str') {
+                    $type = 'string';
+                } elseif($type == 'int' || $type == 'integer') {
+                    $type = 'int';
+                } elseif($type == 'bool' || $type == 'boolean') {
+                    $type = 'boolean';
+                } elseif($type == 'object' || $type == 'class') {
+                    // Note that this is not a valid XMLRPC type
+                    $type = 'object';
+                } elseif($type == 'float' || $type == 'dbl' || $type == 'double' || $type == 'flt') {
+                    $type = 'double';
+                } elseif($type == 'null') {
+                    // Note that this is not a valid XMLRPC type
+                    // The null type can have only one value - null. Why would 
+                    // that be an argument to a function? Just in case:
+                    $type = 'null';
+                } elseif($type == 'mixed') {
+                    // Note that this is not a valid XMLRPC type
+                    $type = 'mixed';
+                } elseif($type == 'array' || $type == 'arr') {
+                    $type = 'array';
+                } elseif($type == 'assoc') {
+                    $type = 'struct';
+                } elseif($type == 'reference' || $type == 'ref') {
+                    // Note that this is not a valid XMLRPC type
+                    // As references cannot be serialized or exported, there is
+                    // no way this could be XML-RPCed.
+                    $type = 'reference';
+                } else {
+                    $type = 'string';
+                }
+*/
+                $result[] = array('type' => $type, 'description' => $start . ' - ' . $tail);
+            }
+        }
+
+        return $result;
+    }
+    
+    
+    /**
+     * Cleans the comment string by removing all comment start and end characters.
+     *
+     * @static
+     * @private
+     * @param $comment(String) The method's comment.
+     */
+    function cleanComment($comment){
+        $comment = str_replace("/**", "", $comment);
+        $comment = str_replace("*/", "", $comment);
+        $comment = str_replace("*", "", $comment);
+        $comment = str_replace("\n", "\\n", trim($comment));
+        $comment = eregi_replace("[\r\t\n ]+", " ", trim($comment));
+        $comment = str_replace("\"", "\\\"", $comment);
+        return $comment;
+    }
+
+    /**
+     *
+     */
+    function showCode($methodTable){
+
+        if(!is_array($methodTable)) $methodTable = array();
+
+        foreach($methodTable as $methodName=>$methodProps){
+            $result .= "\n\t\"" . $methodName . "\" => array(";
+            
+            foreach($methodProps as $key=>$value){
+                $result .= "\n\t\t\"" . $key . "\" => ";
+
+                if($key=="arguments"){
+                    $result .= "array(";
+                    for($i=0; $i<count($value); $i++){
+                        $result .= "\"" . addslashes($value[$i]) . "\"";
+                        if($i<count($value)-1){
+                            $result .= ", ";
+                        }
+                    }
+                    $result .= ")";
+                }else{
+                    $result .= "\"" . $value . "\"";
+                }
+
+                $result .= ",";
+            }
+            
+            $result = substr($result, 0, -1);
+            $result .= "\n\t),";
+        }
+        
+        $result = substr($result, 0, -1);
+        $result = "\$this->methodTable = array(" . $result;
+        $result .= "\n);";
+            
+        return $result;
+    }
+}
+?>

admin/mnet/access_control.php

@@ -0,0 +1,239 @@
+<?php // $Id$
+
+// Allows the admin to control user logins from remote moodles.
+
+require_once dirname(dirname(dirname(__FILE__))) . '/config.php';
+require_once($CFG->libdir.'/adminlib.php');
+include_once($CFG->dirroot.'/mnet/lib.php');
+
+$sort         = optional_param('sort', 'username', PARAM_ALPHA);
+$dir          = optional_param('dir', 'ASC', PARAM_ALPHA);
+$page         = optional_param('page', 0, PARAM_INT);
+$perpage      = optional_param('perpage', 30, PARAM_INT);
+$action       = trim(strtolower(optional_param('action', '', PARAM_ALPHA)));
+
+require_login();
+$adminroot = admin_get_root();
+
+
+admin_externalpage_setup('ssoaccesscontrol', $adminroot);
+
+admin_externalpage_print_header($adminroot);
+
+if (!extension_loaded('openssl')) {
+    print_error('requiresopenssl', 'mnet', '', NULL, true);
+}
+
+$sitecontext = get_context_instance(CONTEXT_SYSTEM);
+$sesskey = sesskey();
+$formerror = array();
+
+// grab the mnet hosts and remove the localhost
+$mnethosts = get_records_menu('mnet_host', '', '', 'name', 'id, name');
+if (array_key_exists($CFG->mnet_localhost_id, $mnethosts)) {
+    unset($mnethosts[$CFG->mnet_localhost_id]);
+}
+
+
+
+// process actions
+if (!empty($action) and confirm_sesskey()) {
+    
+    // boot if insufficient permission
+    if (!has_capability('moodle/user:delete', $sitecontext)) {
+        error(get_string('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');
+    }
+
+    switch ($action) {
+
+        case "delete":
+            delete_records('mnet_sso_access_control', 'id', $id);
+            redirect('access_control.php', get_string('deleteuserrecord', 'mnet', array($idrec->username, $mnethosts[$idrec->mnet_host_id])));
+            break;
+
+        case "acl":
+        
+            // 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');
+            }
+
+            if (mnet_update_sso_access_control($idrec->username, $idrec->mnet_host_id, $accessctrl)) {
+                if ($accessctrl == 'allow') {
+                    redirect('access_control.php', get_string('ssl_acl_allow','mnet', array($idrec->username, $mnethosts[$idrec->mnet_host_id])));
+                } elseif ($accessctrl == 'deny') {
+                    redirect('access_control.php', get_string('ssl_acl_deny','mnet', array($idrec->username, $mnethosts[$idrec->mnet_host_id])));
+                }
+            }
+            break;
+
+        default:
+            print_error('invalidactionparam', 'mnet', '/admin/mnet/access_control.php');
+    }
+}
+
+
+
+// process the form results
+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');
+    }
+    if (empty($form->username)) {
+        $formerror['username'] = get_string('enterausername','mnet');
+    }
+    if (empty($form->mnet_host_id)) {
+        $formerror['mnet_host_id'] = get_string('selectahost','mnet');
+    }
+    if (empty($form->accessctrl)) {
+        $formerror['accessctrl'] = get_string('selectaccesslevel','mnet'); ;
+    }
+
+    // process if there are no errors
+    if (count($formerror) == 0) {
+
+        // username can be a comma separated list
+        $usernames = explode(',', $form->username);
+
+        foreach ($usernames as $username) {
+            $username = trim(moodle_strtolower($username));
+            if (!empty($username)) {
+                if (mnet_update_sso_access_control($username, $form->mnet_host_id, $form->accessctrl)) {
+                    if ($form->accessctrl == 'allow') {
+                        redirect('access_control.php', get_string('ssl_acl_allow','mnet', array($username, $mnethosts[$form->mnet_host_id])));
+                    } elseif ($form->accessctrl == 'deny') {
+                        redirect('access_control.php', get_string('ssl_acl_deny','mnet', array($username, $mnethosts[$form->mnet_host_id])));
+                    }
+                }
+            }
+        }
+    }
+    exit;
+}
+
+// Explain
+print_box(get_string('ssoacldescr','mnet'));
+// Are the needed bits enabled?
+$warn = '';
+if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
+    $warn = '<p>' . get_string('mnetdisabled','mnet') .'</p>';
+}
+
+if (!is_enabled_auth('mnet')) {
+    $warn .= '<p>' .  get_string('authmnetdisabled','mnet').'</p>';
+}
+
+if (get_config('auth/mnet', 'auto_add_remote_users') != true) {
+    $warn .= '<p>' .  get_string('authmnetautoadddisabled','mnet').'</p>';
+}
+if (!empty($warn)) {
+    $warn = '<p>' .  get_string('ssoaclneeds','mnet').'</p>' . $warn;
+    print_box($warn);
+}
+// output the ACL table
+$columns = array("username", "mnet_host_id", "access", "delete");
+$headings = array();
+$string = array('username'     => get_string('username'),
+                'mnet_host_id' => get_string('remotehost', 'mnet'),
+                'access'       => get_string('accesslevel', 'mnet'),
+                'delete'       => get_string('delete'));
+foreach ($columns as $column) {
+    if ($sort != $column) {
+        $columnicon = "";
+        $columndir = "ASC";
+    } else {
+        $columndir = $dir == "ASC" ? "DESC" : "ASC";
+        $columnicon = $dir == "ASC" ? "down" : "up";
+        $columnicon = " <img src=\"$CFG->pixpath/t/$columnicon.gif\" alt=\"\" />";
+    }
+    $headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
+}
+$headings['delete'] = '';
+$acl = get_records('mnet_sso_access_control', '', '', "$sort $dir", '*'); //, $page * $perpage, $perpage);
+$aclcount = count_records('mnet_sso_access_control');
+
+if (!$acl) {
+    print_heading(get_string('noaclentries','mnet'));
+    $table = NULL;
+} else {
+    $table->head = $headings;
+    $table->align = array('left', 'left', 'center');
+    $table->width = "95%";
+    foreach ($acl as $aclrecord) {
+        if ($aclrecord->accessctrl == 'allow') {
+            $accesscolumn = get_string('allow', 'mnet')
+                . " (<a href=\"?id={$aclrecord->id}&amp;action=acl&amp;accessctrl=deny&amp;sesskey={$USER->sesskey}\">"
+                . get_string('deny', 'mnet') . "</a>)";
+        } else {
+            $accesscolumn = get_string('deny', 'mnet')
+                . " (<a href=\"?id={$aclrecord->id}&amp;action=acl&amp;accessctrl=allow&amp;sesskey={$USER->sesskey}\">"
+                . get_string('allow', 'mnet') . "</a>)";
+        }
+        $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);
+    }
+}
+
+if (!empty($table)) {
+    print_table($table);
+    echo '<p>&nbsp;</p>';
+    print_paging_bar($aclcount, $page, $perpage, "?sort=$sort&amp;dir=$dir&amp;perpage=$perpage&amp;");
+}
+
+
+
+// output the add form
+print_simple_box_start('center','90%','','20');
+
+?>
+ <div class="mnetaddtoaclform"> 
+  <form id="mnetaddtoacl" method="post">
+    <input type="hidden" name="sesskey" value="<?php echo $sesskey; ?>" />
+<?php
+
+// enter a username
+echo get_string('username') . ":\n";
+if (!empty($formerror['username'])) {
+    echo '<span class="error"> * </span>';
+}
+echo '<input type="text" name="username" size="20" maxlength="100" />';
+
+// choose a remote host
+echo " " . get_string('remotehost', 'mnet') . ":\n";
+if (!empty($formerror['mnet_host_id'])) {
+    echo '<span class="error"> * </span>';
+}
+choose_from_menu($mnethosts, 'mnet_host_id');
+
+// choose an access level
+echo " " . get_string('accesslevel', 'mnet') . ":\n";
+if (!empty($formerror['accessctrl'])) {
+    echo '<span class="error"> * </span>';
+}
+$accessmenu['allow'] = get_string('allow', 'mnet');
+$accessmenu['deny'] = get_string('deny', 'mnet');
+choose_from_menu($accessmenu, 'accessctrl');
+
+// submit button
+echo '<input type="submit" value="' . get_string('addtoacl', 'mnet') . '" />';
+echo "</form></div>\n";
+
+// print errors
+foreach ($formerror as $error) {
+    echo "<br><span class=\"error\">$error<span>";
+}
+
+print_simple_box_end();
+admin_externalpage_print_footer($adminroot);
+
+?>

admin/mnet/adminlib.php

@@ -0,0 +1,182 @@
+<?php
+/**
+ * Library functions for mnet
+ *
+ * @author  Donal McMullan  donal@catalyst.net.nz
+ * @version 0.0.1
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package mnet
+ */
+
+/**
+ * Parse a file to find out what functions/methods exist in it, and add entries
+ * for the remote-call-enabled functions to the database.
+ *
+ * The path to a file, e.g. auth/mnet/auth.php can be thought of as
+ * type/parentname/docname
+ *
+ * @param  string   $type           mod, auth or enrol
+ * @param  string   $parentname     Implementation of type, e.g. 'mnet' in the
+ *                                  case of auth/mnet/auth.php
+ * @return bool                     True on success, else false
+ */
+function mnet_get_functions($type, $parentname) {
+    global $CFG;
+    $dataobject = new stdClass();
+    $docname = $type.'.php';
+    $publishes = array();
+    if ('mod' == $type) {
+        $docname = 'rpclib.php';
+        $relname  = '/mod/'.$parentname.'/'.$docname;
+        $filename = $CFG->dirroot.$relname;
+        if (file_exists($filename)) include_once $filename;
+        $mnet_publishes = $parentname.'_mnet_publishes';
+        if (function_exists($mnet_publishes)) {
+            (array)$publishes = $mnet_publishes();
+        }
+    } else {
+        // auth or enrol
+        $relname  = '/'.$type.'/'.$parentname.'/'.$docname;
+        $filename = $CFG->dirroot.$relname;
+        if (file_exists($filename)) include_once $filename;
+        $class = $type.($type=='enrol'? 'ment':'').'_plugin_'.$parentname;
+        if (class_exists($class)) {
+            $object = new $class();
+            if (method_exists($object, 'mnet_publishes')) {
+                (array)$publishes = $object->mnet_publishes();
+            }
+        }
+    }
+
+    $methodServiceArray = array();
+    foreach($publishes as $service) {
+        if (is_array($service['methods'])) {
+            foreach($service['methods'] as $methodname) {
+                $methodServiceArray[$methodname][] = $service;
+            }
+        }
+    }
+
+    // Disable functions that don't exist (any more) in the source
+    // Should these be deleted? What about their permissions records?
+    $rpcrecords = get_records_select('mnet_rpc', ' parent=\''.$parentname.'\' AND parent_type=\''.$type.'\' ', 'function_name ASC ');
+    if (!empty($rpcrecords)) {
+        foreach($rpcrecords as $rpc) {
+            if (!array_key_exists($rpc->function_name, $methodServiceArray)) {
+                $rpc->enabled = 0;
+                update_record('mnet_rpc', $rpc);
+            }
+        }
+    }
+
+    if (!file_exists($filename)) return false;
+
+    if (extension_loaded('tokenizer')) {
+        include_once $CFG->dirroot.'/admin/mnet/MethodTable.php';
+        $functions = (array)MethodTable::create($filename,false);
+    }
+
+    foreach($methodServiceArray as $method => $servicearray) {
+        if (!empty($functions[$method])) {
+            $details = $functions[$method];
+            $profile = $details['arguments'];
+            if (!isset($details['returns'])) {
+                array_unshift($profile, array('type' => 'void', 'description' => 'No return value'));
+            } else {
+                array_unshift($profile, $details['returns']);
+            }
+            $dataobject->profile       = serialize($profile);
+            $dataobject->help          = addslashes($details['description']);
+        } else {
+            $dataobject->profile       = serialize(array(array('type' => 'void', 'description' => 'No return value')));
+            $dataobject->help          = '';
+        }
+
+        $dataobject->function_name = $method;
+        $dataobject->xmlrpc_path   = $type.'/'.$parentname.'/'.$docname.'/'.$method;
+        $dataobject->parent_type   = $type;
+        $dataobject->parent        = $parentname;
+        $dataobject->enabled       = '0';
+
+        if ($record_exists = get_record('mnet_rpc', 'xmlrpc_path', $dataobject->xmlrpc_path)) {
+            $dataobject->id      = $record_exists->id;
+            $dataobject->enabled = $record_exists->enabled;
+            update_record('mnet_rpc', $dataobject);
+        } else {
+            $dataobject->id = insert_record('mnet_rpc', $dataobject, true);
+        }
+
+        foreach($servicearray as $service) {
+            $serviceobj = get_record('mnet_service', 'name', $service['name']);
+            if (false == $serviceobj) {
+                $serviceobj = new stdClass();
+                $serviceobj->name        = $service['name'];
+                $serviceobj->apiversion  = $service['apiversion'];
+                $serviceobj->offer       = 1;
+                $serviceobj->id          = insert_record('mnet_service', $serviceobj, true);
+            }
+
+            if (false == get_record('mnet_service2rpc', 'rpcid', $dataobject->id, 'serviceid', $serviceobj->id)) {
+                $obj = new stdClass();
+                $obj->rpcid = $dataobject->id;
+                $obj->serviceid = $serviceobj->id;
+                insert_record('mnet_service2rpc', $obj, true);
+            }
+        }
+    }
+    return true;
+}
+
+function upgrade_RPC_functions($returnurl) {
+    global $CFG;
+
+    $basedir = $CFG->dirroot.'/mod';
+    if (file_exists($basedir) && filetype($basedir) == 'dir') {
+        $dirhandle = opendir($basedir);
+        while (false !== ($dir = readdir($dirhandle))) {
+            $firstchar = substr($dir, 0, 1);
+            if ($firstchar == '.' or $dir == 'CVS' or $dir == '_vti_cnf') {
+                continue;
+            }
+            if (filetype($basedir .'/'. $dir) != 'dir') {
+                continue;
+            }
+
+            mnet_get_functions('mod', $dir);
+
+        }
+    }
+
+    $basedir = $CFG->dirroot.'/auth';
+    if (file_exists($basedir) && filetype($basedir) == 'dir') {
+        $dirhandle = opendir($basedir);
+        while (false !== ($dir = readdir($dirhandle))) {
+            $firstchar = substr($dir, 0, 1);
+            if ($firstchar == '.' or $dir == 'CVS' or $dir == '_vti_cnf') {
+                continue;
+            }
+            if (filetype($basedir .'/'. $dir) != 'dir') {
+                continue;
+            }
+
+            mnet_get_functions('auth', $dir);
+        }
+    }
+
+    $basedir = $CFG->dirroot.'/enrol';
+    if (file_exists($basedir) && filetype($basedir) == 'dir') {
+        $dirhandle = opendir($basedir);
+        while (false !== ($dir = readdir($dirhandle))) {
+            $firstchar = substr($dir, 0, 1);
+            if ($firstchar == '.' or $dir == 'CVS' or $dir == '_vti_cnf') {
+                continue;
+            }
+            if (filetype($basedir .'/'. $dir) != 'dir') {
+                continue;
+            }
+
+            mnet_get_functions('enrol', $dir);
+        }
+    }
+}
+?>

admin/mnet/delete.html

@@ -0,0 +1,52 @@
+<?php
+print_header("$site->shortname: $strmnetsettings", "$site->fullname",
+             '<a href="'.$CFG->wwwroot.'/admin/index.php">'.$stradministration.'</a> -> '.
+             '<a href="'.$CFG->wwwroot.'/admin/mnet/index.php">'.get_string('mnetsettings', 'mnet').'</a> -> Delete host');
+
+print_heading(get_string('mnetsettings', 'mnet'));
+?>
+<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
+    <table class="generalbox standard" border="0" cellpadding="5" cellspacing="0">
+        <tr>
+            <td  class="generalboxcontent">
+            <table cellpadding="9" cellspacing="0" >
+                <tr valign="top">
+                    <td colspan="2" class="header" cellpadding="0"><span><?php print_string('deleteaserver', 'mnet'); ?>Deleting a Server</span></td>
+                </tr>
+                <?php
+                if (count($warn) > 0){
+                ?>
+                <tr valign="top">
+                    <td align="right" colspan="2"><?php print_string('receivedwarnings','mnet'); ?>:<br />
+                    <?php foreach($warn as $warning) echo $warning .'<br />'; ?>
+                    </td>
+                </tr>
+                <?php
+                }
+                ?>
+                <tr valign="top">
+                    <td colspan="2"><?php print_string('reallydeleteserver','mnet'); ?>: "<?php echo $mnet_peer->name; ?>"?</td>
+                </tr>
+                <tr valign="top">
+                    <td width="80">
+                        <form method="post" action="delete.php">
+                            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                            <input type="hidden" name="hostid" value="<?php echo $mnet_peer->id; ?>" />
+                            <input type="hidden" name="step" value="delete" />
+                            <input type="submit" name="submit" value="<?php print_string('delete'); ?>"/>
+                        </form>
+                    </td>
+                    <td>
+                        <form method="get" action="index.php">
+                            <input type="submit" name="ignore" value="<?php print_string('cancel'); ?>"/>
+                        </form>
+                    </td>
+                </tr>
+            </table>
+            </td>
+        </tr>
+    </table>
+</div>
+<?php
+print_footer();
+?>

admin/mnet/delete.php

@@ -0,0 +1,48 @@
+<?PHP // $Id$
+
+    require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
+    include_once($CFG->dirroot.'/mnet/lib.php');
+    $stradministration = get_string('administration');
+    $strconfiguration  = get_string('configuration');
+    $strmnetsettings   = get_string('mnetsettings', 'mnet');
+    $strmnetservices   = get_string('mnetservices', 'mnet');
+    $strmnetlog        = get_string('mnetlog', 'mnet');
+    $strmnetedithost   = get_string('reviewhostdetails', 'mnet');
+    require_login();
+
+    $context = get_context_instance(CONTEXT_SYSTEM);
+    
+    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
+
+    if (!$site = get_site()) {
+        print_error('nosite', '', '', NULL, true);
+    }
+
+/// Initialize variables.
+
+    // Step must be one of:
+    // input   Parse the details of a new host and fetch its public key
+    // commit  Save our changes (to a new OR existing host)
+    $step   = optional_param('step', 'verify', PARAM_ALPHA);
+    $hostid = required_param('hostid', PARAM_INT);
+    $warn = array();
+
+    if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+        redirect('index.php', get_string('postrequired','mnet') ,7);
+    }
+
+    if ('verify' == $step) {
+        $mnet_peer = new mnet_peer();
+        $mnet_peer->set_id($hostid);
+        $live_users = $mnet_peer->count_live_sessions();
+        if ($live_users > 0) {
+            $warn[] = get_string('usersareonline', 'mnet', $live_users);
+        }
+        include('delete.html');
+    } elseif ('delete' == $step) {
+        $mnet_peer = new mnet_peer();
+        $mnet_peer->set_id($hostid);
+        $mnet_peer->delete();
+        redirect('peers.php', get_string('hostdeleted', 'mnet'), 5);
+    }
+?>

admin/mnet/enr_course_enrol.html

@@ -0,0 +1,104 @@
+
+<form id="assignform" method="post" action="">
+<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
+<input type="hidden" name="previoussearch" value="<?php p($previoussearch) ?>" />
+<input type="hidden" name="courseid" value="<?php p($courseid) ?>" />
+<input type="hidden" name="host" value="<?php p($mnet_peer->id) ?>" />
+<input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
+  <table class="generaltable" border="0" cellpadding="5" cellspacing="0">
+    <tr>
+      <td valign="top">
+          <?php print_string('existingusers', 'role', count($mnetenrolledusers)); ?>
+      </td>
+      <td></td>
+      <td valign="top">
+          <?php print_string('potentialusers', 'role', $availableusers->_numOfRows); ?>
+      </td>
+    </tr>
+    <tr>
+      <td valign="top">
+          <select name="removeselect[]" size="20" id="removeselect" multiple="multiple"
+                  onfocus="getElementById('assignform').add.disabled=true;
+                           getElementById('assignform').remove.disabled=false;
+                           getElementById('assignform').addselect.selectedIndex=-1;">
+          <?php
+            foreach ($mnetenrolledusers as $enrolleduser) {
+                $fullname = fullname($enrolleduser, true);
+                echo "<option value=\"$enrolleduser->id\">".s($fullname)." (".s($enrolleduser->rolename).")</option>\n";
+            }
+          ?>
+
+          </select></td>
+      <td valign="top">
+        <br />
+        <input name="add" type="submit" id="add" value="&larr;" />
+        <br />
+        <input name="remove" type="submit" id="remove" value="&rarr;" />
+        <br />
+      </td>
+      <td valign="top">
+          <select name="addselect[]" size="20" id="addselect" multiple="multiple"
+                  onfocus="getElementById('assignform').add.disabled=false;
+                           getElementById('assignform').remove.disabled=true;
+                           getElementById('assignform').removeselect.selectedIndex=-1;">
+          <?php
+
+              if (!empty($searchtext)) {
+                  echo "<optgroup label=\"$strsearchresults (" . $availableusers->_numOfRows . ")\">\n";
+                  while ($user = rs_fetch_next_record($availableusers)) {
+                      if (!isset($enrolledusers[$user->id])) {
+                          $fullname = fullname($user, true);
+                          echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                      }
+                  }
+                  echo "</optgroup>\n";
+
+              } else {
+                  if ($availableusers->_numOfRows > MAX_USERS_PER_PAGE) {
+                      echo '<optgroup label="'.get_string('toomanytoshow').'"><option></option></optgroup>'."\n"
+                          .'<optgroup label="'.get_string('trysearching').'"><option></option></optgroup>'."\n";
+                  } else {
+                      while ($user = rs_fetch_next_record($availableusers)) {
+                          $fullname = fullname($user, true);
+                          echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                      }
+                  }
+              }
+          ?>
+         </select>
+         <br />
+         <input type="text" name="searchtext" size="30" value="<?php p($searchtext, true) ?>"
+                  onfocus ="getElementById('assignform').add.disabled=true;
+                            getElementById('assignform').remove.disabled=true;
+                            getElementById('assignform').removeselect.selectedIndex=-1;
+                            getElementById('assignform').addselect.selectedIndex=-1;"
+                  onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
+                               if (keyCode == 13) {
+                                    getElementById('assignform').previoussearch.value=1;
+                                    getElementById('assignform').submit();
+                               } " />
+         <input name="search" id="search" type="submit" value="<?php p($strsearch) ?>" />
+         <?php
+              if (!empty($searchusers)) {
+                  echo '<input name="showall" id="showall" type="submit" value="'.$strshowall.'" />'."\n";
+              }
+         ?>
+       </td>
+    </tr>
+    <tr>
+      <td valign="top"><?php print_string('otherenrolledusers', 'mnet'); ?>:<br />
+          <ul>
+          <?php
+            foreach ($remtenrolledusers as $enrolleduser) {
+                $fullname = fullname($enrolleduser, true);
+                print '<li>'
+                    . s($fullname) . ' (' . s($enrolleduser->rolename) . ') '
+                    . s($enrolleduser->enroltype)."</li>\n";
+            }
+          ?></ul></td>
+      <td valign="top"></td>
+      <td valign="top"></td>
+    </tr>
+  </table>
+  </div>
+</form>

admin/mnet/enr_course_enrol.php

@@ -0,0 +1,281 @@
+<?PHP  // $Id$
+       // enrol_config.php - allows admin to edit all enrollment variables
+       //                    Yes, enrol is correct English spelling.
+
+    require_once(dirname(__FILE__) . "/../../config.php");
+    require_once($CFG->libdir.'/adminlib.php');
+    include_once($CFG->dirroot.'/mnet/xmlrpc/client.php');
+
+    if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
+
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('mnetenrol', $adminroot);
+    $CFG->pagepath = 'admin/mnet';
+
+    require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
+    $enrolment = enrolment_factory::factory('mnet');
+
+    $mnethostid = required_param('host', PARAM_INT);
+    $courseid = required_param('courseid', PARAM_INT);
+
+    $mnet_peer = new mnet_peer();
+    if (!$mnet_peer->set_id($mnethostid)) {
+        print_error('hostcoursenotfound','mnet');
+    }
+
+    $course = get_record('mnet_enrol_course', 'id', $courseid, 'hostid', $mnet_peer->id);
+
+    if (empty($course)) {
+        print_error('hostcoursenotfound','mnet');
+    }
+
+    define("MAX_USERS_PER_PAGE", 5000);
+
+    $add            = optional_param('add', 0, PARAM_BOOL);
+    $remove         = optional_param('remove', 0, PARAM_BOOL);
+    $showall        = optional_param('showall', 0, PARAM_BOOL);
+    $searchtext     = optional_param('searchtext', '', PARAM_RAW); // search string
+    $previoussearch = optional_param('previoussearch', 0, PARAM_BOOL);
+    $userid         = optional_param('userid', 0, PARAM_INT); // needed for user tabs
+
+    $errors = array();
+
+    $previoussearch = ($searchtext != '') or ($previoussearch) ? 1:0;
+
+    $baseurl = "remote_enrolment.php?courseid={$course->id}&amp;host={$mnet_peer->id}";
+    if (!empty($userid)) {
+        $baseurl .= '&amp;userid='.$userid;
+    }
+
+/// Process incoming role assignment
+
+    if ($frm = data_submitted()) {
+        if ($add and !empty($frm->addselect) and confirm_sesskey()) {
+            $timemodified = time();
+
+            foreach ($frm->addselect as $adduser) {
+                if (!$adduser = clean_param($adduser, PARAM_INT)) {
+                    continue;
+                }
+                if (! $enrolment->req_enrol_user($adduser, $course->id)) {
+                    $errors[] = "Could not add user with id $adduser to course {$course->id}!";
+                }
+            }
+        } else if ($remove and !empty($frm->removeselect) and confirm_sesskey()) {
+            foreach ($frm->removeselect as $removeuser) {
+                $removeuser = clean_param($removeuser, PARAM_INT);
+                if (! $enrolment->req_unenrol_user($removeuser, $course->id)) {
+                    $errors[] = "Could not remove user with id $removeuser from course {$course->id}!";
+                }
+            }
+        } else if ($showall) {
+            $searchtext = '';
+            $previoussearch = 0;
+        }
+    }
+
+/// Prepare data for users / enrolled users panes
+
+
+/// Create a new request object
+    $mnet_request = new mnet_xmlrpc_client();
+
+/// Pass it the path to the method that we want to execute
+    $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;
+
+    unset($mnet_request);
+    
+    $select = '';
+    $all_enrolled_usernames = '';
+    $timemodified = array();
+/// List all the users (homed on this server) who are enrolled on the course
+/// This will include mnet-enrolled users, and those who have enrolled 
+/// themselves, etc.
+    if (is_array($all_enrolled_users) && count($all_enrolled_users)) {
+        foreach($all_enrolled_users as $username => $data) {
+            $all_enrolled_usernames .= "'$username', ";
+        }
+        $select = ' u.username IN (' .substr($all_enrolled_usernames, 0, -2) .') AND ';
+    } else {
+        $all_enrolled_users = array();
+    }
+
+/// Synch our mnet_enrol_assignments with remote server
+    $sql = "
+            SELECT
+                u.id,
+                u.firstname,
+                u.lastname,
+                u.username,
+                u.email,
+                a.enroltype,
+                a.id as enrolid,
+                COALESCE(a.hostid, 0) as wehaverecord,
+                a.courseid
+            FROM
+                {$CFG->prefix}user u
+            LEFT JOIN
+                {$CFG->prefix}mnet_enrol_assignments a
+            ON
+                a.userid = u.id AND a.courseid={$courseid}
+            WHERE
+                $select 
+                u.deleted = 0 AND
+                u.confirmed = 1 AND
+                u.mnethostid = {$CFG->mnet_localhost_id}
+            ORDER BY
+                u.firstname ASC,
+                u.lastname ASC";
+
+    if (!$enrolledusers = get_records_sql($sql)) {
+        $enrolledusers = array();
+    }
+
+    foreach($enrolledusers as $user) {
+
+        $dataobj = new stdClass();
+        $dataobj->userid    = $user->id;
+        $dataobj->hostid    = $mnet_peer->id;
+        $dataobj->courseid  = $courseid;
+        $dataobj->rolename  = $all_enrolled_users[$user->username]['name'];
+        $dataobj->enroltype = $all_enrolled_users[$user->username]['enrol'];
+
+        if ($user->wehaverecord == 0) {
+            $dataobj->enroltime = $all_enrolled_users[$user->username]['timemodified'];
+            $dataobj->id = insert_record('mnet_enrol_assignments', $dataobj);
+        } elseif (array_key_exists($user->username, $all_enrolled_users)) {
+            $dataobj->id    = $user->enrolid;
+            update_record('mnet_enrol_assignments', $dataobj);
+        } elseif (is_array($all_enrolled_users) && count($all_enrolled_users)) {
+            delete_record('mnet_enrol_assignments', 'id', $user->enrolid);
+        }
+    }
+    unset($enrolledusers);
+
+    // Read about our remote enrolments in 2 sets
+    // first, get the remote enrolments done via enrol/mnet      $mnetenrolledusers
+    // second, get the remote enrolments done with other plugins $remtenrolledusers
+    // NOTE: both arrays are keyed on the userid! 
+    $sql = "
+            SELECT
+                u.id,
+                u.firstname,
+                u.lastname,
+                a.rolename,
+                a.enroltype,
+                a.courseid
+            FROM
+                {$CFG->prefix}user u,
+                {$CFG->prefix}mnet_enrol_assignments a
+            WHERE
+                a.userid = u.id AND 
+                a.courseid={$courseid} AND
+                a.enroltype = 'mnet'   AND
+                u.deleted = 0 AND
+                u.confirmed = 1 AND
+                u.mnethostid = {$CFG->mnet_localhost_id}
+            ORDER BY
+                u.firstname ASC,
+                u.lastname ASC";
+
+    if (!$mnetenrolledusers = get_records_sql($sql)) {
+        $mnetenrolledusers = array();
+    }
+    $sql = "
+            SELECT
+                u.id,
+                u.firstname,
+                u.lastname,
+                a.rolename,
+                a.enroltype,
+                a.courseid
+            FROM
+                {$CFG->prefix}user u,
+                {$CFG->prefix}mnet_enrol_assignments a
+            WHERE
+                a.userid = u.id AND 
+                a.courseid={$courseid} AND
+                a.enroltype != 'mnet'  AND
+                u.deleted = 0 AND
+                u.confirmed = 1 AND
+                u.mnethostid = {$CFG->mnet_localhost_id}
+            ORDER BY
+                u.firstname ASC,
+                u.lastname ASC";
+
+    if (!$remtenrolledusers = get_records_sql($sql)) {
+        $remtenrolledusers = array();
+    }
+
+    $select = '';
+    $exclude = array_merge(array_keys($mnetenrolledusers), array_keys($remtenrolledusers));
+    $exclude[] = 0;
+    $select = 'AND u.username!=\'guest\' AND u.id NOT IN ('. join(',',$exclude) .') ';
+    unset($exclude);
+
+    $searchtext = trim($searchtext);
+
+    if ($searchtext !== '') {   // Search for a subset of remaining users
+        $LIKE      = sql_ilike();
+        $FULLNAME  = sql_fullname();
+
+        $select  .= " AND ($FULLNAME $LIKE '%$searchtext%' OR email $LIKE '%$searchtext%') ";
+    }
+
+    $sql = ('SELECT id, firstname, lastname, email 
+            FROM '.$CFG->prefix.'user u
+            WHERE deleted = 0 AND confirmed = 1 
+                  AND mnethostid = '.$CFG->mnet_localhost_id.' '
+            .$select
+            .'ORDER BY lastname ASC, firstname ASC');
+
+    $availableusers = get_recordset_sql($sql, 0, MAX_USERS_PER_PAGE);
+
+
+
+/// Print the page
+
+/// get language strings
+$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');
+$strroletoassign = get_string('roletoassign', 'role');
+$strcurrentcontext = get_string('currentcontext', 'role');
+$strsearch = get_string('search');
+$strshowall = get_string('showall');
+$strparticipants = get_string('participants');
+$strsearchresults = get_string('searchresults');
+
+admin_externalpage_print_header($adminroot);
+
+print_box('<strong>' . s($mnet_peer->name) . ' : ' 
+          . format_string($course->shortname) .' '. format_string($course->fullname) 
+          . '</strong><br />'
+          . get_string("enrolcourseenrol_desc", "mnet"));
+
+echo "<hr />";
+
+include(dirname(__FILE__).'/enr_course_enrol.html');
+
+if (!empty($errors)) {
+    $msg = '<p>';
+    foreach ($errors as $e) {
+        $msg .= $e.'<br />';
+    }
+    $msg .= '</p>';
+    notify($msg);
+}
+
+
+admin_externalpage_print_footer($adminroot);
+
+?>

admin/mnet/enr_courses.php

@@ -0,0 +1,58 @@
+<?PHP  // $Id$
+       // enrol_config.php - allows admin to edit all enrollment variables
+       //                    Yes, enrol is correct English spelling.
+
+    require_once(dirname(__FILE__) . "/../../config.php");
+    require_once($CFG->libdir.'/adminlib.php');
+
+    if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
+
+
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('mnetenrol', $adminroot);
+    $CFG->pagepath = 'admin/mnet';
+
+    require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
+    $enrolment = enrolment_factory::factory('mnet');
+
+    $mnethost = required_param('host', PARAM_INT);
+    $host = get_record('mnet_host', 'id', $mnethost);
+
+    $courses = $enrolment->fetch_remote_courses($mnethost);
+
+    /// Print the page
+
+    admin_externalpage_print_header($adminroot);
+
+    print_box('<strong>' . s($host->name) . ' </strong><br />'
+              . get_string("enrolcourses_desc", "mnet"));
+
+    echo '<hr />';
+
+    echo '<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->'
+           . '<table class="generaltable">';
+
+    $icon  = "<img src=\"$CFG->pixpath/i/course.gif\"".
+    " class=\"icon\" alt=\"".get_string("course")."\" />";
+
+    foreach ($courses as $course) {
+        $link = $CFG->wwwroot . '/admin/mnet/enr_course_enrol.php?'
+            . "host={$mnethost}&amp;courseid={$course->id}&amp;sesskey={$USER->sesskey}";
+        echo '<tr>'
+               . "<td>$icon</td>"
+               . "<td><a href=\"$link\">".format_string($course->fullname). "</a></td>"
+               . '</tr><tr>'
+               . '<td></td>'
+               . '<td>'.format_string($course->shortname). ' - ' .format_string($course->cat_name).'</td>'
+               . '</tr><tr>'
+               . '<td></td>'
+               . "<td align=\"left\" >{$course->summary}</td>"
+               . '</tr>';
+    }
+    echo '</table></div>';
+
+    admin_externalpage_print_footer($adminroot);
+
+?>

admin/mnet/enr_hosts.php

@@ -0,0 +1,62 @@
+<?PHP  // $Id$
+       // enrol_config.php - allows admin to edit all enrollment variables
+       //                    Yes, enrol is correct English spelling.
+
+    require_once(dirname(__FILE__) . "/../../config.php");
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('mnetenrol', $adminroot);
+    $CFG->pagepath = 'admin/mnet';
+
+
+    require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
+
+    $enrolment = enrolment_factory::factory('mnet');
+
+/// Otherwise fill and print the form.
+
+    /// get language strings
+
+    admin_externalpage_print_header($adminroot);
+
+    print_box(get_string("remoteenrolhosts_desc", "mnet"));
+
+    echo '<hr />';
+
+    if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
+        print_box(get_string('mnetdisabled','mnet'));
+    }
+
+    echo '<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->'
+           . '<table cellspacing="0" cellpadding="5" id="hosts" class="generaltable generalbox" >'
+           . '<tr>'
+           . '<th class="header c0"> '.get_string('host', 'mnet').' </th>'
+           . '<th class="header c1"> '.get_string('enrolments', 'mnet').' </th>'
+           . '<th class="header c2"> '.get_string('courses', 'mnet').' </th>'
+           // . '<th class="header c3"> &nbsp; </th>'
+           . '</tr>';
+    $hosts = $enrolment->list_remote_servers();
+    foreach ($hosts as $host) {
+        $coursesurl = "{$CFG->wwwroot}/admin/mnet/enr_courses.php?host={$host->id}&amp;sesskey={$USER->sesskey}";
+        $coursecount = get_field_sql("SELECT count(id) FROM {$CFG->prefix}mnet_enrol_course WHERE hostid={$host->id}");
+        if (empty($coursecount)) {
+            $coursecount = '?';
+        }
+        $enrolcount = get_field_sql("SELECT count(id) FROM {$CFG->prefix}mnet_enrol_assignments WHERE hostid={$host->id}");
+
+        echo '<tr>'
+               . "<td><a href=\"{$coursesurl}\">{$host->name}</a></td>"
+               . "<td align=\"center\" >$enrolcount</td>"
+               . "<td align=\"center\" >$coursecount - <a href=\"{$coursesurl}\">".get_string('editenrolments', 'mnet')."</a></td>"
+               // TODO: teach report/log/index.php to show per-host-logs
+               // . '<td align="center" ><a href="{$CFG->wwwroot}/admin/report/log/index.php?course_host={$host->id}">'
+               // . get_string('logs', 'mnet').'</a> </td>'
+               . '</tr>';
+    }
+    echo '</table>'
+       . '</div>';
+
+    admin_externalpage_print_footer($adminroot);
+
+?>

admin/mnet/index.php

@@ -0,0 +1,152 @@
+<?PHP // $Id$
+
+    // Allows the admin to configure mnet stuff
+
+    require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    include_once($CFG->dirroot.'/mnet/lib.php');
+
+    require_login();
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('net', $adminroot);
+
+    $context = get_context_instance(CONTEXT_SYSTEM);
+
+    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
+
+
+    if (!extension_loaded('openssl')) {
+        admin_externalpage_print_header($adminroot);
+        set_config('mnet_dispatcher_mode', 'off');
+        print_error('requiresopenssl', 'mnet', '', NULL, true);
+    }
+
+    if (!$site = get_site()) {
+        admin_externalpage_print_header($adminroot);
+        set_config('mnet_dispatcher_mode', 'off');
+        print_error('nosite', '', '', NULL, true);
+    }
+
+    if (!function_exists('curl_init') ) {
+        admin_externalpage_print_header($adminroot);
+        set_config('mnet_dispatcher_mode', 'off');
+        print_error('nocurl', 'mnet', '', NULL, true);
+    }
+
+    if (!isset($CFG->mnet_dispatcher_mode)) {
+        set_config('mnet_dispatcher_mode', 'off');
+    }
+
+/// If data submitted, process and store
+    if (($form = data_submitted()) && confirm_sesskey()) {
+        if (!empty($form->submit) && $form->submit == get_string('savechanges')) {
+            if (in_array($form->mode, array("off", "strict", "dangerous"))) {
+                if (set_config('mnet_dispatcher_mode', $form->mode)) {
+                    redirect('index.php', get_string('changessaved'));
+                } else {
+                    error('Invalid action parameter.', 'index.php');
+                }
+            }
+        } elseif (!empty($form->submit) && $form->submit == get_string('delete')) {
+            $MNET->get_private_key();
+            $_SESSION['mnet_confirm_delete_key'] = md5(sha1($MNET->keypair['keypair_PEM'])).':'.time();
+            notice_yesno(get_string("deletekeycheck", "mnet"),
+                                    "index.php?sesskey=$USER->sesskey&amp;confirm=".md5($MNET->public_key),
+                                    "index.php",
+                                     array('sesskey' => $USER->sesskey),
+                                     NULL,
+                                    'post',
+                                    'get');
+            exit;
+        } else {
+            // We're deleting
+            
+            
+            if (!isset($_SESSION['mnet_confirm_delete_key'])) {
+                // fail - you're being attacked?
+            }
+
+            $key = '';
+            $time = '';
+            @list($key, $time) = explode(':',$_SESSION['mnet_confirm_delete_key']);
+            $MNET->get_private_key();
+
+            if($time < time() - 60) {
+                // fail - you're out of time.
+                print_error ('deleteoutoftime', 'mnet', 'index.php');
+                exit;
+            }
+
+            if ($key != md5(sha1($MNET->keypair['keypair_PEM']))) {
+                // fail - you're being attacked?
+                print_error ('deletewrongkeyvalue', 'mnet', 'index.php');
+                exit;
+            }
+
+            $MNET->replace_keys();
+            redirect('index.php', get_string('keydeleted','mnet'));
+            exit;
+        }
+    }
+    $hosts = get_records_select('mnet_host', " id != '{$CFG->mnet_localhost_id}' AND deleted = '0' ",'wwwroot ASC' );
+
+    admin_externalpage_print_header($adminroot);
+?>
+<center>
+<form method="post" action="index.php">
+    <table align="center" width="635" class="generalbox" border="0" cellpadding="5" cellspacing="0">
+        <tr>
+            <td  class="generalboxcontent">
+            <table cellpadding="9" cellspacing="0" >
+                <tr valign="top">
+                    <td colspan="2" class="header" cellpadding="0"><?php print_string('aboutyourhost', 'mnet'); ?></td>
+                </tr>
+                <tr valign="top">
+                    <td align="right"><?php print_string('publickey', 'mnet'); ?>:</td>
+                    <td><pre><?php echo $MNET->public_key; ?></pre></td>
+                </tr>
+                <tr valign="top">
+                    <td align="right"><?php print_string('expires', 'mnet'); ?>:</td>
+                    <td><?php echo userdate($MNET->public_key_expires); ?></td>
+                </tr>
+                <tr valign="top">
+                    <td align="right"><?php print_string('net', 'mnet'); ?>:</td>
+                    <td><input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                        <input type="radio" name="mode" value="off" <?php echo ("off" == $CFG->mnet_dispatcher_mode)? 'checked="checked"' : '' ?> /> <?php print_string('off', 'mnet'); ?> <br />
+                        <input type="radio" name="mode" value="strict" <?php echo ("strict" == $CFG->mnet_dispatcher_mode)? 'checked="checked"' : '' ?> /> <?php print_string('on', 'mnet'); ?><br />
+                        <input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" />
+                    </td>
+                </tr>
+            </table>
+            </td>
+        </tr>
+    </table>
+</form>
+<form method="post" action="index.php">
+    <table align="center" width="635" class="generalbox" border="0" cellpadding="5" cellspacing="0">
+        <tr>
+            <td  class="generalboxcontent">
+            <table cellpadding="9" cellspacing="0" >
+                <tr valign="top">
+                    <td colspan="2" class="header" cellpadding="0"><?php print_string('expireyourkey', 'mnet'); ?></td>
+                </tr>
+                <tr valign="top">
+                    <td colspan="2" cellpadding="0"><?php print_string('expireyourkeyexplain', 'mnet'); ?></td>
+                </tr>
+                <tr valign="top">
+                    <td align="left" width="10" nowrap="nowrap"><?php print_string('expireyourkey', 'mnet'); ?></td>
+                    <td align="left"><input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                        <input type="hidden" name="deleteKey" value="" />
+                        <input type="submit" name="submit" value="<?php print_string('delete'); ?>" />
+                    </td>
+                </tr>
+            </table>
+            </td>
+        </tr>
+    </table>
+</form>
+</center>
+
+<?php
+admin_externalpage_print_footer($adminroot);
+?>

admin/mnet/mnet_review.html

@@ -0,0 +1,135 @@
+<?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($adminroot);
+
+if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
+    $tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
+    $tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
+    $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
+} else {
+    $tabs[] = new tabobject('mnetdetails', '#', $strmnetedithost, $strmnetedithost, false);
+}
+print_tabs(array($tabs), 'mnetdetails');
+
+print_simple_box_start("center", "");
+?>
+<form method="post" action="peers.php">
+<div>
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+<input type="hidden" name="step" value="commit" />
+<input type="hidden" name="last_connect_time" value="<?php echo $mnet_peer->last_connect_time; ?>" />
+<input type="hidden" name="id" value="<?php echo isset($mnet_peer->id)?  $mnet_peer->id : '0' ; ?>" />
+<table cellpadding="9" cellspacing="0" width="635">
+
+<tr>
+    <td align="right" valign="top"><?php print_string('site'); ?>:</td>
+    <td valign="top"><input type="text" name="name" size="30" value="<?php echo $mnet_peer->name; ?>" /></td>
+</tr>
+<tr>
+    <td align="right" valign="top"><?php print_string('hostname', 'mnet'); ?>:</td>
+    <td valign="top"><input type="text" name="wwwroot" size="30" value="<?php echo $mnet_peer->wwwroot; ?>" /></td>
+</tr>
+<?php
+if (empty($mnet_peer->public_key)) $mnet_peer->public_key = '';
+?>
+<tr>
+    <td align="right" valign="top"><?php
+        print_string('publickey', 'mnet');
+        echo ': <br />';
+        helpbutton("publickey", get_string('publickey', 'mnet'), "mnet", true, true);
+    ?></td>
+<?php
+
+
+
+if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) {
+    $key = mnet_get_public_key($mnet_peer->wwwroot);
+    $mnet_peer->public_key = clean_param($key, PARAM_PEM);
+}
+?>
+    <td valign="top">
+        <?php 
+        if (empty($mnet_peer->public_key)) {
+            print_string('nopubkey', 'mnet');
+        }
+        ?><br />
+        <textarea rows="17" cols="65" name="public_key" style="font-size: 8px;"><?php echo $mnet_peer->public_key; ?></textarea>
+    </td>
+</tr>
+<tr>
+    <td align="right" valign="top"><?php print_string('expires', 'mnet'); ?>:</td>
+    <td valign="top">
+<?php
+    if($mnet_peer->public_key_expires < time()) {
+        print_string('expired', 'mnet');
+        echo ' ';
+    }
+    echo userdate($mnet_peer->public_key_expires);
+?>
+    </td>
+</tr>
+<?php
+
+if(!empty($currentkey)) {
+?>
+    <tr>
+        <td align="right" valign="top"></td>
+        <td valign="top"><?php print_string('keymismatch', 'mnet'); ?></td>
+    </tr>
+    <tr>
+        <td align="right" valign="top"><?php print_string('currentkey', 'mnet'); ?>:</td>
+        <td valign="top"><pre style="font-size: 8px;"><?php echo $currentkey;?></pre></td>
+    </tr>
+<?php
+}
+
+if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
+?>
+    <tr>
+        <td align="right" valign="top"><?php print_string('last_connect_time', 'mnet'); ?>:</td>
+        <td valign="top"><?php echo ($mnet_peer->last_connect_time == 0)? get_string('never','mnet') : date('H:i:s d/m/Y',$mnet_peer->last_connect_time);?></td>
+    </tr>
+<?php
+}
+
+if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0){
+?>
+    <tr>
+        <td align="right" valign="top"><?php print_string('deleted'); ?>:</td>
+        <td valign="top">
+            <input type="radio" name="deleted" value="0" checked="checked" /> <?php print_string('reenableserver','mnet'); ?><br />
+            <input type="radio" name="deleted" value="1"  /> <?php print_string('yes'); ?><br />
+        </td>
+    </tr>
+<?php
+}
+
+if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address){
+?>
+    <tr>
+        <td align="right" valign="top"><?php print_string('ipaddress', 'mnet');
+        echo ': <br />';
+        helpbutton("ipaddress", get_string('ipaddress', 'mnet'), "mnet", true, true);
+        ?>:</td>
+        <td valign="top"><?php echo $mnet_peer->ip_address; ?></td>
+    </tr>
+
+<?php
+}
+?>
+<tr>
+    <td></td>
+    <td><input type="submit" value="<?php print_string("savechanges"); ?>" /></td>
+</tr>
+</table>
+</div>
+</form>
+<?php
+print_simple_box_end();
+admin_externalpage_print_footer($adminroot);
+?>

admin/mnet/mnet_review_allhosts.html

@@ -0,0 +1,22 @@
+<?php
+admin_externalpage_print_header($adminroot);
+
+$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);
+print_tabs(array($tabs), 'mnetdetails');
+
+print_simple_box_start("center", "");
+?>
+<table cellpadding="9" cellspacing="0" >
+<tr>
+    <td align="right" valign="top"><?php print_string('site'); ?>:</td>
+    <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>
+</tr>
+</table>
+<?php
+print_simple_box_end();
+admin_externalpage_print_footer($adminroot);
+?>

admin/mnet/mnet_services.html

@@ -0,0 +1,100 @@
+<?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);
+if ($mnet_peer->id != $CFG->mnet_all_hosts_id) $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
+print_tabs(array($tabs), 'mnetservices');
+print_simple_box_start("center", "");
+
+?>
+
+<form method="post" action="mnet_services.php">
+<div>
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+<input type="hidden" name="step" value="<?php echo $mnet_peer->nextstep; ?>" />
+<input type="hidden" name="hostid" value="<?php echo ($mnet_peer->id)?  $mnet_peer->id : '0' ; ?>" />
+<table cellpadding="9" cellspacing="0" >
+<?php 
+    foreach($myservices as $name => $versions) {
+    $version = current($versions);
+?>
+<tr>
+    <td align="left" valign="top" colspan="2">
+    <h3><?php echo get_string($name.'_name', $version['parent_type'].'_'.$version['parent'] , $mnet_peer->name); ?></h3>
+    <?php echo get_string($name.'_description', $version['parent_type'].'_'.$version['parent'], $mnet_peer->name); ?>
+<?php
+        $breakstring = '';
+        foreach($versions as $version){
+            if (count($versions) > 1) {
+                $versionstring = '('.get_string('version','mnet') .' '.$version['apiversion'].')';
+            } else {
+                $versionstring = '';
+            }
+    
+            echo $breakstring;
+?>
+    <input type="hidden" name="exists[<?php echo  $version['serviceid']; ?>]" value="1" />
+    <input type="checkbox" name="publish[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_publish']))? 'checked="checked" ': '' ; ?>/>
+<?php 
+            print_string('publish','mnet');
+            echo $versionstring; 
+            if (!empty($version['hostsubscribes'])) { 
+                echo '<a href="#" title="'.get_string('issubscribed','mnet', $mnet_peer->name).'">&radic;</a> '; 
+            }
+            if (!empty($version['allhosts_publish'])) { 
+                print_string("enabled_for_all",'mnet',!empty($version['I_publish']));
+            } 
+            echo '<br />';
+?>
+    <input type="checkbox" name="subscribe[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_subscribe']))? 'checked="checked" ': '' ; ?>/>
+<?php 
+            print_string('subscribe','mnet');
+            echo $versionstring; 
+            if (!empty($version['hostpublishes'])) { 
+                echo '<a href="#" title="'.get_string('ispublished','mnet', $mnet_peer->name).'">&radic;</a> ';
+            } 
+            if (!empty($version['allhosts_subscribe'])) {
+                print_string("enabled_for_all",'mnet',!empty($version['I_subscribe']));
+            }
+            
+            echo '<br />';  
+            $breakstring = '. . . . . . . . . . . . . . . . . . . . . . . . <br>';
+        } // end foreach
+?>
+    </td>
+</tr>
+<?php
+    } // end foreach
+?>
+<tr>
+    <td align="left" valign="top" colspan="2">
+    <div id="pubTreeLoc"></div>
+    </td>
+</tr>
+<tr>
+    <td align="left" valign="top" colspan="2">
+    <div id="subTreeLoc"></div>
+    </td>
+</tr>
+<tr>
+    <td colspan="2"><input type="submit" value="<?php print_string("savechanges") ?>" /></td>
+</tr>
+<tr>
+    <td align="left" valign="top" colspan="2">
+    <div id="formElements"><input type="hidden" name="outer" value="4" /></div>
+    </td>
+</tr>
+</table>
+</div>
+</form>
+<?php
+print_simple_box_end();
+admin_externalpage_print_footer($adminroot);
+?>

admin/mnet/mnet_services.php

@@ -0,0 +1,183 @@
+<?php
+    // Allows the admin to configure services for remote hosts
+
+    require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    include_once($CFG->dirroot.'/mnet/lib.php');
+
+    require_login();
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('mnetpeers', $adminroot);
+
+    $context = get_context_instance(CONTEXT_SYSTEM);
+
+    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
+
+    if (!$site = get_site()) {
+        print_error('nosite', '', '', NULL, true);
+    }
+
+/// Initialize variables.
+
+    // Step must be one of:
+    // input   Parse the details of a new host and fetch its public key
+    // commit  Save our changes (to a new OR existing host)
+    // 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);
+    $nocertstring = '';
+    $nocertmatch  = '';
+    $badcert = '';
+    $certerror = '';
+    $noipmatch = '';
+    $stradministration   = get_string('administration');
+    $strconfiguration    = get_string('configuration');
+    $strmnetsettings     = get_string('mnetsettings', 'mnet');
+    $strmnetservices     = get_string('mnetservices', 'mnet');
+    $strmnetlog          = get_string('mnetlog', 'mnet');
+    $strmnetedithost     = get_string('reviewhostdetails', 'mnet');
+    $strmneteditservices = get_string('reviewhostservices', 'mnet');
+
+    $mnet_peer = new mnet_peer();
+
+    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;
+
+            if ($publish != 1 && $subscribe != 1) {
+                if (false == $host2service) {
+                    // We don't have or need a record - do nothing!
+                } else {
+                    // We don't need the record - delete it
+                    delete_records('mnet_host2service', 'hostid', $_POST['hostid'], 'serviceid', $key);
+                }
+            } elseif (false == $host2service && ($publish == 1 || $subscribe == 1)) {
+                $host2service = new stdClass();
+                $host2service->hostid = $_POST['hostid'];
+                $host2service->serviceid = $key;
+                
+                $host2service->publish = $publish;
+                $host2service->subscribe = $subscribe;
+
+                $host2service->id = insert_record('mnet_host2service', $host2service);
+            } elseif ($host2service->publish != $publish || $host2service->subscribe != $subscribe) {
+                $host2service->publish   = $publish;
+                $host2service->subscribe = $subscribe;
+                $tf = update_record('mnet_host2service', $host2service);
+            }
+        }
+    }
+
+    if (is_int($hostid)) {
+        if (0 == $mnet_peer->id) $mnet_peer->set_id($hostid);
+        $mnet_peer->nextstep = 'verify';
+
+        $id_list = $mnet_peer->id;
+        if (!empty($CFG->mnet_all_hosts_id)) {
+            $id_list .= ', '.$CFG->mnet_all_hosts_id;
+        }
+
+        $concat = sql_concat('COALESCE(h2s.id,0) ', ' \'-\' ', ' svc.id');
+
+        $query = "
+            SELECT DISTINCT
+                $concat as id,
+                svc.id as serviceid,
+                svc.name,
+                svc.offer,
+                svc.apiversion,
+                r.parent_type,
+                r.parent,
+                h2s.hostid,
+                h2s.publish,
+                h2s.subscribe
+            FROM
+                {$CFG->prefix}mnet_service2rpc s2r,
+                {$CFG->prefix}mnet_rpc r,
+                {$CFG->prefix}mnet_service svc
+            LEFT JOIN
+                {$CFG->prefix}mnet_host2service h2s
+            ON
+                h2s.hostid in ($id_list) AND
+                h2s.serviceid = svc.id
+            WHERE
+                svc.offer = '1' AND
+                s2r.serviceid = svc.id AND
+                s2r.rpcid = r.id
+            ORDER BY
+                svc.name ASC";
+
+        $resultset = get_records_sql($query);
+
+        if (is_array($resultset)) {
+            $resultset = array_values($resultset);
+        } else {
+            $resultset = array();
+        }
+
+        require_once $CFG->dirroot.'/mnet/xmlrpc/client.php';
+
+        $remoteservices = array();
+        if ($hostid != $CFG->mnet_all_hosts_id) {
+            // Create a new request object
+            $mnet_request = new mnet_xmlrpc_client();
+
+            // Tell it the path to the method that we want to execute
+            $mnet_request->set_method('system/listServices');
+            $mnet_request->send($mnet_peer);
+            if (is_array($mnet_request->response)) {
+                foreach($mnet_request->response as $service) {
+                    $remoteservices[$service['name']][$service['apiversion']] = $service;
+                }
+            }
+        }
+
+        $myservices = array();
+        foreach($resultset as $result) {
+            $result->hostpublishes  = false;
+            $result->hostsubscribes = false;
+            if (isset($remoteservices[$result->name][$result->apiversion])) {
+                if ($remoteservices[$result->name][$result->apiversion]['publish'] == 1) {
+                    $result->hostpublishes  = true;
+                }
+                if ($remoteservices[$result->name][$result->apiversion]['subscribe'] == 1) {
+                    $result->hostsubscribes  = true;
+                }
+            }
+
+            if (empty($myservices[$result->name][$result->apiversion])) {
+                $myservices[$result->name][$result->apiversion] = array('serviceid' => $result->serviceid,
+                                                                        'name' => $result->name,
+                                                                        'offer' => $result->offer,
+                                                                        'apiversion' => $result->apiversion,
+                                                                        'parent_type' => $result->parent_type,
+                                                                        'parent' => $result->parent,
+                                                                        'hostsubscribes' => $result->hostsubscribes,
+                                                                        'hostpublishes' => $result->hostpublishes
+                                                                        );
+            }
+
+            // allhosts_publish allows us to tell the admin that even though he
+            // is disabling a service, it's still available to the host because
+            // he's also publishing it to 'all hosts'
+            if ($result->hostid == $CFG->mnet_all_hosts_id && $CFG->mnet_all_hosts_id != $mnet_peer->id) {
+                $myservices[$result->name][$result->apiversion]['allhosts_publish'] = $result->publish;
+                $myservices[$result->name][$result->apiversion]['allhosts_subscribe'] = $result->subscribe;
+            } elseif (!empty($result->hostid)) {
+                $myservices[$result->name][$result->apiversion]['I_publish'] = $result->publish;
+                $myservices[$result->name][$result->apiversion]['I_subscribe'] = $result->subscribe;
+            }
+
+        }
+
+    } else {
+        redirect('peers.php', get_string('nohostid','mnet'), '5');
+        exit;
+    }
+
+    include('./mnet_services.html');
+?>

admin/mnet/peers.html

@@ -0,0 +1,93 @@
+<?php
+admin_externalpage_print_header($adminroot);
+
+if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
+    print_box(get_string('mnetdisabled','mnet'));
+}
+?>
+<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
+    <form  method="post" action="peers.php">
+        <div>
+            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+            <input type="hidden" name="updateregisterall" value="1" />
+            <table cellspacing="0" cellpadding="5" class="generaltable generalbox" >
+                <tr>
+                    <th class="header c0" colspan="2"><?php print_string('registerallhosts', 'mnet'); ?></th>
+                </tr>
+                <tr>
+                    <td class="cell c1" colspan="2"><?php print_string('registerallhostsexplain', 'mnet'); ?></td>
+                </tr>
+                <tr>
+                    <td class="cell c1"><input type="checkbox" name="registerallhosts" <?php if (!empty($CFG->mnet_register_allhosts)) echo 'checked="checked" '; ?>/></td>
+                    <td class="cell c1"> <?php print_string('registerallhosts', 'mnet'); ?> </td>
+                </tr>
+                <tr>
+                    <td align="right" colspan="2"><input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" /></td>
+                </tr>
+            </table>
+        </div>
+    </form>
+    <table cellspacing="0" cellpadding="5" class="generaltable generalbox standard" >
+        <tr>
+            <th class="header c0"><?php print_string('site'); ?></th>
+            <th class="header c1"><?php print_string('system','mnet'); ?></th>
+            <th class="header c2"><?php print_string('last_connect_time', 'mnet'); ?></th>
+            <th class="header c3"></th>
+        </tr>
+<?php
+
+    foreach($hosts as $host) {
+
+        if ($host->last_connect_time == 0) {
+            $last_connect = get_string('never');
+        } else {
+            $last_connect = date('H:i:s d/m/Y', $host->last_connect_time);
+        }
+
+?>
+    <tr>
+        <td class="cell c0"><a href="peers.php?step=update&amp;hostid=<?php echo $host->id; ?>"><?php echo $host->name; ?></a></td>
+        <td class="cell c1"><a href="peers.php?step=update&amp;hostid=<?php echo $host->id; ?>"><?php echo $host->wwwroot; ?></a></td>
+        <td class="cell c2"><?php if ($host->id != $CFG->mnet_all_hosts_id) echo $last_connect; ?></td>
+        <td class="cell c3">
+<?php   if ($host->id != $CFG->mnet_all_hosts_id){ ?>
+            <form method="post" action="delete.php">
+                <div>
+                <input type="hidden" name="hostid" value="<?php echo $host->id; ?>" />
+                <input type="hidden" name="step" value="verify" />
+                <input type="submit" name="submit" value="<?php print_string('delete'); ?>"/>
+                </div>
+            </form>
+<?php   } ?>
+        </td>
+    </tr>
+<?php
+    }
+?>
+    </table>
+    <form method="post" action="peers.php">
+        <table cellspacing="0" cellpadding="5" class="generaltable generalbox standard" >
+            
+            <tr>
+                <th class="header c4" colspan="4">
+                    <?php print_string('addnewhost', 'mnet'); ?>
+                    <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                    <input type="hidden" name="step" value="input" />
+                </th>
+            </tr>
+            <tr>
+                <td class="cell c0">wwwroot:</td>
+                <td class="cell c1"><input type="text" name="wwwroot" value="" /></td>
+                <td class="cell c2"></td>
+                <td class="cell c3"></td>
+            </tr>
+            <tr>
+                <td class="cell c4" align="right" colspan="4"><input type="submit" value="<?php print_string('addhost','mnet'); ?>" /></td>
+            </tr>
+        
+        </table>
+    </form>
+</div>
+<?php
+admin_externalpage_print_footer($adminroot);
+?>

admin/mnet/peers.php

@@ -0,0 +1,156 @@
+<?PHP // $Id$
+
+// Allows the admin to configure other Moodle hosts info
+
+require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
+require_once($CFG->libdir.'/adminlib.php');
+include_once($CFG->dirroot.'/mnet/lib.php');
+
+require_login();
+$adminroot = admin_get_root();
+admin_externalpage_setup('mnetpeers', $adminroot);
+
+$context = get_context_instance(CONTEXT_SYSTEM);
+
+require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
+
+if (!extension_loaded('openssl')) {
+    admin_externalpage_print_header($adminroot);
+    print_error('requiresopenssl', 'mnet', '', NULL, true);
+}
+
+if (!$site = get_site()) {
+    admin_externalpage_print_header($adminroot);
+    print_error('nosite', '', '', NULL, true);
+}
+
+if (!function_exists('curl_init') ) {
+    admin_externalpage_print_header($adminroot);
+    print_error('nocurl', 'mnet', '', NULL, true);
+}
+
+/// Initialize variables.
+
+// Step must be one of:
+// input   Parse the details of a new host and fetch its public key
+// commit  Save our changes (to a new OR existing host)
+$step   = optional_param('step', NULL, PARAM_ALPHA);
+$hostid = optional_param('hostid', NULL, PARAM_INT);
+
+// Fetch some strings for the HTML templates
+$strmnetservices   = get_string('mnetservices', 'mnet');
+$strmnetlog        = get_string('mnetlog', 'mnet');
+$strmnetedithost   = get_string('reviewhostdetails', 'mnet');
+
+if (!isset($CFG->mnet_dispatcher_mode)) set_config('mnet_dispatcher_mode', 'off');
+
+/// If data submitted, process and store
+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');
+        exit;
+    }
+
+    if (!empty($form->updateregisterall)) {
+        if (!empty($form->registerallhosts)) {
+            set_config('mnet_register_allhosts',1);
+        } else {
+            set_config('mnet_register_allhosts',0);
+        }
+        redirect('peers.php', get_string('changessaved'));
+    } else {
+
+        $mnet_peer = new mnet_peer();
+    
+        if (!empty($form->id)) {
+            $form->id = clean_param($form->id, PARAM_INT);
+            $mnet_peer->set_id($form->id);
+        } else {
+            // PARAM_URL requires a genuine TLD (I think) This breaks my testing
+            $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');
+                exit;
+            }
+            unset($temp_wwwroot);
+            $mnet_peer->bootstrap($form->wwwroot);
+        }
+    
+        if (isset($form->name) && $form->name != $mnet_peer->name) {
+            $form->name = clean_param($form->name, PARAM_NOTAGS);
+            $mnet_peer->set_name($form->name);
+        }
+    
+        if (isset($form->deleted) && ($form->deleted == '0' || $form->deleted == '1')) {
+            $mnet_peer->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);
+                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);
+                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);
+                    exit;
+                }
+            }
+        }
+
+        // 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);
+            }
+        }
+
+        if ('input' == $form->step) {
+            include('./mnet_review.html');
+        } elseif ('commit' == $form->step) {
+            $bool = $mnet_peer->commit();
+            if ($bool) {
+                redirect('peers.php?step=update&amp;hostid='.$mnet_peer->id, get_string('changessaved'));
+            } else {
+                error('Invalid action parameter.', 'index.php');
+            }
+        }
+    }
+} elseif (is_int($hostid)) {
+    $mnet_peer = new mnet_peer();
+    $mnet_peer->set_id($hostid);
+    $currentkey = mnet_get_public_key($mnet_peer->wwwroot);
+    if($currentkey == $mnet_peer->public_key) unset($currentkey);
+    $form = new stdClass();
+    if ($hostid != $CFG->mnet_all_hosts_id) {
+        include('./mnet_review.html');
+    } else {
+        include('./mnet_review_allhosts.html');
+    }
+} else {
+    $hosts = get_records_select('mnet_host', " id != '{$CFG->mnet_localhost_id}' AND deleted = '0' ",'wwwroot ASC' );
+    if (empty($hosts)) $hosts = array();
+    include('./peers.html');
+}
+?>

admin/mnet/trustedhosts.html

@@ -0,0 +1,68 @@
+<?php
+admin_externalpage_print_header($adminroot);
+?>
+<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
+<table cellspacing="0" cellpadding="5"  class="generaltable generalbox" >
+    <tr>
+        <th class="header c0" colspan="2"><?php print_string('trustedhosts', 'mnet'); ?></th>
+    </tr>
+    <tr>
+        <td class="cell c1" colspan="2"><?php print_string('trustedhostsexplain', 'mnet'); ?></td>
+    </tr>
+    <tr>
+        <td class="cell c1" colspan="2">
+            <form  method="post" action="trustedhosts.php">
+            <div>
+                <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                <textarea name="hostlist" cols="40" rows="20"><?php echo $trusted_hosts; ?></textarea><br />
+                <input type="submit" value="<?php print_string('savechanges'); ?>" />
+            </div>
+            </form>
+        </td>
+    </tr>
+</table>
+<table cellspacing="0" cellpadding="5" class="generaltable generalbox" >
+    <tr>
+        <th class="header c0" colspan="2"><?php print_string('testtrustedhosts', 'mnet'); ?></th>
+    </tr>
+<?php 
+    if (!empty($test_ip_address)){
+?>
+    <tr>
+        <td class="cell c1" colspan="2">
+            <?php
+                if ($in_range) {
+                    print_string('is_in_range',  'mnet', $test_ip_address);
+                    echo '<br />';
+                    print_string('validated_by', 'mnet', $validated_by);
+                } else {
+                    print_string('not_in_range',  'mnet', $test_ip_address);
+                }
+            ?>
+        </td>
+    </tr>
+<?php
+   } else {
+?>
+    <tr>
+        <td class="cell c1" colspan="2"><?php print_string('testtrustedhostsexplain', 'mnet'); ?></td>
+    </tr>
+<?php
+   } 
+?>
+    <tr>
+        <td class="cell c1" colspan="2">
+            <form  method="get" action="trustedhosts.php">
+            <div>
+                <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+                <input type="text" name="testipaddress" value="<?php echo $test_ip_address; ?>" />
+                <input type="submit" value="<?php print_string('go'); ?>" />
+            </div>
+            </form>
+        </td>
+    </tr>
+</table>
+</div>
+<?php
+admin_externalpage_print_footer($adminroot);
+?>

admin/mnet/trustedhosts.php

@@ -0,0 +1,72 @@
+<?php
+    // Allows the admin to configure services for remote hosts
+
+    require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    include_once($CFG->dirroot.'/mnet/lib.php');
+
+    require_login();
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('trustedhosts', $adminroot);
+
+    $context = get_context_instance(CONTEXT_SYSTEM);
+
+    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
+
+    if (!extension_loaded('openssl')) {
+        admin_externalpage_print_header($adminroot);
+        print_error('requiresopenssl', 'mnet', '', NULL, true);
+    }
+    
+    if (!$site = get_site()) {
+        admin_externalpage_print_header($adminroot);
+        print_error('nosite', '', '', NULL, true);
+    }
+
+    $trusted_hosts = '';//array();
+    $old_trusted_hosts = get_config('mnet', 'mnet_trusted_hosts');
+    if (!empty($old_trusted_hosts)) {
+        $old_trusted_hosts =  explode(',', $old_trusted_hosts);
+    } else {
+        $old_trusted_hosts = array();
+    }
+
+    $test_ip_address = optional_param('testipaddress', NULL, PARAM_HOST);
+    $in_range = false;
+    if (!empty($test_ip_address)) {
+        foreach($old_trusted_hosts as $host) {
+            list($network, $mask) = explode('/', $host.'/');
+            if (empty($network)) continue;
+            if (strlen($mask) == 0) $mask = 32;
+            
+            if (ip_in_range($test_ip_address, $network, $mask)) {
+                $in_range = true;
+                $validated_by = $network.'/'.$mask;
+                break;
+            }
+        }
+    }
+
+    /// If data submitted, process and store
+    if (($form = data_submitted()) && confirm_sesskey()) {
+        $hostlist = preg_split("/[\s,]+/", $form->hostlist);
+        foreach($hostlist as $host) {
+            list($address, $mask) = explode('/', $host.'/');
+            if (empty($address)) continue;
+            if (strlen($mask) == 0) $mask = 32;
+            $trusted_hosts .= trim($address).'/'.trim($mask)."\n";
+            unset($address, $mask);
+        }
+        set_config('mnet_trusted_hosts', str_replace("\n", ',', $trusted_hosts), 'mnet');
+    } elseif (!empty($old_trusted_hosts)) {
+        foreach($old_trusted_hosts as $host) {
+            list($address, $mask) = explode('/', $host.'/');
+            if (empty($address)) continue;
+            if (strlen($mask) == 0) $mask = 32;
+            $trusted_hosts .= trim($address).'/'.trim($mask)."\n";
+            unset($address, $mask);
+        }
+    }
+
+    include('./trustedhosts.html');
+?>

admin/module.php

@@ -16,7 +16,7 @@
         }
 
         if ($module != '') {
-            require_once("$CFG->dirroot/mod/$module/lib.php");
+            include_once("$CFG->dirroot/mod/$module/lib.php");
             // 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.
@@ -43,7 +43,7 @@
 
 /// 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");
 
     $strmodulename = get_string("modulename", $module);
 
@@ -55,7 +55,7 @@
 
     print_heading($strmodulename);
 
-    print_simple_box("<center>".get_string("configwarning", 'admin')."</center>", "center", "60%");
+    print_simple_box(get_string("configwarning", 'admin'), "center", "60%");
     echo "<br />";
 
     print_simple_box_start("center", "");

admin/modules.php

@@ -2,10 +2,15 @@
       // Allows the admin to manage activity modules
 
     require_once('../config.php');
+    require_once('../course/lib.php');
     require_once($CFG->libdir.'/adminlib.php');
+    require_once($CFG->libdir.'/tablelib.php');
+
+    // defines
+    define('MODULE_TABLE','module_administration_table');
+
     $adminroot = admin_get_root();
     admin_externalpage_setup('managemodules', $adminroot);
-    require_once('../course/lib.php');
 
     $show    = optional_param('show', '', PARAM_SAFEDIR);
     $hide    = optional_param('hide', '', PARAM_SAFEDIR);
@@ -23,34 +28,51 @@
     $strsettings = get_string("settings");
     $stractivities = get_string("activities");
     $stractivitymodule = get_string("activitymodule");
+    $strshowmodulecourse = get_string('showmodulecourse');
 
     admin_externalpage_print_header($adminroot);
 
     print_heading($stractivities);
 
-    $coursesaffected = false;
-
-
 /// If data submitted, then process and store.
 
     if (!empty($hide) and confirm_sesskey()) {
         if (!$module = get_record("modules", "name", $hide)) {
             error("Module doesn't exist!");
         }
-        set_field("modules", "visible", "0", "id", $module->id);                               // Hide main module
-        set_field('course_modules', 'visibleold', '1', 'visible' ,'1', 'module', $module->id); // Remember the previous visible state so we can toggle this back if the module is unhidden.
-        set_field('course_modules', 'visibleold', '0', 'visible' ,'0', 'module', $module->id);
-        set_field("course_modules", "visible", "0", "module", $module->id);                    // Hide all related activity modules
-        $coursesaffected = true;
+        set_field("modules", "visible", "0", "id", $module->id); // Hide main module
+        // Remember the visibility status in visibleold
+        // and hide...
+        $sql = "UPDATE {$CFG->prefix}course_modules
+                SET visibleold=visible,
+                    visible=0
+                WHERE  module={$module->id}";
+        execute_sql($sql, false);
+        // clear the course modinfo cache for courses
+        // where we just deleted something
+        $sql = "UPDATE {$CFG->prefix}course
+                SET modinfo=''
+                WHERE id IN (SELECT DISTINCT course 
+                             FROM {$CFG->prefix}course_modules 
+                             WHERE visibleold=1 AND module={$module->id})";
+        execute_sql($sql, false);
     }
 
     if (!empty($show) and confirm_sesskey()) {
         if (!$module = get_record("modules", "name", $show)) {
             error("Module doesn't exist!");
         }
-        set_field("modules", "visible", "1", "id", $module->id);                               // Show main module
-        set_field('course_modules', 'visible', '1', 'visibleold', '1', 'module', $module->id); // Get the previous saved visible state for the course module.
-        $coursesaffected = true;
+        set_field("modules", "visible", "1", "id", $module->id); // Show main module
+        set_field('course_modules', 'visible', '1', 'visibleold', 
+                  '1', 'module', $module->id); // Get the previous saved visible state for the course module.
+        // clear the course modinfo cache for courses
+        // where we just made something visible
+        $sql = "UPDATE {$CFG->prefix}course
+                SET modinfo=''
+                WHERE id IN (SELECT DISTINCT course 
+                             FROM {$CFG->prefix}course_modules 
+                             WHERE visible=1 AND module={$module->id})";
+        execute_sql($sql, false);
     }
 
     if (!empty($delete) and confirm_sesskey()) {
@@ -83,6 +105,15 @@
                 }
             }
 
+            // clear course.modinfo for courses
+            // that used this module...
+            $sql = "UPDATE {$CFG->prefix}course
+                    SET modinfo=''
+                    WHERE id IN (SELECT DISTINCT course 
+                                 FROM {$CFG->prefix}course_modules 
+                                 WHERE module={$module->id})";
+            execute_sql($sql, false);
+
             // Now delete all the course module records
             if (!delete_records("course_modules", "module", $module->id)) {
                 notify("Error occurred while deleting all $strmodulename records in course_modules table");
@@ -118,20 +149,12 @@
             // Delete the capabilities that were defined by this module
             capabilities_cleanup('mod/'.$module->name);
 
-            // rebuild_course_cache();  // Because things have changed
-            $coursesaffected = true;
-
             $a->module = $strmodulename;
             $a->directory = "$CFG->dirroot/mod/$delete";
             notice(get_string("moduledeletefiles", "", $a), "modules.php");
         }
     }
 
-    if ($coursesaffected) {
-        rebuild_course_cache();  // Because things have changed
-    }
-
-
 /// Get and sort the existing modules
 
     if (!$modules = get_records("modules")) {
@@ -149,16 +172,19 @@
     ksort($modulebyname);
 
 /// Print the table of all modules
-
-    $table->head  = array ($stractivitymodule, $stractivities, $strversion, "$strhide/$strshow", $strdelete, $strsettings);
-    $table->align = array ("left", "right", "left", "center", "center", "center");
-    $table->wrap  = array ("nowrap", "", "", "", "","");
-    $table->size  = array ("100%", "10", "10", "10", "10","12");
-    $table->width = "100";
+    // construct the flexible table ready to display
+    $table = new flexible_table(MODULE_TABLE);
+    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'delete', 'settings'));
+    $table->define_headers(array($stractivitymodule, $stractivities, $strversion, "$strhide/$strshow", $strdelete, $strsettings));
+    $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/modules.php');
+    $table->set_attribute('id', 'modules');
+    $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
+    $table->setup();
 
     foreach ($modulebyname as $modulename => $module) {
 
-        $icon = "<img src=\"$CFG->modpixpath/$module->name/icon.gif\" hspace=\"10\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" />";
+        // took out hspace="\10\", because it does not validate. don't know what to replace with.
+        $icon = "<img src=\"$CFG->modpixpath/$module->name/icon.gif\" class=\"icon\" alt=\"\" />";
 
         $delete = "<a href=\"modules.php?delete=$module->name&amp;sesskey=$USER->sesskey\">$strdelete</a>";
 
@@ -169,26 +195,40 @@
         }
 
         $count = count_records_select("$module->name",'course<>0');
+        if ($count>0) {
+            $countlink = "<a href=\"{$CFG->wwwroot}/course/search.php?modulelist=$module->name" .
+                "&amp;sesskey={$USER->sesskey}\" title=\"$strshowmodulecourse\">$count</a>";
+        }
+        else {
+            $countlink = "$count";
+        }
 
         if ($module->visible) {
             $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=$USER->sesskey\" title=\"$strhide\">".
-                       "<img src=\"$CFG->pixpath/i/hide.gif\" align=\"middle\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" /></a>";
+                       "<img src=\"$CFG->pixpath/i/hide.gif\" class=\"icon\" alt=\"$strhide\" /></a>";
             $class = "";
         } else {
             $visible = "<a href=\"modules.php?show=$module->name&amp;sesskey=$USER->sesskey\" title=\"$strshow\">".
-                       "<img src=\"$CFG->pixpath/i/show.gif\" align=\"middle\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" /></a>";
-            $class = "class=\"dimmed_text\"";
+                       "<img src=\"$CFG->pixpath/i/show.gif\" class=\"icon\" alt=\"$strshow\" /></a>";
+            $class = " class=\"dimmed_text\"";
         }
         if ($module->name == "forum") {
             $delete = "";
             $visible = "";
             $class = "";
         }
-        $table->data[] = array ("<span $class>$icon $modulename</span>", $count, $module->version, $visible, $delete, $settings);
-    }
-    print_table($table);
 
-    echo "<br /><br />";
+        $table->add_data(array(
+            '<span'.$class.'>'.$icon.' '.$modulename.'</span>', 
+            $countlink, 
+            '<span'.$class.'>'.$module->version.'</span>', 
+            $visible, 
+            $delete, 
+            $settings
+        ));
+    }
+
+    $table->print_html();
 
     admin_externalpage_print_footer($adminroot);
 

admin/multilangupgrade.php

@@ -0,0 +1,124 @@
+<?php /// $Id$
+      /// Search and replace strings throughout all texts in the whole database
+
+require_once('../config.php');
+require_once($CFG->dirroot.'/course/lib.php');
+require_once($CFG->libdir.'/adminlib.php');
+$adminroot = admin_get_root();
+admin_externalpage_setup('multilangupgrade', $adminroot);
+
+$go = optional_param('go', 0, PARAM_BOOL);
+
+require_login();
+
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+###################################################################
+admin_externalpage_print_header($adminroot);
+
+print_heading(get_string('multilangupgrade', 'admin'));
+
+$strmultilangupgrade = get_String('multilangupgradeinfo', 'admin');
+
+if (!$go or !data_submitted() or !confirm_sesskey()) {   /// Print a form
+    $optionsyes = array('go'=>1, 'sesskey'=>sesskey());
+    notice_yesno($strmultilangupgrade, 'multilangupgrade.php', 'index.php', $optionsyes, null, 'post', 'get');
+    admin_externalpage_print_footer($adminroot);
+    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());
+
+echo '<strong>Progress:</strong>';
+$i = 0;
+$skiptables = array($CFG->prefix.'config', $CFG->prefix.'user_students', $CFG->prefix.'user_teachers');//, $CFG->prefix.'sessions2');
+
+foreach ($tables as $table) {
+    if (($CFG->prefix && strpos($table, $CFG->prefix) !== 0)
+      or strpos($table, $CFG->prefix.'pma') === 0) { // Not our tables
+        continue;
+    }
+    if (in_array($table, $skiptables)) { // Don't process these
+        continue;
+    }
+    if ($columns = $db->MetaColumns($table, false)) {
+        if (!array_key_exists('id', $columns) and !array_key_exists('ID', $columns)) {
+            continue; // moodle tables have id
+        }
+        foreach ($columns as $column => $data) {
+            if (in_array($data->type, array('text','mediumtext','longtext','varchar'))) {  // Text stuff only
+                // first find candidate records
+                $rs = get_recordset_sql("SELECT id, $column FROM $table WHERE $column LIKE '%</lang>%' OR $column LIKE '%<span lang=%'");
+                if ($rs and $rs->RecordCount() > 0) {
+                    while (!$rs->EOF) {
+                        $text = $rs->fields[$column];
+                        $id   = $rs->fields['id'];
+
+                        if ($i % 600 == 0) {
+                            echo '<br />';
+                        }
+                        if ($i % 10 == 0) {
+                            echo '.';
+                        }
+                        $i++;
+                        $rs->MoveNext();
+
+                        if (empty($text) or is_numeric($text)) {
+                            continue; // nothing to do
+                        }
+
+                        $search = '/(<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)(\s*<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)+/is';
+                        $newtext = preg_replace_callback($search, 'multilangupgrade_impl', $text);
+
+                        if (is_null($newtext)) {
+                            continue; // regex error
+                        }
+
+                        if ($newtext != $text) {
+                            $newtext = addslashes($newtext);
+                            execute_sql("UPDATE $table SET $column='$newtext' WHERE id=$id", false);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+// set conversion flag - switches to new plugin automatically
+set_config('filter_multilang_converted', 1);
+
+print_simple_box_end();
+
+/// Rebuild course cache which might be incorrect now
+notify('Rebuilding course cache...', 'notifysuccess');
+rebuild_course_cache();
+notify('...finished', 'notifysuccess');
+
+print_continue('index.php');
+
+admin_externalpage_print_footer($adminroot);
+die;
+
+
+function multilangupgrade_impl($langblock) {
+    $searchtosplit = '/<(?:lang|span) lang="([a-zA-Z0-9_-]*)".*?>(.+?)<\/(?:lang|span)>/is';
+    preg_match_all($searchtosplit, $langblock[0], $rawlanglist);
+    $return = '';
+    foreach ($rawlanglist[1] as $index=>$lang) {
+        $return .= '<span lang="'.$lang.'" class="multilang">'.$rawlanglist[2][$index].'</span>';
+    }
+    return $return;
+}
+?>

admin/oacleanup.php

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

admin/pagelib.php

@@ -4,11 +4,18 @@ require_once($CFG->libdir.'/pagelib.php');
 
 define('PAGE_ADMIN', 'admin');
 
-define('BLOCK_L_MIN_WIDTH',0);
-define('BLOCK_L_MAX_WIDTH',210);
-define('BLOCK_R_MIN_WIDTH',0);
-define('BLOCK_R_MAX_WIDTH',210);
+// Bounds for block widths
+// more flexible for theme designers taken from theme config.php
+$lmin = (empty($THEME->block_l_min_width)) ? 0 :   $THEME->block_l_min_width;
+$lmax = (empty($THEME->block_l_max_width)) ? 210 : $THEME->block_l_max_width;
+$rmin = (empty($THEME->block_r_min_width)) ? 0 :   $THEME->block_r_min_width;
+$rmax = (empty($THEME->block_r_max_width)) ? 210 : $THEME->block_r_max_width;
 
+define('BLOCK_L_MIN_WIDTH', $lmin);
+define('BLOCK_L_MAX_WIDTH', $lmax);
+define('BLOCK_R_MIN_WIDTH', $rmin);
+define('BLOCK_R_MAX_WIDTH', $rmax);
+  
 page_map_class(PAGE_ADMIN, 'page_admin');
 
 class page_admin extends page_base {
@@ -109,12 +116,12 @@ class page_admin extends page_base {
         $this->init_full($section); // we're trusting that init_full() has already been called by now; it should have.
                                     // if not, print_header() has to be called with a $section parameter
 
-        if ($this->user_allowed_editing()) {
-            $buttons = '<table><tr><td><form target="' . $CFG->framename . '" method="get" action="' . $this->url_get_path() . '">'.
-                       '<input type="hidden" name="adminedit" value="'.($this->user_is_editing()?'off':'on').'" />'.
+	// 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').'" /></form></td>' . 
-                       '</tr></table>';
+                       '<input type="submit" value="'.get_string($this->user_is_editing()?'blockseditoff':'blocksediton').'" /></div></form></div>';
         } else {
             $buttons = '&nbsp;';
         }

admin/phpinfo.php

@@ -20,8 +20,14 @@
     $html = ob_get_contents();
     ob_end_clean();
 
+/// Delete styles from output
     $html = preg_replace('#(\n?<style[^>]*?>.*?</style[^>]*?>)|(\n?<style[^>]*?/>)#is', '', $html);
     $html = preg_replace('#(\n?<head[^>]*?>.*?</head[^>]*?>)|(\n?<head[^>]*?/>)#is', '', $html);
+/// Delete DOCTYPE from output
+    $html = preg_replace('/<!DOCTYPE html PUBLIC.*?>/is', '', $html);
+/// Delete body and html tags
+    $html = preg_replace('/<html.*?>.*?<body.*?>/is', '', $html);
+    $html = preg_replace('/<\/body><\/html>/is', '', $html);
 
     echo $html;
 

admin/process_email.php

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

admin/register.php

@@ -34,98 +34,94 @@
     $strregistration = get_string("registration");
     $strregistrationinfo = get_string("registrationinfo");
 
-    print_header("$site->shortname: $strregistration", "$site->fullname", 
+    print_header("$site->shortname: $strregistration", $site->fullname, 
                  "<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> $strregistration");
 
     print_heading($strregistration);
 
     print_simple_box($strregistrationinfo, "center", "70%");
-    echo "<br />";
 
 
 /// Print the form
 
-    print_simple_box_start("center", "");
+    echo "<form id=\"mform1\" class=\"mform\" action=\"http://moodle.org/register/\" method=\"post\">\n";
+    echo '<fieldset id="registration">';
+    echo '<legend>Registration Information</legend>';
 
-    echo "<form name=\"form\" action=\"http://moodle.org/register/\" method=\"post\">\n";
-    echo "<table cellpadding=\"9\" border=\"0\">\n";
-    echo "<tr valign=\"top\">\n";
-    echo "<td align=\"center\" colspan=\"2\">".get_string("location")."</td>\n";
-    echo "</tr>\n";
-
-    echo "<tr valign=\"top\">\n";
-    echo "<td align=\"right\">Moodle URL:</td>\n";
-    echo "<td>$CFG->wwwroot</td>\n";
     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=\"host\" value=\"".$_SERVER["HTTP_HOST"]."\">\n";
-    echo "<input type=\"hidden\" name=\"lang\" value=\"".current_language()."\">\n";
-    echo "</td></tr>\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=\"host\" value=\"".$_SERVER["HTTP_HOST"]."\" />\n";
+    echo "<input type=\"hidden\" name=\"lang\" value=\"".current_language()."\" />\n";
 
-    echo "<tr valign=\"top\">\n";
-    echo "<td align=\"right\">".get_string("currentversion").":</td>\n";
-    echo "<td>$CFG->release ($CFG->version)</td>\n";
-    echo "<input type=\"hidden\" name=\"version\" value=\"$CFG->version\">\n";
-    echo "<input type=\"hidden\" name=\"release\" value=\"$CFG->release\">\n";
-    echo "</td></tr>\n";
+    echo "<input type=\"hidden\" name=\"version\" value=\"$CFG->version\" />\n";
+    echo "<input type=\"hidden\" name=\"release\" value=\"$CFG->release\" />\n";
 
-    echo "<tr valign=\"top\">\n";
-    echo "<td align=\"right\">".get_string("fullsitename").":</td>\n";
-    echo "<td><input size=\"50\" type=\"text\" name=\"sitename\" value=\"$site->fullname\"></td>\n";
-    echo "</tr>\n";
+    echo '<div class="fitem">';
+    echo '<div class="fitemtitle"><label>URL</label></div>';
+    echo '<div class="felement ftext">'.$CFG->wwwroot.'</div>';
+    echo '</div>';
+            
+    echo '<div class="fitem">';
+    echo '<div class="fitemtitle"><label>'.get_string("currentversion").'</label></div>';
+    echo '<div class="felement ftext">'."$CFG->release ($CFG->version)".'</div>';
+    echo '</div>';
+            
+    echo '<div class="fitem">';
+    echo '<div class="fitemtitle"><label for="sitename">'.get_string("fullsitename").'</label></div>';
+    echo '<div class="felement ftext">';
+    echo '<input size="50" id="sitename" type="text" name="sitename" value="'.format_string($site->fullname).'" />';
+    echo '</div>';
+    echo '</div>';
 
-    echo "<tr valign=\"top\">\n";
-    echo "<td align=\"right\">".get_string("country").":</td>\n";
-    echo "<td>";
+    echo '<div class="fitem">';
+    echo '<div class="fitemtitle"><label for="menucountry">'.get_string("country").'</label></div>';
+    echo '<div class="felement ftext">';
     choose_from_menu (get_list_of_countries(), "country", $admin->country, get_string("selectacountry")."...", "", "");
-    echo "</td>\n";
-    echo "</tr>\n";
+    echo '</div>';
+    echo '</div>';
 
-    echo "<tr valign=\"top\">\n";
-    echo "<td align=\"right\"><a href=\"http://moodle.org/sites/?country=$admin->country\" title=\"See the current list of sites\" target=_blank>".get_string("publicdirectory")."</a>:</td>\n";
-    echo "<td>";
+    echo '<div class="fitem">';
+    echo '<div class="fitemtitle"><label for="menupublic">'."<a href=\"http://moodle.org/sites/?country=$admin->country\" title=\"".get_string("publicdirectorytitle")."\">".get_string("publicdirectory")."</a>".'</label></div>';
+    echo '<div class="felement ftext">';
     $options[0] = get_string("publicdirectory0");
     $options[1] = get_string("publicdirectory1");
     $options[2] = get_string("publicdirectory2");
     choose_from_menu ($options, "public", "2", "", "", "");
     unset($options);
-    echo "</td>\n";
-    echo "</tr>\n";
+    echo '</div>';
+    echo '</div>';
 
-    echo "<tr valign=\"top\">\n";
-    echo "<td align=\"right\">".get_string("registrationcontact")."</a>:</td>\n";
-    echo "<td>\n";
+    echo '<div class="fitem">';
+    echo '<div class="fitemtitle"><label for="menucontact">'.get_string("registrationcontact").'</label></div>';
+    echo '<div class="felement ftext">';
     $options[0] = get_string("registrationcontactno");
     $options[1] = get_string("registrationcontactyes");
     choose_from_menu ($options, "contact", "1", "", "", "");
     unset($options);
-    echo "</td>\n";
-    echo "</tr>\n";
-
-    echo "<tr valign=\"top\">\n";
-    echo "<td align=\"right\">".get_string("statistics").":";
-    echo "<br />(".get_string("notpublic").')';
-    echo "</td>\n";
-    echo "<td>";
+    echo '</div>';
+    echo '</div>';
+            
+    echo '<div class="fitem">';
+    echo '<div class="fitemtitle"><label>'.get_string("statistics")."<br />(".get_string("notpublic").')'.'</label></div>';
+    echo '<div class="felement ftext">';
 
     $count = count_records('course')-1;
     echo get_string("courses").": ".$count;
-    echo "<input type=\"hidden\" name=\"courses\" value=\"$count\">\n";
+    echo "<input type=\"hidden\" name=\"courses\" value=\"$count\" />\n";
     echo '<br />';
 
     $count = count_records('user', 'deleted', 0);
     echo get_string("users").": ".$count;
-    echo "<input type=\"hidden\" name=\"users\" value=\"$count\">\n";
+    echo "<input type=\"hidden\" name=\"users\" value=\"$count\" />\n";
     echo '<br />';
 
     // total number of role assignments
     $count = count_records('role_assignments'); 
     echo get_string('roleassignments', 'role').": ".$count;
-    echo "<input type=\"hidden\" name=\"roleassignments\" value=\"$count\">\n";
+    echo "<input type=\"hidden\" name=\"roleassignments\" value=\"$count\" />\n";
     echo '<br />';
 
     // first find all distinct roles with mod/course:update
@@ -140,64 +136,55 @@
     
     $count = count_records_sql($sql);
     echo get_string("teachers").": ".$count;
-    echo "<input type=\"hidden\" name=\"courseupdaters\" value=\"$count\">\n";
+    echo "<input type=\"hidden\" name=\"courseupdaters\" value=\"$count\" />\n";
     echo '<br />';
 
     $count = count_records('forum_posts');
     echo get_string("posts", 'forum').": ".$count;
-    echo "<input type=\"hidden\" name=\"posts\" value=\"$count\">\n";
+    echo "<input type=\"hidden\" name=\"posts\" value=\"$count\" />\n";
     echo '<br />';
 
     $count = count_records('question');
     echo get_string("questions", 'quiz').": ".$count;
-    echo "<input type=\"hidden\" name=\"questions\" value=\"$count\">\n";
+    echo "<input type=\"hidden\" name=\"questions\" value=\"$count\" />\n";
     echo '<br />';
 
     $count = count_records('resource');
     echo get_string("modulenameplural", "resource").": ".$count;
-    echo "<input type=\"hidden\" name=\"resources\" value=\"$count\">\n";
-    echo '<br />';
+    echo "<input type=\"hidden\" name=\"resources\" value=\"$count\" />\n";
+    echo '</div>';
+    echo '</div>';
+            
+    echo '<div class="fitem">';
+    echo '<div class="fitemtitle"><label for="adminname">'.get_string("administrator").'</label></div>';
+    echo '<div class="felement ftext">';
+    echo "<input size=\"50\" type=\"text\" id=\"adminname\" name=\"adminname\" value=\"".fullname($admin, true)."\" />";
+    echo '</div>';
+    echo '</div>';
 
-    echo "</td>\n";
-    echo "</tr>\n";
+    echo '<div class="fitem">';
+    echo '<div class="fitemtitle"><label for="adminemail">'.get_string("email").'</label></div>';
+    echo '<div class="felement ftext">';
+    echo "<input size=\"50\" type=\"text\" id=\"adminemail\" name=\"adminemail\" value=\"$admin->email\" />";
+    echo '</div>';
+    echo '</div>';
 
-    echo "<tr valign=\"top\">\n";
-    echo "<td align=\"center\" colspan=\"2\"><hr size=\"1\" noshade>".get_string("administrator")."</td>\n";
-    echo "</tr>\n";
-
-    echo "<tr valign=\"top\">\n";
-    echo "<td align=\"right\">".get_string("administrator").":</td>\n";
-    echo "<td><input size=\"50\" type=\"text\" name=\"adminname\" value=\"".fullname($admin, true)."\"></td>\n";
-    echo "</tr>\n";
-
-    echo "<tr valign=\"top\">\n";
-    echo "<td align=\"right\">".get_string("email").":</td>\n";
-    echo "<td><input size=\"50\" type=\"text\" name=\"adminemail\" value=\"$admin->email\"></td>\n";
-    echo "</tr>\n";
-
-    echo "<tr valign=\"top\">\n";
-    echo "<td align=\"right\">".get_string("registrationemail")."</a>:</td>\n";
-    echo "<td>\n";
+    echo '<div class="fitem">';
+    echo '<div class="fitemtitle"><label for="menumailme">'.get_string("registrationemail").'</label></div>';
+    echo '<div class="felement ftext">';
     $options[0] = get_string("registrationno");
     $options[1] = get_string("registrationyes");
     choose_from_menu ($options, "mailme", "1", "", "", "");
     unset($options);
-    echo "</td>\n";
-    echo "</tr>\n";
+    echo '</div>';
+    echo '</div>';
 
-    echo "<tr valign=\"top\">\n";
-    echo "<td align=\"right\">&nbsp;</td>\n";
-    echo "<td><input type=\"submit\" value=\"".get_string("registrationsend")."\"></td>\n";
-    echo "</tr>\n";
+    echo '<div class="felement fsubmit"><input name="submitbutton" value="'.get_string('registrationsend').'" type="submit" id="id_submitbutton" /></div>';
 
+    echo "</fieldset>\n";
 
-    echo "</table>\n";
     echo "</form>\n";
 
-    print_simple_box_end();
-
-    echo "<br />\n";
-
     print_footer();
 
 ?>

admin/replace.php

@@ -25,10 +25,10 @@ if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Pr
     print_simple_box_start('center');
     echo '<div align="center">';
     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 />';
-    echo 'Replace with this string: <input type="text" name="replace"><br /></br />';
-    echo '<input type="submit" value="Yes, do it now"><br />';
+    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+    echo 'Search whole database for: <input type="text" name="search" /><br />';
+    echo 'Replace with this string: <input type="text" name="replace" /><br />';
+    echo '<input type="submit" value="Yes, do it now" /><br />';
     echo '</form>';
     echo '</div>';
     print_simple_box_end();

admin/report/backups/index.php

@@ -0,0 +1,140 @@
+<?php // $Id$
+      // index.php - scheduled backup logs
+
+    require_once('../../../config.php');
+    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));
+
+/// Scheduled backups are disabled by the server admin
+    if (!empty($CFG->disablescheduledbackups)) {
+        print_error('scheduledbackupsdisabled', '', '', NULL, true);
+    }
+
+/// Scheduled backups aren't active by the site admin
+    $backup_config = backup_get_config();
+    if (empty($backup_config->backup_sche_active)) {
+        notify(get_string('scheduledbackupsinactive'));
+    }
+
+/// Get needed strings
+    $backuploglaststatus = get_string("backuploglaststatus");
+    $backuplogdetailed = get_string("backuplogdetailed");
+    $stradmin = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strbackup = get_string("backup");
+    $strbackupdetails = get_string("backupdetails");
+    $strlogs = get_string("logs");
+    $strftimedatetime = get_string("strftimerecent");
+    $strftimetime = get_string("strftimetime").":%S";
+    $strerror = get_string("error");
+    $strok = get_string("ok");
+    $strunfinished = get_string("unfinished");
+    $strskipped = get_string("skipped");
+    $strcourse = get_string("course");
+    $strtimetaken = get_string("timetaken","quiz");
+    $strstatus = get_string("status");
+    $strnext = get_string("next");
+
+/// Decide when to show last execution logs or detailed logs
+/// Lastlog view
+    if (!$courseid) {
+        print_heading($backuploglaststatus);
+        print_simple_box_start('center');
+    /// Now, get every record from backup_courses
+        $courses = get_records("backup_courses");
+
+        if (!$courses) {
+            notify(get_string('nologsfound'));
+        } else {
+            echo "<table border=\"0\" align=\"center\" cellpadding=\"3\" cellspacing=\"3\">";
+            //Print table header
+            echo "<tr>";
+            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strcourse</font></td>";
+            echo "<td nowrap=\"nowrap\" align=\"center\" colspan=\"3\"><font size=\"3\">$strtimetaken</font></td>";
+            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strstatus</font></td>";
+            echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"3\">$strnext</font></td></tr>";
+            foreach ($courses as $course) {
+            /// Get the course shortname
+                $coursename = get_field ("course","fullname","id",$course->courseid);
+                if ($coursename) {
+                    echo "<tr>";
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\"><a href=\"index.php?courseid=$course->courseid\">".$coursename."</a></font></td>";
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->laststarttime,$strftimedatetime)."</font></td>";
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\"> - </font></td>";
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->lastendtime,$strftimedatetime)."</font></td>";
+                    if ($course->laststatus == 1) {
+                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"green\">".$strok."</font></td>";
+                    } else if ($course->laststatus == 2) {
+                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"red\">".$strunfinished."</font></td>";
+                    } else if ($course->laststatus == 3) {
+                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"green\">".$strskipped."</font></td>";
+                    } else {
+                        echo "<td nowrap=\"nowrap\" align=\"center\"><font size=\"2\" color=\"red\">".$strerror."</font></td>";
+                    }
+                    echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($course->nextstarttime,$strftimedatetime)."</font></td>";
+                    echo "</tr>";
+                }
+            }
+            echo "</table>";
+        }
+        print_simple_box_end();
+/// Detailed View !!
+    } else {
+        print_heading($backuplogdetailed);
+
+        $coursename = get_field("course","fullname","id","$courseid");
+        print_heading("$strcourse: $coursename");
+
+        print_simple_box_start('center');
+
+    /// First, me get all the distinct backups for that course in backup_log
+        $executions = get_records_sql("SELECT DISTINCT laststarttime,laststarttime
+                                       FROM {$CFG->prefix}backup_log
+                                       WHERE courseid = '$courseid'
+                                       ORDER BY laststarttime DESC");
+
+    /// Iterate over backup executions
+        if (!$executions) {
+            notify(get_string('nologsfound'));
+        } else {
+            echo "<table border=\"0\" align=\"center\" cellpadding=\"3\" cellspacing=\"3\">";
+            foreach($executions as $execution) {
+                echo "<tr>";
+                echo "<td nowrap=\"nowrap\" align=\"center\" colspan=\"3\">";
+                print_simple_box("<center>".userdate($execution->laststarttime)."</center>", "center");
+                echo "</td>";
+                echo "</tr>";
+                $logs = get_records_sql("SELECT *
+                                         FROM {$CFG->prefix}backup_log
+                                         WHERE courseid = '$courseid'  AND
+                                               laststarttime = '$execution->laststarttime'
+                                         ORDER BY id");
+                if ($logs) {
+                    foreach ($logs as $log) {
+                        echo "<tr>";
+                        echo "<td nowrap=\"nowrap\"><font size=\"2\">".userdate($log->time,$strftimetime)."</font></td>";
+                        $log->info = str_replace("- ERROR!!","- <font color=\"red\">ERROR!!</font>",$log->info);
+                        $log->info = str_replace("- OK","- <font color=\"green\">OK</font>",$log->info);
+                        echo "<td nowrap=\"nowrap\"><font size=\"2\">".str_replace("  ","&nbsp;&nbsp;&nbsp;&nbsp;",$log->info)."</font></td>";
+                        echo "</tr>";
+                    }
+                }
+            }
+            echo "</table>";
+        }
+        print_simple_box_end();
+    }
+
+    admin_externalpage_print_footer($adminroot);
+
+?>

admin/report/courseoverview/index.php

@@ -17,7 +17,7 @@
     require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));  // needed?
 
     if (empty($CFG->enablestats)) {
-        redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'));
+        redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3, $adminroot);
     }
 
 
@@ -46,13 +46,13 @@
     $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);
+        error(get_string('nostatstodisplay'), $CFG->wwwroot.'/course/view.php?id='.$course->id, $adminroot);
     }
 
     echo '<form action="index.php" method="post">'."\n";
+    echo '<fieldset class="invisiblefieldset">';
 
     $table->width = '*';
-
     $table->align = array('left','left','left','left','left','left');
     $table->data[] = array(get_string('statsreporttype'),choose_from_menu($reportoptions,'report',$report,'','','',true),
                            get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
@@ -60,6 +60,7 @@
                            '<input type="submit" value="'.get_string('view').'" />') ;
 
     print_table($table);
+    echo '</fieldset>';
     echo '</form>';
 
     if (!empty($report) && !empty($time)) {
@@ -79,13 +80,13 @@
         $courses = get_records_sql($sql, 0, $numcourses);
 
         if (empty($courses)) {
-            notify(get_string('statsnodata'));
+            notify(get_string('statsnodata'));echo '</td></tr></table>';echo '<p>after notify</p>';
 
         } else {
             if (empty($CFG->gdversion)) {
-                echo '<div align="center">(' . get_string("gdneed") .')</div>';
+                echo '<div class="boxaligncenter">(' . get_string("gdneed") .')</div>';
             } else {
-                echo '<div align="center"><img src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></div>';
+                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>';
             }
 
             $table = new StdClass;
@@ -114,7 +115,6 @@
             print_table($table);
         }
     }
-
     admin_externalpage_print_footer($adminroot);
 
 ?>

admin/report/courseoverview/reportsgraph.php

@@ -10,9 +10,9 @@
 
     require_login();
 
-    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM));
 
-    stats_check_uptodate($course->id);
+    stats_check_uptodate();
 
     $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
 

admin/report/log/index.php

@@ -16,16 +16,18 @@
 
     print_heading(get_string('chooselogs') .':');
 
-    print_log_selector_form($course);
+    print_mnet_log_selector_form($CFG->mnet_localhost_id, $course);
 
     echo '<br />';
     print_heading(get_string('chooselivelogs') .':');
 
-    echo '<center><h3>';
-    link_to_popup_window('/course/report/log/live.php?id='. $course->id,'livelog', get_string('livelogs'), 500, 800);
-    echo '</h3></center>';
+    $heading = link_to_popup_window('/course/report/log/live.php?id='. $course->id,
+                                    'livelog', get_string('livelogs'),
+                                    500, 800, '', 'none', true);
+
+    print_heading($heading, 'center', 3);
 
 
     admin_externalpage_print_footer($adminroot);
 
-?>
+?>

admin/report/question/index.php

@@ -0,0 +1,74 @@
+<?php // $Id$
+
+    require_once('../../../config.php');
+    require_once($CFG->dirroot.'/question/upgrade.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('reportquestion', $adminroot);
+
+    admin_externalpage_print_header($adminroot);
+    print_heading(page_doc_link(get_string('adminreport', 'question')));
+
+    $probstr = '';
+    $contextupgradeversion = 2007081000;
+    if ($CFG->version < $contextupgradeversion){
+        ///cwrqpfs issue
+        $probstr = print_heading(get_string('cwrqpfs', 'question'), '', 3, 'main', true);
+
+        if ($updates = question_cwqpfs_to_update()){
+
+            $probstr .=get_string('cwrqpfsinfo', 'question');
+            $probstr .= '<ul>';
+            $catlist = join(array_keys($updates), ',');
+            //get info about cateogries and no of questions used outside category's course
+            $categories = get_records_sql('SELECT qc.*, c.fullname as coursename FROM '.$CFG->prefix.'question_categories as qc, '
+                        .$CFG->prefix.'course as c WHERE qc.course = c.id AND qc.id IN ('.$catlist.')');
+            foreach ($updates as $id => $publish){
+                $categories[$id]->caturl = "$CFG->wwwroot/question/category.php?sesskey=".sesskey().
+                            "&amp;edit=$id&amp;id=".$categories[$id]->course;
+                if ($categories[$id]->publish){
+                    $categories[$id]->changefrom = get_string('published', 'question');
+                    $categories[$id]->changeto = get_string('unpublished', 'question');
+                } else {
+                    $categories[$id]->changefrom = get_string('unpublished', 'question');
+                    $categories[$id]->changeto = get_string('published', 'question');
+                }
+                $probstr .= '<li>'.get_string('changepublishstatuscat', 'question', $categories[$id]);
+                if ($questions = get_records_sql('SELECT q.*, qui.id as quizid, qui.name as quizname, cm.id as cmid, '
+                               .'qui.course, c.fullname as coursename FROM '.$CFG->prefix.'question q, '
+                               .$CFG->prefix.'quiz_question_instances qqi, '
+                               .$CFG->prefix.'quiz qui, '
+                               .$CFG->prefix.'course_modules cm, '
+                               .$CFG->prefix.'modules m, '
+                               .$CFG->prefix.'course c '
+                            .'WHERE (q.category = '.$id.' AND qqi.question = q.id '
+                            .'AND qqi.quiz = qui.id '
+                            .'AND qui.course = c.id '
+                            .'AND cm.instance = qui.id '
+                            .'AND cm.module = m.id '
+                            .'AND m.name = \'quiz\''
+                            .'AND ('.$categories[$id]->course.' <> qui.course)) ORDER BY qui.id ASC')){
+
+                    $probstr .= '<ul>';
+                    foreach ($questions as $question){
+                        $question->quizurl = "$CFG->wwwroot/mod/quiz/edit.php?cmid=".$question->cmid;
+                        $question->qurl = "$CFG->wwwroot/question/question.php?cmid={$question->cmid}&amp;id={$question->id}&amp;returnurl=".urlencode($FULLME);
+                        $probstr .= '<li>'.get_string('questionaffected', 'question', $question).'</li>';
+                    }
+                    $probstr .= '</ul>';
+                }
+                $probstr .= '</li>';
+            }
+            $probstr .= '</ul>';
+        } else {
+            $probstr .=('<p>'.get_string('cwrqpfsnoprob', 'question').'</p>');
+        }
+    }
+    if ($probstr) {
+        print_box($probstr);
+    } else {
+        print_box(get_string('noprobs', 'question'), 'boxwidthnarrow boxaligncenter generalbox');
+    }
+    admin_externalpage_print_footer($adminroot);
+?>

admin/report/simpletest/ex_reporter.php

@@ -38,14 +38,14 @@ class ExHtmlReporter extends HtmlReporter {
      * @param bool $showpasses Whether this reporter should output anything for passes.
      */
     function ExHtmlReporter($showpasses) {
-        global $CFG;
+        global $CFG, $THEME;
 
         $this->HtmlReporter();
         $this->showpasses = $showpasses;
 
         $this->strrunonlyfolder = $this->get_string('runonlyfolder');
         $this->strrunonlyfile = $this->get_string('runonlyfile');
-        $this->strseparator = ' <img src="' . $CFG->pixpath . '/a/r_breadcrumb.gif" class="resize" alt="" /> ';
+        $this->strseparator = get_separator();
     }
 
     /**

admin/report/simpletest/index.php

@@ -90,16 +90,18 @@ if (!is_null($path)) {
 }
 // Print the form for adjusting options.
 print_simple_box_start('center', '70%');
-echo '<form method="GET" action="index.php">';
+echo '<form method="get" action="index.php">';
+echo '<fieldset class="invisiblefieldset">';
 print_heading($formheader);
 echo '<p>'; print_checkbox('showpasses', 1, $showpasses, get_string('showpasses', $langfile)); echo '</p>';
 echo '<p>'; print_checkbox('showsearch', 1, $showsearch, get_string('showsearch', $langfile)); echo '</p>';
 echo '<p>'; print_checkbox('thorough', 1, $thorough, get_string('thorough', $langfile)); echo '</p>';
 echo '<p>';
     echo '<label for="path">', get_string('onlytest', $langfile), '</label> ';
-    echo '<input type="text" id="path" name="path" value="', $displaypath, '" size="60" />';
+    echo '<input type="text" id="path" name="path" value="', $displaypath, '" size="40" />';
 echo '</p>';
 echo '<input type="submit" value="' . get_string('runtests', $langfile) . '" />';
+echo '</fieldset>';
 echo '</form>';
 print_simple_box_end();
 

admin/report/stats/index.php

@@ -30,7 +30,7 @@
     }
 
     if ($mode == STATS_MODE_RANKED) {
-        redirect($CFG->wwwroot.'/'.$CFG->admin.'/report/stats/index.php?time='.$time);
+        redirect($CFG->wwwroot.'/'.$CFG->admin.'/report/stats/index.php?time='.$time, '', 3, $adminroot);
     }
 
     if (!$course = get_record("course","id",$courseid)) {
@@ -46,7 +46,7 @@
     require_login();
 
     if (empty($CFG->enablestats)) {
-        redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'));
+        redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3, $adminroot);
     }
 
     require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_COURSE, $course->id));
@@ -59,7 +59,7 @@
 //    $strreports = get_string("reports");
 //    $strstats = get_string('stats');
 //
-//    $menu = report_stats_mode_menu($course, $mode, $time);
+//    $menu = report_stats_mode_menu($course, $mode, $time); // add 4th $url parameter if uncommented!
 //
 //
 //    $crumb = "<a href=\"{$CFG->wwwroot}/admin\">".get_string('administration')."</a> ->

admin/roles/allowassign.php

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

admin/roles/allowoverride.php

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

admin/roles/assign.html

@@ -1,27 +1,21 @@
-
-<form name="assignform" id="assignform" method="post" action="">
+<form id="assignform" method="post" action="">
+<div>
 <input type="hidden" name="previoussearch" value="<?php p($previoussearch) ?>" />
 <input type="hidden" name="userid" value="<?php p($userid) ?>" />
 <input type="hidden" name="courseid" value="<?php p($courseid) ?>" />
 <input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
 <input type="hidden" name="contextid" value="<?php p($contextid) ?>" />
 <input type="hidden" name="roleid" value="<?php p($roleid) ?>" />
-  <table align="center" border="0" cellpadding="5" cellspacing="0">
+  <table summary="" style="margin-left:auto;margin-right:auto" border="0" cellpadding="5" cellspacing="0">
     <tr>
       <td valign="top">
-          <?php print_string('existingusers', 'role', count($contextusers)); ?>
-      </td>
-      <td></td>
-      <td valign="top">
-          <?php print_string('potentialusers', 'role', $usercount); ?>
-      </td>
-    </tr>
-    <tr>
-      <td valign="top">
-          <select name="removeselect[]" size="20" id="removeselect" multiple
-                  onFocus="document.assignform.add.disabled=true;
-                           document.assignform.remove.disabled=false;
-                           document.assignform.addselect.selectedIndex=-1;" />
+          <label for="removeselect"><?php print_string('existingusers', 'role', count($contextusers)); ?></label>
+          <br />
+          <select name="removeselect[]" size="20" id="removeselect" multiple="multiple"
+                  onfocus="getElementById('assignform').add.disabled=true;
+                           getElementById('assignform').remove.disabled=false;
+                           getElementById('assignform').addselect.selectedIndex=-1;">
+
           <?php
             $i = 0;
             foreach ($contextusers as $contextuser) {
@@ -38,73 +32,78 @@
                 echo '<option/>'; // empty select breaks xhtml strict
             }
           ?>
-
+          
           </select></td>
       <td valign="top">
+        <br />
         <label title="<?php print_string('hiddenassign') ?>">
             <input type="checkbox" name="hidden" value="1" />
-            <img src="<?php echo $CFG->pixpath; ?>/t/hide.gif" alt="<?php print_string('hiddenassign') ?>" class="hide-show-image" />            <? 
-            helpbutton ('hiddenassign', get_string('hiddenassign'));
-            ?>
+            <img src="<?php echo $CFG->pixpath; ?>/t/hide.gif" alt="<?php print_string('hiddenassign') ?>" class="hide-show-image" />
+            <?php helpbutton('hiddenassign', get_string('hiddenassign')); ?>
         </label>
-        <br />
-        <input name="add" type="submit" id="add" value="&larr;" />
-        <br />
-        <input name="remove" type="submit" id="remove" value="&rarr;" />
-        <br />
+        <?php check_theme_arrows(); ?>
+        <p class="arrow_button">
+            <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">
-          <select name="addselect[]" size="20" id="addselect" multiple
-                  onFocus="document.assignform.add.disabled=false;
-                           document.assignform.remove.disabled=true;
-                           document.assignform.removeselect.selectedIndex=-1;">
+          <label for="addselect"><?php print_string('potentialusers', 'role', $usercount); ?></label>
+          <br />
+          <select name="addselect[]" size="20" id="addselect" multiple="multiple"
+                  onfocus="getElementById('assignform').add.disabled=false;
+                           getElementById('assignform').remove.disabled=true;
+                           getElementById('assignform').removeselect.selectedIndex=-1;">
           <?php
+            $i=0;
+            if (!empty($searchtext)) {
+                echo "<optgroup label=\"$strsearchresults (" . $usercount . ")\">\n";
+                while ($user = rs_fetch_next_record($availableusers)) {
+                    $fullname = fullname($user, true);
+                    echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                    $i++;
+                }
+                echo "</optgroup>\n";
 
-              if (!empty($searchtext)) {
-                  echo "<optgroup label=\"$strsearchresults (" . $availableusers->_numOfRows . ")\">\n";
-                  while ($user = rs_fetch_next_record($availableusers)) {
-                      if (!isset($contextusers[$user->id])) {
-                          $fullname = fullname($user, true);
-                          echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
-                      }
-                  }
-                  echo "</optgroup>\n";
-
-              } else {
-                  if ($usercount > MAX_USERS_PER_PAGE) {
-                      echo '<optgroup label="'.get_string('toomanytoshow').'"><option></option></optgroup>'."\n"
+            } else {
+                if ($usercount > MAX_USERS_PER_PAGE) {
+                    echo '<optgroup label="'.get_string('toomanytoshow').'"><option></option></optgroup>'."\n"
                           .'<optgroup label="'.get_string('trysearching').'"><option></option></optgroup>'."\n";
-                  } else {
-                      while ($user = rs_fetch_next_record($availableusers)) {
-                          if (!isset($contextusers[$user->id])) {
-                              $fullname = fullname($user, true);
-                              echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
-                          }
-                      }
-                  }
-              }
+                } else {
+                    while ($user = rs_fetch_next_record($availableusers)) {
+                        $fullname = fullname($user, true);
+                        echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                        $i++;
+                    }
+                }
+            }
+            if ($i==0) {
+                echo '<option/>'; // empty select breaks xhtml strict
+            }
           ?>
          </select>
          <br />
-         <input type="text" name="searchtext" size="30" value="<?php p($searchtext, true) ?>"
-                  onFocus ="document.assignform.add.disabled=true;
-                            document.assignform.remove.disabled=true;
-                            document.assignform.removeselect.selectedIndex=-1;
-                            document.assignform.addselect.selectedIndex=-1;"
+         <label for="searchtext" class="accesshide"><?php p($strsearch) ?></label>
+         <input type="text" name="searchtext" id="searchtext" size="30" value="<?php p($searchtext, true) ?>"
+                  onfocus ="getElementById('assignform').add.disabled=true;
+                            getElementById('assignform').remove.disabled=true;
+                            getElementById('assignform').removeselect.selectedIndex=-1;
+                            getElementById('assignform').addselect.selectedIndex=-1;"
                   onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
                                if (keyCode == 13) {
-                                    document.assignform.previoussearch.value=1;
-                                    document.assignform.submit();
+                                    getElementById('assignform').previoussearch.value=1;
+                                    getElementById('assignform').submit();
                                } " />
          <input name="search" id="search" type="submit" value="<?php p($strsearch) ?>" />
          <?php
-              if (!empty($searchusers)) {
+              if (!empty($searchtext)) {
                   echo '<input name="showall" id="showall" type="submit" value="'.$strshowall.'" />'."\n";
               }
          ?>
        </td>
     </tr>
   </table>
+</div>
 </form>
 
 

admin/roles/assign.php

@@ -36,7 +36,6 @@
         error("Context ID was incorrect (can't find it)");
     }
 
-
     $inmeta = 0;
     if ($context->contextlevel == CONTEXT_COURSE) {
         $courseid = $context->instanceid;
@@ -51,9 +50,11 @@
         }
     } else {
         $courseid = SITEID;
-        $course = get_site();
+        $course = clone($SITE);
     }
 
+    require_login($course);
+
     if ($context->contextlevel == CONTEXT_COURSE) {
         require_login($context->instanceid);
     } else {
@@ -62,7 +63,9 @@
 
     require_capability('moodle/role:assign', $context);
 
-    $assignableroles = get_assignable_roles($context);
+/// needed for tabs.php
+    $overridableroles = get_overridable_roles($context);
+    $assignableroles  = get_assignable_roles($context);
 
 /// Get some language strings
 
@@ -100,13 +103,13 @@
         if ($courseid != SITEID) {
             print_header("$fullname", "$fullname",
                      "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->
-                      <a href=\"$CFG->wwwroot/user/index.php?id=$course->id\">$strparticipants</a> -> <a href=\"$CFG->wwwroot/user/view.php?id=$userid&course=$courseid\">$fullname</a> ->".$straction,
+                      <a href=\"$CFG->wwwroot/user/index.php?id=$course->id\">$strparticipants</a> -> <a href=\"$CFG->wwwroot/user/view.php?id=$userid&amp;course=$courseid\">$fullname</a> ->".$straction,
                       "", "", true, "&nbsp;", navmenu($course));
 
         /// site header
         } else {
-            print_header("$course->fullname: $fullname", "$course->fullname",
-                        "<a href=\"$CFG->wwwroot/user/view.php?id=$userid&course=$courseid\">$fullname</a> -> $straction", "", "", true, "&nbsp;", navmenu($course));
+            print_header("$course->fullname: $fullname", $course->fullname,
+                        "<a href=\"$CFG->wwwroot/user/view.php?id=$userid&amp;course=$courseid\">$fullname</a> -> $straction", "", "", true, "&nbsp;", navmenu($course));
         }
 
         $showroles = 1;
@@ -116,13 +119,19 @@
         $adminroot = admin_get_root();
         admin_externalpage_setup('assignroles', $adminroot);
         admin_externalpage_print_header($adminroot);
+    } else if ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID) {
+        $adminroot = admin_get_root();
+        admin_externalpage_setup('frontpageroles', $adminroot);
+        admin_externalpage_print_header($adminroot);
+        $currenttab = '';
+        $tabsmode = 'assign';
+        include_once('tabs.php');
     } else {
         $currenttab = '';
         $tabsmode = 'assign';
         include_once('tabs.php');
     }
 
-
 /// Process incoming role assignment
 
     if ($frm = data_submitted()) {
@@ -154,12 +163,14 @@
                     }
                 }
             }
-
+            
+            $rolename = get_field('role', 'name', 'id', $roleid);
+            add_to_log($course->id, 'role', 'assign', 'admin/roles/assign.php?contextid='.$context->id.'&roleid='.$roleid, $rolename, '', $USER->id);
         } else if ($remove and !empty($frm->removeselect) and confirm_sesskey()) {
 
             $sitecontext = get_context_instance(CONTEXT_SYSTEM);
             $topleveladmin = false;
-   
+
             // we only worry about this if the role has doanything capability at site level
             if ($context->id == $sitecontext->id && $adminroles = get_roles_with_capability('moodle/site:doanything', CAP_ALLOW, $sitecontext)) {
                 foreach ($adminroles as $adminrole) {
@@ -168,7 +179,7 @@
                     }
                 }
             }
- 
+
             foreach ($frm->removeselect as $removeuser) {
                 $removeuser = clean_param($removeuser, PARAM_INT);
 
@@ -188,20 +199,28 @@
                     }
                 }
             }
-
+            
+            $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;
         }
+        
+        
+    
     }
 
-
-    print_heading_with_help(get_string('assignroles', 'role'), 'assignroles');
+    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');
+    }
 
     if ($context->contextlevel==CONTEXT_SYSTEM) {
-        print_simple_box(get_string('globalroleswarning', 'role'));
+        print_box(get_string('globalroleswarning', 'role'));
     }
-
+    
     if ($roleid) {        /// prints a form to swap roles
 
     /// Get all existing participants in this context.
@@ -211,8 +230,8 @@
             $contextusers = array();
         }
 
-        $select  = "username <> 'guest' AND username <> 'changeme' AND deleted = 0 AND confirmed = 1";
-    
+        $select  = "username <> 'guest' AND deleted = 0 AND confirmed = 1";
+
         $usercount = count_records_select('user', $select) - count($contextusers);
 
         $searchtext = trim($searchtext);
@@ -221,25 +240,104 @@
             $LIKE      = sql_ilike();
             $FULLNAME  = sql_fullname();
 
-            $select  .= " AND ($FULLNAME $LIKE '%$searchtext%' OR email $LIKE '%$searchtext%') ";
+            $selectsql = " AND ($FULLNAME $LIKE '%$searchtext%' OR email $LIKE '%$searchtext%') ";
+            $select  .= $selectsql;
+        } else { 
+            $selectsql = ""; 
         }
 
-        $availableusers = get_recordset_sql('SELECT id, firstname, lastname, email 
-                                               FROM '.$CFG->prefix.'user 
-                                              WHERE '.$select.'
-                                            ORDER BY lastname ASC, firstname ASC');
+        if ($context->contextlevel > CONTEXT_COURSE) { // mod or block (or group?)
 
-        /// In the .html file below we loop through these results and exclude any in $contextusers
+            /************************************************************************
+             *                                                                      *
+             * context level is above or equal course context level                 *
+             * in this case we pull out all users matching search criteria (if any) *
+             *                                                                      *
+             * MDL-11324                                                            *
+             * a mini get_users_by_capability() call here, this is done instead of  *
+             * get_users_by_capability() because                                    *
+             * 1) get_users_by_capability() does not deal with searching by name    *
+             * 2) exceptions array can be potentially large for large courses       *
+             * 3) get_recordset_sql() is more efficient                             *
+             *                                                                      *
+             ************************************************************************/
+        
+            if ($possibleroles = get_roles_with_capability('moodle/course:view', CAP_ALLOW, $context)) {
+  
+                $doanythingroles = get_roles_with_capability('moodle/site:doanything', CAP_ALLOW, get_context_instance(CONTEXT_SYSTEM));
+
+                $validroleids = array();
+                foreach ($possibleroles as $possiblerole) {
+                    if (isset($doanythingroles[$possiblerole->id])) {  // We don't want these included
+                            continue;
+                    }
+                    if ($caps = role_context_capabilities($possiblerole->id, $context, 'moodle/course:view')) { // resolved list
+                        if (isset($caps['moodle/course:view']) && $caps['moodle/course:view'] > 0) { // resolved capability > 0
+                            $validroleids[] = $possiblerole->id;
+                        }
+                    }
+                }
+
+                if ($validroleids) {
+                    $roleids =  '('.implode(',', $validroleids).')';
+            
+                    $select = " SELECT u.id, u.firstname, u.lastname, u.email";
+                    $countselect = "SELECT COUNT(u.id)";
+                    $from   = " FROM {$CFG->prefix}user u
+                                INNER JOIN {$CFG->prefix}role_assignments ra ON ra.userid = u.id
+                                INNER JOIN {$CFG->prefix}role r ON r.id = ra.roleid";
+                    $where  = " WHERE ra.contextid ".get_related_contexts_string($context)."
+                                AND u.deleted = 0
+                                AND ra.roleid in $roleids";
+                    $excsql = " AND u.id NOT IN (
+                                    SELECT u.id
+                                    FROM {$CFG->prefix}role_assignments r,
+                                    {$CFG->prefix}user u
+                                    WHERE r.contextid = $contextid
+                                    AND u.id = r.userid 
+                                    AND r.roleid = $roleid
+                                    $selectsql)";
+            
+                    $availableusers = get_recordset_sql($select . $from . $where . $selectsql . $excsql);         
+                }
+
+                $usercount =  $availableusers->_numOfRows;
+
+            }
+
+        } else { 
+         
+            /************************************************************************
+             *                                                                      *
+             * context level is above or equal course context level                 *
+             * in this case we pull out all users matching search criteria (if any) *
+             *                                                                      *
+             ************************************************************************/
+            
+            /// MDL-11111 do not include user already assigned this role in this context as available users
+            /// so that the number of available users is right and we save time looping later
+            $availableusers = get_recordset_sql('SELECT id, firstname, lastname, email
+                                                FROM '.$CFG->prefix.'user
+                                                WHERE '.$select.'
+                                                AND id NOT IN (
+                                                    SELECT u.id
+                                                    FROM '.$CFG->prefix.'role_assignments r,
+                                                    '.$CFG->prefix.'user u
+                                                    WHERE r.contextid = '.$contextid.'
+                                                    AND u.id = r.userid 
+                                                    AND r.roleid = '.$roleid.'
+                                                    '.$selectsql.')
+                                                ORDER BY lastname ASC, firstname ASC');
+
+            $usercount = $availableusers->_numOfRows;         
+
+        }
     
-        echo '<form name="rolesform" action="assign.php" method="post">';
-        echo '<div align="center">'.$strcurrentcontext.': '.print_context_name($context).'<br/>';
-        if ($userid) {
-            echo '<input type="hidden" name="userid" value="'.$userid.'" />';
-        }
-        echo '<input type="hidden" name="courseid" value="'.$courseid.'" />';
-        echo '<input type="hidden" name="contextid" value="'.$context->id.'" />'.$strroletoassign.': ';
-        choose_from_menu ($assignableroles, 'roleid', $roleid, get_string('listallroles', 'role').'...', $script='rolesform.submit()');
-        echo '</div></form>';
+        echo '<div style="text-align:center">'.$strcurrentcontext.': '.print_context_name($context).'<br/>';
+        $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);
+        echo '</div>';
 
         print_simple_box_start('center');
         include('assign.html');
@@ -280,7 +378,7 @@
         print_table($table);
     }
 
-    if ($context->contextlevel == CONTEXT_SYSTEM) {
+    if ($context->contextlevel == CONTEXT_SYSTEM or ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID)) {
         admin_externalpage_print_footer($adminroot);
     } else {
         print_footer($course);

admin/roles/manage.html

@@ -4,72 +4,106 @@
         case 'add':
             $submitlabel = get_string('addrole', 'role');
             break;
-        case 'view':
-            $submitlabel = get_string('listallroles', 'role');
-            break;
         case 'edit':
         default:
             $submitlabel = get_string('savechanges');
     }
+
+    if ($action == 'view') {
 ?>
-
-
-<form name="rolesform" action="manage.php" method="post">
+<?php
+    }
+?>
+<form id="rolesform" action="manage.php" method="post">
+<fieldset class="invisiblefieldset">
 <input type="hidden" name="roleid" value="<?php p($roleid) ?>" />
 <input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
 <input type="hidden" name="action" value="<?php if ($action != 'view') { echo p($action); } ?>" />
-
-<table cellpadding="9" cellspacing="0" align="center">
-<tr valign="top">
-    <td align="right"><?php print_string('name') ?>:</td>
-    <td><?php
-    if ($action == 'view') {
-        p($role->name);
-    } else {
-        echo '<input type="text" name="name" maxlength="254" size="50" value="'.s($role->name).'" />';
-        if (isset($errors["name"])) formerr($errors["name"]);
-    } ?></td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string('shortname') ?>:</td>
-    <td><?php
-    if ($action == 'view') {
-        p($role->shortname);
-    } else {
-        echo '<input type="text" name="shortname" maxlength="20" size="15" value="'.s($role->shortname).'" />';
-        if (isset($errors["shortname"])) formerr($errors["shortname"]);
-    } ?></td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string('description') ?>:</td>
-    <td><?php
-    if ($action == 'view') {
-        p($role->description);
-        $usehtmleditor = false;
-    } else {
-        print_textarea($usehtmleditor, 10, 50, 50, 10, 'description', $role->description);
-    } ?></td>
-</tr>
+</fieldset>
+<table class="roledesc" cellpadding="9" cellspacing="0">
+<?php if ($action == 'view') { ?>
+    <tr valign="top">
+        <td align="right"><?php print_string('name') ?>:</td>
+        <td><?php p($role->name); ?></td>
+    </tr>
+    <tr valign="top">
+        <td align="right"><?php print_string('shortname') ?>:</td>
+        <td><?php p($role->shortname); ?></td>
+    </tr>
+    <tr valign="top">
+        <td align="right"><?php print_string('description') ?>:</td>
+        <td><?php p($role->description); $usehtmleditor = false; ?></td>
+    </tr>
+    <tr valign="top">
+        <td align="right"><?php print_string('legacytype', 'role') ?>:</td>
+        <td><?php 
+                $usehtmleditor = false;
+                if (empty($role->legacytype)) {
+                    print_string('none');
+                } else {
+                    print_string('legacy:'.$role->legacytype, 'role');
+                }
+            ?>
+        </td>
+    </tr>
+<?php } else { ?>
+    <tr valign="top">
+        <td align="right"><label for="name"><?php print_string('name') ?></label></td>
+        <td><?php
+            echo '<input type="text" id="name" name="name" maxlength="254" size="50" value="'.s($role->name).'" />';
+            if (isset($errors["name"])) formerr($errors["name"]);
+            ?>
+        </td>
+    </tr>
+    <tr valign="top">
+        <td align="right"><label for="shortname"><?php print_string('shortname') ?></label></td>
+        <td><?php
+            echo '<input type="text" id="shortname" name="shortname" maxlength="20" size="15" value="'.s($role->shortname).'" />';
+            if (isset($errors["shortname"])) formerr($errors["shortname"]);
+            ?>
+        </td>
+    </tr>
+    <tr valign="top">
+        <td align="right"><label for="edit-description"><?php print_string('description') ?></label></td>
+        <td><?php
+            print_textarea($usehtmleditor, 10, 50, 50, 10, 'description', $role->description);
+            ?>
+        </td>
+    </tr>
+    <tr valign="top">
+        <td align="right"><label for="menulegacytype"><?php print_string('legacytype', 'role') ?></label></td>
+        <td><?php
+            $options = array();
+            $options[''] = get_string('none');
+            $legacyroles = get_legacy_roles();
+            foreach($legacyroles as $ltype=>$lcap) {
+                $options[$ltype] = get_string('legacy:'.$ltype, 'role');
+            }
+            choose_from_menu($options, 'legacytype', $role->legacytype, '');
+            ?>
+        </td>
+    </tr>
+<?php } ?>
 </table>
 
 <?php
     print_heading_with_help(get_string('permissions','role'), 'permissions');
 
-    $strinherit = get_string('inherit','role');
+    $strinherit = get_string('notset','role');
     $strallow = get_string('allow','role');
     $strprevent = get_string('prevent','role');
     $strprohibit = get_string('prohibit','role');
 ?>
 
-<table class="rolecap" align="center">
+<table class="rolecap">
 
 <tr>
-<th class="name" align="left"><?php print_string('capability','role') ?></th>
-<th class="inherit"><?php p($strinherit); ?></th>
-<th class="allow"><?php p($strallow); ?></th>
-<th class="prevent"><?php p($strprevent); ?></th>
-<th class="prohibit"><?php p($strprohibit); ?></th>
-<th class="risk" colspan="5"><?php print_string('risks','role') ?></th>
+<th class="name" align="left" scope="col"><?php print_string('capability','role') ?></th>
+<th class="inherit" scope="col"><?php p($strinherit); ?></th>
+<th class="allow" scope="col"><?php p($strallow); ?></th>
+<th class="prevent" scope="col"><?php p($strprevent); ?></th>
+<th class="prohibit" scope="col"><?php p($strprohibit); ?></th>
+<th class="risk" colspan="5" scope="col"><?php print_string('risks','role') ?></th>
 </tr>
 
 <?php
@@ -79,9 +113,23 @@ $contextlevel = 0;
 $component = '';
 
 $strrisks = s(get_string('risks', 'role'));
-$strcapabilities = s(get_string('capabilities', 'role'));
+// MDL-11687
+$strcapabilities = 'Capabilities';//s(get_string('capabilities', 'role'));
+
+// prepare legacy defaults
+if (!empty($role->legacytype)) {
+    $defaultcaps = get_default_capabilities($role->legacytype);
+} else {
+    $defaultcaps = false;
+}
 
 foreach ($capabilities as $capability) {
+
+    //legacy caps have their own selector
+    if (islegacy($capability->name)) {
+        continue;
+    }
+
     // prints a breaker if component or name or context level
     if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
         echo ('<tr class="rolecapheading header"><td colspan="10" class="header"><strong>'.
@@ -94,7 +142,6 @@ foreach ($capabilities as $capability) {
 
     if (empty($errors)) {
        // check the capability override for this cap, this role in this context
-        $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
         $localoverride = get_local_override($roleid, $sitecontext->id, $capability->name);
     } else {
         $localoverride = new object();
@@ -106,39 +153,53 @@ foreach ($capabilities as $capability) {
     $riskinfo = '<td class="risk managetrust">';
     $rowclasses = '';
     if (RISK_MANAGETRUST & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">T</a>';
+        $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+        $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_managetrust.gif" alt="'.get_string('riskmanagetrustshort', 'admin').'" /></a>';
         $rowclasses .= ' riskmanagetrust';
     }
     $riskinfo .= '</td><td class="risk config">';
     if (RISK_CONFIG & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">C</a>';
+        $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+        $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_config.gif" alt="'.get_string('riskconfigshort', 'admin').'" /></a>';
         $rowclasses .= ' riskconfig';
     }
     $riskinfo .= '</td><td class="risk xss">';
     if (RISK_XSS & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">X</a>';
+        $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+        $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_xss.gif" alt="'.get_string('riskxssshort', 'admin').'" /></a>';
         $rowclasses .= ' riskxss';
     }
     $riskinfo .= '</td><td class="risk personal">';
     if (RISK_PERSONAL & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">P</a>';
+        $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+        $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_personal.gif" alt="'.get_string('riskpersonalshort', 'admin').'" /></a>';
         $rowclasses .= ' riskpersonal';
     }
     $riskinfo .= '</td><td class="risk spam">';
     if (RISK_SPAM & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">S</a>';
+        $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+        $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_spam.gif" alt="'.get_string('riskspamshort', 'admin').'" /></a>';
         $rowclasses .= ' riskspam';
     }
     $riskinfo .= '</td>';
 
+    $isinherit  = (!isset($defaultcaps[$capability->name]) or $defaultcaps[$capability->name] == CAP_INHERIT) ? 'capdefault' : '';
+    $isallow    = (isset($defaultcaps[$capability->name]) and $defaultcaps[$capability->name] == CAP_ALLOW) ? 'capdefault' : '';
+    $isprevent  = (isset($defaultcaps[$capability->name]) and $defaultcaps[$capability->name] == CAP_PREVENT) ? 'capdefault' : '';
+    $isprohibit = (isset($defaultcaps[$capability->name]) and $defaultcaps[$capability->name] == CAP_PROHIBIT) ? 'capdefault' : '';
+
     ?>
 
         <tr class="rolecap <?php echo $rowclasses; ?>">
-        <td class="name"><span class="cap-desc"><a target="docspopup" href="<?php echo $CFG->docroot.'/'.$lang.'/'.$strcapabilities.'/'.$capability->name ?>"><?php echo get_capability_string($capability->name); ?></a><span class="cap-name"><?php echo $capability->name ?></span></label></td>
-        <td class="inherit"><input type="radio" title="<?php p($strinherit); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_INHERIT ?>" <?php if (!isset($localoverride->permission) || $localoverride->permission==CAP_INHERIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="allow"><input type="radio" title="<?php p($strallow); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_ALLOW ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_ALLOW){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="prevent" ><input type="radio" title="<?php p($strprevent); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PREVENT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PREVENT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="prohibit" ><input type="radio" title="<?php p($strprohibit); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PROHIBIT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PROHIBIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="name"><span class="cap-desc"><a onclick="this.target='docspopup'" href="<?php echo $CFG->docroot.'/'.$lang.'/'.$strcapabilities.'/'.$capability->name ?>"><?php echo get_capability_string($capability->name); ?></a><span class="cap-name"><?php echo $capability->name ?></span></span></td>
+        <td class="inherit <?php echo $isinherit ?>">
+          <input type="radio" title="<?php p($strinherit); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_INHERIT ?>" <?php if (!isset($localoverride->permission) || $localoverride->permission==CAP_INHERIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="allow <?php echo $isallow ?>">
+          <input type="radio" title="<?php p($strallow); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_ALLOW ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_ALLOW){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="prevent <?php echo $isprevent ?>" >
+          <input type="radio" title="<?php p($strprevent); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PREVENT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PREVENT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="prohibit <?php echo $isprohibit ?>" >
+          <input type="radio" title="<?php p($strprohibit); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PROHIBIT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PROHIBIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
 
         <?php echo $riskinfo; ?>
 
@@ -147,11 +208,11 @@ foreach ($capabilities as $capability) {
 <?php } ?>
 </table>
 
-<div class="submit" align="center">
-<input type="submit" value="<?php p($submitlabel) ?>" />
 <?php if ($action != 'view') { ?>
+<div class="submit buttons">
+<input type="submit" value="<?php p($submitlabel) ?>" />
 <input type="submit" name="cancel" value="<?php print_string('cancel') ?>" />
-<?php } ?>
 </div>
+<?php } ?>
 
 </form>

admin/roles/manage.php

@@ -15,7 +15,8 @@
     $confirm     = optional_param('confirm', 0, PARAM_BOOL);
     $cancel      = optional_param('cancel', 0, PARAM_BOOL);
 
-    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+
     require_capability('moodle/role:manage', $sitecontext);
 
     if ($cancel) {
@@ -43,6 +44,12 @@
         $i++;
     }
 
+    // do not delete these default system roles
+    $defaultroles = array();
+    $defaultroles[] = $CFG->notloggedinroleid;
+    $defaultroles[] = $CFG->guestroleid;
+    $defaultroles[] = $CFG->defaultuserroleid;
+    $defaultroles[] = $CFG->defaultcourseroleid;
 
 /// form processing, editing a role, adding a role, deleting a role etc.
     switch ($action) {
@@ -50,6 +57,12 @@
             if ($data = data_submitted() and confirm_sesskey()) {
 
                 $shortname = moodle_strtolower(clean_param(clean_filename($shortname), PARAM_SAFEDIR)); // only lowercase safe ASCII characters
+                $legacytype = required_param('legacytype', PARAM_RAW);
+
+                $legacyroles = get_legacy_roles();
+                if (!array_key_exists($legacytype, $legacyroles)) {
+                    $legacytype = '';
+                }
 
                 if (empty($name)) {
                     $errors['name'] = get_string('errorbadrolename', 'role');
@@ -64,12 +77,19 @@
                 }
 
                 if (empty($errors)) {
-                    $newrole = create_role($name, $shortname, $description);
+                    $newroleid = create_role($name, $shortname, $description);
+
+                    // set proper legacy type
+                    if (!empty($legacytype)) {
+                        assign_capability($legacyroles[$legacytype], CAP_ALLOW, $newroleid, $sitecontext->id);
+                    }
+
                 } else {
                     $newrole = new object();
-                    $newrole->name = $name;
-                    $newrole->shortname = $shortname;
+                    $newrole->name        = $name;
+                    $newrole->shortname   = $shortname;
                     $newrole->description = $description;
+                    $newrole->legacytype  = $legacytype;
                 }
 
                 $allowed_values = array(CAP_INHERIT, CAP_ALLOW, CAP_PREVENT, CAP_PROHIBIT);
@@ -79,6 +99,12 @@
                     if (!isset($data->{$cap->name})) {
                         continue;
                     }
+
+                    // legacy caps have their own selector
+                    if (islegacy($data->{$cap->name})) {
+                        continue;
+                    }
+
                     $capname = $cap->name;
                     $value = clean_param($data->{$cap->name}, PARAM_INT);
                     if (!in_array($value, $allowed_values)) {
@@ -86,21 +112,31 @@
                     }
 
                     if (empty($errors)) {
-                        assign_capability($capname, $value, $newrole, $sitecontext->id);
+                        assign_capability($capname, $value, $newroleid, $sitecontext->id);
                     } else {
                         $newrole->$capname = $value;
                     }
                 }
+
                 if (empty($errors)) {
+                    $rolename = get_field('role', 'name', 'id', $newroleid);
+                    add_to_log(SITEID, 'role', 'add', 'admin/roles/manage.php?action=add', $rolename, '', $USER->id);
                     redirect('manage.php');
                 }
             }
+            
             break;
 
         case 'edit':
             if ($data = data_submitted() and confirm_sesskey()) {
 
                 $shortname = moodle_strtolower(clean_param(clean_filename($shortname), PARAM_SAFEDIR)); // only lowercase safe ASCII characters
+                $legacytype = required_param('legacytype', PARAM_RAW);
+
+                $legacyroles = get_legacy_roles();
+                if (!array_key_exists($legacytype, $legacyroles)) {
+                    $legacytype = '';
+                }
 
                 if (empty($name)) {
                     $errors['name'] = get_string('errorbadrolename', 'role');
@@ -121,9 +157,10 @@
                 }
                 if (!empty($errors)) {
                     $newrole = new object();
-                    $newrole->name = $name;
-                    $newrole->shortname = $shortname;
+                    $newrole->name        = $name;
+                    $newrole->shortname   = $shortname;
                     $newrole->description = $description;
+                    $newrole->legacytype  = $legacytype;
                 }
 
                 $allowed_values = array(CAP_INHERIT, CAP_ALLOW, CAP_PREVENT, CAP_PROHIBIT);
@@ -133,6 +170,12 @@
                     if (!isset($data->{$cap->name})) {
                         continue;
                     }
+
+                    // legacy caps have their own selector
+                    if (islegacy($data->{$cap->name}) === 0 ) {
+                        continue;
+                    }
+
                     $capname = $cap->name;
                     $value = clean_param($data->{$cap->name}, PARAM_INT);
                     if (!in_array($value, $allowed_values)) {
@@ -166,6 +209,7 @@
                             assign_capability($capname, $value, $roleid, $sitecontext->id);
                         }
                     }
+
                 }
 
                 if (empty($errors)) {
@@ -178,12 +222,26 @@
                     if (!update_record('role', $role)) {
                         error('Could not update role!');
                     }
+
+                    // set proper legacy type
+                    foreach($legacyroles as $ltype=>$lcap) {
+                        if ($ltype == $legacytype) {
+                            assign_capability($lcap, CAP_ALLOW, $roleid, $sitecontext->id);
+                        } else {
+                            unassign_capability($lcap, $roleid);
+                        } 
+                    }                    
+                    add_to_log(SITEID, 'role', 'edit', 'admin/roles/manage.php?action=edit&roleid='.$role->id, $role->name, '', $USER->id);
                     redirect('manage.php');
                 }
             }
+
             break;
 
         case 'delete':
+            if (in_array($roleid, $defaultroles)) {
+                error('This role is used as one of the default system roles, it can not be deleted');
+            }
             if ($confirm and data_submitted() and confirm_sesskey()) {
                 if (!delete_role($roleid)) {
                     error('Could not delete role with ID '.$roleid);
@@ -236,9 +294,98 @@
             redirect('manage.php');
             break;
 
-        default:
+        case 'duplicate':
+            if (!array_key_exists($roleid, $roles)) {
+                redirect('manage.php');
+            }
+
+            if ($confirm and data_submitted() and confirm_sesskey()) {
+                //ok - lets duplicate!
+            } else {
+                // show confirmation
+                admin_externalpage_print_header($adminroot);
+                $optionsyes = array('action'=>'duplicate', 'roleid'=>$roleid, 'sesskey'=>sesskey(), 'confirm'=>1);
+                $optionsno  = array('action'=>'view', 'roleid'=>$roleid);
+                $a = new object();
+                $a->id = $roleid;
+                $a->name = $roles[$roleid]->name;
+                $a->shortname = $roles[$roleid]->shortname;
+                notice_yesno(get_string('duplicaterolesure', 'role', $a), 'manage.php', 'manage.php', $optionsyes, $optionsno, 'post', 'get');
+                admin_externalpage_print_footer($adminroot);
+                die;
+            }
+
+            // duplicate current role
+            $sourcerole = get_record('role','id',$roleid);
+
+            $fullname = $sourcerole->name;
+            $shortname = $sourcerole->shortname;
+            $currentfullname = "";
+            $currentshortname = "";
+            $counter = 0;
+
+            // find a name for the duplicated role
+            do {
+                if ($counter) {
+                    $suffixfull = " ".get_string("copyasnoun")." ".$counter;
+                    $suffixshort = "_".$counter;
+                } else {
+                    $suffixfull = "";
+                    $suffixshort = "";
+                }
+                $currentfullname = $fullname.$suffixfull;
+                // Limit the size of shortname - database column accepts <= 15 chars
+                $currentshortname = substr($shortname, 0, 15 - strlen($suffixshort)).$suffixshort;
+                $coursefull  = get_record("role","name",addslashes($currentfullname));
+                $courseshort = get_record("role","shortname",addslashes($currentshortname));
+                $counter++;
+            } while ($coursefull || $courseshort);
+
+            $description = 'duplicate of '.$fullname;
+            if ($newrole = create_role($currentfullname, $currentshortname, $description)) {
+                // dupilcate all the capabilities
+                role_cap_duplicate($sourcerole, $newrole);
+            }
+            $rolename = get_field('role', 'name', 'id', $newrole);
+            add_to_log(SITEID, 'role', 'duplicate', 'admin/roles/manage.php?roleid='.$newrole.'&action=duplicate', $rolename, '', $USER->id);
+            redirect('manage.php');
             break;
 
+        case 'reset':
+            if (!array_key_exists($roleid, $roles)) {
+                redirect('manage.php');
+            }
+
+            if ($confirm and data_submitted() and confirm_sesskey()) {
+                reset_role_capabilities($roleid);
+                $rolename = get_field('role', 'name', 'id', $roleid);
+                add_to_log(SITEID, 'role', 'reset', 'admin/roles/manage.php?roleid='.$roleid.'&action=reset', $rolename, '', $USER->id);
+                redirect('manage.php?action=view&amp;roleid='.$roleid);
+
+            } else {
+                // show confirmation
+                admin_externalpage_print_header($adminroot);
+                $optionsyes = array('action'=>'reset', 'roleid'=>$roleid, 'sesskey'=>sesskey(), 'confirm'=>1);
+                $optionsno  = array('action'=>'view', 'roleid'=>$roleid);
+                $a = new object();
+                $a->id = $roleid;
+                $a->name = $roles[$roleid]->name;
+                $a->shortname = $roles[$roleid]->shortname;
+                $a->legacytype = get_legacy_type($roleid);
+                if (empty($a->legacytype)) {
+                    $warning = get_string('resetrolesurenolegacy', 'role', $a);
+                } else {
+                    $warning = get_string('resetrolesure', 'role', $a);
+                }
+                notice_yesno($warning, 'manage.php', 'manage.php', $optionsyes, $optionsno, 'post', 'get');
+                admin_externalpage_print_footer($adminroot);
+                die;
+            }
+
+            break;
+
+        default:
+            break;
     }
 
 /// print UI now
@@ -254,9 +401,10 @@
             $roleid = 0;
             if (empty($errors) or empty($newrole)) {
                 $role = new object();
-                $role->name='';
-                $role->shortname='';
-                $role->description='';
+                $role->name        = '';
+                $role->shortname   = '';
+                $role->description = '';
+                $role->legacytype  = '';
             } else {
                 $role = stripslashes_safe($newrole);
             }
@@ -266,6 +414,7 @@
             if(!$role = get_record('role', 'id', $roleid)) {
                 error('Incorrect role ID!');
             }
+            $role->legacytype = get_legacy_type($role->id);
         }
 
         foreach ($roles as $rolex) {
@@ -292,18 +441,28 @@
                 break;
         }
 
-        echo '<div align="center" class="selector">';
+        echo '<div class="selector">';
         if ($action == 'view') {
-            echo get_string('selectrole', 'role').': ';
-            echo '<form style="display:inline;" name="switchrole" action="manage.php" method="get">';
-            echo '<input type="hidden" name="action" value="view" />';
-            choose_from_menu ($roleoptions, 'roleid', $roleid, get_string('listallroles', 'role').'...', $script='switchrole.submit()');
-            echo '</form>';
-            echo '<form style="display:inline;" name="editrole" action="manage.php" method="get">';
-            echo '<input type="hidden" name="roleid" value="'.$roleid.'" />';
-            echo '<input type="hidden" name="action" value="edit" />';
-            echo '<input type="submit" value="'.get_string('edit').'" />';
-            echo '</form>';
+            popup_form('manage.php?action=view&amp;roleid=', $roleoptions, 'switchrole', $roleid, '', '', '',
+                       false, 'self', get_string('selectrole', 'role'));
+
+            echo '<div class="buttons">';
+
+            $legacytype = get_legacy_type($roleid); 
+            $options = array();
+            $options['roleid'] = $roleid;
+            $options['action'] = 'edit';
+            print_single_button('manage.php', $options, get_string('edit'));
+            $options['action'] = 'reset';
+            if (empty($legacytype)) {
+                print_single_button('manage.php', $options, get_string('resetrolenolegacy', 'role'));
+            } else {
+                print_single_button('manage.php', $options, get_string('resetrole', 'role'));
+            }
+            $options['action'] = 'duplicate';
+            print_single_button('manage.php', $options, get_string('duplicaterole', 'role'));
+            print_single_button('manage.php', null, get_string('listallroles', 'role'));
+            echo '</div>';
         }
         echo '</div>';
 
@@ -351,21 +510,25 @@
             $row[0] = '<a href="manage.php?roleid='.$role->id.'&amp;action=view">'.format_string($role->name).'</a>';
             $row[1] = format_text($role->description, FORMAT_HTML);
             $row[2] = s($role->shortname);
-            $row[3] = '<a title="'.$stredit.'" href="manage.php?action=edit&roleid='.$role->id.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="'.$stredit.'" /></a> ';
-            $row[3] .= '<a title="'.$strdelete.'" href="manage.php?action=delete&roleid='.$role->id.'&sesskey='.sesskey().'">'.
-                         '<img src="'.$CFG->pixpath.'/t/delete.gif" height="11" width="11" border="0" alt="'.$strdelete.'" /></a> ';
-            if ($role->sortorder != 0) {
-                $row[3] .= '<a title="'.$strmoveup.'" href="manage.php?action=moveup&roleid='.$role->id.'&sesskey='.sesskey().'">'.
-                     '<img src="'.$CFG->pixpath.'/t/up.gif" height="11" width="11" border="0" alt="'.$strmoveup.'" /></a> ';
+            $row[3] = '<a title="'.$stredit.'" href="manage.php?action=edit&amp;roleid='.$role->id.'">'.
+                         '<img src="'.$CFG->pixpath.'/t/edit.gif" class="iconsmall" alt="'.$stredit.'" /></a> ';
+            if (in_array($role->id, $defaultroles)) {
+                $row[3] .= '<img src="'.$CFG->wwwroot.'/pix/spacer.gif" class="iconsmall" alt="" /> ';
             } else {
-                $row[3] .= '<img src="'.$CFG->wwwroot.'/pix/spacer.gif" height="11" width="11" border="0" alt="" /> ';
+                $row[3] .= '<a title="'.$strdelete.'" href="manage.php?action=delete&amp;roleid='.$role->id.'&amp;sesskey='.sesskey().'">'.
+                             '<img src="'.$CFG->pixpath.'/t/delete.gif" class="iconsmall" alt="'.$strdelete.'" /></a> ';
+            }
+            if ($role->sortorder != 0) {
+                $row[3] .= '<a title="'.$strmoveup.'" href="manage.php?action=moveup&amp;roleid='.$role->id.'&amp;sesskey='.sesskey().'">'.
+                     '<img src="'.$CFG->pixpath.'/t/up.gif" class="iconsmall" alt="'.$strmoveup.'" /></a> ';
+            } else {
+                $row[3] .= '<img src="'.$CFG->wwwroot.'/pix/spacer.gif" class="iconsmall" alt="" /> ';
             }
             if ($role->sortorder+1 < $rolescount) {
-                $row[3] .= '<a title="'.$strmovedown.'" href="manage.php?action=movedown&roleid='.$role->id.'&sesskey='.sesskey().'">'.
-                     '<img src="'.$CFG->pixpath.'/t/down.gif" height="11" width="11" border="0" alt="'.$strmovedown.'" /></a> ';
+                $row[3] .= '<a title="'.$strmovedown.'" href="manage.php?action=movedown&amp;roleid='.$role->id.'&amp;sesskey='.sesskey().'">'.
+                     '<img src="'.$CFG->pixpath.'/t/down.gif" class="iconsmall" alt="'.$strmovedown.'" /></a> ';
             } else {
-                $row[3] .= '<img src="'.$CFG->wwwroot.'/pix/spacer.gif" height="11" width="11" border="0" alt="" /> ';
+                $row[3] .= '<img src="'.$CFG->wwwroot.'/pix/spacer.gif" class="iconsmall" alt="" /> ';
             }
 
             $table->data[] = $row;
@@ -375,7 +538,9 @@
 
         $options = new object();
         $options->action = 'add';
+        echo '<div class="buttons">';
         print_single_button('manage.php', $options, get_string('addrole', 'role'), 'get');
+        echo '</div>';
     }
 
     admin_externalpage_print_footer($adminroot);
@@ -418,4 +583,18 @@ function switch_roles($first, $second) {
     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);
+    }
+}
 ?>

admin/roles/managetabs.php

@@ -1,6 +1,12 @@
 <?php
 // this page deals with the 2 tabs for manage.php and grant.php
 
+    if (!defined('MOODLE_INTERNAL')) {
+        die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+    }
+
+    $toprow = array();
+
     $toprow[] = new tabobject('manage', $CFG->wwwroot.'/'.$CFG->admin.'/roles/manage.php', get_string('manageroles', 'role'),'', true);
 
     $toprow[] = new tabobject('allowassign', $CFG->wwwroot.'/'.$CFG->admin.'/roles/allowassign.php', get_string('allowassign', 'role'));

admin/roles/override.html

@@ -5,21 +5,23 @@
     $strprohibit = get_string('prohibit','role');
 ?>
 
-<form name="overrideform" action="override.php" method="post">
-    <input type="hidden" name="contextid" value="<?php p($contextid) ?>">
-    <input type="hidden" name="roleid" value="<?php p($roleid) ?>">
+<form id="overrideform" action="override.php" method="post">
+    <fieldset class="invisiblefieldset">
+    <input type="hidden" name="contextid" value="<?php p($contextid) ?>" />
+    <input type="hidden" name="roleid" value="<?php p($roleid) ?>" />
     <input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
     <input type="hidden" name="userid" value="<?php p($userid) ?>" />
     <input type="hidden" name="courseid" value="<?php p($courseid) ?>" />
+    </fieldset>
 
     <table class="rolecap">
         <tr>
-            <th class="name" align="left"><?php print_string('capability','role') ?></th>
-            <th class="inherit"><?php p($strinherit); ?></th>
-            <th class="allow"><?php p($strallow); ?></th>
-            <th class="prevent"><?php p($strprevent); ?></th>
-            <th class="prohibit"><?php p($strprohibit); ?></th>
-            <th class="risk" colspan="5"><?php print_string('risks','role') ?></th>
+            <th class="name" align="left" scope="col"><?php print_string('capability','role') ?></th>
+            <th class="inherit" scope="col"><?php p($strinherit); ?></th>
+            <th class="allow" scope="col"><?php p($strallow); ?></th>
+            <th class="prevent" scope="col"><?php p($strprevent); ?></th>
+            <th class="prohibit" scope="col"><?php p($strprohibit); ?></th>
+            <th class="risk" colspan="5" scope="col"><?php print_string('risks','role') ?></th>
         </tr>
         <?php
 
@@ -28,9 +30,16 @@
         $component = '';
 
         $strrisks = s(get_string('risks', 'role'));
-        $strcapabilities = s(get_string('capabilities', 'role'));
+        // MDL-11687
+        $strcapabilities = 'Capabilities';//s(get_string('capabilities', 'role'));
 
         foreach ($capabilities as $capability) {
+
+            // legacy caps should not be overriden - we must use proper capabilities if needed
+            if (islegacy($capability->name)) {
+                continue;
+            }
+
         // prints a breaker if component or name or context level
             if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
                 echo ('<tr class="rolecapheading header"><td colspan="10" class="header"><strong>'.get_component_string($capability->component, $capability->contextlevel).'</strong></td></tr>');
@@ -57,32 +66,37 @@
                 $isprohibit = 0;
             }
 
-            $isdisabled = $isprohibit || islegacy($capability->name);
+            $isdisabled = $isprohibit;
 
             $riskinfo = '<td class="risk managetrust">';
             $rowclasses = '';
             if (RISK_MANAGETRUST & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">T</a>';
+                $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+                $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_managetrust.gif" alt="'.get_string('riskmanagetrustshort', 'admin').'" /></a>';
                 $rowclasses .= ' riskmanagetrust';
             }
             $riskinfo .= '</td><td class="risk config">';
             if (RISK_CONFIG & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">C</a>';
+                $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+                $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_config.gif" alt="'.get_string('riskconfigshort', 'admin').'" /></a>';
                 $rowclasses .= ' riskconfig';
             }
             $riskinfo .= '</td><td class="risk xss">';
             if (RISK_XSS & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">X</a>';
+                $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+                $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_xss.gif" alt="'.get_string('riskxssshort', 'admin').'" /></a>';
                 $rowclasses .= ' riskxss';
             }
             $riskinfo .= '</td><td class="risk personal">';
             if (RISK_PERSONAL & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">P</a>';
+                $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+                $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_personal.gif" alt="'.get_string('riskpersonalshort', 'admin').'" /></a>';
                 $rowclasses .= ' riskpersonal';
             }
             $riskinfo .= '</td><td class="risk spam">';
             if (RISK_SPAM & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">S</a>';
+                $riskinfo .= '<a onclick="this.target=\'docspopup\'" title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">';
+                $riskinfo .= '<img src="'.$CFG->pixpath.'/i/risk_spam.gif" alt="'.get_string('riskspamshort', 'admin').'" /></a>';
                 $rowclasses .= ' riskspam';
             }
             $riskinfo .= '</td>';
@@ -91,33 +105,33 @@
         ?>
 
         <tr class="rolecap <?php echo $rowclasses; ?>">
-          <td class="name"><span class="cap-desc"><a target="docspopup" href="<?php echo $CFG->docroot.'/'.$lang.'/'.$strcapabilities.'/'.$capability->name ?>"><?php echo get_capability_string($capability->name); ?></a><span class="cap-name"><?php echo $capability->name ?></span></label></td>
+             <td class="name"><span class="cap-desc"><a onclick="this.target='docspopup'" href="<?php echo $CFG->docroot.'/'.$lang.'/'.$strcapabilities.'/'.$capability->name ?>"><?php echo get_capability_string($capability->name); ?></a><span class="cap-name"><?php echo $capability->name ?></span></span></td>
 
              <td class="inherit">
              <input type="radio" title="<?php p($strinherit); ?>" name="<?php echo $capability->name; ?>" value="0"
                 <?php
-                    if ($localpermission == CAP_INHERIT) {echo 'checked="checked"';}
+                    if ($localpermission == CAP_INHERIT) {echo 'checked="checked" ';}
                     if ($isdisabled)           {echo 'disabled="disabled"';}?> />
              </td>
 
              <td class="allow <?php if ($isallow) {echo ' capcurrent';} ?>">
              <input type="radio" title="<?php p($strallow); ?>" name="<?php echo $capability->name; ?>"
                 <?php echo ' value="'.CAP_ALLOW.'"';
-                   if ($localpermission == CAP_ALLOW) {echo ' checked="checked"';}
+                   if ($localpermission == CAP_ALLOW) {echo ' checked="checked" ';}
                    if ($isdisabled)                   {echo ' disabled="disabled"';}?> />
              </td>
 
              <td class="prevent <?php if ($isprevent) {echo ' capcurrent';} ?>">
              <input type="radio" title="<?php p($strprevent); ?>" name="<?php echo $capability->name; ?>"
                 <?php echo ' value="'.CAP_PREVENT.'"';
-                   if ($localpermission == CAP_PREVENT) {echo ' checked="checked"';}
+                   if ($localpermission == CAP_PREVENT) {echo ' checked="checked" ';}
                    if ($isdisabled)                     {echo ' disabled="disabled"';}?> />
              </td>
 
              <td class="prohibit <?php if ($isprohibit) {echo ' capcurrent';} ?>">
              <input type="radio" title="<?php p($strprohibit); ?>" name="<?php echo $capability->name; ?>"
                 <?php echo ' value="'.CAP_PROHIBIT.'"';
-                   if ($localpermission == CAP_PROHIBIT) {echo ' checked="checked"';}
+                   if ($localpermission == CAP_PROHIBIT) {echo ' checked="checked" ';}
                    if ($isdisabled)                      {echo ' disabled="disabled"';}?> />
              </td>
             <?php echo $riskinfo; ?>
@@ -125,8 +139,7 @@
 
         <?php } ?>
     </table>
-    <br />
-    <div align="center">
+    <div class="submit buttons">
         <input type="submit" value="<?php print_string('savechanges') ?>" />
         <input type="submit" name="cancel" value="<?php print_string('cancel') ?>" />
     </div>

admin/roles/override.php

@@ -2,7 +2,7 @@
 
     require_once('../../config.php');
 
-    $contextid = required_param('contextid',PARAM_INT);    // context id
+    $contextid = required_param('contextid', PARAM_INT);   // context id
     $roleid    = optional_param('roleid', 0, PARAM_INT);   // requested role id
     $userid    = optional_param('userid', 0, PARAM_INT);   // needed for user tabs
     $courseid  = optional_param('courseid', 0, PARAM_INT); // needed for user tabs
@@ -12,29 +12,34 @@
         error('Bad context ID');
     }
 
-    if (!$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID)) {
+    if (!$sitecontext = get_context_instance(CONTEXT_SYSTEM)) {
         error('No site ID');
     }
 
     if ($context->id == $sitecontext->id) {
-        error ('Can not override base role capabilities');
+        error('Can not override base role capabilities');
     }
 
-    require_capability('moodle/role:override', $context);   // Just to make sure
+    if (!has_capability('moodle/role:override', $context)) {
+        error('You do not have permission to change overrides in this context!');
+    }
 
     if ($courseid) {
         if (!$course = get_record('course', 'id', $courseid)) {
             error('Bad course ID');
         }
     } else {
-        $course = $SITE;
+        $course = clone($SITE);
+        $courseid = SITEID;
     }
 
+    require_login($course);
+
     $baseurl = 'override.php?contextid='.$context->id;
     if (!empty($userid)) {
         $baseurl .= '&userid='.$userid;
     }
-    if (!empty($courseid)) {
+    if ($courseid != SITEID) {
         $baseurl .= '&courseid='.$courseid;
     }
 
@@ -42,6 +47,9 @@
         redirect($baseurl);
     }
 
+/// needed for tabs.php
+    $overridableroles = get_overridable_roles($context);
+    $assignableroles  = get_assignable_roles($context);
 
 /// Get some language strings
 
@@ -53,6 +61,7 @@
     $strparticipants   = get_string('participants');
 
 /// Make sure this user can override that role
+
     if ($roleid) {
         if (!user_can_override($context, $roleid)) {
             error ('you can not override this role in this context');
@@ -64,18 +73,27 @@
         $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
     }
 
+/// get all cababilities
+    $capabilities = fetch_context_capabilities($context);
+
 /// Process incoming role override
     if ($data = data_submitted() and $roleid and confirm_sesskey()) {
         $allowed_values = array(CAP_INHERIT, CAP_ALLOW, CAP_PREVENT, CAP_PROHIBIT);
-        $capabilities = fetch_context_capabilities($context); // capabilities applicable in this context
 
         $localoverrides = get_records_select('role_capabilities', "roleid = $roleid AND contextid = $context->id",
                                              '', 'capability, permission, id');
 
         foreach ($capabilities as $cap) {
+
             if (!isset($data->{$cap->name})) {
+                //cap not specified in form
                 continue;
             }
+
+            if (islegacy($data->{$cap->name})) {
+                continue;
+            }
+
             $capname = $cap->name;
             $value = clean_param($data->{$cap->name}, PARAM_INT);
             if (!in_array($value, $allowed_values)) {
@@ -112,6 +130,8 @@
                 }
             }
         }
+        $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);
     }
 
@@ -129,12 +149,20 @@
 
         /// site header
         } else {
-            print_header("$course->fullname: $fullname", "$course->fullname",
+            print_header("$course->fullname: $fullname", $course->fullname,
                         "<a href=\"$CFG->wwwroot/user/view.php?id=$userid&amp;course=$course->id\">$fullname</a> -> $straction", "", "", true, "&nbsp;", navmenu($course));
         }
         $showroles = 1;
         $currenttab = 'override';
         include_once($CFG->dirroot.'/user/tabs.php');
+    } else if ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID) {
+        require_once($CFG->libdir.'/adminlib.php');
+        $adminroot = admin_get_root();
+        admin_externalpage_setup('frontpageroles', $adminroot);
+        admin_externalpage_print_header($adminroot);
+        $currenttab = '';
+        $tabsmode = 'override';
+        include_once('tabs.php');
     } else {
         $currenttab = '';
         $tabsmode = 'override';
@@ -143,21 +171,14 @@
 
     print_heading_with_help(get_string('overrides', 'role'), 'overrides');
 
-    $overridableroles = get_overridable_roles($context);
-
     if ($roleid) {
     /// prints a form to swap roles
-        echo '<form name="rolesform" action="override.php" method="get">';
-        echo '<div align="center">'.$strcurrentcontext.': '.print_context_name($context).'<br/>';
-        if ($userid) {
-            echo '<input type="hidden" name="userid" value="'.$userid.'" />';
-        }
-        if ($courseid) {
-            echo '<input type="hidden" name="courseid" value="'.$courseid.'" />';
-        }
-        echo '<input type="hidden" name="contextid" value="'.$context->id.'" />'.$strroletooverride.': ';
-        choose_from_menu ($overridableroles, 'roleid', $roleid, get_string('listallroles', 'role').'...', $script='rolesform.submit()');
-        echo '</div></form>';
+        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);
+        echo '</div>';
 
         $parentcontexts = get_parent_contexts($context);
         if (!empty($parentcontexts)) {
@@ -174,11 +195,12 @@
 
         $lang = str_replace('_utf8', '', current_language());
 
-        // Get the capabilities overrideable in this context
-        if ($capabilities = fetch_context_capabilities($context)) {
+        if (!empty($capabilities)) {
+            // Print the capabilities overrideable in this context
             print_simple_box_start('center');
             include_once('override.html');
             print_simple_box_end();
+
         } else {
             notice(get_string('nocapabilitiesincontext', 'role'),
                     $CFG->wwwroot.'/'.$CFG->admin.'/roles/'.$baseurl);
@@ -204,6 +226,10 @@
         print_table($table);
     }
 
-    print_footer($course);
+    if ($context->contextlevel == CONTEXT_SYSTEM or ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID)) {
+        admin_externalpage_print_footer($adminroot);
+    } else {
+        print_footer($course);
+    }
 
 ?>

admin/roles/tabs.php

@@ -1,6 +1,11 @@
 <?php // $Id$
 
 // Handles headers and tabs for the roles control at any level apart from SYSTEM level
+// We also assume that $currenttab, $assignableroles and $overridableroles are defined
+
+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+}
 
 if ($currenttab != 'update') {
     switch ($context->contextlevel) {
@@ -27,11 +32,16 @@ if ($currenttab != 'update') {
             break;
 
         case CONTEXT_COURSE:
-            $streditcoursesettings = get_string("editcoursesettings");
+            if ($context->instanceid != SITEID) {
+                $streditcoursesettings = get_string("editcoursesettings");
 
-            $course = get_record('course', 'id', $context->instanceid);
-            print_header($streditcoursesettings, "$course->fullname",
-                    "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> $straction");
+                $course = get_record('course', 'id', $context->instanceid);
+
+                require_login($course);
+
+                print_header($streditcoursesettings, $course->fullname,
+                        "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> $straction");
+            }
             break;
 
         case CONTEXT_GROUP:
@@ -52,6 +62,8 @@ if ($currenttab != 'update') {
                 error("The required instance of this module doesn't exist");
             }
 
+            require_login($course);
+
             $strnav = "<a href=\"$CFG->wwwroot/mod/$module->name/view.php?id=$cm->id\">$instance->name</a> ->";
             $fullmodulename = get_string("modulename", $module->name);
             $streditinga = get_string("editinga", "moodle", $fullmodulename);
@@ -63,10 +75,9 @@ if ($currenttab != 'update') {
                 $focuscursor = "form.name";
             }
 
-            $COURSE = $course;
             print_header_simple($streditinga, '',
                     "<a href=\"$CFG->wwwroot/mod/$module->name/index.php?id=$course->id\">$strmodulenameplural</a> ->
-                    $strnav <a href=\"$CFG->wwwroot/course/mod.php?update=$cm->id&sesskey=".sesskey()."\">$streditinga</a> -> $straction", $focuscursor, "", false);
+                    $strnav <a href=\"$CFG->wwwroot/course/mod.php?update=$cm->id&amp;sesskey=".sesskey()."\">$streditinga</a> -> $straction", $focuscursor, "", false);
 
             break;
 
@@ -79,6 +90,9 @@ if ($currenttab != 'update') {
                     switch ($blockinstance->pagetype) {
                         case 'course-view':
                             if ($course = get_record('course', 'id', $blockinstance->pageid)) {
+
+                                require_login($course);
+
                                 if ($course->id != SITEID) {
                                     $navigation = "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> $navigation";
                                 }
@@ -102,7 +116,7 @@ if ($currenttab != 'update') {
             break;
 
         default:
-            error ('This is an unknown context!');
+            error ('This is an unknown context (' . $context->contextlevel . ') in admin/roles/tabs.php!');
             return false;
 
     }
@@ -121,16 +135,8 @@ if ($context->contextlevel != CONTEXT_SYSTEM) {    // Print tabs for anything ex
     $toprow[] = new tabobject('roles', $CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.
                                $context->id, get_string('roles'));
 
-    if (isset($tabsmode)) {
+    if (!empty($tabsmode)) {
 
-        if (!isset($assignableroles)) {
-            $assignableroles = get_assignable_roles($context);
-        }
-        if (!isset($overridableroles)) {
-            $overridableroles = get_overridable_roles($context);
-        }
-
-        $inactive[] = 'roles';
         if (!empty($assignableroles)) {
             $secondrow[] = new tabobject('assign',
                                          $CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$context->id,
@@ -147,14 +153,32 @@ if ($context->contextlevel != CONTEXT_SYSTEM) {    // Print tabs for anything ex
                                true);
         }
 
-        if ($tabsmode == 'override') {
-            $currenttab = 'override';
-        } elseif ($tabsmode == 'assign') {
-            $currenttab = 'assign';
-        }
+        $inactive[] = 'roles';
+        $activetwo = array('roles');
+        $currenttab = $tabsmode;
 
     } else {
         $inactive[] = '';
+        $activetwo = array();
+    }
+
+/// 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.:
+/// include_once($CFG->dirroot . '/grades/tabs.php');
+
+/// Finally, we support adding some 'on-the-fly' tabs here
+/// All the logic to decide what to show must be self-cointained in the tabs file
+    if (isset($CFG->extratabs) && !empty($CFG->extratabs)) {
+        if ($extratabs = explode(',', $CFG->extratabs)) {
+            asort($extratabs);
+            foreach($extratabs as $extratab) {
+            /// Each extra tab mus be one $CFG->dirroot relative file
+                if (file_exists($CFG->dirroot . '/' . $extratab)) {
+                    include_once($CFG->dirroot . '/' . $extratab);
+                }
+            }
+        }
     }
 
     if (!empty($secondrow)) {
@@ -163,7 +187,7 @@ if ($context->contextlevel != CONTEXT_SYSTEM) {    // Print tabs for anything ex
         $tabs = array($toprow);
     }
 
-    print_tabs($tabs, $currenttab, $inactive);
+    print_tabs($tabs, $currenttab, $inactive, $activetwo);
 }
 
 ?>

admin/search.php

@@ -58,9 +58,11 @@ if ($statusmsg != '') {
 
 $resultshtml = search_settings_html(admin_get_root(), $query);
 
-echo '<form action="search.php" method="post" name="adminsettings" id="adminsettings">';
+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 '</div>';
 echo '<fieldset>';
 echo '<div class="clearer"><!-- --></div>';
 if ($resultshtml != '') {
@@ -112,6 +114,11 @@ function search_settings(&$node, $query) {
 function search_settings_html(&$node, $query) {
 
     global $CFG;
+
+    if ($query == ''){
+        return '';
+    }
+
     if (is_a($node, 'admin_category')) {
         $entries = array_keys($node->children);
         $return = '';

admin/settings.php

@@ -87,6 +87,32 @@ if ($data = data_submitted()) {
 
 /// print header stuff ------------------------------------------------------------
 // header must be printed after the redirects and require_logout
+
+if (empty($SITE->fullname)) {
+    print_header();
+    print_simple_box(get_string('configintrosite', 'admin'), 'center', '50%');
+
+    if ($statusmsg != '') {
+        notify ($statusmsg);
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------
+
+    echo '<form action="settings.php" method="post" id="adminsettings">';
+    echo '<div class="settingsform">';
+    echo '<input type="hidden" name="section" value="' . $PAGE->section . '" />';
+    echo '<input type="hidden" name="sesskey" value="' . $USER->sesskey . '" />';
+    echo '<input type="hidden" name="return" value="' . $return . '" />';
+    print_heading($root->visiblename);
+
+    echo $root->output_html();
+
+    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)) {
     $pageblocks = blocks_setup($PAGE);
 
@@ -98,40 +124,74 @@ if (!empty($SITE->fullname)) {
     $PAGE->print_header();
 
     echo '<table id="layout-table"><tr>';
+    $lt = (empty($THEME->layouttable)) ? array('left', 'middle', 'right') : $THEME->layouttable;
+    foreach ($lt as $column) {
+        switch ($column) {
+            case 'left':
     echo '<td style="width: ' . $preferred_width_left . 'px;" id="left-column">';
+    if (!empty($THEME->roundcorners)) {
+        echo '<div class="bt"><div></div></div>';
+        echo '<div class="i1"><div class="i2"><div class="i3">';
+    }
     blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
+    if (!empty($THEME->roundcorners)) {
+        echo '</div></div></div>';
+        echo '<div class="bb"><div></div></div>';
+    }
     echo '</td>';
+            break;
+            case 'middle':
     echo '<td id="middle-column">';
-} else {
+    if (!empty($THEME->roundcorners)) {
+        echo '<div class="bt"><div></div></div>';
+        echo '<div class="i1"><div class="i2"><div class="i3">';
+    }
+    echo '<a name="startofcontent"></a>';
 
-    print_header();
-    print_simple_box(get_string('configintrosite', 'admin'), 'center', '50%');
+    if ($statusmsg != '') {
+        notify ($statusmsg);
+    }
 
-}
+    // ---------------------------------------------------------------------------------------------------------------
 
-if ($statusmsg != '') {
-    notify ($statusmsg);
-}
+    echo '<form action="settings.php" method="post" id="adminsettings">';
+    echo '<div class="settingsform">';
+    echo '<input type="hidden" name="section" value="' . $PAGE->section . '" />';
+    echo '<input type="hidden" name="sesskey" value="' . $USER->sesskey . '" />';
+    echo '<input type="hidden" name="return" value="' . $return . '" />';
+    print_heading($root->visiblename);
 
-// ---------------------------------------------------------------------------------------------------------------
+    echo $root->output_html();
 
-echo '<form action="settings.php" method="post" name="adminsettings" id="adminsettings">';
-echo '<input type="hidden" name="section" value="' . $PAGE->section . '" />';
-echo '<input type="hidden" name="sesskey" value="' . $USER->sesskey . '" />';
-echo '<input type="hidden" name="return" value="' . $return . '" />';
-print_heading($root->visiblename);
+    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="' . get_string('savechanges','admin') . '" /></div>';
 
-echo $root->output_html();
+    echo '</div>';
+    echo '</form>';
 
-echo '<div class="form-buttons"><input class="form-submit" type="submit" value="' . get_string('savechanges','admin') . '" /></div>';
-
-echo '</form>';
-
-if (!empty($SITE->fullname)) {
+    if (!empty($THEME->roundcorners)) {
+        echo '</div></div></div>';
+        echo '<div class="bb"><div></div></div>';
+    }
     echo '</td>';
-    echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">';
-    blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
-    echo '</td></tr></table>';
+            break;
+            case 'right':
+    if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) {
+        echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">';
+        if (!empty($THEME->roundcorners)) {
+            echo '<div class="bt"><div></div></div>';
+            echo '<div class="i1"><div class="i2"><div class="i3">';
+        }
+        blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
+        if (!empty($THEME->roundcorners)) {
+            echo '</div></div></div>';
+            echo '<div class="bb"><div></div></div>';
+        }
+        echo '</td>';
+    }
+            break;
+        }
+    }
+    echo '</tr></table>';
 }
 
 if (!empty($CFG->adminusehtmleditor)) {

admin/settings/appearance.php

@@ -10,39 +10,20 @@ $temp->add(new admin_setting_configcheckbox('allowuserthemes', get_string('allow
 $temp->add(new admin_setting_configcheckbox('allowcoursethemes', get_string('allowcoursethemes', 'admin'), get_string('configallowcoursethemes', 'admin'), 0));
 $temp->add(new admin_setting_configcheckbox('allowuserblockhiding', get_string('allowuserblockhiding', 'admin'), get_string('configallowuserblockhiding', 'admin'), 1));
 $temp->add(new admin_setting_configcheckbox('showblocksonmodpages', get_string('showblocksonmodpages', 'admin'), get_string('configshowblocksonmodpages', 'admin'), 0));
-$temp->add(new admin_setting_configcheckbox('tabselectedtofront', get_string('tabselectedtofronttext', 'admin'), get_string('tabselectedtofront', 'admin'), 0));
 $ADMIN->add('themes', $temp);
 $ADMIN->add('themes', new admin_externalpage('themeselector', get_string('themeselector','admin'), $CFG->wwwroot . '/theme/index.php'));
 
-
-// "frontpage" settingpage
-$temp = new admin_settingpage('frontpage', get_string('frontpage','admin'));
-$temp->add(new admin_setting_sitesettext('fullname', get_string('fullsitename'), '', ''));
-$temp->add(new admin_setting_sitesettext('shortname', get_string('shortsitename'), '', ''));
-$temp->add(new admin_setting_special_frontpagedesc());
-$temp->add(new admin_setting_courselist_frontpage(false)); // non-loggedin version of the setting (that's what the parameter is for :) )
-$temp->add(new admin_setting_courselist_frontpage(true)); // loggedin version of the setting
-$temp->add(new admin_setting_sitesetcheckbox('numsections', get_string('sitesection'),
-               get_string('sitesectionhelp','admin'), 1));
-$temp->add(new admin_setting_sitesetselect('newsitems', get_string('newsitemsnumber'),
-     '', 3,
-     array('0' => '0',
-           '1' => '1',
-           '2' => '2',
-           '3' => '3',
-           '4' => '4',
-           '5' => '5',
-           '6' => '6',
-           '7' => '7',
-           '8' => '8',
-           '9' => '9',
-           '10' => '10')));
-$temp->add(new admin_setting_configtext('coursesperpage', get_string('coursesperpage', 'admin'), get_string('configcoursesperpage', 'admin'), 20, PARAM_INT));
-$ADMIN->add('appearance', $temp);
+# for CALENDAR_TF_12 and CALENDAR_TF_24 ...
+require_once($CFG->dirroot . '/calendar/lib.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'),

admin/settings/courses.php

@@ -3,7 +3,7 @@
 // This file defines settingpages and externalpages under the "courses" category
 
 
-$ADMIN->add('courses', new admin_externalpage('coursemgmt', get_string('coursemgmt', 'admin'), $CFG->wwwroot . '/course/index.php?categoryedit=on'));
+$ADMIN->add('courses', new admin_externalpage('coursemgmt', get_string('coursemgmt', 'admin'), $CFG->wwwroot . '/course/index.php?categoryedit=on','moodle/category:update'));
 
 $ADMIN->add('courses', new admin_externalpage('enrolment', get_string('enrolments'), $CFG->wwwroot . '/'.$CFG->admin.'/enrol.php'));
 
@@ -17,7 +17,7 @@ $ADMIN->add('courses', $temp);
 
 
 // "backups" settingpage
-$temp = new admin_settingpage('backups', get_string('backups','admin'));
+$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));

admin/settings/frontpage.php

@@ -0,0 +1,45 @@
+<?php // $Id$
+
+// This file defines everything related to frontpage
+
+if (get_site()) { //do not use during installation
+    $frontpagecontext = get_context_instance(CONTEXT_COURSE, SITEID);
+    $frontpagecontextid = $frontpagecontext->id; 
+} else {
+    $frontpagecontext = NULL;
+    $frontpagecontextid = 0; 
+}
+
+// "frontpage" settingpage
+$temp = new admin_settingpage('frontpagesettings', get_string('frontpagesettings','admin'), 'moodle/course:update', false, $frontpagecontext);
+$temp->add(new admin_setting_sitesettext('fullname', get_string('fullsitename'), '', ''));
+$temp->add(new admin_setting_sitesettext('shortname', get_string('shortsitename'), '', ''));
+$temp->add(new admin_setting_special_frontpagedesc());
+$temp->add(new admin_setting_courselist_frontpage(false)); // non-loggedin version of the setting (that's what the parameter is for :) )
+$temp->add(new admin_setting_courselist_frontpage(true)); // loggedin version of the setting
+$temp->add(new admin_setting_sitesetcheckbox('numsections', get_string('sitesection'), get_string('sitesectionhelp','admin'), 1));
+$temp->add(new admin_setting_sitesetselect('newsitems', get_string('newsitemsnumber'), '', 3,
+     array('0' => '0',
+           '1' => '1',
+           '2' => '2',
+           '3' => '3',
+           '4' => '4',
+           '5' => '5',
+           '6' => '6',
+           '7' => '7',
+           '8' => '8',
+           '9' => '9',
+           '10' => '10')));
+$temp->add(new admin_setting_configtext('coursesperpage', get_string('coursesperpage', 'admin'), get_string('configcoursesperpage', 'admin'), 20, PARAM_INT));
+$temp->add(new admin_setting_configcheckbox('allowvisiblecoursesinhiddencategories', get_string('allowvisiblecoursesinhiddencategories', 'admin'), get_string('configvisiblecourses', 'admin'), 0));
+$ADMIN->add('frontpage', $temp);
+
+$ADMIN->add('frontpage', new admin_externalpage('frontpageroles', get_string('frontpageroles', 'admin'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=" . $frontpagecontextid, 'moodle/role:assign', false, $frontpagecontext));
+
+$ADMIN->add('frontpage', new admin_externalpage('frontpagebackup', get_string('frontpagebackup', 'admin'), $CFG->wwwroot.'/backup/backup.php?id='.SITEID, 'moodle/site:backup', false, $frontpagecontext));
+
+$ADMIN->add('frontpage', new admin_externalpage('frontpagerestore', get_string('frontpagerestore', 'admin'), $CFG->wwwroot.'/files/index.php?id='.SITEID.'&amp;wdir=/backupdata', 'moodle/site:restore', false, $frontpagecontext));
+
+$ADMIN->add('frontpage', new admin_externalpage('sitefiles', get_string('sitefiles'), $CFG->wwwroot . '/files/index.php?id=' . SITEID, 'moodle/course:managefiles', false, $frontpagecontext));
+
+?>

admin/settings/language.php

@@ -6,13 +6,16 @@
 $temp = new admin_settingpage('langsettings', get_string('languagesettings', 'admin'));
 $temp->add(new admin_setting_configselect('lang', get_string('lang', 'admin'), get_string('configlang', 'admin'), current_language(), get_list_of_languages())); // $CFG->lang might be set in installer already, default en or en_utf8 is in setup.php
 $temp->add(new admin_setting_configcheckbox('langmenu', get_string('langmenu', 'admin'), get_string('configlangmenu', 'admin'), 1));
-$temp->add(new admin_setting_configtext('langlist', get_string('langlist', 'admin'), get_string('configlanglist', 'admin'), '', PARAM_NOTAGS));
+$temp->add(new admin_setting_langlist());
 $temp->add(new admin_setting_configcheckbox('langcache', get_string('langcache', 'admin'), get_string('configlangcache', 'admin'), 1));
 $temp->add(new admin_setting_configtext('locale', get_string('localetext', 'admin'), get_string('configlocale', 'admin'), '', PARAM_FILE));
+
+// new CFG variable for excel encoding
+$temp->add(new admin_setting_configselect('latinexcelexport', get_string('latinexcelexport', 'admin'), get_string('configlatinexcelexport', 'admin'), '0', array('0'=>'Unicode','1'=>'Latin')));
+
+
 $ADMIN->add('language', $temp);
 
-
-
 $ADMIN->add('language', new admin_externalpage('langedit', get_string('langedit', 'admin'), "$CFG->wwwroot/$CFG->admin/lang.php"));
 $ADMIN->add('language', new admin_externalpage('langimport', get_string('langpacks', 'admin'), "$CFG->wwwroot/$CFG->admin/langimport.php"));
 

admin/settings/location.php

@@ -5,7 +5,6 @@ $temp = new admin_settingpage('locationsettings', get_string('locationsettings',
 $options = get_list_of_timezones();
 $options[99] = get_string('serverlocaltime');
 $temp->add(new admin_setting_configselect('timezone', get_string('timezone','admin'), get_string('configtimezone', 'admin'), 99, $options));
-$options = get_list_of_timezones();
 $options[99] = get_string('timezonenotforced', 'admin');
 $temp->add(new admin_setting_configselect('forcetimezone', get_string('forcetimezone', 'admin'), get_string('helpforcetimezone', 'admin'), 99, $options));
 $options = get_list_of_countries();

admin/settings/misc.php

@@ -6,6 +6,7 @@
 $temp = new admin_settingpage('experimental', get_string('experimental', 'admin'));
 $temp->add(new admin_setting_configcheckbox('enableajax', get_string('enableajax', 'admin'), get_string('configenableajax', 'admin'), 0));
 $temp->add(new admin_setting_configcheckbox('enableglobalsearch', get_string('enableglobalsearch', 'admin'), get_string('configenableglobalsearch', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('smartpix', get_string('smartpix', 'admin'), get_string('configsmartpix', 'admin'), 0));
 $ADMIN->add('misc', $temp);
 
 // XMLDB editor
@@ -16,5 +17,6 @@ $ADMIN->add('misc', new admin_externalpage('xmldbeditor', get_string('xmldbedito
 $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)));
 
 ?>

admin/settings/mnet.php

@@ -0,0 +1,21 @@
+<?php // $Id$
+
+// 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', 
+                                           'moodle/site:config'));
+
+$ADMIN->add('mnet', new admin_externalpage('mnetpeers', get_string('mnetpeers', 'mnet'), 
+                                           $CFG->wwwroot . '/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', 
+                                           'moodle/site:config'));
+$ADMIN->add('mnet', new admin_externalpage('mnetenrol', get_string('mnetenrol', 'mnet'), 
+                                           $CFG->wwwroot . '/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', 
+                                           'moodle/site:config'));
+?>

admin/settings/security.php

@@ -25,7 +25,7 @@ $temp->add(new admin_setting_configselect('fullnamedisplay', get_string('fullnam
               'lastname firstname' => get_string('lastname') . ' + ' . get_string('firstname'),
               'firstname' => get_string('firstname'))));
 $temp->add(new admin_setting_configcheckbox('extendedusernamechars', get_string('extendedusernamechars', 'admin'), get_string('configextendedusernamechars', 'admin'), 0));
-$temp->add(new admin_setting_configtext('sitepolicy', get_string('sitepolicy', 'admin'), get_string('configsitepolicy', 'admin'), '', PARAM_URL));
+$temp->add(new admin_setting_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'),
@@ -33,6 +33,10 @@ $temp->add(new admin_setting_configselect('bloglevel', get_string('bloglevel', '
                                                                                                                                           1 => get_string('personalblogs','blog'),
                                                                                                                                           0 => get_string('disableblogs','blog'))));
 
+$temp->add(new admin_setting_configcheckbox('cronclionly', get_string('cronclionly', 'admin'), get_string('configcronclionly', 'admin'), 0));
+$temp->add(new admin_setting_configtext('cronremotepassword', get_string('cronremotepassword', 'admin'), get_string('configcronremotepassword', 'admin'), '', PARAM_RAW));
+$temp->add(new admin_setting_configcheckbox('emailchangeconfirmation', get_string('emailchangeconfirmation', 'admin'), get_string('configemailchangeconfirmation', 'admin'), 0));
+
 $ADMIN->add('security', $temp);
 
 
@@ -41,7 +45,6 @@ $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('secureforms', get_string('secureforms', 'admin'), get_string('configsecureforms', 'admin'), 0));
 $ADMIN->add('security', $temp);
 
 

admin/settings/server.php

@@ -47,15 +47,13 @@ $temp->add(new admin_setting_configselect('digestmailtime', get_string('digestma
                                                                                                                                                           '21' => '21',
                                                                                                                                                           '22' => '22',
                                                                                                                                                           '23' => '23')));
-if (!empty($CFG->unicodedb)) { // These options are only available if running under unicodedb
-    unset($options);
-    unset($charsets);
-    $charsets = get_list_of_charsets();
-    $options['0'] = get_string('none');
-    $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_configcheckbox('allowusermailcharset', get_string('allowusermailcharset', 'admin'), get_string('configallowusermailcharset', 'admin'), 0));
-}
+$charsets = get_list_of_charsets();
+unset($charsets['UTF-8']); // not needed here
+$options = array();
+$options['0'] = get_string('none');
+$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_configcheckbox('allowusermailcharset', get_string('allowusermailcharset', 'admin'), get_string('configallowusermailcharset', 'admin'), 0));
 $ADMIN->add('server', $temp, 100);
 
 
@@ -87,6 +85,8 @@ $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('debugsmtp', get_string('debugsmtp', 'admin'), get_string('configdebugsmtp', 'admin'), 0));
 $temp->add(new admin_setting_special_perfdebug());
 $ADMIN->add('server', $temp);
 
@@ -127,8 +127,6 @@ $temp->add(new admin_setting_configtext('proxyhost', get_string('proxyhost', 'ad
 $temp->add(new admin_setting_configtext('proxyport', get_string('proxyport', 'admin'), get_string('configproxyport', 'admin'), 0, PARAM_INT));
 $ADMIN->add('server', $temp);
 
-$ADMIN->add('server', new admin_externalpage('sitefiles', get_string('sitefiles'), $CFG->wwwroot . '/files/index.php?id=' . SITEID));
-
 $ADMIN->add('server', new admin_externalpage('maintenancemode', get_string('sitemaintenancemode', 'admin'), "$CFG->wwwroot/$CFG->admin/maintenance.php"));
 
 
@@ -157,6 +155,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 +184,27 @@ $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_configcheckbox('enablerecordcache', get_string('enablerecordcache', 'admin'), get_string('configenablerecordcache', 'admin'), 1));
+$temp->add(new admin_setting_configselect('cachetype', get_string('cachetype', 'admin'), 
+                                          get_string('configcachetype', 'admin'), false, 
+                                          array( '' => 'none', 
+                                                 'internal' => 'internal', 
+                                                 'memcached' => 'memcached', 
+                                                 'eaccelerator' => 'eaccelerator')));
+// NOTE: $CFG->rcache is forced to bool in lib/setup.php
+$temp->add(new admin_setting_configselect('rcache', get_string('rcache', 'admin'),
+                                          get_string('configrcache', 'admin'), false, 
+                                          array( '0' => 'false', 
+                                                 '1' => 'true')));
+$temp->add(new admin_setting_configtext('rcachettl', get_string('rcachettl', 'admin'),
+                                        get_string('configrcachettl', 'admin'), 10));
+$temp->add(new admin_setting_configtext('intcachemax', get_string('intcachemax', 'admin'),
+                                        get_string('configintcachemax', 'admin'), 10));
+$temp->add(new admin_setting_configtext('memcachedhosts', get_string('memcachedhosts', 'admin'),
+                                        get_string('configmemcachedhosts', 'admin'), ''));
+$temp->add(new admin_setting_configselect('memcachedpconn', get_string('memcachedpconn', 'admin'),
+                                          get_string('configmemcachedpconn', 'admin'), false, 
+                                          array( '0' => 'false', 
+                                                 '1' => 'true')));
 $ADMIN->add('server', $temp);
 
 if (file_exists("$CFG->dirroot/$CFG->admin/mysql/frame.php")) {

admin/settings/top.php

@@ -25,12 +25,14 @@ $ADMIN->add('modules', new admin_externalpage('managefilters', get_string('manag
 
 $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->dbtype != 'mysql' && $CFG->dbtype != 'postgres7') {
+    if ($plugin == 'simpletest' && $CFG->dbfamily != 'mysql' && $CFG->dbfamily != 'postgres') {
         continue;
     }
 /// End of removable snippet

admin/settings/users.php

@@ -6,11 +6,17 @@
 $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('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('addnewuser', get_string('addnewuser'), "$CFG->wwwroot/$CFG->admin/user.php?newuser=true", 'moodle/user:create'));
+$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
@@ -23,7 +29,7 @@ $ADMIN->add('roles', new admin_externalpage('assignroles', get_string('assignglo
 // "userpolicies" settingpage
 $temp = new admin_settingpage('userpolicies', get_string('userpolicies', 'admin'));
 
-$context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+$context = get_context_instance(CONTEXT_SYSTEM);
 if (!$guestrole = get_guest_role()) {
     $guestrole->id = 0;
 }
@@ -32,16 +38,45 @@ if ($studentroles = get_roles_with_capability('moodle/legacy:student', CAP_ALLOW
 } else {
     $studentrole->id = 0;
 }
-$assignableroles  = get_assignable_roles($context);
+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);
+    }
+}
+// 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));
+    }
+}
 
 $temp->add(new admin_setting_configselect('notloggedinroleid', get_string('notloggedinroleid', 'admin'),
-              get_string('confignotloggedinroleid', 'admin'), $guestrole->id, $assignableroles ));
+              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'), $guestrole->id, $assignableroles));
+              get_string('configdefaultuserroleid', 'admin'), $userrole->id, $allroles));
 $temp->add(new admin_setting_configselect('defaultcourseroleid', get_string('defaultcourseroleid', 'admin'),
-              get_string('configdefaultcourseroleid', 'admin'), $studentrole->id, $assignableroles));
+              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));
+
+$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(),

admin/stickyblocks.php

@@ -63,19 +63,16 @@
     }
 
 
-    print_simple_box_start('center');
+    print_box_start();
     print_heading($strheading);
-    echo '<form method="post" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/stickyblocks.php">'
-        .'<p align="center">'.get_string('stickyblockspagetype','admin').': ';
-    choose_from_menu($options,'pt',$pt,'choose','this.form.submit();');
-    echo '</p></form>';
-    echo get_string('stickyblocksduplicatenotice','admin');
-    print_simple_box_end();
+    popup_form("$CFG->wwwroot/$CFG->admin/stickyblocks.php?pt=", $options, 'selecttype', $pt, 'choose', '', '', false, 'self', get_string('stickyblockspagetype','admin').': ');
+    echo '<p>'.get_string('stickyblocksduplicatenotice','admin').'</p>';
+    print_box_end();
 
 
     if (!empty($pt)) {
         echo '</td>';
-        echo '<td valign="top" style="width: '.$blocks_preferred_width.'px;" id="left-column">';
+        echo '<td valign="top" style="width: '.$blocks_preferred_width.'px;" id="right-column">';
         blocks_print_group($PAGE, $blocks, BLOCK_POS_RIGHT);
         echo '</td>';
         echo '</tr></table>';

admin/timezone.php

@@ -33,8 +33,8 @@
     echo '<center><form action="timezone.php" method="get">';
     echo "$strusers ($strall): ";
     choose_from_menu ($timezones, "zone", 99, get_string("serverlocaltime"), "", "99");
-    echo "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\">";
-    echo "<input type=\"submit\" value=\"$strsavechanges\">";
+    echo "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />";
+    echo "<input type=\"submit\" value=\"$strsavechanges\" />";
     echo "</form></center>";
 
     print_footer();

admin/timezoneimport.php

@@ -15,7 +15,6 @@
 
 /// Print headings
 
-    $strcalendarsettings = get_string('calendarsettings', 'admin');
     $strimporttimezones = get_string('importtimezones', 'admin');
 
     admin_externalpage_print_header($adminroot);
@@ -23,16 +22,16 @@
     print_heading($strimporttimezones);
 
     if (!$ok or !confirm_sesskey()) {
-        $message = '<p>';
+        $message = '<br /><br />';
         $message .= $CFG->dataroot.'/temp/olson.txt<br />';
-        $message .= $CFG->dataroot.'/temp/timezones.txt<br />';
-        $message .= '<a href="http://download.moodle.org/timezones/">http://download.moodle.org/timezones/</a><br />';
-        $message .= '<a href="'.$CFG->wwwroot.'/lib/timezones.txt">'.$CFG->dirroot.'/lib/timezones.txt</a><br />';
-        $message .= '</p>';
+        $message .= $CFG->dataroot.'/temp/timezone.txt<br />';
+        $message .= '<a href="http://download.moodle.org/timezone/">http://download.moodle.org/timezone/</a><br />';
+        $message .= '<a href="'.$CFG->wwwroot.'/lib/timezone.txt">'.$CFG->dirroot.'/lib/timezone.txt</a><br />';
+        $message .= '<br />';
 
         $message = get_string("configintrotimezones", 'admin', $message);
 
-        notice_yesno($message, 'timezoneimport.php?ok=1&sesskey='.sesskey(), 'index.php');
+        notice_yesno($message, 'timezoneimport.php?ok=1&amp;sesskey='.sesskey(), 'index.php');
 
         admin_externalpage_print_footer($adminroot);
         exit;
@@ -55,7 +54,7 @@
 
 /// Next, look for a CSV file locally
 
-    $source = $CFG->dataroot.'/temp/timezones.txt';
+    $source = $CFG->dataroot.'/temp/timezone.txt';
     if (!$importdone and is_readable($source)) {
         if ($timezones = get_records_csv($source, 'timezone')) {
             update_timezone_records($timezones);
@@ -65,17 +64,17 @@
 
 /// Otherwise, let's try moodle.org's copy
 
-    $source = 'http://download.moodle.org/timezones/';
+    $source = 'http://download.moodle.org/timezone/';
     if (!$importdone and ini_get('allow_url_fopen')) {
         if (is_readable($source) && $contents = file_get_contents($source)) {  // Grab whole page
-            if ($file = fopen($CFG->dataroot.'/temp/timezones.txt', 'w')) {            // Make local copy
+            if ($file = fopen($CFG->dataroot.'/temp/timezone.txt', 'w')) {            // Make local copy
                 fwrite($file, $contents);
                 fclose($file);
-                if ($timezones = get_records_csv($CFG->dataroot.'/temp/timezones.txt', 'timezone')) {  // Parse it
+                if ($timezones = get_records_csv($CFG->dataroot.'/temp/timezone.txt', 'timezone')) {  // Parse it
                     update_timezone_records($timezones);
                     $importdone = $source;
                 }
-                unlink($CFG->dataroot.'/temp/timezones.txt');
+                unlink($CFG->dataroot.'/temp/timezone.txt');
             }
         }
     }
@@ -83,7 +82,7 @@
 
 /// Final resort, use the copy included in Moodle
 
-    $source = $CFG->dirroot.'/lib/timezones.txt';
+    $source = $CFG->dirroot.'/lib/timezone.txt';
     if (!$importdone and is_readable($source)) {  // Distribution file
         if ($timezones = get_records_csv($source, 'timezone')) {
             update_timezone_records($timezones);

admin/upgradelogs.php

@@ -52,11 +52,7 @@
         $starttime = time();
         $sleeptime = 0;
 
-        if ($CFG->dbtype == "mysql") {
-            $LIKE = "LIKE";
-        } else {
-            $LIKE = "ILIKE";
-        }
+        $LIKE = sql_ilike();
 
         if ($cmcount > 10) {
             print_simple_box('This process may take a very long time ... please be patient and let it finish.',

admin/upgradesettings.php

@@ -6,6 +6,9 @@
 require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 
+/// no guest autologin
+require_login(0, false);
+
 $adminroot = admin_get_root();
 admin_externalpage_setup('upgradesettings', $adminroot); // now hidden page
 
@@ -58,11 +61,12 @@ admin_externalpage_print_header($adminroot);
 
 print_simple_box(get_string('upgradesettingsintro','admin'),'','100%','',5,'generalbox','');
 
-echo '<form action="upgradesettings.php" method="post" name="adminsettings" id="adminsettings">';
+echo '<form action="upgradesettings.php" method="post" id="adminsettings">';
 echo '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
 echo '<fieldset>';
 echo '<div class="clearer"><!-- --></div>';
 echo $newsettingshtml;
+echo '</fieldset>';
 echo '<div class="form-buttons"><input class="form-submit" type="submit" value="' . get_string('savechanges','admin') . '" /></div>';
 echo '</form>';
 

admin/uploaduser.php

@@ -62,13 +62,16 @@ if ($um->preprocess_files() && confirm_sesskey()) {
     // that we'll take longer, and that the process should be recycled soon
     // to free up memory.
     @set_time_limit(0);
-    @raise_memory_limit("128M");
+    @raise_memory_limit("192M");
     if (function_exists('apache_child_terminate')) {
         @apache_child_terminate();
     }
 
-    //Fix mac/dos newlines
     $text = my_file_get_contents($filename);
+    //trim utf-8 bom
+    $textlib = new textlib();
+    $text = $textlib->trim_utf8_bom($text);
+    //Fix mac/dos newlines
     $text = preg_replace('!\r\n?!',"\n",$text);
     $fp = fopen($filename, "w");
     fwrite($fp,$text);
@@ -82,7 +85,8 @@ if ($um->preprocess_files() && confirm_sesskey()) {
             "firstname" => 1,
             "lastname" => 1,
             "email" => 1);
-    $optionalDefaults = array("institution" => 1,
+    $optionalDefaults = array("mnethostid" => 1,
+            "institution" => 1,
             "department" => 1,
             "city" => 1,
             "country" => 1,
@@ -100,8 +104,6 @@ if ($um->preprocess_files() && confirm_sesskey()) {
             "maildisplay" => 1,
             "htmleditor" => 1,
             "autosubscribe" => 1,
-            "idnumber" => 1,
-            "icq" => 1,
             "course1" => 1,
             "course2" => 1,
             "course3" => 1,
@@ -130,10 +132,10 @@ if ($um->preprocess_files() && confirm_sesskey()) {
             // check for valid field names
             foreach ($header as $i => $h) {
                 $h = trim($h); $header[$i] = $h; // remove whitespace
-                if (!($required[$h] or $optionalDefaults[$h] or $optional[$h])) {
+                if (!(isset($required[$h]) or isset($optionalDefaults[$h]) or isset($optional[$h]))) {
                     error(get_string('invalidfieldname', 'error', $h), 'uploaduser.php?sesskey='.$USER->sesskey);
                 }
-                if ($required[$h]) {
+                if (isset($required[$h])) {
                     $required[$h] = 0;
                 }
             }
@@ -172,7 +174,7 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                     // add fields to object $user
                     foreach ($record as $name => $value) {
                         // check for required values
-                        if ($required[$name] and !$value) {
+                        if (isset($required[$name]) and !$value) {
                             error(get_string('missingfield', 'error', $name). " ".
                                     get_string('erroronline', 'error', $linenum) .". ".
                                     get_string('processingstops', 'error'),
@@ -226,17 +228,11 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                         }
                     }
 
-                    if ($user->username === 'changeme') {
-                        notify(get_string('invaliduserchangeme', 'admin'));
-                        $userserrors++;
-                        continue;
-                    }
-
                     // before insert/update, check whether we should be updating
                     // an old record instead
                     if ($allowrenames && !empty($user->oldusername) ) {
                         $user->oldusername = moodle_strtolower($user->oldusername);
-                        if ($olduser = get_record('user','username',$user->oldusername)) {
+                        if ($olduser = get_record('user', 'username', $user->oldusername, 'mnethostid', $user->mnethostid)) {
                             if (set_field('user', 'username', $user->username, 'username', $user->oldusername)) {
                                 notify(get_string('userrenamed', 'admin') . " : $user->oldusername $user->username");
                                 $renames++;
@@ -252,7 +248,7 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                         }
                     }
 
-                    if ($olduser = get_record("user","username",$username)) {
+                    if ($olduser = get_record("user", "username", $username, "mnethostid", $user->mnethostid)) {
                         if ($updateaccounts) {
                             // Record is being updated
                             $user->id = $olduser->id;
@@ -270,7 +266,6 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                             //This can be used to obtain a list of userids for existing users
                             notify("$olduser->id ".get_string('usernotaddedregistered', 'error', $username));
                             $userserrors++;
-                            continue;
                         }
 
                     } else { // new user
@@ -304,8 +299,8 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                             if (!$course[$i]) {
                                 notify(get_string('coursegroupunknown','error',$addgroup[$i]));
                             } else {
-                                if ($group = get_record("groups","courseid",$course[$i]->id,"name",$addgroup[$i])) {
-                                    $groupid[$i] = $group->id;
+                                if ($gid = groups_get_group_by_name($course[$i]->id, $addgroup[$i])) {
+                                    $groupid[$i] = $gid;
                                 } else {
                                     notify(get_string('groupunknown','error',$addgroup[$i]));
                                 }
@@ -379,13 +374,13 @@ print_heading_with_help($struploadusers, 'uploadusers');
 $noyesoptions = array( get_string('no'), get_string('yes') );
 
 $maxuploadsize = get_max_upload_file_size();
-echo '<center>';
-echo '<form method="post" enctype="multipart/form-data" action="uploaduser.php">'.
-$strfile.'&nbsp;<input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'">'.
-'<input type="hidden" name="sesskey" value="'.$USER->sesskey.'">'.
-'<input type="file" name="userfile" size="30">';
+echo '<div style="text-align:center">';
+echo '<form method="post" enctype="multipart/form-data" action="uploaduser.php"><div>'.
+$strfile.'&nbsp;<input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'" />'.
+'<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />'.
+'<input type="file" name="userfile" size="30" />';
 print_heading(get_string('settings'));
-echo '<table>';
+echo '<table style="margin-left:auto;margin-right:auto">';
 echo '<tr><td>' . get_string('passwordhandling', 'auth') . '</td><td>';
 $passwordopts = array( 0 => get_string('infilefield', 'auth'),
         1 => get_string('createpasswordifneeded', 'auth'),
@@ -401,9 +396,9 @@ echo '<tr><td>' . get_string('allowrenames', 'admin') . '</td><td>';
 choose_from_menu($noyesoptions, 'allowrenames', $allowrenames);
 echo '</td></tr>';
 echo '</table><br />';
-echo '<input type="submit" value="'.$struploadusers.'">';
-echo '</form><br />';
-echo '</center>';
+echo '<input type="submit" value="'.$struploadusers.'" />';
+echo '</div></form><br />';
+echo '</div>';
 
 admin_externalpage_print_footer($adminroot);
 
@@ -424,4 +419,3 @@ function my_file_get_contents($filename, $use_include_path = 0) {
 }
 
 ?>
-

admin/user.php

@@ -3,7 +3,6 @@
     require_once('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
 
-    $newuser      = optional_param('newuser', 0, PARAM_BOOL);
     $delete       = optional_param('delete', 0, PARAM_INT);
     $confirm      = optional_param('confirm', '', PARAM_ALPHANUM);   //md5 confirmation hash
     $confirmuser  = optional_param('confirmuser', 0, PARAM_INT);
@@ -14,380 +13,427 @@
     $search       = trim(optional_param('search', '', PARAM_RAW));
     $lastinitial  = optional_param('lastinitial', '', PARAM_CLEAN);  // only show students with this last initial
     $firstinitial = optional_param('firstinitial', '', PARAM_CLEAN); // only show students with this first initial
-
-    if (!$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID)) {  // Should never happen
-        redirect('index.php');
-    }
-
-    if (empty($CFG->rolesactive)) {   // No admin user yet.
-
-        $user = new object();
-        $user->firstname    = get_string('admin');
-        $user->lastname     = get_string('user');
-        $user->username     = 'admin';
-        $user->password     = hash_internal_user_password('admin');
-        $user->email        = 'root@localhost';
-        $user->confirmed    = 1;
-        $user->lang         = $CFG->lang;
-        $user->maildisplay  = 1;
-        $user->timemodified = time();
-
-        if (! $user->id = insert_record('user', $user)) {
-            error("SERIOUS ERROR: Could not create admin user record !!!");
-        }
-
-        if (! $user = get_record('user', 'id', $user->id)) {   // Double check.
-            error("User ID was incorrect (can't find it)");
-        }
-
-
-        // Assign the default admin role to the new user.
-        if (!$adminroles = get_roles_with_capability('moodle/legacy:admin', CAP_ALLOW)) {
-            error('No admin role could be found');
-        }
-        foreach ($adminroles as $adminrole) {
-            role_assign($adminrole->id, $user->id, 0, $sitecontext->id);
-        }
-        set_config('rolesactive', 1);
-
-
-        if (! $site = get_site()) {
-            error("Could not find site-level course");
-        }
-
-        // Log the user in.
-        $USER = $user;
-        $USER->loggedin = true;
-        $USER->sessionIP = md5(getremoteaddr());   // Store the current IP in the session
-        $USER->site = $CFG->wwwroot;
-        $USER->admin = true;
-        $USER->newadminuser = true;
-
-        sesskey();   // For added security, used to check script parameters
-
-        load_all_capabilities();
-
-        redirect("$CFG->wwwroot/user/edit.php?id=$user->id&course=$site->id");  // Edit thyself
-        exit;
-
-    } else {
-        if (! $site = get_site()) {
-            error("Could not find site-level course");
-        }
-    }
-
-    require_login();
+    $ru           = optional_param('ru', '2', PARAM_INT);            // show remote users
+    $lu           = optional_param('lu', '2', PARAM_INT);            // show local users
+    $acl          = optional_param('acl', '0', PARAM_INT);           // id of user to tweak mnet ACL (requires $access)
 
     $adminroot = admin_get_root();
+    admin_externalpage_setup('editusers', $adminroot);
 
-    if ($newuser) {
-        admin_externalpage_setup('addnewuser', $adminroot);
+    // Let's see if we have *any* mnet users. Just ask for a single record
+    $mnet_users = get_records_select('user', " auth='mnet' AND mnethostid != '{$CFG->mnet_localhost_id}' ", '', '*', '0', '1');
+    if(is_array($mnet_users) && count($mnet_users) > 0) {
+        $mnet_auth_users = true;
     } else {
-        admin_externalpage_setup('editusers', $adminroot);
+        $mnet_auth_users = false;
+    }
+    
+    if($mnet_auth_users) {
+        // Determine which users we are looking at (local, remote, or both). Start with both.
+        if (!isset($_SESSION['admin-user-remoteusers'])) {
+            $_SESSION['admin-user-remoteusers'] = 1;
+            $_SESSION['admin-user-localusers']  = 1;
+        }
+        if ($ru == 0 or $ru == 1) {
+            $_SESSION['admin-user-remoteusers'] = $ru;
+        }
+        if ($lu == 0 or $lu == 1) {
+             $_SESSION['admin-user-localusers'] = $lu;
+        }
+        $remoteusers = $_SESSION['admin-user-remoteusers'];
+        $localusers  = $_SESSION['admin-user-localusers'];
+    
+        // if neither remote nor local, set to sensible local only
+        if (!$remoteusers and !$localusers) {
+            $_SESSION['admin-user-localusers'] = 1;
+            $localusers = 1;
+        }
     }
 
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $site = get_site();
 
-    if ($newuser) {                 // Create a new user
+    if (!has_capability('moodle/user:update', $sitecontext) and !has_capability('moodle/user:delete', $sitecontext)) {
+        error('You do not have the required permission to edit/delete users.');
+    }
 
-        if (!has_capability('moodle/user:create', $sitecontext)) {
-            error('You do not have the required permission to create new users.');
+    $stredit   = get_string('edit');
+    $strdelete = get_string('delete');
+    $strdeletecheck = get_string('deletecheck');
+    $strsearch = get_string('search');
+    $strshowallusers = get_string('showallusers');
+
+    if (empty($CFG->loginhttps)) {
+        $securewwwroot = $CFG->wwwroot;
+    } else {
+        $securewwwroot = str_replace('http:','https:',$CFG->wwwroot);
+    }
+
+    admin_externalpage_print_header($adminroot);
+
+    if ($confirmuser and confirm_sesskey()) {
+        if (!$user = get_record('user', 'id', $confirmuser)) {
+            error("No such user!", '', true);
         }
 
-        if (!$user = get_record('user', 'username', 'changeme')) {   // half finished user from another time
+        $auth = get_auth_plugin($user->auth);
 
-            $user = new object();
-            $user->auth         = 'manual';
-            $user->firstname    = '';
-            $user->lastname     = '';
-            $user->username     = 'changeme';
-            $user->password     = '';
-            $user->email        = '';
-            $user->lang         = $CFG->lang;
-            $user->confirmed    = 1;
-            $user->timemodified = time();
+        $result = $auth->user_confirm(addslashes($user->username), addslashes($user->secret));
 
-            if (! $user->id = insert_record('user', $user)) {
-                error('Could not start a new user!');
-            }
-        }
-
-        redirect("$CFG->wwwroot/user/edit.php?id=$user->id&course=$site->id");
-
-    } else {                        // List all users for editing
-
-        if (!has_capability('moodle/user:update', $sitecontext) and !has_capability('moodle/user:delete', $sitecontext)) {
-            error('You do not have the required permission to edit/delete users.');
-        }
-
-        $stredit   = get_string('edit');
-        $strdelete = get_string('delete');
-        $strdeletecheck = get_string('deletecheck');
-        $strsearch = get_string('search');
-        $strshowallusers = get_string('showallusers');
-
-        admin_externalpage_print_header($adminroot);
-
-        if ($confirmuser and confirm_sesskey()) {
-            if (!$user = get_record('user', 'id', $confirmuser)) {
-                error("No such user!");
-            }
-
-            $confirmeduser = new object();
-            $confirmeduser->id = $confirmuser;
-            $confirmeduser->confirmed = 1;
-            $confirmeduser->timemodified = time();
-
-            if (update_record('user', $confirmeduser)) {
-                notify(get_string('userconfirmed', '', fullname($user, true)) );
-            } else {
-                notify(get_string('usernotconfirmed', '', fullname($user, true)));
-            }
-
-        } else if ($delete and confirm_sesskey()) {              // Delete a selected user, after confirmation
-
-            if (!has_capability('moodle/user:delete', $sitecontext)) {
-                error('You do not have the required permission to delete a user.');
-            }
-
-            if (!$user = get_record('user', 'id', $delete)) {
-                error("No such user!");
-            }
-
-            $primaryadmin = get_admin();
-            if ($user->id == $primaryadmin->id) {
-                error("You are not allowed to delete the primary admin user!");
-            }
-
-            if ($confirm != md5($delete)) {
-                $fullname = fullname($user, true);
-                print_heading(get_string('deleteuser', 'admin'));
-                $optionsyes = array('delete'=>$delete, 'confirm'=>md5($delete), 'sesskey'=>sesskey());
-                notice_yesno(get_string('deletecheckfull', '', "'$fullname'"), 'user.php', 'user.php', $optionsyes, NULL, 'post', 'get');
-                admin_externalpage_print_footer($adminroot);
-                die;
-            } else if (data_submitted() and !$user->deleted) {
-                $updateuser = new object();
-                $updateuser->id = $user->id;
-                $updateuser->deleted = 1;
-                $updateuser->username = addslashes("$user->email.".time());  // Remember it just in case
-                $updateuser->email = '';               // Clear this field to free it up
-                $updateuser->idnumber = '';               // Clear this field to free it up
-                $updateuser->timemodified = time();
-                if (update_record('user', $updateuser)) {
-                    // not sure if this is needed. unenrol_student($user->id);  // From all courses
-                    delete_records('role_assignments', 'userid', $user->id); // unassign all roles
-                    // remove all context assigned on this user?
-                    notify(get_string('deletedactivity', '', fullname($user, true)) );
-                } else {
-                    notify(get_string('deletednot', '', fullname($user, true)));
-                }
-            }
-        }
-
-        // Carry on with the user listing
-
-        $columns = array("firstname", "lastname", "email", "city", "country", "lastaccess");
-
-        foreach ($columns as $column) {
-            $string[$column] = get_string("$column");
-            if ($sort != $column) {
-                $columnicon = "";
-                if ($column == "lastaccess") {
-                    $columndir = "DESC";
-                } else {
-                    $columndir = "ASC";
-                }
-            } else {
-                $columndir = $dir == "ASC" ? "DESC":"ASC";
-                if ($column == "lastaccess") {
-                    $columnicon = $dir == "ASC" ? "up":"down";
-                } else {
-                    $columnicon = $dir == "ASC" ? "down":"up";
-                }
-                $columnicon = " <img src=\"$CFG->pixpath/t/$columnicon.gif\" alt=\"\" />";
-
-            }
-            $$column = "<a href=\"user.php?sort=$column&amp;dir=$columndir&amp;search=".urlencode(stripslashes($search))."&amp;firstinitial=$firstinitial&amp;lastinitial=$lastinitial\">".$string[$column]."</a>$columnicon";
-        }
-
-        if ($sort == "name") {
-            $sort = "firstname";
-        }
-
-        $users = get_users_listing($sort, $dir, $page*$perpage, $perpage, $search, $firstinitial, $lastinitial);
-        $usercount = get_users(false);
-        $usersearchcount = get_users(false, $search, true, "", "", $firstinitial, $lastinitial);
-
-        if ($search or $firstinitial or $lastinitial) {
-            print_heading("$usersearchcount / $usercount ".get_string('users'));
-            $usercount = $usersearchcount;
+        if ($result == AUTH_CONFIRM_OK or $result == AUTH_CONFIRM_ALREADY) {
+            notify(get_string('userconfirmed', '', fullname($user, true)) );
         } else {
-            print_heading("$usercount ".get_string('users'));
+            notify(get_string('usernotconfirmed', '', fullname($user, true)));
         }
 
-        $alphabet = explode(',', get_string('alphabet'));
-        $strall = get_string('all');
+    } else if ($delete and confirm_sesskey()) {              // Delete a selected user, after confirmation
+
+        if (!has_capability('moodle/user:delete', $sitecontext)) {
+            error('You do not have the required permission to delete a user.');
+        }
+
+        if (!$user = get_record('user', 'id', $delete)) {
+            error("No such user!", '', true);
+        }
+
+        $primaryadmin = get_admin();
+        if ($user->id == $primaryadmin->id) {
+            error("You are not allowed to delete the primary admin user!", '', true);
+        }
+
+        if ($confirm != md5($delete)) {
+            $fullname = fullname($user, true);
+            print_heading(get_string('deleteuser', 'admin'));
+            $optionsyes = array('delete'=>$delete, 'confirm'=>md5($delete), 'sesskey'=>sesskey());
+            notice_yesno(get_string('deletecheckfull', '', "'$fullname'"), 'user.php', 'user.php', $optionsyes, NULL, 'post', 'get');
+            admin_externalpage_print_footer($adminroot);
+            die;
+        } else if (data_submitted() and !$user->deleted) {
+            //following code is also used in auth sync scripts
+            $updateuser = new object();
+            $updateuser->id           = $user->id;
+            $updateuser->deleted      = 1;
+            $updateuser->username     = addslashes("$user->email.".time());  // Remember it just in case
+            $updateuser->email        = '';               // Clear this field to free it up
+            $updateuser->idnumber     = '';               // Clear this field to free it up
+            $updateuser->timemodified = time();
+            if (update_record('user', $updateuser)) {
+                // Removing a user may have more requirements than just removing their role assignments.
+                // Use 'role_unassign' to make sure that all necessary actions occur.
+                role_unassign(0, $user->id);
+                // remove all context assigned on this user?
+                notify(get_string('deletedactivity', '', fullname($user, true)) );
+            } else {
+                notify(get_string('deletednot', '', fullname($user, true)));
+            }
+        }
+    } else if ($acl and confirm_sesskey()) {
+        if (!has_capability('moodle/user:delete', $sitecontext)) {
+            // TODO: this should be under a separate capability
+            error('You are not permitted to modify the MNET access control list.');
+        }
+        if (!$user = get_record('user', 'id', $acl)) {
+            error("No such user.", '', true);
+        }
+        if (!is_mnet_remote_user($user)) {
+            error('Users in the MNET access control list must be remote MNET users.');
+        }
+        $accessctrl = strtolower(required_param('accessctrl', PARAM_ALPHA));
+        if ($accessctrl != 'allow' and $accessctrl != 'deny') {
+            error('Invalid access parameter.');
+        }
+        $aclrecord = get_record('mnet_sso_access_control', 'username', $user->username, 'mnet_host_id', $user->mnethostid);
+        if (empty($aclrecord)) {
+            $aclrecord = new object();
+            $aclrecord->mnet_host_id = $user->mnethostid;
+            $aclrecord->username = $user->username;
+            $aclrecord->accessctrl = $accessctrl;
+            if (!insert_record('mnet_sso_access_control', $aclrecord)) {
+                error("Database error - Couldn't modify the MNET access control list.", '', true);
+            }
+        } else {
+            $aclrecord->accessctrl = $accessctrl;
+            if (!update_record('mnet_sso_access_control', $aclrecord)) {
+                error("Database error - Couldn't modify the MNET access control list.", '', true);
+            }
+        }
+        $mnethosts = get_records('mnet_host', '', '', 'id', 'id,wwwroot,name');
+        notify("MNET access control list updated: username '$user->username' from host '"
+                . $mnethosts[$user->mnethostid]->name
+                . "' access now set to '$accessctrl'.");
+    }
+
+    // Carry on with the user listing
+
+    $columns = array("firstname", "lastname", "email", "city", "country", "lastaccess");
+
+    foreach ($columns as $column) {
+        $string[$column] = get_string("$column");
+        if ($sort != $column) {
+            $columnicon = "";
+            if ($column == "lastaccess") {
+                $columndir = "DESC";
+            } else {
+                $columndir = "ASC";
+            }
+        } else {
+            $columndir = $dir == "ASC" ? "DESC":"ASC";
+            if ($column == "lastaccess") {
+                $columnicon = $dir == "ASC" ? "up":"down";
+            } else {
+                $columnicon = $dir == "ASC" ? "down":"up";
+            }
+            $columnicon = " <img src=\"$CFG->pixpath/t/$columnicon.gif\" alt=\"\" />";
+
+        }
+        $$column = "<a href=\"user.php?sort=$column&amp;dir=$columndir&amp;search=".urlencode(stripslashes($search))."&amp;firstinitial=$firstinitial&amp;lastinitial=$lastinitial\">".$string[$column]."</a>$columnicon";
+    }
+
+    if ($sort == "name") {
+        $sort = "firstname";
+    }
+    
+    // tell the query which users we are looking at (local, remote, or both)
+    $remotewhere = '';
+    if($mnet_auth_users && ($localusers XOR $remoteusers)) {
+        if ($localusers) {
+            $remotewhere .= " and mnethostid = {$CFG->mnet_localhost_id} ";
+        } else {
+            $remotewhere .= " and mnethostid <> {$CFG->mnet_localhost_id} ";
+        }
+    }
+    
+    $users = get_users_listing($sort, $dir, $page*$perpage, $perpage, $search, $firstinitial, $lastinitial, $remotewhere, false);
+    $usercount = get_users(false);
+    $usersearchcount = get_users(false, $search, true, "", "", $firstinitial, $lastinitial);
+
+    if ($search or $firstinitial or $lastinitial) {
+        print_heading("$usersearchcount / $usercount ".get_string('users'));
+        $usercount = $usersearchcount;
+    } else {
+        print_heading("$usercount ".get_string('users'));
+    }
+
+    $alphabet = explode(',', get_string('alphabet'));
+    $strall = get_string('all');
 
 
-        /// Bar of first initials
+    /// Bar of first initials
 
-        echo "<center><p align=\"center\">";
-        echo get_string("firstname")." : ";
-        if ($firstinitial) {
+    echo "<p style=\"text-align:center\">";
+    echo get_string("firstname")." : ";
+    if ($firstinitial) {
+        echo " <a href=\"user.php?sort=firstname&amp;dir=ASC&amp;".
+             "perpage=$perpage&amp;lastinitial=$lastinitial\">$strall</a> ";
+    } else {
+        echo " <b>$strall</b> ";
+    }
+    foreach ($alphabet as $letter) {
+        if ($letter == $firstinitial) {
+            echo " <b>$letter</b> ";
+        } else {
             echo " <a href=\"user.php?sort=firstname&amp;dir=ASC&amp;".
-                 "perpage=$perpage&amp;lastinitial=$lastinitial\">$strall</a> ";
+                 "perpage=$perpage&amp;lastinitial=$lastinitial&amp;firstinitial=$letter\">$letter</a> ";
+        }
+    }
+    echo "<br />";
+
+    /// Bar of last initials
+
+    echo get_string("lastname")." : ";
+    if ($lastinitial) {
+        echo " <a href=\"user.php?sort=lastname&amp;dir=ASC&amp;".
+             "perpage=$perpage&amp;firstinitial=$firstinitial\">$strall</a> ";
+    } else {
+        echo " <b>$strall</b> ";
+    }
+    foreach ($alphabet as $letter) {
+        if ($letter == $lastinitial) {
+            echo " <b>$letter</b> ";
         } else {
-            echo " <b>$strall</b> ";
-        }
-        foreach ($alphabet as $letter) {
-            if ($letter == $firstinitial) {
-                echo " <b>$letter</b> ";
-            } else {
-                echo " <a href=\"user.php?sort=firstname&amp;dir=ASC&amp;".
-                     "perpage=$perpage&amp;lastinitial=$lastinitial&amp;firstinitial=$letter\">$letter</a> ";
-            }
-        }
-        echo "<br />";
-
-        /// Bar of last initials
-
-        echo get_string("lastname")." : ";
-        if ($lastinitial) {
             echo " <a href=\"user.php?sort=lastname&amp;dir=ASC&amp;".
-                 "perpage=$perpage&amp;firstinitial=$firstinitial\">$strall</a> ";
-        } else {
-            echo " <b>$strall</b> ";
+                 "perpage=$perpage&amp;firstinitial=$firstinitial&amp;lastinitial=$letter\">$letter</a> ";
         }
-        foreach ($alphabet as $letter) {
-            if ($letter == $lastinitial) {
-                echo " <b>$letter</b> ";
-            } else {
-                echo " <a href=\"user.php?sort=lastname&amp;dir=ASC&amp;".
-                     "perpage=$perpage&amp;firstinitial=$firstinitial&amp;lastinitial=$letter\">$letter</a> ";
+    }
+    echo "</p>";
+
+    print_paging_bar($usercount, $page, $perpage,
+            "user.php?sort=$sort&amp;dir=$dir&amp;perpage=$perpage&amp;firstinitial=$firstinitial&amp;lastinitial=$lastinitial&amp;search=".urlencode(stripslashes($search))."&amp;");
+
+    flush();
+
+
+    if (!$users) {
+        $match = array();
+        if ($search !== '') {
+           $match[] = s($search);
+        }
+        if ($firstinitial) {
+           $match[] = get_string('firstname').": $firstinitial"."___";
+        }
+        if ($lastinitial) {
+           $match[] = get_string('lastname').": $lastinitial"."___";
+        }
+        $matchstring = implode(", ", $match);
+        print_heading(get_string('nousersmatching', '', $matchstring));
+
+        $table = NULL;
+
+    } else {
+
+        $countries = get_list_of_countries();
+        if (empty($mnethosts)) {
+            $mnethosts = get_records('mnet_host', '', '', 'id', 'id,wwwroot,name');
+        }
+
+        foreach ($users as $key => $user) {
+            if (!empty($user->country)) {
+                $users[$key]->country = $countries[$user->country];
             }
         }
+        if ($sort == "country") {  // Need to resort by full country name, not code
+            foreach ($users as $user) {
+                $susers[$user->id] = $user->country;
+            }
+            asort($susers);
+            foreach ($susers as $key => $value) {
+                $nusers[] = $users[$key];
+            }
+            $users = $nusers;
+        }
+
+        $mainadmin = get_admin();
+
+        $override = new object();
+        $override->firstname = 'firstname';
+        $override->lastname = 'lastname';
+        $fullnamelanguage = get_string('fullnamedisplay', '', $override);
+        if (($CFG->fullnamedisplay == 'firstname lastname') or
+            ($CFG->fullnamedisplay == 'firstname') or
+            ($CFG->fullnamedisplay == 'language' and $fullnamelanguage == 'firstname lastname' )) {
+            $fullnamedisplay = "$firstname / $lastname";
+        } else { // ($CFG->fullnamedisplay == 'language' and $fullnamelanguage == 'lastname firstname') 
+            $fullnamedisplay = "$lastname / $firstname";
+        }
+        $table->head = array ($fullnamedisplay, $email, $city, $country, $lastaccess, "", "", "");
+        $table->align = array ("left", "left", "left", "left", "left", "center", "center", "center");
+        $table->width = "95%";
+        foreach ($users as $user) {
+            if ($user->username == 'guest') {
+                continue; // do not dispaly dummy new user and guest here
+            }
+
+            if ($user->id == $USER->id) {
+                $deletebutton = "";
+            } else {
+                if (has_capability('moodle/user:delete', $sitecontext)) {
+                    $deletebutton = "<a href=\"user.php?delete=$user->id&amp;sesskey=$USER->sesskey\">$strdelete</a>";
+                } else {
+                    $deletebutton ="";
+                }
+            }
+
+            if (has_capability('moodle/user:update', $sitecontext) and ($user->id==$USER->id or $user->id != $mainadmin->id) and !is_mnet_remote_user($user)) {
+                $editbutton = "<a href=\"$securewwwroot/user/editadvanced.php?id=$user->id&amp;course=$site->id\">$stredit</a>";
+                if ($user->confirmed == 0) {
+                    $confirmbutton = "<a href=\"user.php?confirmuser=$user->id&amp;sesskey=$USER->sesskey\">" . get_string('confirm') . "</a>";
+                } else {
+                    $confirmbutton = "";
+                }
+            } else {
+                $editbutton ="";
+                if ($user->confirmed == 0) {
+                    $confirmbutton = "<span class=\"dimmed_text\">".get_string('confirm')."</span>";
+                } else {
+                    $confirmbutton = "";
+                }
+            }
+
+            // for remote users, shuffle columns around and display MNET stuff
+            if (is_mnet_remote_user($user)) {
+                $accessctrl = 'allow';
+                if ($acl = get_record('mnet_sso_access_control', 'username', $user->username, 'mnet_host_id', $user->mnethostid)) {
+                    $accessctrl = $acl->accessctrl;
+                }
+                $changeaccessto = ($accessctrl == 'deny' ? 'allow' : 'deny');
+                // delete button in confirm column - remote users should already be confirmed
+                // TODO: no delete for remote users, for now. new userid, delete flag, unique on username/host...
+                $confirmbutton = "";
+                // ACL in delete column
+                $deletebutton = get_string($accessctrl, 'mnet');
+                if (has_capability('moodle/user:delete', $sitecontext)) {
+                    // TODO: this should be under a separate capability
+                    $deletebutton .= " (<a href=\"?acl={$user->id}&amp;accessctrl=$changeaccessto&amp;sesskey={$USER->sesskey}\">"
+                            . get_string($changeaccessto, 'mnet') . " access</a>)";
+                }
+                // mnet info in edit column
+                if (isset($mnethosts[$user->mnethostid])) {
+                    $editbutton = $mnethosts[$user->mnethostid]->name;
+                }
+            }
+
+            if ($user->lastaccess) {
+                $strlastaccess = format_time(time() - $user->lastaccess);
+            } else {
+                $strlastaccess = get_string('never');
+            }
+            $fullname = fullname($user, true);
+
+            $table->data[] = array ("<a href=\"../user/view.php?id=$user->id&amp;course=$site->id\">$fullname</a>",
+                                "$user->email",
+                                "$user->city",
+                                "$user->country",
+                                $strlastaccess,
+                                $editbutton,
+                                $deletebutton,
+                                $confirmbutton);
+        }
+    }
+
+    if($mnet_auth_users) {
+        echo "<p style=\"text-align:center\">";
+        if ($localusers == 1 && $remoteusers == 1) {
+            echo '<a href="?lu=0">'.get_string('hidelocal','mnet').'</a> | ';
+        } elseif ($localusers == 0)  {
+            echo '<a href="?lu=1">'.get_string('showlocal','mnet').'</a> | ';
+        } else {
+            echo get_string('hidelocal','mnet').' | ';
+        }
+        if ($localusers == 1 && $remoteusers == 1) {
+            echo '<a href="?ru=0">'.get_string('hideremote','mnet').'</a>';
+        } elseif ($remoteusers == 0) {
+            echo '<a href="?ru=1">'.get_string('showremote','mnet').'</a>';
+        } else {
+            echo get_string('hideremote','mnet');
+        }
         echo "</p>";
-        echo "</center>";
-
-        print_paging_bar($usercount, $page, $perpage,
-                "user.php?sort=$sort&amp;dir=$dir&amp;perpage=$perpage&amp;firstinitial=$firstinitial&amp;lastinitial=$lastinitial&amp;search=".urlencode(stripslashes($search))."&amp;");
-
-        flush();
-
-
-        if (!$users) {
-            $match = array();
-            if ($search !== '') {
-               $match[] = s($search);
-            }
-            if ($firstinitial) {
-               $match[] = get_string('firstname').": $firstinitial"."___";
-            }
-            if ($lastinitial) {
-               $match[] = get_string('lastname').": $lastinitial"."___";
-            }
-            $matchstring = implode(", ", $match);
-            print_heading(get_string('nousersmatching', '', $matchstring));
-
-            $table = NULL;
-
-        } else {
-
-            $countries = get_list_of_countries();
-
-            foreach ($users as $key => $user) {
-                if (!empty($user->country)) {
-                    $users[$key]->country = $countries[$user->country];
-                }
-            }
-            if ($sort == "country") {  // Need to resort by full country name, not code
-                foreach ($users as $user) {
-                    $susers[$user->id] = $user->country;
-                }
-                asort($susers);
-                foreach ($susers as $key => $value) {
-                    $nusers[] = $users[$key];
-                }
-                $users = $nusers;
-            }
-
-            $table->head = array ("$firstname / $lastname", $email, $city, $country, $lastaccess, "", "", "");
-            $table->align = array ("left", "left", "left", "left", "left", "center", "center", "center");
-            $table->width = "95%";
-            foreach ($users as $user) {
-                if ($user->username == 'changeme' or $user->username == 'guest') {
-                    continue; // do not dispaly dummy new user and guest here
-                }
-
-                if ($user->id == $USER->id) {
-                    $deletebutton = "";
-                } else {
-                    if (has_capability('moodle/user:delete', $sitecontext)) {
-                        $deletebutton = "<a href=\"user.php?delete=$user->id&amp;sesskey=$USER->sesskey\">$strdelete</a>";
-                    } else {
-                        $deletebutton ="";
-                    }
-                }
-
-                if (has_capability('moodle/user:update', $sitecontext)) {
-                    $editbutton = "<a href=\"../user/edit.php?id=$user->id&amp;course=$site->id\">$stredit</a>";
-                    if ($user->confirmed == 0) {
-                        $confirmbutton = "<a href=\"user.php?confirmuser=$user->id&amp;sesskey=$USER->sesskey\">" . get_string('confirm') . "</a>";
-                    } else {
-                        $confirmbutton = "";
-                    }
-                } else {
-                    $editbutton ="";
-                    if ($user->confirmed == 0) {
-                        $confirmbutton = "<span class=\"dimmed_text\">".get_string('confirm')."</span>";
-                    } else {
-                        $confirmbutton = "";
-                    }
-                }
-
-                if ($user->lastaccess) {
-                    $strlastaccess = format_time(time() - $user->lastaccess);
-                } else {
-                    $strlastaccess = get_string('never');
-                }
-                $fullname = fullname($user, true);
-
-                $table->data[] = array ("<a href=\"../user/view.php?id=$user->id&amp;course=$site->id\">$fullname</a>",
-                                    "$user->email",
-                                    "$user->city",
-                                    "$user->country",
-                                    $strlastaccess,
-                                    $editbutton,
-                                    $deletebutton,
-                                    $confirmbutton);
-            }
-        }
-
-        echo "<table class=\"searchbox\" align=\"center\" cellpadding=\"10\"><tr><td>";
-        echo "<form action=\"user.php\" method=\"get\">";
-        echo "<input type=\"text\" name=\"search\" value=\"".s($search, true)."\" size=\"20\" />";
-        echo "<input type=\"submit\" value=\"$strsearch\" />";
-        if ($search) {
-            echo "<input type=\"button\" onclick=\"document.location='user.php';\" value=\"$strshowallusers\" />";
-        }
-        echo "</form>";
-        echo "</td></tr></table>";
-
-        if (has_capability('moodle/user:create', $sitecontext)) {
-            print_heading("<a href=\"user.php?newuser=true&amp;sesskey=$USER->sesskey\">".get_string('addnewuser')."</a>");
-        }
-        if (!empty($table)) {
-            print_table($table);
-            print_paging_bar($usercount, $page, $perpage,
-                             "user.php?sort=$sort&amp;dir=$dir&amp;perpage=$perpage".
-                             "&amp;firstinitial=$firstinitial&amp;lastinitial=$lastinitial&amp;search=".urlencode(stripslashes($search))."&amp;");
-            if (has_capability('moodle/user:create', $sitecontext)) {
-                print_heading("<a href=\"user.php?newuser=true&amp;sesskey=$USER->sesskey\">".get_string("addnewuser")."</a>");
-            }
-        }
-
-
-        admin_externalpage_print_footer($adminroot);
     }
 
+    echo "<table class=\"searchbox\" style=\"margin-left:auto;margin-right:auto\" cellpadding=\"10\"><tr><td>";
+    echo "<form action=\"user.php\" method=\"get\"><fieldset class=\"invisiblefieldset\">";
+    echo "<input type=\"text\" name=\"search\" value=\"".s($search, true)."\" size=\"20\" />";
+    echo "<input type=\"submit\" value=\"$strsearch\" />";
+    if ($search) {
+        echo "<input type=\"button\" onclick=\"document.location='user.php';\" value=\"$strshowallusers\" />";
+    }
+    echo "</fieldset></form>";
+    echo "</td></tr></table>";
+
+    if (has_capability('moodle/user:create', $sitecontext)) {
+        print_heading('<a href="'.$securewwwroot.'/user/editadvanced.php?id=-1">'.get_string('addnewuser').'</a>');
+    }
+    if (!empty($table)) {
+        print_table($table);
+        print_paging_bar($usercount, $page, $perpage,
+                         "user.php?sort=$sort&amp;dir=$dir&amp;perpage=$perpage".
+                         "&amp;firstinitial=$firstinitial&amp;lastinitial=$lastinitial&amp;search=".urlencode(stripslashes($search))."&amp;");
+        if (has_capability('moodle/user:create', $sitecontext)) {
+            print_heading('<a href="'.$securewwwroot.'/user/editadvanced.php?id=-1">'.get_string('addnewuser').'</a>');
+        }
+    }
+
+
+    admin_externalpage_print_footer($adminroot);
+
+
 ?>

admin/utfdbmigrate.html

@@ -1,70 +0,0 @@
-<?php
-   if (!isset($form->dbhost)) {
-       $form->dbhost = '';
-   }
-   if (!isset($form->dbname)) {
-       $form->dbname = '';
-   }
-   if (!isset($form->dbuser)) {
-       $form->dbuser = '';
-   }
-   if (!isset($form->dbpass)) {
-       $form->dbpass = '';
-   }
-   if (!isset($form->dbcluster)) {
-       $form->dbcluster = '';
-   }
-   if (!isset($form->pathtopgdump)) {
-       $form->pathtopgdump = '';
-   }
-   if (!isset($form->pathtopsql)) {
-       $form->pathtopsql = '';
-   }
-?>
-<form name="migratefrom" action="utfdbmigrate.php" method="POST">
-<input name="migrate" type="hidden" value="1" />
-<input name="sesskey" type="hidden" value="<?php echo sesskey() ?>" />
-<?php if (isset($err["dbconnect"])) formerr($err["dbconnect"]); ?>
-<?php if (isset($err["pathtopgdump"])) formerr($err["pathtopgdump"]); ?>
-<?php if (isset($err["pathtopsql"])) formerr($err["pathtopsql"]); ?>
-<table cellpadding="9" cellspacing="0" width="500">
-<tr valign="top">
-    <td align="right"><?php print_string("dbhost", "install") ?>:</td>
-    <td><input type="text" name="dbhost" value="<?php p($form->dbhost) ?>" />
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string("database", "install") ?>:</td>
-    <td><input type="text" name="dbname" value="<?php p($form->dbname) ?>" />
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string("user") ?>:</td>
-    <td><input type="text" name="dbuser" value="<?php p($form->dbuser) ?>" />
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string("password") ?>:</td>
-    <td><input type="text" name="dbpass" value="<?php p($form->dbpass) ?>" />
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string("pgcluster", "admin") ?>:</td>
-    <td><input type="text" name="dbcluster" value="<?php p($form->dbcluster) ?>" />
-    <td><?php print_string("pgclusterdescription", "admin") ?></td>
-</tr>
-<tr valign="top">
-    <td align="right" nowrap="nowrap"><?php print_string("pathtopgdump","admin") ?>:</td>
-    <td><input type="text" name="pathtopgdump" value="<?php p($form->pathtopgdump) ?>" />
-    <td><?php print_string("pathtopgdumpdesc","admin"); ?></td>
-</tr>
-<tr valign="top">
-    <td align="right" nowrap="nowrap"><?php print_string("pathtopsql","admin") ?>:</td>
-    <td><input type="text" name="pathtopsql" value="<?php p($form->pathtopsql) ?>" />
-    <td><?php print_string("pathtopsqldesc","admin"); ?></td>
-</tr>
-</table>
-<center>
-<input type="submit" value="<?php print_string('continue') ?>"/>
-&nbsp;<input type="button" value="<?php print_string('cancel') ?>" onclick="javascript:history.go(-1)" />
-</center>

admin/xmldb/actions/check_indexes/check_indexes.class.php

@@ -0,0 +1,271 @@
+<?php // $Id$
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 2001-3001 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  //
+// 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                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+/// This class will compare all the indexes found in the XMLDB definitions
+/// with the phisical DB implementation, reporting about all the missing
+/// indexes to be created to be 100% ok.
+
+class check_indexes extends XMLDBAction {
+
+    /**
+     * Init method, every subclass will have its own
+     */
+    function init() {
+        parent::init();
+
+    /// Set own core attributes
+
+    /// Set own custom attributes
+
+    /// Get needed strings
+        $this->loadStrings(array(
+            'confirmcheckindexes' => 'xmldb',
+            'ok' => '',
+            'missing' => 'xmldb',
+            'table' => 'xmldb',
+            'key' => 'xmldb',
+            'index' => 'xmldb',
+            'searchresults' => 'xmldb',
+            'missingindexes' => 'xmldb',
+            'completelogbelow' => 'xmldb',
+            'nomissingindexesfound' => 'xmldb',
+            'yesmissingindexesfound' => 'xmldb',
+            'yes' => '',
+            'no' => '',
+            'back' => 'xmldb'
+
+        ));
+    }
+
+    /**
+     * Invoke method, every class will have its own
+     * returns true/false on completion, setting both
+     * errormsg and output as necessary
+     */
+    function invoke() {
+        parent::invoke();
+
+        $result = true;
+
+    /// Set own core attributes
+        $this->does_generate = ACTION_GENERATE_HTML;
+
+    /// These are always here
+        global $CFG, $XMLDB;
+
+    /// And we nedd some ddl suff
+        require_once ($CFG->libdir . '/ddllib.php');
+
+    /// Here we'll acummulate all the missing indexes found
+        $missing_indexes = array();
+
+    /// Do the job, setting $result as needed
+
+    /// Get the confirmed to decide what to do
+        $confirmed = optional_param('confirmed', false, PARAM_BOOL);
+
+    /// If  not confirmed, show confirmation box
+        if (!$confirmed) {
+            $o = '<table class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o.= '  <tr><td class="generalboxcontent">';
+            $o.= '    <p class="centerpara">' . $this->str['confirmcheckindexes'] . '</p>';
+            $o.= '    <table class="boxaligncenter" cellpadding="20"><tr><td>';
+            $o.= '      <div class="singlebutton">';
+            $o.= '        <form action="index.php?action=check_indexes&amp;confirmed=yes" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></fieldset></form></div>';
+            $o.= '      </td><td>';
+            $o.= '      <div class="singlebutton">';
+            $o.= '        <form action="index.php?action=main_view" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></fieldset></form></div>';
+            $o.= '      </td></tr>';
+            $o.= '    </table>';
+            $o.= '  </td></tr>';
+            $o.= '</table>';
+
+            $this->output = $o;
+        } else {
+        /// The back to edit table button
+            $b = ' <p class="centerpara buttons">';
+            $b .= '<a href="index.php">[' . $this->str['back'] . ']</a>';
+            $b .= '</p>';
+
+        /// Iterate over $XMLDB->dbdirs, loading their XML data to memory
+            if ($XMLDB->dbdirs) {
+                $dbdirs =& $XMLDB->dbdirs;
+                $o='<ul>';
+                foreach ($dbdirs as $dbdir) {
+                /// Only if the directory exists
+                    if (!$dbdir->path_exists) {
+                        continue;
+                    }
+                /// Load the XML file
+                    $xmldb_file = new XMLDBFile($dbdir->path . '/install.xml');
+                /// Load the needed XMLDB generator
+                    $classname = 'XMLDB' . $CFG->dbtype;
+                    $generator = new $classname();
+                    $generator->setPrefix($CFG->prefix);
+
+                /// Only if the file exists
+                    if (!$xmldb_file->fileExists()) {
+                        continue;
+                    }
+                /// Load the XML contents to structure
+                    $loaded = $xmldb_file->loadXMLStructure();
+                    if (!$loaded || !$xmldb_file->isLoaded()) {
+                        notify('Errors found in XMLDB file: '. $dbdir->path . '/install.xml');
+                        continue;
+                    }
+                /// Arriving here, everything is ok, get the XMLDB structure
+                    $structure = $xmldb_file->getStructure();
+                    $o.='    <li>' . str_replace($CFG->dirroot . '/', '', $dbdir->path . '/install.xml');
+                /// Getting tables
+                    if ($xmldb_tables = $structure->getTables()) {
+                        $o.='        <ul>';
+                    /// Foreach table, process its indexes and keys
+                        foreach ($xmldb_tables as $xmldb_table) {
+                        /// Skip table if not exists
+                            if (!table_exists($xmldb_table)) {
+                                continue;
+                            }
+                            $o.='            <li>' . $xmldb_table->getName();
+                        /// Keys
+                            if ($xmldb_keys = $xmldb_table->getKeys()) {
+                                $o.='        <ul>';
+                                foreach ($xmldb_keys as $xmldb_key) {
+                                    $o.='            <li>' . $this->str['key'] . ': ' . $xmldb_key->readableInfo() . ' ';
+                                /// Primaries are skipped
+                                    if ($xmldb_key->getType() == XMLDB_KEY_PRIMARY) {
+                                        $o.='<font color="green">' . $this->str['ok'] . '</font></li>';
+                                        continue;
+                                    }
+                                /// If we aren't creating the keys or the key is a XMLDB_KEY_FOREIGN (not underlying index generated
+                                /// automatically by the RDBMS) create the underlying (created by us) index (if doesn't exists)
+                                    if (!$generator->getKeySQL($xmldb_table, $xmldb_key) || $xmldb_key->getType() == XMLDB_KEY_FOREIGN) {
+                                    /// Create the interim index
+                                        $xmldb_index = new XMLDBIndex('anyname');
+                                        $xmldb_index->setFields($xmldb_key->getFields());
+                                        switch ($xmldb_key->getType()) {
+                                            case XMLDB_KEY_UNIQUE:
+                                            case XMLDB_KEY_FOREIGN_UNIQUE:
+                                                $xmldb_index->setUnique(true);
+                                                break;
+                                            case XMLDB_KEY_FOREIGN:
+                                                $xmldb_index->setUnique(false);
+                                                break;
+                                        }
+                                    /// Check if the index exists in DB
+                                        if (index_exists($xmldb_table, $xmldb_index)) {
+                                            $o.='<font color="green">' . $this->str['ok'] . '</font>';
+                                        } else {
+                                            $o.='<font color="red">' . $this->str['missing'] . '</font>';
+                                        /// Add the missing index to the list
+                                            $obj = new object;
+                                            $obj->table = $xmldb_table;
+                                            $obj->index = $xmldb_index;
+                                            $missing_indexes[] = $obj;
+                                        }
+                                    }
+                                    $o.='</li>';
+                                }
+                                $o.='        </ul>';
+                            }
+                        /// Indexes
+                            if ($xmldb_indexes = $xmldb_table->getIndexes()) {
+                                $o.='        <ul>';
+                                foreach ($xmldb_indexes as $xmldb_index) {
+                                    $o.='            <li>' . $this->str['index'] . ': ' . $xmldb_index->readableInfo() . ' ';
+                                /// Check if the index exists in DB
+                                    if (index_exists($xmldb_table, $xmldb_index)) {
+                                        $o.='<font color="green">' . $this->str['ok'] . '</font>';
+                                    } else {
+                                        $o.='<font color="red">' . $this->str['missing'] . '</font>';
+                                    /// Add the missing index to the list
+                                        $obj = new object;
+                                        $obj->table = $xmldb_table;
+                                        $obj->index = $xmldb_index;
+                                        $missing_indexes[] = $obj;
+                                    }
+                                    $o.='</li>';
+                                }
+                                $o.='        </ul>';
+                            }
+                            $o.='    </li>';
+                        }
+                        $o.='        </ul>';
+                    }
+                    $o.='    </li>';
+                }
+                $o.='</ul>';
+            }
+
+        /// We have finished, let's show the results of the search
+            $s = '';
+            $r = '<table class="generalbox boxaligncenter boxwidthwide" border="0" cellpadding="5" cellspacing="0" id="results">';
+            $r.= '  <tr><td class="generalboxcontent">';
+            $r.= '    <h2 class="main">' . $this->str['searchresults'] . '</h2>';
+            $r.= '    <p class="centerpara">' . $this->str['missingindexes'] . ': ' . count($missing_indexes) . '</p>';
+            $r.= '  </td></tr>';
+            $r.= '  <tr><td class="generalboxcontent">';
+
+        /// If we have found missing indexes inform about them
+            if (count($missing_indexes)) {
+                $r.= '    <p class="centerpara">' . $this->str['yesmissingindexesfound'] . '</p>';
+                $r.= '        <ul>';
+                foreach ($missing_indexes as $obj) {
+                    $xmldb_table = $obj->table;
+                    $xmldb_index = $obj->index;
+                    $sqlarr = $xmldb_table->getAddIndexSQL($CFG->dbtype, $CFG->prefix, $xmldb_index, true);
+                    $r.= '            <li>' . $this->str['table'] . ': ' . $xmldb_table->getName() . '. ' .
+                                              $this->str['index'] . ': ' . $xmldb_index->readableInfo() . '</li>';
+                    $s.= '<code>' . str_replace("\n", '<br />', implode('<br />', $sqlarr)) . '</code><br />';
+                    
+                }
+                $r.= '        </ul>';
+            /// Add the SQL statements (all together)
+                $r.= '<hr />' . $s;
+            } else {
+                $r.= '    <p class="centerpara">' . $this->str['nomissingindexesfound'] . '</p>';
+            }
+            $r.= '  </td></tr>';
+            $r.= '  <tr><td class="generalboxcontent">';
+        /// Add the complete log message
+            $r.= '    <p class="centerpara">' . $this->str['completelogbelow'] . '</p>';
+            $r.= '  </td></tr>';
+            $r.= '</table>';
+
+            $this->output = $b . $r . $o;
+        }
+
+    /// Launch postaction if exists (leave this here!)
+        if ($this->getPostAction() && $result) {
+            return $this->launch($this->getPostAction());
+        }
+
+    /// Return ok if arrived here
+        return $result;
+    }
+}
+?>

admin/xmldb/actions/delete_field/delete_field.class.php

@@ -72,17 +72,17 @@ class delete_field extends XMLDBAction {
 
     /// If  not confirmed, show confirmation box
         if (!$confirmed) {
-            $o = '<table align="center" width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o = '<table width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
             $o.= '  <tr><td class="generalboxcontent">';
-            $o.= '    <p align="center">' . $this->str['confirmdeletefield'] . '<br /><br />' . $fieldparam . '</p>';
-            $o.= '    <table align="center" cellpadding="20"><tr><td>';
+            $o.= '    <p class="centerpara">' . $this->str['confirmdeletefield'] . '<br /><br />' . $fieldparam . '</p>';
+            $o.= '    <table class="boxaligncenter" cellpadding="20"><tr><td>';
             $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=delete_field&amp;confirmed=yes&amp;postaction=edit_table&amp;field=' . $fieldparam . '&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></form></div>';
+            $o.= '        <form action="index.php?action=delete_field&amp;confirmed=yes&amp;postaction=edit_table&amp;field=' . $fieldparam . '&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></fieldset></form></div>';
             $o.= '      </td><td>';
             $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=edit_table&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></form></div>';
+            $o.= '        <form action="index.php?action=edit_table&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></div></form></fieldset>';
             $o.= '      </td></tr>';
             $o.= '    </table>';
             $o.= '  </td></tr>';

admin/xmldb/actions/delete_index/delete_index.class.php

@@ -72,17 +72,17 @@ class delete_index extends XMLDBAction {
 
     /// If  not confirmed, show confirmation box
         if (!$confirmed) {
-            $o = '<table align="center" width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o = '<table width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
             $o.= '  <tr><td class="generalboxcontent">';
-            $o.= '    <p align="center">' . $this->str['confirmdeleteindex'] . '<br /><br />' . $indexparam . '</p>';
-            $o.= '    <table align="center" cellpadding="20"><tr><td>';
+            $o.= '    <p class="centerpara">' . $this->str['confirmdeleteindex'] . '<br /><br />' . $indexparam . '</p>';
+            $o.= '    <table class="boxaligncenter" cellpadding="20"><tr><td>';
             $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=delete_index&amp;confirmed=yes&amp;postaction=edit_table&amp;index=' . $indexparam . '&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></form></div>';
+            $o.= '        <form action="index.php?action=delete_index&amp;confirmed=yes&amp;postaction=edit_table&amp;index=' . $indexparam . '&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></fieldset></form></div>';
             $o.= '      </td><td>';
             $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=edit_table&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></form></div>';
+            $o.= '        <form action="index.php?action=edit_table&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></fieldset></form></div>';
             $o.= '      </td></tr>';
             $o.= '    </table>';
             $o.= '  </td></tr>';

admin/xmldb/actions/delete_key/delete_key.class.php

@@ -72,17 +72,17 @@ class delete_key extends XMLDBAction {
 
     /// If  not confirmed, show confirmation box
         if (!$confirmed) {
-            $o = '<table align="center" width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o = '<table width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
             $o.= '  <tr><td class="generalboxcontent">';
-            $o.= '    <p align="center">' . $this->str['confirmdeletekey'] . '<br /><br />' . $keyparam . '</p>';
-            $o.= '    <table align="center" cellpadding="20"><tr><td>';
+            $o.= '    <p class="centerpara">' . $this->str['confirmdeletekey'] . '<br /><br />' . $keyparam . '</p>';
+            $o.= '    <table class="boxaligncenter" cellpadding="20"><tr><td>';
             $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=delete_key&amp;confirmed=yes&amp;postaction=edit_table&amp;key=' . $keyparam . '&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></form></div>';
+            $o.= '        <form action="index.php?action=delete_key&amp;confirmed=yes&amp;postaction=edit_table&amp;key=' . $keyparam . '&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></fieldset></form></div>';
             $o.= '      </td><td>';
             $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=edit_table&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></form></div>';
+            $o.= '        <form action="index.php?action=edit_table&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></fieldset></form></div>';
             $o.= '      </td></tr>';
             $o.= '    </table>';
             $o.= '  </td></tr>';

admin/xmldb/actions/delete_sentence/delete_sentence.class.php

@@ -72,17 +72,17 @@ class delete_sentence extends XMLDBAction {
 
     /// If  not confirmed, show confirmation box
         if (!$confirmed) {
-            $o = '<table align="center" width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o = '<table width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
             $o.= '  <tr><td class="generalboxcontent">';
-            $o.= '    <p align="center">' . $this->str['confirmdeletesentence'] . '</p>';
-            $o.= '    <table align="center" cellpadding="20"><tr><td>';
+            $o.= '    <p class="centerpara">' . $this->str['confirmdeletesentence'] . '</p>';
+            $o.= '    <table class="boxaligncenter" cellpadding="20"><tr><td>';
             $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=delete_sentence&amp;confirmed=yes&amp;postaction=edit_statement&amp;sentence=' . $sentenceparam . '&amp;statement=' . urlencode($statementparam) . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></form></div>';
+            $o.= '        <form action="index.php?action=delete_sentence&amp;confirmed=yes&amp;postaction=edit_statement&amp;sentence=' . $sentenceparam . '&amp;statement=' . urlencode($statementparam) . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></fieldset></form></div>';
             $o.= '      </td><td>';
             $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=edit_statement&amp;statement=' . urlencode($statementparam) . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></form></div>';
+            $o.= '        <form action="index.php?action=edit_statement&amp;statement=' . urlencode($statementparam) . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></fieldset></form></div>';
             $o.= '      </td></tr>';
             $o.= '    </table>';
             $o.= '  </td></tr>';

admin/xmldb/actions/delete_statement/delete_statement.class.php

@@ -71,17 +71,17 @@ class delete_statement extends XMLDBAction {
 
     /// If  not confirmed, show confirmation box
         if (!$confirmed) {
-            $o = '<table align="center" width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o = '<table width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
             $o.= '  <tr><td class="generalboxcontent">';
-            $o.= '    <p align="center">' . $this->str['confirmdeletestatement'] . '<br /><br />' . $statementparam . '</p>';
-            $o.= '    <table align="center" cellpadding="20"><tr><td>';
+            $o.= '    <p class="centerpara">' . $this->str['confirmdeletestatement'] . '<br /><br />' . $statementparam . '</p>';
+            $o.= '    <table class="boxaligncenter" cellpadding="20"><tr><td>';
             $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=delete_statement&amp;confirmed=yes&amp;postaction=edit_xml_file&amp;statement=' . $statementparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></form></div>';
+            $o.= '        <form action="index.php?action=delete_statement&amp;confirmed=yes&amp;postaction=edit_xml_file&amp;statement=' . $statementparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></fieldset></form></div>';
             $o.= '      </td><td>';
             $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=edit_xml_file&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></form></div>';
+            $o.= '        <form action="index.php?action=edit_xml_file&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></fieldset></form></div>';
             $o.= '      </td></tr>';
             $o.= '    </table>';
             $o.= '  </td></tr>';

admin/xmldb/actions/delete_table/delete_table.class.php

@@ -71,17 +71,17 @@ class delete_table extends XMLDBAction {
 
     /// If  not confirmed, show confirmation box
         if (!$confirmed) {
-            $o = '<table align="center" width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o = '<table width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
             $o.= '  <tr><td class="generalboxcontent">';
-            $o.= '    <p align="center">' . $this->str['confirmdeletetable'] . '<br /><br />' . $tableparam . '</p>';
-            $o.= '    <table align="center" cellpadding="20"><tr><td>';
+            $o.= '    <p class="centerpara">' . $this->str['confirmdeletetable'] . '<br /><br />' . $tableparam . '</p>';
+            $o.= '    <table class="boxaligncenter" cellpadding="20"><tr><td>';
             $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=delete_table&amp;confirmed=yes&amp;postaction=edit_xml_file&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></form></div>';
+            $o.= '        <form action="index.php?action=delete_table&amp;confirmed=yes&amp;postaction=edit_xml_file&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></fieldset></form></div>';
             $o.= '      </td><td>';
             $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=edit_xml_file&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></form></div>';
+            $o.= '        <form action="index.php?action=edit_xml_file&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></fieldset></form></div>';
             $o.= '      </td></tr>';
             $o.= '    </table>';
             $o.= '  </td></tr>';

admin/xmldb/actions/delete_xml_file/delete_xml_file.class.php

@@ -70,17 +70,17 @@ class delete_xml_file extends XMLDBAction {
 
     /// If  not confirmed, show confirmation box
         if (!$confirmed) {
-            $o = '<table align="center" width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o = '<table width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
             $o.= '  <tr><td class="generalboxcontent">';
-            $o.= '    <p align="center">' . $this->str['confirmdeletexmlfile'] . '<br /><br />' . $dirpath . '/install.php</p>';
-            $o.= '    <table align="center" cellpadding="20"><tr><td>';
+            $o.= '    <p class="centerpara">' . $this->str['confirmdeletexmlfile'] . '<br /><br />' . $dirpath . '/install.php</p>';
+            $o.= '    <table class="boxaligncenter" cellpadding="20"><tr><td>';
             $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=delete_xml_file&amp;confirmed=yes&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;postaction=main_view#lastused" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></form></div>';
+            $o.= '        <form action="index.php?action=delete_xml_file&amp;confirmed=yes&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;postaction=main_view#lastused" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></fieldset></form></div>';
             $o.= '      </td><td>';
             $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=main_view#lastused" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></form></div>';
+            $o.= '        <form action="index.php?action=main_view#lastused" method="post"><fieldset class="invisiblefieldset">';
+            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></fieldset></form></div>';
             $o.= '      </td></tr>';
             $o.= '    </table>';
             $o.= '  </td></tr>';

admin/xmldb/actions/edit_field/edit_field.class.php

@@ -98,13 +98,14 @@ class edit_field extends XMLDBAction {
         $origstructure =& $dbdir->xml_file->getStructure();
 
     /// Add the main form
-        $o = '<form name="form" id="form" action="index.php" method="post">';
+        $o = '<form id="form" action="index.php" method="post">';
+        $o.= '    <div>';
         $o.= '    <input type="hidden" name ="dir" value="' . str_replace($CFG->dirroot, '', $dirpath) . '" />';
         $o.= '    <input type="hidden" name ="table" value="' . $tableparam .'" />';
         $o.= '    <input type="hidden" name ="field" value="' . $fieldparam .'" />';
         $o.= '    <input type="hidden" name ="action" value="edit_field_save" />';
         $o.= '    <input type="hidden" name ="postaction" value="edit_table" />';
-        $o.= '    <table id="formelements" align="center">';
+        $o.= '    <table id="formelements" class="boxaligncenter">';
     /// XMLDB field name
     /// If the field has dependencies, we cannot change its name
         $disabled = '';
@@ -170,18 +171,18 @@ class edit_field extends XMLDBAction {
     /// Change button
         $o.= '      <tr valign="top"><td>&nbsp;</td><td colspan="2"><input type="submit" value="' .$this->str['change'] . '" /></td></tr>';
         $o.= '    </table>';
-        $o.= '</form>';
+        $o.= '</div></form>';
     /// Calculate the buttons
-        $b = ' <p align="center" class="buttons">';
+        $b = ' <p class="centerpara buttons">';
     /// The view original XML button
         if ($table->getField($fieldparam)) {
-            $b .= '&nbsp;<a href="index.php?action=view_field_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=original&amp;table=' . $tableparam . '&amp;field=' . $fieldparam . '" target="_blank">[' . $this->str['vieworiginal'] . ']</a>';
+            $b .= '&nbsp;<a href="index.php?action=view_field_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=original&amp;table=' . $tableparam . '&amp;field=' . $fieldparam . '">[' . $this->str['vieworiginal'] . ']</a>';
         } else {
             $b .= '&nbsp;[' . $this->str['vieworiginal'] . ']';
         }
     /// The view edited XML button
         if ($field->hasChanged()) {
-            $b .= '&nbsp;<a href="index.php?action=view_field_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=edited&amp;table=' . $tableparam . '&amp;field=' . $fieldparam . '" target="_blank">[' . $this->str['viewedited'] . ']</a>';
+            $b .= '&nbsp;<a href="index.php?action=view_field_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=edited&amp;table=' . $tableparam . '&amp;field=' . $fieldparam . '">[' . $this->str['viewedited'] . ']</a>';
         } else {
             $b .= '&nbsp;[' . $this->str['viewedited'] . ']';
         }

admin/xmldb/actions/edit_index/edit_index.class.php

@@ -98,20 +98,21 @@ class edit_index extends XMLDBAction {
         $origstructure =& $dbdir->xml_file->getStructure();
 
     /// Add the main form
-        $o = '<form name="form" id="form" action="index.php" method="post">';
+        $o = '<form id="form" action="index.php" method="post">';
+        $o.= '<div>';
         $o.= '    <input type="hidden" name ="dir" value="' . str_replace($CFG->dirroot, '', $dirpath) . '" />';
         $o.= '    <input type="hidden" name ="table" value="' . $tableparam .'" />';
         $o.= '    <input type="hidden" name ="index" value="' . $indexparam .'" />';
         $o.= '    <input type="hidden" name ="action" value="edit_index_save" />';
         $o.= '    <input type="hidden" name ="postaction" value="edit_table" />';
-        $o.= '    <table id="formelements" align="center">';
+        $o.= '    <table id="formelements" class="boxaligncenter">';
     /// XMLDB index name
     /// If the index has dependencies, we cannot change its name
         $disabled = '';
         if ($structure->getIndexUses($table->getName(), $index->getName())) {
             $disabled = ' disabled="disabled " ';
         }
-        $o.= '      <tr valign="top"><td><label for="name" accesskey="n">Name:</label></td><td colspan="2"><input name="name" type="text" size="30" id="name"' . $disabled . 'value="' . s($index->getName()) . '" /></td></tr>';
+        $o.= '      <tr valign="top"><td><label for="name" accesskey="n">Name:</label></td><td colspan="2"><input name="name" type="text" size="30" id="name"' . $disabled . ' value="' . s($index->getName()) . '" /></td></tr>';
     /// XMLDB key comment
         $o.= '      <tr valign="top"><td><label for="comment" accesskey="c">Comment:</label></td><td colspan="2"><textarea name="comment" rows="3" cols="80" id="comment">' . s($index->getComment()) . '</textarea></td></tr>';
     /// XMLDBIndex Type
@@ -125,18 +126,18 @@ class edit_index extends XMLDBAction {
     /// Change button
         $o.= '      <tr valign="top"><td>&nbsp;</td><td colspan="2"><input type="submit" value="' .$this->str['change'] . '" /></td></tr>';
         $o.= '    </table>';
-        $o.= '</form>';
+        $o.= '</div></form>';
     /// Calculate the buttons
-        $b = ' <p align="center" class="buttons">';
+        $b = ' <p class="centerpara buttons">';
     /// The view original XML button
         if ($table->getIndex($indexparam)) {
-            $b .= '&nbsp;<a href="index.php?action=view_index_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=original&amp;table=' . $tableparam . '&amp;index=' . $indexparam . '" target="_blank">[' . $this->str['vieworiginal'] . ']</a>';
+            $b .= '&nbsp;<a href="index.php?action=view_index_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=original&amp;table=' . $tableparam . '&amp;index=' . $indexparam . '">[' . $this->str['vieworiginal'] . ']</a>';
         } else {
             $b .= '&nbsp;[' . $this->str['vieworiginal'] . ']';
         }
     /// The view edited XML button
         if ($index->hasChanged()) {
-            $b .= '&nbsp;<a href="index.php?action=view_index_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=edited&amp;table=' . $tableparam . '&amp;index=' . $indexparam . '" target="_blank">[' . $this->str['viewedited'] . ']</a>';
+            $b .= '&nbsp;<a href="index.php?action=view_index_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=edited&amp;table=' . $tableparam . '&amp;index=' . $indexparam . '">[' . $this->str['viewedited'] . ']</a>';
         } else {
             $b .= '&nbsp;[' . $this->str['viewedited'] . ']';
         }