Bumping to Moodle 1.8.1 finally

Apparently there _is_ a PHP ini setting controlling
it -- defaults to off.

admin/admin.html

@@ -1,103 +0,0 @@
-
-<form name="adminform" id="adminform" method="post" action="admin.php">
-<input type="hidden" name="previoussearch" value="<?php echo $previoussearch ?>">
-<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
-  <table align="center" border="0" cellpadding="5" cellspacing="0">
-    <tr>
-      <td valign="top">
-          <?php
-              $a->count = count($admins);
-              $a->items = $strexistingadmins;
-              print_string('counteditems', '', $a);
-          ?>
-      </td>
-      <td></td>
-      <td valign="top">
-          <?php
-              $a->count = $usercount;
-              $a->items = $strpotentialadmins;
-              print_string('counteditems', '', $a);
-          ?>
-      </td>
-    </tr>
-    <tr>
-      <td valign="top">
-          <select name="removeselect[]" size="20" id="removeselect" multiple
-                  onFocus="document.adminform.add.disabled=true;
-                           document.adminform.remove.disabled=false;
-                           document.adminform.addselect.selectedIndex=-1;">
-          <?php 
-              if (count($admins) == 1) {
-                  $disabled = 'disabled';
-                  $removebuttontype = 'hidden';
-              } else {
-                  $disabled = '';
-                  $removebuttontype = 'submit';
-              }
-
-              foreach ($admins as $admin) {
-                  $fullname = fullname($admin, true);
-                  echo "<option value=\"$admin->id\" $disabled>".$fullname.", ".$admin->email."</option>\n";
-              }
-          ?>
-          
-          </select></td>
-      <td valign="top">
-        <br />
-        <input name="add" type="submit" id="add" value="&larr;" />
-        <br />
-        <input name="remove" type="<?php echo $removebuttontype ?>" id="remove" value="&rarr;" />
-        <br />
-      </td>
-      <td valign="top">
-          <select name="addselect[]" size="20" id="addselect" multiple
-                  onFocus="document.adminform.add.disabled=false;
-                           document.adminform.remove.disabled=true;
-                           document.adminform.removeselect.selectedIndex=-1;">
-          <?php
-              if (!empty($searchusers)) {
-                  echo "<optgroup label=\"$strsearchresults (" . count($searchusers) . ")\">\n";
-                  foreach ($searchusers as $user) {
-                      $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"
-                          .'<optgroup label="'.get_string('trysearching').'"><option></option></optgroup>'."\n";
-                  } else {
-                      if (!empty($users)) {
-                          foreach ($users as $user) {
-                              $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 ="document.adminform.add.disabled=true;
-                            document.adminform.remove.disabled=true;
-                            document.adminform.removeselect.selectedIndex=-1;
-                            document.adminform.addselect.selectedIndex=-1;"
-                  onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
-                               if (keyCode == 13) {
-                                   document.adminform.previoussearch.value=1;
-                                   document.adminform.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>
-  </table>
-</form>
-
-

admin/admin.php

@@ -1,125 +0,0 @@
-<?PHP // $Id$
-      // Admin-only script to assign administrative rights to users
-
-    require_once('../config.php');
-    
-    define("MAX_USERS_PER_PAGE", 50);
-
-    if (! $site = get_site()) {
-        redirect("$CFG->wwwroot/$CFG->admin/index.php");
-    }
-
-    require_login();
-
-    if (!isadmin()) {
-        error("You must be an administrator to use this page.");
-    }
-
-    if (!confirm_sesskey()) {
-        error(get_string('confirmsesskeybad', 'error'));
-    }
-
-    $primaryadmin = get_admin();
-
-/// If you want any administrator to have the ability to assign admin
-/// rights, then comment out the following if statement
-    if ($primaryadmin->id != $USER->id) {
-        error("You must be the primary administrator to use this page.");
-    }
-
-/// assign all of the configurable language strings
-    $stringstoload = array (
-        "assignadmins",
-        "administration",
-        "existingadmins",
-        "potentialadmins",
-        "search",
-        "users",
-        "searchresults",
-        "showall"
-        );
-
-    foreach ($stringstoload as $stringtoload){
-        $strstringtoload = "str" . $stringtoload;
-        $$strstringtoload = get_string($stringtoload);
-    }
-
-    print_header("$site->shortname: $strassignadmins", 
-                 "$site->fullname", 
-                 "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> -> $strassignadmins", "adminform.searchtext");
-
-
-    if (!$frm = data_submitted()) {
-        print_simple_box("<center>".get_string("adminhelpassignadmins")."</center>", "center", "50%");
-
-/// A form was submitted so process the input
-    
-    } else {
-        if (!empty($frm->add) and !empty($frm->addselect)) {
-            foreach ($frm->addselect as $addadmin) {
-                if (! add_admin($addadmin)) {
-                    error("Could not add admin with user id $addadmin!");
-                }
-            }
-        } else if (!empty($frm->remove) and !empty($frm->removeselect)) {
-            $admins = get_admins();
-            if (count($admins) > count($frm->removeselect)) {
-                foreach ($frm->removeselect as $removeadmin) {
-                    if (! remove_admin($removeadmin)) {
-                        error("Could not remove admin with user id $removeadmin!");
-                    }
-                }
-            }
-        } else if (!empty($frm->showall)) {
-            unset($frm->searchtext);
-            $frm->previoussearch = 0;
-        }
-    }
-
-/// Is there a current search?
-    $previoussearch = (!empty($frm->search) or (isset($frm->previoussearch) and $frm->previoussearch == 1)) ;
-
-/// Get all existing admins
-    $admins = get_admins();
-
-
-    $adminarray = array();
-    foreach ($admins as $admin) {
-        $adminarray[] = $admin->id;
-    }
-    $adminlist = implode(',', $adminarray);
-
-    unset($adminarray);
-
-
-/// Get search results excluding any current admins
-    if (!empty($frm->searchtext) and $previoussearch) {
-        $searchusers = get_users(true, $frm->searchtext, true, $adminlist, 'firstname ASC, lastname ASC',
-                                      '', '', 0, 99999, 'id, firstname, lastname, email');
-        $usercount = get_users(false, '', true, $adminlist);
-    }
-
-/// If no search results then get potential users excluding current admins
-    if (empty($searchusers)) {
-
-        $usercount =  get_users(false, '', true, $adminlist, 'firstname ASC, lastname ASC', '', '',
-                                0, 99999, 'id, firstname, lastname, email');
-
-        $users = array();
-
-        if ($usercount <= MAX_USERS_PER_PAGE) {
-            if (!$users = get_users(true, '', true, $adminlist, 'firstname ASC, lastname ASC', '', '',
-                               0, 99999, 'id, firstname, lastname, email') ) {
-                $users = array();
-            }
-        }
-    }
-
-    $searchtext = (isset($frm->searchtext)) ? $frm->searchtext : "";
-    $previoussearch = ($previoussearch) ? '1' : '0';
-
-    include('./admin.html');
-
-    print_footer();
-
-?>

admin/auth.php

@@ -1,335 +1,303 @@
-<?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
+ *
+ */
 
-    $auth = optional_param('auth', '', PARAM_SAFEDIR);
+require_once('../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir.'/tablelib.php');
 
-    require_login();
+$adminroot = admin_get_root();
+admin_externalpage_setup('userauthentication', $adminroot);
 
-    if (!$site = get_site()) {
-        redirect("index.php");
-    }
+$action = optional_param('action', '', PARAM_ACTION);
+$auth   = optional_param('auth', '', PARAM_SAFEDIR);
 
-    if (!isadmin()) {
-        error("Only the admin can use this page");
-    }
+// get currently installed and enabled auth plugins
+$authsavailable = get_list_of_plugins('auth');
 
-    if (!confirm_sesskey()) {
-        error(get_string('confirmsesskeybad', 'error'));
-    }
+//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);
+}
 
-    $focus = '';
+get_enabled_auth_plugins(true); // fix the list of enabled auths
+if (empty($CFG->auth)) {
+    $authsenabled = array();
+} else {
+    $authsenabled = explode(',', $CFG->auth);
+}
 
-/// If data submitted, then process and store.
+if (!isset($CFG->registerauth)) {
+    set_config('registerauth', '');
+}
 
-    if ($config = data_submitted()) {
+if (!isset($CFG->auth_instructions)) {
+    set_config('auth_instructions', '');
+}
 
-        $config = (array)$config;
-        validate_form($config, $err);
+if (!empty($auth) and !exists_auth_plugin($auth)) {
+    error(get_string('pluginnotinstalled', 'auth', $auth), $url);
+}
 
-        // 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");
-        }
 
-        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";
+////////////////////////////////////////////////////////////////////////////////
+// process actions
+
+$status = '';
+
+switch ($action) {
+
+    case 'save':
+        if (data_submitted() and confirm_sesskey()) {
+
+            // save settings
+            set_config('guestloginbutton', required_param('guestloginbutton', PARAM_BOOL));
+            set_config('alternateloginurl', stripslashes(trim(required_param('alternateloginurl', PARAM_RAW))));
+            set_config('registerauth', required_param('register', PARAM_SAFEDIR));
+            set_config('auth_instructions', stripslashes(trim(required_param('auth_instructions', PARAM_RAW))));
+
+            // enable registerauth in $CFG->auth if needed
+            if (!empty($CFG->registerauth) and !in_array($CFG->registerauth, $authsenabled)) {
+                $authsenabled[] = $CFG->registerauth;
+                set_config('auth', implode(',', $authsenabled));
             }
+            $status = get_string('changessaved');
         }
-    }
+        break;
 
-/// 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;
+    case 'disable':
+        // remove from enabled list
+        $key = array_search($auth, $authsenabled);
+        if ($key !== false) {
+            unset($authsenabled[$key]);
+            set_config('auth', implode(',', $authsenabled));
         }
-        set_config('changepassword','');
+
+        if ($auth == $CFG->registerauth) {
+            set_config('registerauth', '');
+        }
+        break;
+
+    case 'enable':
+        // add to enabled list
+        if (!in_array($auth, $authsenabled)) {
+            $authsenabled[] = $auth;
+            $authsenabled = array_unique($authsenabled);
+            set_config('auth', implode(',', $authsenabled));
+        }
+        break;
+
+    case 'down':
+        $key = array_search($auth, $authsenabled);
+        // check auth plugin is valid
+        if ($key === false) {
+            error(get_string('pluginnotenabled', 'auth', $auth), $url);
+        }
+        // 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);
+    $displayauths[$auth] = get_string("auth_{$auth}title", 'auth');
+    if ($authplugin->can_signup()) {
+        $registrationauths[$auth] = get_string("auth_{$auth}title", 'auth');
+    }
+}
+
+foreach ($authsavailable as $auth) {
+    if (array_key_exists($auth, $displayauths)) {
+        continue; //already in the list
+    }
+    $authplugin = get_auth_plugin($auth);
+    $displayauths[$auth] = get_string("auth_{$auth}title", 'auth');
+    if ($authplugin->can_signup()) {
+        $registrationauths[$auth] = get_string("auth_{$auth}title", 'auth');
+    }
+}
+
+// build the display table
+$table = new flexible_table('auth_admin_table');
+$table->define_columns(array('name', 'enable', 'order', 'settings'));
+$table->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>";
     }
 
-    $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");
-
-    $stradministration        = get_string("administration");
-    $strauthentication        = get_string("authentication");
-    $strauthenticationoptions = get_string("authenticationoptions","auth");
-    $strsettings = get_string("settings");
-    $strusers = get_string("users");
-
-    print_header("$site->shortname: $strauthenticationoptions", "$site->fullname",
-                  "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> -> $strauthenticationoptions", "$focus");
-
-    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");
-
-    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>";
-
-    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>";
-
+    // 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;
     }
 
-    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>";
+    // settings link
+    $settings = "<a href=\"auth_config.php?sesskey={$USER->sesskey}&amp;auth=$auth\">{$txt->settings}</a>";
 
-    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>";
-    }
+    // 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 '<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 '<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 '</table>';
-    echo '<p align="center"><input type="submit" value="'.get_string('savechanges').'"></p>';
-    echo '</form>';
+echo '</fieldset>';
 
-    print_simple_box_end();
-
-    print_footer();
-    exit;
-
-/// Functions /////////////////////////////////////////////////////////////////
-
-function validate_form(&$form, &$err) {
-
-   // if (empty($form->fullname))
-   //     $err["fullname"] = get_string("missingsitename");
-
-    return;
-}
-
-//
-// 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"} = '';
-        }
-
-        // 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);
-        }
-
-        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"}, "");
-        }
-        echo '</td>';
-        if (!empty($helptext)) {
-            echo '<td rowspan="' . count($user_fields) . '">' . $helptext . '</td>';
-            $helptext = '';
-        }
-        echo '</tr>';
-    }
-}
+////////////////////////////////////////////////////////////////////////////////
+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,180 @@
+<?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);
+$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", "department", "address", "city", "country", "description", "idnumber", "lang");
+
+$modules = get_list_of_plugins('auth');
+foreach ($modules as $module) {
+    $options[$module] = get_string("auth_{$module}title", 'auth');
+}
+asort($options);
+
+// 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($options[$auth]);
+print_simple_box_start('center', '60%', '', 5, 'informationbox');
+print_string("auth_{$auth}description", 'auth');
+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/backup.php

@@ -1,132 +0,0 @@
-<?PHP  // $Id$
-       // backup.php - allows admin to edit all configuration variables for scheduled backups
-
-    require_once("../config.php");
-    require_once("../backup/lib.php");
-    require_once("../backup/backup_scheduled.php");
-
-    require_login();
-
-    if (!isadmin()) {
-        error("Only an admin can use this page");
-    }
-
-    if (!$site = get_site()) {
-        error("Site isn't defined!");
-    }
-
-    //Initialise error variables
-    $error = false;
-    $sche_destination_error = "";
-
-    /// If data submitted, then process and store.
-
-    if (($config = data_submitted()) && confirm_sesskey()) {
-
-        //First of all we check that everything is correct
-        //Check for trailing slash and backslash in backup_sche_destination
-        if (!empty($backup_sche_destination) and 
-            (substr($backup_sche_destination,-1) == "/" or substr($backup_sche_destination,-1) == "\\")) {
-            $error = true;
-            $sche_destination_error = get_string("pathslasherror");
-        //Now check that backup_sche_destination dir exists
-        } else if (!empty($backup_sche_destination) and
-            !is_dir($backup_sche_destination)) {
-            $error = true;
-            $sche_destination_error = get_string("pathnotexists");
-        }
-
-        //We need to do some weekdays conversions prior to continue
-        $i = 0;
-        $temp = "";
-        $a_config = (array)$config;
-        while ($i<7) {
-            $tocheck = "dayofweek_".$i;
-            if (isset($a_config[$tocheck])) {
-                $temp .= "1";
-            } else {
-                $temp .= "0"; 
-            }
-            unset($a_config[$tocheck]);
-            $i++;
-        }
-        $a_config['backup_sche_weekdays'] = $temp;
-        $config = (object)$a_config;
-        //weekdays conversions done. Continue
-
-        foreach ($config as $name => $value) {
-            backup_set_config($name, $value);
-        }
-
-        //And now, we execute schedule_backup_next_execution() for each course in the server to have the next
-        //execution time updated automatically everytime it's changed.
-        $status = true;
-        //get admin
-        $admin = get_admin();
-        if (!$admin) {
-            $status = false;
-        }
-        //get backup config
-        if (! $backup_config =  backup_get_config()) {
-            $status = false;
-        }
-        if ($status) {
-            //get courses
-            if ($courses = get_records('course', '', '', '', 'id,shortname')) {
-                //For each course, we check (insert, update) the backup_course table
-                //with needed data
-                foreach ($courses as $course) {
-                    //We check if the course exists in backup_course
-                    $backup_course = get_record("backup_courses","courseid",$course->id);
-                    //If it doesn't exist, create 
-                    if (!$backup_course) {
-                        $temp_backup_course->courseid = $course->id;
-                        $newid = insert_record("backup_courses",$temp_backup_course);
-                        //And get it from db
-                        $backup_course = get_record("backup_courses","id",$newid);
-                    }
-                    //Now, calculate next execution of the course
-                    $nextstarttime = schedule_backup_next_execution ($backup_course,$backup_config,time(),$admin->timezone);
-                    //Save it to db
-                    set_field("backup_courses","nextstarttime",$nextstarttime,"courseid",$backup_course->courseid);
-                }
-            }
-        }
-
-        if (!$error) {
-            redirect("$CFG->wwwroot/$CFG->admin/index.php", get_string("changessaved"), 1);
-            exit;
-        }
-    }
-
-/// Otherwise print the form.
-
-    $stradmin = get_string("administration");
-    $strconfiguration = get_string("configuration");
-    $strbackup = get_string("backup");
-
-    print_header("$site->shortname: $strconfiguration: $strbackup", $site->fullname,
-                  "<a href=\"index.php\">$stradmin</a> -> ".
-                  "<a href=\"configure.php\">$strconfiguration</a> -> ".
-                  $strbackup);
-
-    echo "<p align=\"right\"><a href=\"../backup/log.php\">".get_string("logs")."</a></p>";
-
-    print_heading($strbackup);
-
-    print_simple_box("<center>".get_string("adminhelpbackup")."</center>", "center", "50%");
-    echo "<br />";
-
-    print_simple_box_start("center");
-
-    //Check for required functions...
-    if (!function_exists('utf8_encode')) {
-        notify("You need to add XML support to your PHP installation");
-    } 
-    include ("$CFG->dirroot/backup/config.html");
-
-    print_simple_box_end();
-
-    print_footer();
-
-?>

admin/block.php

@@ -3,19 +3,13 @@
 // block.php - allows admin to edit all local configuration variables for a block
 
     require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('manageblocks', $adminroot);
     require_once($CFG->libdir.'/blocklib.php');
 
-    require_login();
-
-    if (!isadmin()) {
-        error('Only an admin can use this page');
-    }
-    if (!$site = get_site()) {
-        error("Site isn't defined!");
-    }
-
     $blockid = required_param('block', PARAM_INT);
-   
+
     if(($blockrecord = blocks_get_record($blockid)) === false) {
         error('This block does not exist');
     }
@@ -53,23 +47,19 @@
 
     /// Otherwise print the form.
 
-    $stradmin = get_string('administration');
-    $strconfiguration = get_string('configuration');
     $strmanageblocks = get_string('manageblocks');
     $strblockname = $block->get_title();
-    
+
     // $CFG->pagepath is used to generate the body and id attributes for the body tag
     // of the page. It is also used to generate the link to the Moodle Docs for this view.
-    $CFG->pagepath = 'block/' . $strblockname . '/config';
-    
-    print_header($site->shortname.': '.$strblockname.": $strconfiguration", $site->fullname,
-                  "<a href=\"index.php\">$stradmin</a> -> ".
-                  "<a href=\"configure.php\">$strconfiguration</a> -> ".
-                  "<a href=\"blocks.php\">$strmanageblocks</a> -> ".$strblockname);
+    $CFG->pagepath = 'block/' . $block->name() . '/config';
+
+
+    admin_externalpage_print_header($adminroot);
 
     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">';
@@ -80,6 +70,6 @@
     echo '</p>';
     $block->config_print();
     echo '</form>';
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/blocks.php

@@ -3,8 +3,13 @@
     // Allows the admin to configure blocks (hide/show, delete and configure)
 
     require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
     require_once($CFG->libdir.'/blocklib.php');
     require_once($CFG->libdir.'/tablelib.php');
+    require_once($CFG->libdir.'/ddllib.php');
+
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('manageblocks', $adminroot);
 
     $confirm  = optional_param('confirm', 0, PARAM_BOOL);
     $hide     = optional_param('hide', 0, PARAM_INT);
@@ -12,21 +17,8 @@
     $delete   = optional_param('delete', 0, PARAM_INT);
     $multiple = optional_param('multiple', 0, PARAM_INT);
 
-    require_login();
-
-    if (!isadmin()) {
-        error("Only administrators can use this page!");
-    }
-
-    if (!$site = get_site()) {
-        error("Site isn't defined!");
-    }
-
-
 /// Print headings
 
-    $stradministration = get_string('administration');
-    $strconfiguration = get_string('configuration');
     $strmanageblocks = get_string('manageblocks');
     $strdelete = get_string('delete');
     $strversion = get_string('version');
@@ -36,10 +28,9 @@
     $strcourses = get_string('blockinstances', 'admin');
     $strname = get_string('name');
     $strmultiple = get_string('blockmultiple', 'admin');
+    $strshowblockcourse = get_string('showblockcourse');
 
-    print_header("$site->shortname: $strmanageblocks", "$site->fullname",
-                 "<a href=\"index.php\">$stradministration</a> -> ".
-                 "<a href=\"configure.php\">$strconfiguration</a> -> $strmanageblocks");
+    admin_externalpage_print_header($adminroot);
 
     print_heading($strmanageblocks);
 
@@ -85,34 +76,51 @@
             notice_yesno(get_string('blockdeleteconfirm', '', $strblockname),
                          'blocks.php?delete='.$block->id.'&amp;confirm=1&amp;sesskey='.$USER->sesskey,
                          'blocks.php');
-            print_footer();
+            admin_externalpage_print_footer($adminroot);
             exit;
 
         } else {
+            // Inform block it's about to be deleted
+            $blockobject = block_instance($block->name);
+            if ($blockobject) {
+                $blockobject->before_delete();  //only if we can create instance, block might have been already removed
+            }
+
+            // First delete instances and then block
+            $instances = get_records('block_instance', 'blockid', $block->id);
+            if(!empty($instances)) {
+                foreach($instances as $instance) {
+                    blocks_delete_instance($instance);
+                    blocks_delete_instance($instance, true);
+                }
+            }
+
             // Delete block
             if (!delete_records('block', 'id', $block->id)) {
                 notify("Error occurred while deleting the $strblockname record from blocks table");
             }
 
-            $instances = get_records('block_instance', 'blockid', $block->id);
-            if(!empty($instances)) {
-                foreach($instances as $instance) {
-                    blocks_delete_instance($instance);
-                }
-            }
-
             // Then the tables themselves
-
             if ($tables = $db->Metatables()) {
                 $prefix = $CFG->prefix.$block->name;
+                $prefix2 = $CFG->prefix.'block_'.$block->name;
                 foreach ($tables as $table) {
-                    if (strpos($table, $prefix) === 0) {
-                        if (!execute_sql("DROP TABLE $table", false)) {
+                    if (strpos($table, $prefix) === 0 || strpos($table, $prefix2) === 0) {
+                    /// If the match has been due to the 1st condition, debug to developers
+                        if (strpos($table, $prefix) === 0) {
+                            debugging('This block has some wrongly named tables. See Moodle Docs coding guidelines (and MDL-6786)', DEBUG_DEVELOPER);
+                        }
+                    /// Strip prefix from $table
+                        $table = preg_replace("/^{$CFG->prefix}/", '', $table);
+                        $xmldb_table = new XMLDBTable($table);
+                        if (!drop_table($xmldb_table, true, false)) {
                             notify("ERROR: while trying to drop table $table");
                         }
                     }
                 }
             }
+            // Delete the capabilities that were defined by this block
+            capabilities_cleanup('block/'.$block->name);
 
             $a->block = $strblockname;
             $a->directory = $CFG->dirroot.'/blocks/'.$block->name;
@@ -132,7 +140,7 @@
 
     foreach ($blocks as $block) {
         if(!block_is_compatible($block->name)) {
-            notify('Block '. $block->name .' is not compatible with the current version of Mooodle and needs to be updated by a programmer.');
+            notify('Block '. $block->name .' is not compatible with the current version of Moodle and needs to be updated by a programmer.');
             $incompatible[] = $block;
             continue;
         }
@@ -156,12 +164,9 @@
 
     $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.'/admin/blocks.php');
-
-    $table->set_attribute('cellspacing', '0');
+    $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
     $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) {
@@ -176,14 +181,21 @@
         }
 
         $count = count_records('block_instance', 'blockid', $blockid);
+        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()) {
@@ -200,8 +212,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,
@@ -215,15 +227,14 @@
         print_heading(get_string('incompatibleblocks', 'admin'));
 
         $table = new flexible_table('admin-blocks-incompatible');
-        
+
         $table->define_columns(array('block', 'delete'));
         $table->define_headers(array($strname, $strdelete));
-        $table->define_baseurl($CFG->wwwroot.'/admin/blocks.php');
-    
-        $table->set_attribute('cellspacing', '0');
+        $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
+
         $table->set_attribute('id', 'incompatible');
-        $table->set_attribute('class', 'generaltable generalbox');
-    
+        $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
+
         $table->setup();
 
         foreach ($incompatible as $block) {
@@ -235,6 +246,6 @@
         $table->print_html();
     }
 
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/calendar.html

@@ -1,68 +0,0 @@
-
-<form method="post" action="calendar.php">
-<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-<table class="formtable">
-    <tr>
-      <th>adminseesall:</th>
-      <td>
-        <div><?php print_string('helpadminseesall', 'admin'); ?></div>
-        <p>
-        <select name="adminseesallcourses">
-          <option value="0" <?php if(empty($CFG->calendar_adminseesall)) echo "selected='selected'"; ?>><?php print_string('adminseesownevents', 'admin'); ?></option>
-          <option value="1" <?php if(!empty($CFG->calendar_adminseesall)) echo "selected='selected'"; ?>><?php print_string('adminseesallevents', 'admin'); ?></option>
-        </select>
-        </p>
-      </td>
-    </tr>
-    <tr>
-      <th>startwday:</th>
-      <td>
-        <div><?php print_string('helpstartofweek', 'admin'); ?></div>
-        <p><?php choose_from_menu($weekdays, 'startwday', empty($CFG->calendar_startwday) ? 0 : $CFG->calendar_startwday, ''); ?></p>
-      </td>
-    </tr>
-    <tr>
-      <th>weekenddays:</th>
-      <td>
-        <div><?php print_string('helpweekenddays', 'admin'); ?></div>
-        <p>
-        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="1" id="weekend1" <?php if(CALENDAR_WEEKEND &  2) echo 'checked="checked"'; ?> /> <label for="weekend1"><?php print_string('monday', 'calendar'); ?></label></span>
-        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="2" id="weekend2" <?php if(CALENDAR_WEEKEND &  4) echo 'checked="checked"'; ?> /> <label for="weekend2"><?php print_string('tuesday', 'calendar'); ?></label></span>
-        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="3" id="weekend3" <?php if(CALENDAR_WEEKEND &  8) echo 'checked="checked"'; ?> /> <label for="weekend3"><?php print_string('wednesday', 'calendar'); ?></label></span>
-        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="4" id="weekend4" <?php if(CALENDAR_WEEKEND & 16) echo 'checked="checked"'; ?> /> <label for="weekend4"><?php print_string('thursday', 'calendar'); ?></label></span>
-        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="5" id="weekend5" <?php if(CALENDAR_WEEKEND & 32) echo 'checked="checked"'; ?> /> <label for="weekend5"><?php print_string('friday', 'calendar'); ?></label></span>
-        <br />
-        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="6" id="weekend6" <?php if(CALENDAR_WEEKEND & 64) echo 'checked="checked"'; ?> /> <label for="weekend6"><?php print_string('saturday', 'calendar'); ?></label></span>
-        <span style="white-space: nowrap;"><input type="checkbox" name="weekend[]" value="0" id="weekend0" <?php if(CALENDAR_WEEKEND &  1) echo 'checked="checked"'; ?> /> <label for="weekend0"><?php print_string('sunday', 'calendar'); ?></label></span>
-        </p>
-      </td>
-    </tr>
-    <tr>
-      <th>upcoming_lookahead:</th>
-      <td>
-        <div><?php print_string('helpupcominglookahead', 'admin'); ?></div>
-        <p><input type="text" name="lookahead" size="3" value="<?php echo CALENDAR_UPCOMING_DAYS; ?>" /></p>
-      </td>
-    </tr>
-    <tr>
-      <th>upcoming_maxevents:</th>
-      <td>
-        <div><?php print_string('helpupcomingmaxevents', 'admin'); ?></div>
-        <p><input type="text" name="maxevents" size="3" value="<?php echo CALENDAR_UPCOMING_MAXEVENTS; ?>" /></p>
-      </td>
-    </tr>
-    <tr>
-      <th>timezones:</th>
-      <td>
-        <div><?php print_string('helpforcetimezone', 'admin'); ?></div>
-        <p><?php choose_from_menu($timezones, 'forcetimezone', $CFG->forcetimezone, get_string('timezonenotforced', 'admin'), '', '99'); ?></p>
-        <p><a href="timezoneimport.php"><?php print_string('importtimezones', 'admin'); ?>...</a></p>
-      </td>
-    </tr>
-    <tr>
-      <td colspan="2" align="center">
-          <input type="submit" value="<?php print_string('savechanges'); ?>" />
-      </td>
-    </tr>
-</table>
-</form>

admin/calendar.php

@@ -1,98 +0,0 @@
-<?PHP // $Id$
-
-    // Allows the admin to configure calendar and date/time stuff
-
-    require_once('../config.php');
-
-    require_login();
-
-    if (!isadmin()) {
-        error('Only administrators can use this page!');
-    }
-
-    if (!$site = get_site()) {
-        error('Site isn\'t defined!');
-    }
-
-/// Print headings
-
-    $stradministration = get_string('administration');
-    $strconfiguration = get_string('configuration');
-    $strcalendarsettings = get_string('calendarsettings', 'admin');
-
-    print_header("$site->shortname: $strcalendarsettings", "$site->fullname",
-                 "<a href=\"index.php\">$stradministration</a> -> ".
-                 "<a href=\"configure.php\">$strconfiguration</a> -> $strcalendarsettings");
-
-    print_heading($strcalendarsettings);
-
-/// If data submitted, process and store
-
-    if (($form = data_submitted()) && confirm_sesskey()) {
-        if(isset($form->adminseesallcourses)) {
-            set_config('calendar_adminseesall', intval($form->adminseesallcourses) != 0);
-            unset($SESSION->cal_courses_shown);
-        }
-        if(isset($form->forcetimezone)) {
-            // To protect from SQL injections ...
-            $form->timezone = clean_param($form->timezone, PARAM_PATH); //not a path, but it looks like it anyway
-            set_config('forcetimezone', $form->forcetimezone);
-        }
-        if(isset($form->startwday)) {
-            $startwday = intval($form->startwday);
-            if($startwday >= 0 && $startwday <= 6) {
-                set_config('calendar_startwday', $startwday);
-            }
-        }
-        if(isset($form->weekend)) {
-            if(is_array($form->weekend)) {
-                // Creating a packed bitfield; look at /calendar/lib.php if you can't figure it out
-                $bitfield = 0;
-                foreach($form->weekend as $day) {
-                    $bitfield |= (1 << (intval($day) % 7));
-                }
-                if($bitfield > 0) {
-                    set_config('calendar_weekend', $bitfield);
-                }
-            }
-        }
-        if(isset($form->lookahead)) {
-            $lookahead = intval($form->lookahead);
-            if($lookahead > 0) {
-                set_config('calendar_lookahead', $lookahead);
-            }
-        }
-        if(isset($form->maxevents)) {
-            $maxevents = intval($form->maxevents);
-            if($maxevents > 0) {
-                set_config('calendar_maxevents', $maxevents);
-            }
-        }
-        redirect('index.php');
-    }
-
-    // Include the calendar library AFTER modifying the data, so we read the latest values
-    require_once($CFG->dirroot.'/calendar/lib.php');
-
-    // Populate some variables we 're going to need in calendar.html
-    $timezones = get_list_of_timezones();
-
-    $weekdays = array(
-        0 => get_string('sunday', 'calendar'),
-        1 => get_string('monday', 'calendar'),
-        2 => get_string('tuesday', 'calendar'),
-        3 => get_string('wednesday', 'calendar'),
-        4 => get_string('thursday', 'calendar'),
-        5 => get_string('friday', 'calendar'),
-        6 => get_string('saturday', 'calendar')
-    );
-
-    // Main display starts here
-
-    print_simple_box_start("center", "80%");
-    include('./calendar.html');
-    print_simple_box_end();
-
-    print_footer();
-
-?>

admin/config.php

@@ -1,187 +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();
-        if (!isadmin()) {
-            error('Only the admin can use this page');
-        }
-    }
-
-/// 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-Z]", "", $value);
-                }
-                if ($name == "defaultallowedmodules") {
-                    $value = implode(',',$value);
-                }
-                if ($name == 'hiddenuserfields') {
-                    if (in_array('none', $value)) {
-                        $value = '';
-                    } else {
-                        $value = implode(',',$value);
-                    }
-                }
-                unset($conf);
-                $conf->name  = $name;
-                $conf->value = $value;
-                if ($current = get_record('config', 'name', $name)) {
-                    $conf->id = $current->id;
-                    if (! update_record('config', $conf)) {
-                        notify("Could not update $name to $value");
-                    }
-                } else {
-                    if (! insert_record('config', $conf)) {
-                        notify("Error: could not add new variable $name !");
-                    }
-                }
-            }
-            redirect('index.php', get_string('changessaved'), 1);
-            exit;
-
-        } else {
-            foreach ($err as $key => $value) {
-                $focus = "form.$key";
-            }
-        }
-    }
-
-/// Otherwise fill and print the form.
-
-    if (empty($config)) {
-        $config = $CFG;
-        if (!$config->locale = get_field('config', 'value', 'name', 'locale')) {
-            $config->locale = $CFG->lang;
-        }
-    }
-
-    $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/configure.php

@@ -1,56 +0,0 @@
-<?php // $Id$
-
-    require_once('../config.php');
-
-    require_login();
-
-    if (!isadmin()) {
-        error('Only admins can access this page');
-    }
-
-    if (!$site = get_site()) {
-        redirect('index.php');
-    }
-
-    $stradministration   = get_string('administration');
-    $strconfiguration  = get_string('configuration');
-
-    print_header("$site->shortname: $stradministration: $strconfiguration", "$site->fullname", 
-                 '<a href="index.php">'. "$stradministration</a> -> $strconfiguration");
-
-    print_heading($strconfiguration);
-
-    $table->align = array ('right', 'left');
-
-    $table->data[] = array("<strong><a href=\"config.php\">". get_string('configvariables', 'admin') .'</a></strong>',
-                           get_string('adminhelpconfigvariables'));
-    $table->data[] = array("<strong><a href=\"site.php\">". get_string('sitesettings') .'</a></strong>',
-                           get_string('adminhelpsitesettings'));
-    $table->data[] = array("<strong><a href=\"../theme/index.php\">". get_string('themes') .'</a></strong>',
-                           get_string('adminhelpthemes'));
-    $table->data[] = array("<strong><a href=\"lang.php\">". get_string('language') .'</a></strong>',
-                           get_string('adminhelplanguage'));
-    $table->data[] = array("<strong><a href=\"modules.php\">".get_string('managemodules'). ' </a></strong>',
-                           get_string('adminhelpmanagemodules'));
-    $table->data[] = array("<strong><a href=\"blocks.php\">". get_string('manageblocks') .'</a></strong>',
-                           get_string('adminhelpmanageblocks'));
-    $table->data[] = array("<strong><a href=\"filters.php\">". get_string('managefilters') .'</a></strong>',
-                           get_string('adminhelpmanagefilters'));
-    if (!isset($CFG->disablescheduledbackups)) {
-        $table->data[] = array("<strong><a href=\"backup.php\">".get_string("backup")."</a></strong>",
-                               get_string('adminhelpbackup'));
-    }
-
-    $table->data[]= array("<strong><a href=\"editor.php\">". get_string('editorsettings') ."</a></strong>",
-                    get_string('adminhelpeditorsettings'));
-    $table->data[]= array("<strong><a href=\"calendar.php\">". get_string('calendarsettings', 'admin') ."</a></strong>",
-                    get_string('helpcalendarsettings', 'admin'));
-    $table->data[]= array("<strong><a href=\"maintenance.php\">". get_string('sitemaintenancemode', 'admin') ."</a></strong>",
-                    get_string('helpsitemaintenance', 'admin'));
-    print_table($table);
-    
-    print_footer($site);
-
-?>
-
-

admin/configvars.php

@@ -1,651 +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[7]  = $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=/pic.jpg";
-    $options[1] = "file.php/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) );
-
-
-    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="10" 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" />' );
-
-/// 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
-    $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;
-    $configvars['stats']           = $stats;
-
-?>

admin/creators.html

@@ -1,91 +0,0 @@
-
-<form name="creatorsform" id="creatorsform" method="post" action="creators.php">
-<input type="hidden" name="previoussearch" value="<?php echo $previoussearch ?>">
-<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
-  <table align="center" border="0" cellpadding="5" cellspacing="0">
-    <tr>
-      <td valign="top">
-          <?php
-              $a->count = count($creators);
-              $a->items = $strexistingcreators;
-              print_string('counteditems', '', $a);
-          ?>
-      </td>
-      <td></td>
-      <td valign="top">
-          <?php
-              $a->count = $usercount;
-              $a->items = $strpotentialcreators;
-              print_string('counteditems', '', $a);
-          ?>
-      </td>
-    </tr>
-    <tr>
-      <td valign="top">
-          <select name="removeselect[]" size="20" id="removeselect" multiple
-                  onFocus="document.creatorsform.add.disabled=true;
-                           document.creatorsform.remove.disabled=false;
-                           document.creatorsform.addselect.selectedIndex=-1;">
-          <?php 
-              foreach ($creators as $creator) {
-                  $fullname = fullname($creator, true);
-                  echo "<option value=\"$creator->id\">".$fullname.", ".$creator->email."</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
-                  onFocus="document.creatorsform.add.disabled=false;
-                           document.creatorsform.remove.disabled=true;
-                           document.creatorsform.removeselect.selectedIndex=-1;">
-          <?php
-              if (!empty($searchusers)) {
-                  echo "<optgroup label=\"$strsearchresults (" . count($searchusers) . ")\">\n";
-                  foreach ($searchusers as $user) {
-                      $fullname = fullname($user, true);
-                      echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
-                  }
-                  echo "</optgroup>\n";
-              }
-              if (!empty($users)) {
-                  foreach ($users as $user) {
-                      $fullname = fullname($user, true);
-                      echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
-                  }
-              }
-          ?>
-         </select>
-         <br />
-         <script type="text/javascript">
-            function
-         </script>
-         <input type="text" name="searchtext" size="30" value="<?php p($searchtext) ?>" 
-                  onFocus ="document.creatorsform.add.disabled=true;
-                            document.creatorsform.remove.disabled=true;
-                            document.creatorsform.removeselect.selectedIndex=-1;
-                            document.creatorsform.addselect.selectedIndex=-1;"
-                  onkeydown = "var keyCode = event.which ? event.which : event.keyCode;
-                               if (keyCode == 13) {
-                                    document.creatorsform.previoussearch.value=1;
-                                    document.creatorsform.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>
-  </table>
-</form>
-
-

admin/creators.php

@@ -1,113 +0,0 @@
-<?PHP // $Id$
-      // Admin only script to assign course creator rights to users
-
-    require_once('../config.php');
-
-    define("MAX_USERS_PER_PAGE", 50);
-
-    if (! $site = get_site()) {
-        redirect("$CFG->wwwroot/$CFG->admin/index.php");
-    }
-
-    require_login();
-
-    if (!isadmin()) {
-        error("You must be an administrator to use this page.");
-    }
-
-    if (!confirm_sesskey()) {
-        error(get_string('confirmsesskeybad', 'error'));
-    }
-
-    $primaryadmin = get_admin();
-
-/// assign all of the configurable language strings
-    $stringstoload = array (
-        "assigncreators",
-        "administration",
-        "existingcreators",
-        "potentialcreators",
-        "search",
-        "users",
-        "searchresults",
-        "showall"
-        );
-
-    foreach ($stringstoload as $stringtoload){
-        $strstringtoload = "str" . $stringtoload;
-        $$strstringtoload = get_string($stringtoload);
-    }
-
-    print_header("$site->shortname: $strassigncreators", 
-                 "$site->fullname", 
-                 "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> ->
-                  $strassigncreators", "creatorsform.searchtext");
-
-
-    if (!$frm = data_submitted()) {
-        print_simple_box("<center>".get_string("adminhelpassigncreators")."</center>", "center", "50%");
-        $frm = new object();
-
-/// A form was submitted so process the input
-
-    } else {
-        if (!empty($frm->add) and !empty($frm->addselect)) {
-            foreach ($frm->addselect as $addcreator) {
-                if (! add_creator($addcreator)) {
-                    error("Could not add course creator with user id $addcreator!");
-                }
-            }
-        } else if (!empty($frm->remove) and !empty($frm->removeselect)) {
-            foreach ($frm->removeselect as $removecreator) {
-                if (! remove_creator($removecreator)) {
-                    error("Could not remove course creator with user id $removecreator!");
-                }
-            }
-        } else if (!empty($frm->showall)) {
-            unset($frm->searchtext);
-            $frm->previoussearch = 0;
-        }
-    }
-
-/// Is there a current search?
-    $previoussearch = (!empty($frm->search) or (isset($frm->previoussearch) && $frm->previoussearch == 1)) ;
-
-
-/// Get all existing creators
-    if (! $creators = get_creators()) {
-        $creators = array();
-    }
-
-    $creatorsarray = array();
-    foreach ($creators as $creator) {
-        $creatorsarray[] = $creator->id;
-    }
-    $creatorlist = implode(',', $creatorsarray);
-
-    unset($creatorarray);
-
-
-/// Get search results excluding any current admins
-    if (!empty($frm->searchtext) and $previoussearch) {
-        $searchusers = get_users(true, $frm->searchtext, true, $creatorlist, 'firstname ASC, lastname ASC',
-                                      '', '', 0, 99999, 'id, firstname, lastname, email');
-        $usercount = get_users(false, '', true, $creatorlist);
-    }
-
-/// If no search results then get potential users excluding current creators
-    if (empty($searchusers)) {
-        if (!$users = get_users(true, '', true, $creatorlist, 'firstname ASC, lastname ASC', '', '',
-                                0, 99999, 'id, firstname, lastname, email') ) {
-            $users = array();
-        }
-        $usercount = count($users);
-    }
-
-    $searchtext = (isset($frm->searchtext)) ? $frm->searchtext : "";
-    $previoussearch = ($previoussearch) ? '1' : '0';
-
-    include('./creators.html');
-
-    print_footer();
-
-?>

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()
@@ -26,27 +30,61 @@
         chdir(dirname($_SERVER['argv'][0]));
     }
 
-    require_once("../config.php");
-    require_once($CFG->dirroot.'/lib/adminlib.php');
+    require_once(dirname(__FILE__) . '/../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
 
-    if (!$alreadyadmin = isadmin()) {
-        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, '/');
+
+/// 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 = '';
+    $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=utf-8');
+        echo "<xmp>"; //<pre> is not good enough for us here
+    } else {
+        //send proper plaintext header
+        @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');
 
 /// Start output log
 
     $timenow  = time();
 
-    mtrace("<pre>");
     mtrace("Server Time: ".date('r',$timenow)."\n\n");
 
 /// Run all cron jobs for each module
@@ -95,11 +133,25 @@
 
         }
     }
-    mtrace("Finished blocks");
+    mtrace('Finished blocks');
 
     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");
+            }
+        }
+        mtrace('Done');
+    } else {
+        mtrace('none found');
     }
 
 
@@ -117,10 +169,12 @@
 
         if ($CFG->longtimenosee) { // value in days
             $longtime = $timenow - ($CFG->longtimenosee * 3600 * 24);
-            if ($students = get_users_longtimenosee($longtime)) {
-                foreach ($students as $student) {
-                    if (unenrol_student($student->userid, $student->course)) {
-                        mtrace("Deleted student enrolment for user $student->userid from course $student->course");
+            if ($assigns = get_users_longtimenosee($longtime)) {
+                foreach ($assigns as $assign) {
+                    if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
+                        if (role_unassign(0, $assign->id, 0, $context->id)) {
+                            mtrace("Deleted assignment for user $assign->id from course $assign->courseid");
+                        }
                     }
                 }
             }
@@ -129,11 +183,13 @@
     
         /// Delete users who haven't confirmed within required period
 
-        $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
-        if ($users = get_users_unconfirmed($oneweek)) {
-            foreach ($users as $user) {
-                if (delete_records('user', 'id', $user->id)) {
-                    mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
+        if (!empty($CFG->deleteunconfirmed)) {
+            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+            if ($users = get_users_unconfirmed($oneweek)) {
+                foreach ($users as $user) {
+                    if (delete_records('user', 'id', $user->id)) {
+                        mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
+                    }
                 }
             }
         }
@@ -143,11 +199,13 @@
 
         /// Delete users who haven't completed profile within required period
 
-        $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
-        if ($users = get_users_not_fully_set_up($oneweek)) {
-            foreach ($users as $user) {
-                if (delete_records('user', 'id', $user->id)) {
-                    mtrace("Deleted not fully setup user $user->username ($user->id)");
+        if (!empty($CFG->deleteunconfirmed)) {
+            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+            if ($users = get_users_not_fully_set_up($oneweek)) {
+                foreach ($users as $user) {
+                    if (delete_records('user', 'id', $user->id)) {
+                        mtrace("Deleted not fully setup user $user->username ($user->id)");
+                    }
                 }
             }
         }
@@ -206,11 +264,11 @@
     } // End of occasional clean-up tasks
 
 
-    if (!isset($CFG->disablescheduledbackups)) {   // Defined in config.php
+    if (empty($CFG->disablescheduledbackups)) {   // Defined in config.php
         //Execute backup's cron
         //Perhaps a long time and memory could help in large sites
         @set_time_limit(0);
-        @raise_memory_limit("128M");
+        @raise_memory_limit("192M");
         if (function_exists('apache_child_terminate')) {
             // if we are running from Apache, give httpd a hint that 
             // it can recycle the process after it's done. Apache's 
@@ -262,7 +320,23 @@
         unset($enrol);
     }
 
-    if (!empty($CFG->enablestats)) {
+/// 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");
@@ -273,7 +347,7 @@
             if (!empty($CFG->statsmaxruntime)) {
                 $time = $CFG->statsmaxruntime+(60*30); // add on half an hour just to make sure (it could take that long to break out of the loop)
             }
-            if (!get_field_sql('SELECT id FROM '.$CFG->prefix.'stats_daily LIMIT 1')) {
+            if (!get_field_sql('SELECT id FROM '.$CFG->prefix.'stats_daily')) {
                 // first run, set another lock. we'll check for this in subsequent runs to set the timeout to later for the normal lock.
                 set_cron_lock('statsfirstrunlock',true,$time,true);
                 $firsttime = true;
@@ -316,4 +390,9 @@
     $difftime = microtime_diff($starttime, microtime());
     mtrace("Execution took ".$difftime." seconds"); 
 
+/// finishe the IE hack
+    if (check_browser_version('MSIE')) {
+        echo "</xmp>";
+    }
+
 ?>

admin/dbperformance.php

@@ -3,15 +3,16 @@
 
     require_once('../config.php');
 
+    // disable moodle specific debug messages that would be breaking the frames
+    disable_debugging();
+
     $topframe    = optional_param('topframe', 0, PARAM_BOOL);
     $bottomframe = optional_param('bottomframe', 0, PARAM_BOOL);
     $do          = optional_param('do', '', PARAM_ALPHA);
 
     require_login();
 
-    if (!isadmin()) {
-        error("Only the admin can use this page");
-    }
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
     $strdatabaseperformance = get_string("databaseperformance");
     $stradministration = get_string("administration");
@@ -19,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

@@ -4,25 +4,35 @@
 // BE VERY CAREFUL USING THIS!
 
     require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('purgemoodledata', $adminroot);
 
     require_login();
 
     $sure       = optional_param('sure', 0, PARAM_BOOL);
     $reallysure = optional_param('reallysure', 0, PARAM_BOOL);
 
-    if (!isadmin()) {
-        error('You must be admin to use this script!');
-    }
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
     $deletedir = $CFG->dataroot;   // The directory to delete!
 
+    admin_externalpage_print_header($adminroot);
+    print_heading('Purge moodledata');
+
     if (empty($sure)) {
-        notice_yesno ('Are you completely sure you want to delete everything inside the directory '. $deletedir .' ?', 'delete.php?sure=yes&sesskey='.sesskey(), 'index.php');
+        $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey());
+        notice_yesno ('Are you completely sure you want to delete everything inside the directory '. $deletedir .' ?',
+            'delete.php', 'index.php', $optionsyes, NULL, 'post', 'get');
+        admin_externalpage_print_footer($adminroot);
         exit;
     }
 
-    if (empty($reallysure)) {
-        notice_yesno ('Are you REALLY REALLY completely sure you want to delete everything inside the directory '. $deletedir .' (this includes all user images, and any other course files that have been created) ?', 'delete.php?sure=yes&reallysure=yes&sesskey='.sesskey(), 'index.php');
+    if (!data_submitted() or empty($reallysure)) {
+        $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey(), 'reallysure'=>'yes');
+        notice_yesno ('Are you REALLY REALLY completely sure you want to delete everything inside the directory '. $deletedir .' (this includes all user images, and any other course files that have been created) ?',
+            'delete.php', 'index.php', $optionsyes, NULL, 'post', 'get');
+        admin_externalpage_print_footer($adminroot);
         exit;
     }
 
@@ -36,6 +46,7 @@
 
     echo '<h1 align="center">Done!</h1>';
     print_continue($CFG->wwwroot);
+    admin_externalpage_print_footer($adminroot);
     exit;
 
 
@@ -66,5 +77,5 @@ function delete_subdirectories($rootdir) {
     }
     closedir($dir);
 }
-  
+
 ?>

admin/editor.html

@@ -1,331 +0,0 @@
-<form method="post" action="editor.php">
-<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-<input type="hidden" name="tab" value="<?php p($currentpage) ?>" />
-<table border="0" cellpadding="4" cellspacing="2">
-<tr>
-    <td align="right" valign="top">htmleditor:</td>
-    <td valign="top">
-    <?php
-       unset($options);
-       $options[0] = get_string("allownot");
-       $options[1] = get_string("allow");
-       choose_from_menu ($options, "htmleditor", $CFG->htmleditor, "", "", "");
-    ?>
-    </td>
-    <td>
-    <?php print_string('confightmleditor', 'admin') ?>
-    </td>
-</tr>
-<?php if ( $currenttab == 'htmlarea' ) { ?>
-<tr>
-    <td align="right" valign="top">editorbackgroundcolor:</td>
-    <td valign="top"><input type="text" name="backgroundcolor" size="10" value="<?php print($CFG->editorbackgroundcolor);?>" /></td>
-    <td valign="top"><?php print_string("edhelpbgcolor");?></td>
-</tr>
-<tr>
-    <td align="right" valign="top">editorfontfamily:</td>
-    <td valign="top"><input type="text" name="fontfamily" size="30" value="<?php print($CFG->editorfontfamily);?>" /></td>
-    <td valign="top"><?php print_string("edhelpfontfamily");?></td>
-</tr>
-<tr>
-    <td align="right" valign="top">editorfontsize:</td>
-    <td valign="top"><input type="text" name="fontsize" size="10" value="<?php print($CFG->editorfontsize);?>" /></td>
-    <td valign="top"><?php print_string("edhelpfontsize");?></td>
-</tr>
-<tr>
-    <td align="right" valign="top">editorkillword:</td>
-    <td valign="top"><select name="killword">
-    <option value="1"<?php print(!$CFG->editorkillword)?"":" selected=\"selected\"";?>><?php print_string("yes");?></option>
-    <option value="0"<?php print(!$CFG->editorkillword)?" selected=\"selected\"":"";?>><?php print_string("no");?></option>
-    </select></td>
-    <td valign="top"><?php print_string("edhelpcleanword");?></td>
-</tr>
-<tr>
-    <td align="right" valign="top">aspellpath:</td>
-    <td valign="top"><input onchange="change_state()" id="aspellpath" type="text" name="aspellpath" size="25" value="<?php print($CFG->aspellpath);?>" /></td>
-    <td valign="top"><?php print_string("edhelpaspellpath");?></td>
-</tr>
-<tr>
-    <td align="right" valign="top">editorspelling:</td>
-    <td valign="top"><select onchange="change_state()" id="spelling" name="spelling"<?php
-    if (empty($CFG->aspellpath)) {
-        echo " disabled=\"disabled\"";
-        $CFG->editorspelling = false;
-    }
-    ?>>
-    <option value="1"<?php print(!$CFG->editorspelling)?"":" selected=\"selected\"";?>><?php print_string("yes");?></option>
-    <option value="0"<?php print(!$CFG->editorspelling)?" selected=\"selected\"":"";?>><?php print_string("no");?></option>
-    </select>
-    <select id="dictionary" name="dictionary"<?php
-    if (empty($CFG->aspellpath)) {
-        echo " disabled=\"disabled\"";
-        $CFG->editordictionary = false;
-    }
-    ?>>
-    <?php
-    if (is_array($dicts)) {
-        foreach ($dicts as $dict) {
-            echo "<option value=\"$dict\"";
-            if (!empty($CFG->editordictionary)) {
-                print ($CFG->editordictionary != $dict) ? "" : " selected=\"selected\"";
-            }
-            echo ">$dict</option>\n";
-        }
-    } else if (is_string($dicts)) {
-        echo '<option value="">'. $dicts .'</option>' . "\n";
-    }
-    ?>
-    </select>
-    </td>
-    <td valign="top"><?php print_string("edhelpenablespelling");?></td>
-</tr>
-<tr><td colspan="3"><br /><?php print_string("edhelpfontlist");?></td></tr>
-<?php
-    if(is_array($fontlist)) {
-        foreach($fontlist as $fontkey => $fontvalue) {
-        ?>
-<tr>
-    <td>&nbsp;</td>
-    <td colspan="2"><input type="text" name="fontname[]" size="15" value="<?php print($fontkey);?>">
-    <input type="text" name="fontnamevalue[]" size="30" value="<?php print($fontvalue);?>" /></td>
-</tr>
-    <?php
-        }
-    }
-?>
-<tr>
-    <td>&nbsp;</td>
-    <td colspan="2"><input type="text" name="fontname[]" size="15" value="" />
-    <input type="text" name="fontnamevalue[]" size="30" value="" /></td>
-</tr>
-<tr>
-    <td valign="top" align="right">editorhidebuttons:</td>
-    <td colspan="2">
-    <?php
-    $buttons = array();
-    if (!empty($CFG->editorhidebuttons)) {
-        $buttons = explode(chr(32), $CFG->editorhidebuttons);
-    }
-    ?>
-    <table border="0" cellpadding="2" cellspacing="1">
-    <tr>
-        <td colspan="12"><input type="checkbox" name="buttons[fontname]"<?php print(in_array("fontname", $buttons)) ? " checked=\"checked\"": "";?> /> <?php print_string("fontname","editor");?>
-        <input type="checkbox" name="buttons[fontsize]"<?php print(in_array("fontsize", $buttons)) ? " checked=\"checked\"": "";?> /> <?php print_string("fontsize","editor");?>
-        <input type="checkbox" name="buttons[formatblock]"<?php print(in_array("formatblock", $buttons)) ? " checked=\"checked\"": "";?> /> <?php print_string("formatblock","editor");?></td>
-    </tr>
-    <tr>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_format_bold.gif" width="18" height="18" alt="<?php print_string("bold","editor");?>" title="<?php print_string("bold","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_format_italic.gif" width="18" height="18" alt="<?php print_string("italic","editor");?>" title="<?php print_string("italic","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_format_underline.gif" width="18" height="18" alt="<?php print_string("underline","editor");?>" title="<?php print_string("underline","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_format_strike.gif" width="18" height="18" alt="<?php print_string("strikethrough","editor");?>" title="<?php print_string("strikethrough","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_format_sub.gif" width="18" height="18" alt="<?php print_string("subscript","editor");?>" title="<?php print_string("subscript","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_format_sup.gif" width="18" height="18" alt="<?php print_string("superscript","editor");?>" title="<?php print_string("superscript","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_copy.gif" width="18" height="18" alt="<?php print_string("copy","editor");?>" title="<?php print_string("copy","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_cut.gif" width="18" height="18" alt="<?php print_string("cut","editor");?>" title="<?php print_string("cut","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_paste.gif" width="18" height="18" alt="<?php print_string("paste","editor");?>" title="<?php print_string("paste","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_wordclean.gif" width="18" height="18" alt="<?php print_string("wordclean","editor");?>" title="<?php print_string("wordclean","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_undo.gif" width="18" height="18" alt="<?php print_string("undo","editor");?>" title="<?php print_string("undo","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_redo.gif" width="18" height="18" alt="<?php print_string("redo","editor");?>" title="<?php print_string("redo","editor");?>" /></td>
-    </tr>
-    <tr>
-        <td><input type="checkbox" name="buttons[bold]"<?php print(in_array("bold", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[italic]"<?php print(in_array("italic", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[underline]"<?php print(in_array("underline", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[strikethrough]"<?php print(in_array("strikethrough", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[subscript]"<?php print(in_array("subscript", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[superscript]"<?php print(in_array("superscript", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[copy]"<?php print(in_array("copy", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[cut]"<?php print(in_array("cut", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[paste]"<?php print(in_array("paste", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[clean]"<?php print(in_array("clean", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[undo]"<?php print(in_array("undo", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[redo]"<?php print(in_array("redo", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-    </tr>
-    <tr>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_align_left.gif" width="18" height="18" alt="<?php print_string("justifyleft","editor");?>" title="<?php print_string("justifyleft","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_align_center.gif" width="18" height="18" alt="<?php print_string("justifycenter","editor");?>" title="<?php print_string("justifycenter","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_align_right.gif" width="18" height="18" alt="<?php print_string("justifyright","editor");?>" title="<?php print_string("justifyright","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_align_justify.gif" width="18" height="18" alt="<?php print_string("justifyfull","editor");?>" title="<?php print_string("justifyfull","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_left_to_right.gif" width="18" height="18" alt="<?php print_string("lefttoright","editor");?>" title="<?php print_string("lefttoright","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_right_to_left.gif" width="18" height="18" alt="<?php print_string("righttoleft","editor");?>" title="<?php print_string("righttoleft","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_list_num.gif" width="18" height="18" alt="<?php print_string("orderedlist","editor");?>" title="<?php print_string("orderedlist","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_list_bullet.gif" width="18" height="18" alt="<?php print_string("unorderedlist","editor");?>" title="<?php print_string("unorderedlist","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_indent_less.gif" width="18" height="18" alt="<?php print_string("outdent","editor");?>" title="<?php print_string("outdent","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_indent_more.gif" width="18" height="18" alt="<?php print_string("indent","editor");?>" title="<?php print_string("indent","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_color_fg.gif" width="18" height="18" alt="<?php print_string("forecolor","editor");?>" title="<?php print_string("forecolor","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_color_bg.gif" width="18" height="18" alt="<?php print_string("hilitecolor","editor");?>" title="<?php print_string("hilitecolor","editor");?>" /></td>
-    </tr>
-    <tr>
-        <td><input type="checkbox" name="buttons[justifyleft]"<?php print(in_array("justifyleft", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[justifycenter]"<?php print(in_array("justifycenter", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[justifyright]"<?php print(in_array("justifyright", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[justifyfull]"<?php print(in_array("justifyfull", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[lefttoright]"<?php print(in_array("lefttoright", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[righttoleft]"<?php print(in_array("righttoleft", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[insertorderedlist]"<?php print(in_array("insertorderedlist", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[insertunorderedlist]"<?php print(in_array("insertunorderedlist", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[outdent]"<?php print(in_array("outdent", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[indent]"<?php print(in_array("indent", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[forecolor]"<?php print(in_array("forecolor", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[hilitecolor]"<?php print(in_array("hilitecolor", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-    </tr>
-    <tr>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_hr.gif" width="18" height="18" alt="<?php print_string("horizontalrule","editor");?>" title="<?php print_string("horizontalrule","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_anchor.gif" width="18" height="18" alt="<?php print_string("createanchor","editor");?>" title="<?php print_string("createanchor","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_link.gif" width="18" height="18" alt="<?php print_string("insertlink","editor");?>" title="<?php print_string("insertlink","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_unlink.gif" width="18" height="18" alt="<?php print_string("removelink","editor");?>" title="<?php print_string("removelink","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_image.gif" width="18" height="18" alt="<?php print_string("insertimage","editor");?>" title="<?php print_string("insertimage","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/insert_table.gif" width="18" height="18" alt="<?php print_string("inserttable","editor");?>" title="<?php print_string("inserttable","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/em.icon.smile.gif" width="18" height="18" alt="<?php print_string("insertsmile","editor");?>" title="<?php print_string("insertsmile","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/icon_ins_char.gif" width="18" height="18" alt="<?php print_string("insertchar","editor");?>" title="<?php print_string("insertchar","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/spell-check.gif" width="18" height="18" alt="<?php print_string("spellcheck","editor");?>" title="<?php print_string("spellcheck","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_html.gif" width="18" height="18" alt="<?php print_string("htmlmode","editor");?>" title="<?php print_string("htmlmode","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/fullscreen_maximize.gif" width="18" height="18" alt="<?php print_string("popupeditor","editor");?>" title="<?php print_string("popupeditor","editor");?>" /></td>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_replace.gif" width="18" height="18" alt="<?php print_string("popupeditor","editor");?>" title="<?php print_string("searchandreplace","editor");?>" /></td>
-    </tr>
-    <tr>
-        <td><input type="checkbox" name="buttons[inserthorizontalrule]"<?php print(in_array("inserthorizontalrule", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[createanchor]"<?php print(in_array("createanchor", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[createlink]"<?php print(in_array("createlink", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[unlink]"<?php print(in_array("unlink", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[insertimage]"<?php print(in_array("insertimage", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[inserttable]"<?php print(in_array("inserttable", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[insertsmile]"<?php print(in_array("insertsmile", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[insertchar]"<?php print(in_array("insertchar", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[spellcheck]"<?php print(in_array("spellcheck", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[htmlmode]"<?php print(in_array("htmlmode", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[popupeditor]"<?php print(in_array("popupeditor", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td><input type="checkbox" name="buttons[search_replace]"<?php print(in_array("search_replace", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-    </tr>
-    <tr>
-        <td><img src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/images/ed_nolink.gif" width="18" height="18" alt="<?php print_string("horizontalrule","editor");?>" title="<?php print_string("nolink","editor");?>" /></td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-    </tr>
-    <tr>
-        <td><input type="checkbox" name="buttons[nolink]"<?php print(in_array("nolink", $buttons)) ? " checked=\"checked\"" : "" ;?> /></td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-    </tr>
-    </table>
-    </td>
-</tr>
-<?php
-    }
-    else if ( $currenttab == 'tinymce' ) {
-    ?>
-<tr>
-    <td>tinymcetheme:</td>
-    <td><?php
-    $options = array('advanced' => 'Advanced','simple' => 'Simple');
-    choose_from_menu ($options, "tinymcetheme", $CFG->tinymcetheme, "", "", "");
-    ?></td>
-    <td>&nbsp;</td>
-</tr>
-<tr>
-    <td valign="top">tinymceplugins:</td>
-    <td nowrap="nowrap"><?php
-    $pluginsdir = $CFG->libdir .'/editor/tinymce/jscripts/tiny_mce/plugins';
-    $plugins = editor_get_tiny_plugins();
-    $pluginsinuse = explode(",", $CFG->tinymceplugins);
-
-    sort($plugins);
-    $cnt = 0;
-    echo '<table border="0" cellpadding="2">';
-    foreach ( $plugins as $plugin ) {
-        $num = ($cnt % 2);
-        if ( $num < 1 ) {
-            echo '<tr>';
-        }
-        echo '<td><input type="checkbox" name="tinymceplugins[]" value="'. s($plugin) .'"';
-        if ( in_array($plugin, $pluginsinuse) ) {
-            echo ' checked="checked"';
-        }
-        echo ' /> '. $plugin .'</td>'."\n";
-
-        if ( $num > 0 ) {
-            echo '</tr>';
-        }
-        $cnt++;
-    }
-    echo '</table>';
-    ?></td>
-    <td>&nbsp;</td>
-</tr>
-<tr>
-    <td>tinymcecontentcss:</td>
-    <td><input type="text" name="tinymcecontentcss" value="<?php
-    !empty($CFG->tinymcecontentcss) ? p($CFG->tinymcecontentcss) : ''; ?>" size="40" /></td>
-    <td>&nbsp;</td>
-</tr>
-<tr>
-    <td>tinymcepopupcss:</td>
-    <td><input type="text" name="tinymcepopupcss" value="<?php
-    !empty($CFG->tinymcepopupcss) ? p($CFG->tinymcepopupcss) : ''; ?>" size="40" /></td>
-    <td>&nbsp;</td>
-</tr>
-<tr>
-    <td>tinymceeditorcss:</td>
-    <td><input type="text" name="tinymceeditorcss" value="<?php
-    !empty($CFG->tinymceeditorcss) ? p($CFG->tinymceeditorcss) : ''; ?>" size="40" /></td>
-    <td>&nbsp;</td>
-</tr>
-    <?php
-    }
-    ?>
-<tr>
-    <td colspan="3" align="center"><input type="submit" value="<?php print_string("savechanges");?>" /></td>
-</tr>
-</table>
-</form>
-
-<form method="post" action="<?php print($GLOBALS['ME']);?>">
-<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-<input type="hidden" name="tab" value="<?php p($currentpage) ?>" />
-<center>
-<input type="submit" name="resettodefaults" value="<?php print_string('editorresettodefaults') ?>" />
-</center>
-</form>
-<script language="javascript" type="text/javascript">
-<!--
-
-function change_state () {
-
-    var choice = document.forms[0].spelling;
-    var speller = choice.options[choice.selectedIndex].value;
-    var spellpath = document.forms[0].aspellpath.value;
-
-    if (spellpath == '') {
-        document.forms[0].spelling.disabled = true;
-    } else {
-        document.forms[0].spelling.disabled = false;
-    }
-
-    if (speller != 1) {
-        document.forms[0].dictionary.disabled = true;
-    } else {
-        document.forms[0].dictionary.disabled = false;
-    }
-}
-
-document.onload = change_state();
--->
-</script>

admin/editor.php

@@ -1,306 +0,0 @@
-<?php // $Id$
-/// configuration routines for HTMLArea editor
-
-    require_once('../config.php');
-
-    $currentpage = optional_param('tab', 1, PARAM_INT);
-
-    require_login();
-
-    if (!isadmin()) {
-        error("Only admins can access this page");
-    }
-
-    if (($data = data_submitted()) && confirm_sesskey()) {
-
-        // do we want default values?
-        if (isset($data->resettodefaults)) {
-            if (!(reset_to_defaults($currentpage))) {
-                error("Editor settings could not be restored!");
-            }
-        } else {
-
-            if (!(editor_update_config($data, $currentpage))) {
-                error("Editor settings could not be updated!");
-            }
-        }
-        redirect("$CFG->wwwroot/$CFG->admin/editor.php?tab=$currentpage", get_string("changessaved"), 1);
-
-    } else {
-        // Generate edit form
-
-        $inactive = array();
-        switch ( $currentpage ) {
-            case 1:
-                $currenttab = 'htmlarea';
-                break;
-            case 2:
-                $currenttab = 'tinymce';
-                break;
-            default:
-                error("Unknown currentpage: $currentpage");
-        }
-
-        //$url = 'editor.php?tab=';
-        //$tabrow = array();
-        //$tabrow[] = new tabobject('htmlarea',$url . '1', 'HTMLArea');
-        //$tabrow[] = new tabobject('tinymce',$url . '2', 'TinyMCE');
-        //$tabs = array($tabrow);
-
-        $fontlist = editor_convert_to_array($CFG->editorfontlist);
-        $dicts    = editor_get_dictionaries();
-
-        $stradmin = get_string("administration");
-        $strconfiguration = get_string("configuration");
-        $streditorsettings = get_string("editorsettings");
-        $streditorsettingshelp = get_string("adminhelpeditorsettings");
-        print_header("Editor settings","Editor settings",
-                     "<a href=\"index.php\">$stradmin</a> -> ".
-                     "<a href=\"configure.php\">$strconfiguration</a> -> $streditorsettings");
-        print_heading($streditorsettings);
-
-        print_simple_box("<center>$streditorsettingshelp</center>","center","50%");
-        print("<br />\n");
-        //print_tabs($tabs, $currenttab, $inactive);
-
-        print_simple_box_start("center");
-        include("editor.html");
-        print_simple_box_end();
-        print_footer();
-    }
-
-
-/// FUNCTIONS
-
-function editor_convert_to_array ($string) {
-/// Converts $CFG->editorfontlist to array
-
-    if (empty($string) || !is_string($string)) {
-        return false;
-    }
-    $fonts = array();
-
-    $lines = explode(";", $string);
-    foreach ($lines as $line) {
-        if (!empty($line)) {
-            list($fontkey, $fontvalue) = explode(":", $line);
-            $fonts[$fontkey] = $fontvalue;
-        }
-    }
-
-   return $fonts;
-}
-
-function editor_update_config ($data, $editor) {
-
-/// Updates the editor config values.
-
-    if (!is_object($data)) {
-        return false;
-    }
-
-    switch($editor) {
-        case 1: // HTMLArea.
-    // Make array for unwanted characters.
-    $nochars = array(chr(33),chr(34),chr(35),chr(36),chr(37),
-                     chr(38),chr(39),chr(40),chr(41),chr(42),
-                     chr(43),chr(46),chr(47),chr(58),chr(59),
-                     chr(60),chr(61),chr(62),chr(63),chr(64),
-                     chr(91),chr(92),chr(93),chr(94),chr(95),
-                     chr(96),chr(123),chr(124),chr(125),chr(126));
-
-    $fontlist = '';
-
-    // make font string
-    $cnt = count($data->fontname);
-    for ($i = 0; $i < $cnt; $i++) {
-        if (!empty($data->fontname[$i])) {
-            $fontlist .= str_replace($nochars, "", $data->fontname[$i]) .":";
-            $fontlist .= str_replace($nochars, "", $data->fontnamevalue[$i]) .";";
-        }
-    }
-    // strip last semicolon
-    $fontlist = substr($fontlist, 0, strlen($fontlist) - 1);
-
-    // make array of values to update
-    $updatedata = array();
-    $updatedata['htmleditor'] = !empty($data->htmleditor) ? $data->htmleditor : 0;
-    $updatedata['editorbackgroundcolor'] = !empty($data->backgroundcolor) ? $data->backgroundcolor : "#ffffff";
-    $updatedata['editorfontfamily'] = !empty($data->fontfamily) ? str_replace($nochars,"",$data->fontfamily) : "Times New Roman, Times";
-    $updatedata['editorfontsize'] = !empty($data->fontsize) ? $data->fontsize : "";
-    $updatedata['editorkillword'] = !empty($data->killword) ? $data->killword : 0;
-    $updatedata['editorspelling'] = !empty($data->spelling) ? $data->spelling : 0;
-    $updatedata['editorfontlist'] = $fontlist;
-    $updatedata['editordictionary'] = !empty($data->dictionary) ? $data->dictionary : '';
-    $updatedata['aspellpath'] = !empty($data->aspellpath) ? $data->aspellpath : '';
-
-    $hidebuttons = '';
-    if (!empty($data->buttons) && is_array($data->buttons)) {
-        foreach ($data->buttons as $key => $value) {
-            $hidebuttons .= $key . " ";
-        }
-    }
-    $updatedata['editorhidebuttons'] = trim($hidebuttons);
-        break;
-
-        case 2: // TinyMCE.
-        $updatedata = array();
-        $updatedata['htmleditor'] = !empty($data->htmleditor) ? $data->htmleditor : 0;
-
-        // Process plugins
-        if ( !empty($data->tinymceplugins) ) {
-            foreach ( $data->tinymceplugins as $key => $value ) {
-                $value = stripslashes(clean_param($value, PARAM_ALPHA));
-                $data->tinymceplugins[$key] = addslashes($value);
-            }
-        }
-        $updatedata['tinymceplugins'] = !empty($data->tinymceplugins) ? implode(",", $data->tinymceplugins) : '';
-        $updatedata['tinymcetheme'] = !empty($data->tinymcetheme) ?
-                                           clean_param($data->tinymcetheme, PARAM_ALPHA) : '';
-        $updatedata['tinymcecontentcss'] = !empty($data->tinymcecontentcss) ?
-                                           clean_param($data->tinymcecontentcss, PARAM_URL) : '';
-        $updatedata['tinymcepopupcss'] = !empty($data->tinymcepopupcss) ?
-                                           clean_param($data->tinymcepopupcss, PARAM_URL) : '';
-        $updatedata['tinymceeditorcss'] = !empty($data->tinymceeditorcss) ?
-                                           clean_param($data->tinymceeditorcss, PARAM_URL) : '';
-        break;
-    }
-
-    foreach ($updatedata as $name => $value) {
-        if (!(set_config($name, $value))) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-function reset_to_defaults ($editor) {
-/// Reset the values to default
-
-    global $CFG;
-    include_once($CFG->dirroot .'/lib/defaults.php');
-
-    $updatedata = array();
-
-    switch ( $editor ) {
-        case 1: // HTMLArea.
-    $updatedata['editorbackgroundcolor'] = $defaults['editorbackgroundcolor'];
-    $updatedata['editorfontfamily'] = $defaults['editorfontfamily'];
-    $updatedata['editorfontsize'] = $defaults['editorfontsize'];
-    $updatedata['editorkillword'] = $defaults['editorkillword'];
-    $updatedata['editorspelling'] = $defaults['editorspelling'];
-    $updatedata['editorfontlist'] = $defaults['editorfontlist'];
-    $updatedata['editorhidebuttons'] = $defaults['editorhidebuttons'];
-    $updatedata['editordictionary'] = '';
-        break;
-
-        case 2: // TinyMCE.
-        $updatedata['tinymceplugins'] = $defaults['tinymceplugins'];
-        $updatedata['tinymcetheme']   = $defaults['tinymcetheme'];
-        $updatedata['tinymcecontentcss'] = $defaults['tinymcecontentcss'];
-        $updatedata['tinymcepopupcss'] = $defaults['tinymcepopupcss'];
-        $updatedata['tinymceeditorcss'] = $defaults['tinymceeditorcss'];
-        break;
-    }
-
-    foreach ($updatedata as $name => $value) {
-        if (!(set_config($name, $value))) {
-            return false;
-        }
-    }
-    return true;
-}
-
-function editor_get_dictionaries () {
-/// Get all installed dictionaries in the system
-
-    global $CFG;
-
-    error_reporting(E_ALL); // for debug, final version shouldn't have this...
-    clearstatcache();
-
-    $strerror = '';
-
-    // If aspellpath isn't set don't even bother ;-)
-    if (empty($CFG->aspellpath)) {
-        return $strerror = 'Empty aspell path!';
-    }
-
-    // Do we have access to popen function?
-    if (!function_exists('popen')) {
-        return $strerror = "Popen function disabled!";
-        exit;
-    }
-
-    global $CFG;
-
-    $cmd          = $CFG->aspellpath;
-    $output       = '';
-    $dictionaries = array();
-    $dicts        = array();
-
-    if(!($handle = @popen(escapeshellarg($cmd) .' dump dicts', 'r'))) {
-        return $strerror = "Couldn't create handle!";
-        exit;
-    }
-
-    while(!feof($handle)) {
-        $output .= fread($handle, 1024);
-    }
-    @pclose($handle);
-
-    $dictionaries = explode(chr(10), $output);
-
-    // Get rid of possible empty values
-    if (is_array($dictionaries)) {
-
-        $cnt = count($dictionaries);
-
-        for ($i = 0; $i < $cnt; $i++) {
-            if (!empty($dictionaries[$i])) {
-                $dicts[] = $dictionaries[$i];
-            }
-        }
-    }
-
-    if (count($dicts) >= 1) {
-        return $dicts;
-    }
-
-    $strerror = "Error! Check your aspell installation!";
-    return $strerror;
-
-}
-
-function editor_get_tiny_plugins() {
-    global $CFG;
-
-    $plugins = array();
-    $plugindir = $CFG->libdir .'/editor/tinymce/jscripts/tiny_mce/plugins';
-
-    if ( !$fp = opendir($plugindir) ) {
-        return $plugins;
-        exit;
-    }
-
-    while ( ($file = readdir($fp)) !== false ) {
-
-        if  ( preg_match("/^\.+/", $file) ) {
-            continue;
-        }
-
-        if ( is_dir($plugindir .'/'. $file) ) {
-            array_push($plugins, $file);
-        }
-
-    }
-
-    if ( $fp ) {
-        closedir($fp);
-    }
-
-    return $plugins;
-
-}
-?>

admin/enrol.php

@@ -3,29 +3,24 @@
        //             Yes, enrol is correct English spelling.
 
     require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
 
     $enrol = optional_param('enrol', $CFG->enrol, PARAM_SAFEDIR);
     $CFG->pagepath = 'enrol';
-    
-    require_login();
 
-    if (!$site = get_site()) {
-        redirect("index.php");
-    }
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('enrolment', $adminroot);
 
-    if (!isadmin()) {
-        error("Only the admin can use this page");
-    }
 
-    if (!confirm_sesskey()) {
-        error(get_string('confirmsesskeybad', 'error'));
-    }
 
     require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
 
 /// Save settings
 
     if ($frm = data_submitted()) {
+        if (!confirm_sesskey()) {
+            error(get_string('confirmsesskeybad', 'error'));
+        }
         if (empty($frm->enable)) {
             $frm->enable = array();
         }
@@ -39,16 +34,14 @@
         $frm->enable = array_merge(array('manual'), $frm->enable); // make sure manual plugin is called first
         set_config('enrol_plugins_enabled', implode(',', $frm->enable));
         set_config('enrol', $frm->default);
-        redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
+        redirect("enrol.php", get_string("changessaved"), 1);
     }
 
 /// Print the form
 
     $str = get_strings(array('enrolmentplugins', 'users', 'administration', 'settings', 'edit'));
 
-    print_header("$site->shortname: $str->enrolmentplugins", "$site->fullname",
-                  "<a href=\"index.php\">$str->administration</a> -> 
-                   <a href=\"users.php\">$str->users</a> -> $str->enrolmentplugins");
+    admin_externalpage_print_header($adminroot);
 
     $modules = get_list_of_plugins("enrol");
     $options = array();
@@ -59,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);
@@ -70,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
@@ -80,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') {
@@ -97,15 +92,16 @@
             $default = '';
         }
         $table->data[$name] = array($name, $enable, $default,
-                                '<a href="enrol_config.php?sesskey='.$USER->sesskey.'&amp;enrol='.$module.'">'.$str->edit.'</a>');
+                                '<a href="enrol_config.php?enrol='.$module.'">'.$str->edit.'</a>');
     }
     asort($table->data);
 
     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>";
 
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/enrol_config.php

@@ -3,23 +3,14 @@
        //                    Yes, enrol is correct English spelling.
 
     require_once("../config.php");
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('enrolment', $adminroot);
 
     $enrol = required_param('enrol', PARAM_ALPHA);
     $CFG->pagepath = 'enrol/' . $enrol;
-    
-    require_login();
 
-    if (!$site = get_site()) {
-        redirect("index.php");
-    }
-
-    if (!isadmin()) {
-        error("Only the admin can use this page");
-    }
-
-    if (!confirm_sesskey()) {
-        error(get_string('confirmsesskeybad', 'error'));
-    }
 
     require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
 
@@ -28,6 +19,9 @@
 /// If data submitted, then process and store.
 
     if ($frm = data_submitted()) {
+        if (!confirm_sesskey()) {
+            error(get_string('confirmsesskeybad', 'error'));
+        }
         if ($enrolment->process_config($frm)) {
             redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
         }
@@ -40,6 +34,7 @@
     /// get language strings
     $str = get_strings(array('enrolmentplugins', 'configuration', 'users', 'administration'));
 
+    unset($options);
 
     $modules = get_list_of_plugins("enrol");
     foreach ($modules as $module) {
@@ -47,25 +42,14 @@
     }
     asort($options);
 
-    print_header("$site->shortname: $str->enrolmentplugins", "$site->fullname",
-                  "<a href=\"index.php\">$str->administration</a> -> 
-                   <a href=\"users.php\">$str->users</a> -> 
-                   <a href=\"enrol.php?sesskey=$USER->sesskey\">$str->enrolmentplugins</a> -> 
-                   $str->configuration");
+    admin_externalpage_print_header($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>";
+    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."\" />";
 
-
-/// Choose an enrolment method
-    echo get_string('chooseenrolmethod').': ';
-    choose_from_menu ($options, "enrol", $enrol, "",
-                      "document.location='enrol_config.php?sesskey=$USER->sesskey&enrol='+document.enrolmenu.enrol.options[document.enrolmenu.enrol.selectedIndex].value", "");
-
-    echo "</b></p></div>";
-    
-/// Print current enrolment type description    
+/// Print current enrolment type description
     print_simple_box_start("center", "80%");
     print_heading($options[$enrol]);
 
@@ -74,15 +58,15 @@
     print_simple_box_end();
 
     echo "<hr />";
-    
+
     $enrolment->config_form($frm);
 
-    echo "<center><p><input type=\"submit\" value=\"".get_string("savechanges")."\"></p></center>\n";
+    echo "<p class=\"centerpara\"><input type=\"submit\" value=\"".get_string("savechanges")."\" /></p>\n";
+    print_simple_box_end();
+    echo "</div>";
     echo "</form>";
 
-    print_simple_box_end();
-
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 
     exit;
 ?>

admin/environment.php

@@ -30,24 +30,17 @@
 // from moodle.org be able to check more and more versions.
 
     require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
     require_once($CFG->libdir.'/environmentlib.php');
     require_once($CFG->libdir.'/componentlib.class.php');
 
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('environment', $adminroot);
 
 /// Parameters
     $action  = optional_param('action', '', PARAM_ACTION);
     $version = optional_param('version', '', PARAM_FILE); //
 
-/// Security checks
-    require_login();
-
-    if (!isadmin()) {
-        error('You need to be admin to use this page');
-    }
-
-    if (!$site = get_site()) {
-        error("Site isn't defined!");
-    }
 
 /// Get some strings
     $stradmin = get_string('administration');
@@ -57,10 +50,10 @@
     $strmoodleversion = get_string('moodleversion');
     $strupdate = get_string('updatecomponent', 'admin');
     $strupwards = get_string('upwards', 'admin');
+    $strmisc = get_string('miscellaneous');
 
 /// Print the header stuff
-    print_header("$SITE->shortname: $strenvironment", $SITE->fullname,
-                 "<a href=\"index.php\">$stradmin</a> -> ".$strenvironment);
+    admin_externalpage_print_header($adminroot);
 
 /// Print the component download link
     echo '<div class="reportlink"><a href="environment.php?action=updatecomponent&amp;sesskey='.$USER->sesskey.'">'.$strupdate.'</a></div>';
@@ -98,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;
@@ -128,22 +121,17 @@
     }
 
 /// 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();
 
 /// Gather and show results
     $status = check_moodle_environment($version, $environment_results);
 
-/// Other links
-    echo '<div align="center">';
-    print_single_button('phpinfo.php', NULL, get_string('phpinfo'));
-    echo '</div>';
-
 /// Print footer
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 ?>

admin/environment.xml

@@ -34,4 +34,89 @@
       </PHP_EXTENSION>
     </PHP_EXTENSIONS>
   </MOODLE>
+  <MOODLE version="1.7">
+    <UNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="unicoderecommended" />
+      </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="7.4" />
+      <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_EXTENSIONS>
+  </MOODLE>
+  <MOODLE version="1.8">
+    <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="7.4" />
+      <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_EXTENSIONS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/filter.php

@@ -3,16 +3,11 @@
     // Edit text filter settings
 
     require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
     require_once($CFG->libdir.'/tablelib.php');
 
-    // check for allowed access
-    require_login();
-    if (!isadmin()) {
-        error( 'Only administrators can use the filters administration page' );
-    }
-    if (!$site = get_site()) {
-        error( 'Site is not defined in filters administration page' );
-    }
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('managefilters', $adminroot);
 
     // get parameters
     $param = new Object;
@@ -26,7 +21,7 @@
     // $CFG->pagepath is used to generate the body and id attributes for the body tag
     // of the page. It is also used to generate the link to the Moodle Docs for this view.
     $CFG->pagepath = 'filter/' . $filtername . '/config';
-    
+
     // get translated strings for use on page
     $txt = new Object;
     $txt->managefilters = get_string( 'managefilters' );
@@ -64,45 +59,40 @@
             // run through submitted data
             // reject if does not start with filter_
             foreach ($config as $name => $value) {
-                set_config( $name,$value );
+                set_config($name, stripslashes($value));
             }
         }
-        redirect( "$CFG->wwwroot/$CFG->admin/filters.php", get_string('changessaved'), 1);
+        redirect("$CFG->wwwroot/$CFG->admin/filters.php");
         exit;
     }
 
     //==============================
     // Display logic
     //==============================
-    
+
     $filtername = ucfirst($filtername);
-    print_header( "$site->shortname: $txt->managefilters", "$site->fullname",
-        "<a href=\"index.php\">$txt->administration</a> -> <a href=\"configure.php\">$txt->configuration</a> " .
-        "-> <a href=\"filters.php\">$txt->managefilters</a> -> $filtername" );
+    admin_externalpage_print_header($adminroot);
+    print_heading( $filtername );
 
-    print_heading( $txt->managefilters );
-
-    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
     print_simple_box_end();
 
-    print_simple_box_end();
-
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 ?>

admin/filters.php

@@ -3,20 +3,14 @@
     // Edit list of available text filters
 
     require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
     require_once($CFG->libdir.'/tablelib.php');
 
     // defines
     define('FILTER_TABLE','filter_administration_table');
 
-    // check for allowed access
-    require_login();
-
-    if (!isadmin()) {
-        error('Only administrators can use the filters administration page');
-    }
-    if (!$site = get_site()) {
-        error('Site is not defined in filters administration page');
-    }
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('managefilters', $adminroot);
 
     // get values from page
     $params = new object();
@@ -189,9 +183,9 @@
     $table = new flexible_table(FILTER_TABLE);
     $table->define_columns(array('name', 'hideshow', 'order', 'settings'));
     $table->define_headers(array($txt->name, $txt->hideshow, $txt->updown, $txt->settings));
-    $table->define_baseurl("$CFG->wwwroot/admin/filters.php");
-    $table->set_attribute('id', 'blocks');
-    $table->set_attribute('class', 'flexible generaltable generalbox');
+    $table->define_baseurl("$CFG->wwwroot/$CFG->admin/filters.php");
+    $table->set_attribute('id', 'filters');
+    $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
     $table->setup();
 
     // iterate through filters adding to display table
@@ -202,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=\"$img/hide.gif\" 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=\"$img/show.gif\" 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>";
         }
@@ -218,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;
         }
@@ -269,61 +263,15 @@
     // Display logic
     //==============================
 
-    print_header("$site->shortname: $txt->managefilters", "$site->fullname",
-        "<a href=\"index.php\">$txt->administration</a> -> <a href=\"configure.php\">$txt->configuration</a> " .
-        "-> $txt->managefilters");
+    admin_externalpage_print_header($adminroot);
 
     print_heading_with_help($txt->managefilters, 'filters');
 
     // print the table of all the filters
     $table->print_html();
 
-    // print the table for the cache controls
-    print_heading($txt->cachecontrols);
-    print_simple_box_start('center');
-    ?>
+    // cache control table has been removed
 
-    <form name="options" id="options" method="post" action="<?php echo $url; ?>" >
-        <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
-        <input type="hidden" name="action" value="config" />
-        <table cellpadding="20">
-            <tr valign="top">
-                <td nowrap="nowrap" align="right"><?php echo $txt->cachetext; ?></td>
-                <td><?php choose_from_menu($options, "cachetext", $CFG->cachetext, "", "", ""); ?></td>
-                <td><?php echo $txt->configcachetext; ?></td>
-            </tr>
-            <tr valign="top">
-                <td nowrap="nowrap" align="right"><?php echo $txt->filteruploadedfiles; ?></td>
-                <td><?php choose_from_menu(array($txt->none,$txt->allfiles,$txt->htmlfilesonly),
-                    "filteruploadedfiles", $CFG->filteruploadedfiles,"","",""); ?></td>
-                <td><?php echo $txt->configfilteruploadedfiles; ?></td>
-            </tr>
-            <tr valign="top">
-                <td nowrap="nowrap" align="right"><?php echo $txt->filtermatchoneperpage; ?></td>
-                <td><?php choose_from_menu(array($txt->no,$txt->yes), "filtermatchoneperpage", $CFG->filtermatchoneperpage,"","",""); ?></td>
-                <td><?php echo $txt->configfiltermatchoneperpage; ?></td>
-        <tr valign="top">
-        <td nowrap="nowrap" align="right"><?php echo $txt->filtermatchonepertext; ?></td>
-        <td><?php choose_from_menu(array($txt->no,$txt->yes), "filtermatchonepertext", $CFG->filtermatchonepertext,"","",""); ?></td>
-        <td><?php echo $txt->configfiltermatchonepertext; ?></td>
-        </tr>
-            </tr>
-            <tr valign="top">
-                <td nowrap="nowrap" align="right"><?php echo $txt->filterall; ?></td>
-                <td><?php choose_from_menu(array($txt->no,$txt->yes), "filterall", $CFG->filterall,"","",""); ?></td>
-                <td><?php echo $txt->configfilterall; ?></td>
-            </tr>
-            <tr valign="top">
-                <td>&nbsp;</td>
-                <td><input type="submit" value="<?php print_string('savechanges'); ?>" /></td>
-                <td>&nbsp;</td>
-            </tr>
-        </table>
-    </form>
-
-    <?php
-    print_simple_box_end();
-
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>

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/health.php

@@ -1,26 +1,34 @@
 <?php  // $Id$
 
+    ob_start(); //for whitespace test
     require_once('../config.php');
 
+    // extra whitespace test - intentionally breaks cookieless mode
+    $extraws = '';
+    while (true) {
+        $extraws .= ob_get_contents();
+        if (!@ob_end_clean()) {
+            break;
+        }
+    }
+
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('healthcenter', $adminroot);
+
     define('SEVERITY_NOTICE',      'notice');
     define('SEVERITY_ANNOYANCE',   'annoyance');
     define('SEVERITY_SIGNIFICANT', 'significant');
     define('SEVERITY_CRITICAL',    'critical');
 
-    $resetsesserrorcounter = optional_param('resetsesserrorcounter', 0, PARAM_BOOL);
-    $solution              = optional_param('solution', 0, PARAM_SAFEDIR); //in fact it is class name alhanumeric and _
+    $solution = optional_param('solution', 0, PARAM_SAFEDIR); //in fact it is class name alhanumeric and _
 
     require_login();
-    if (!isadmin()) {
-        error('Only the admin can use this page');
-    }
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
     $site = get_site();
-    $stradmin         = get_string('administration');
-    $strhealthcenter  = get_string('healthcenter');
 
-    print_header($site->shortname.': '.$strhealthcenter, $site->fullname,
-                  '<a href="index.php">'.$stradmin.'</a> -> '.$strhealthcenter);
+    admin_externalpage_print_header($adminroot);
 
 echo <<<STYLES
 <style type="text/css">
@@ -92,7 +100,7 @@ STYLES;
     }
 
 
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 
 function health_find_problems() {
@@ -216,18 +224,13 @@ class problem_000001 extends problem_base {
 
 class problem_000002 extends problem_base {
     function title() {
-        return 'Extra characters at the end of config.php';
+        return 'Extra characters at the end of config.php or other library function';
     }
     function exists() {
-        // [pj] When the requirements are raised to PHP 4.3.0 this will be file_get_contents()
-        if($fp = @fopen('../config.php', 'r')) {
-            $contents = fread($fp, 16384); // 16K should be enough
-            $ending = substr($contents, -2);
-            unset($contents);
-            if($ending == '?>') {
-                return false;
-            }
-            fclose($fp);
+        global $extraws;
+
+        if($extraws === '') {
+            return false;
         }
         return true;
     }
@@ -235,11 +238,11 @@ class problem_000002 extends problem_base {
         return SEVERITY_SIGNIFICANT;
     }
     function description() {
-        return 'Your Moodle configuration file, config.php, contains some characters after the closing PHP tag (?>). This could cause Moodle to exhibit several kinds of problems and should be fixed.';
+        return 'Your Moodle configuration file config.php or another library file, contains some characters after the closing PHP tag (?>). This causes Moodle to exhibit several kinds of problems (such as broken downloaded files) and must be fixed.';
     }
     function solution() {
         global $CFG;
-        return 'You need to edit <strong>'.$CFG->dirroot.'/config.php</strong> and remove all characters (including spaces and returns) after the ending ?> tag. These two characters should be the very last in that file.';
+        return 'You need to edit <strong>'.$CFG->dirroot.'/config.php</strong> and remove all characters (including spaces and returns) after the ending ?> tag. These two characters should be the very last in that file. The extra trailing whitespace may be also present in other PHP files that are included from lib/setup.php.';
     }
 }
 
@@ -350,24 +353,41 @@ class problem_000008 extends problem_base {
         return 'PHP: memory_limit cannot be controlled by Moodle';
     }
     function exists() {
-        $memlimit = @ini_get('memory_limit');
-        if(empty($memlimit)) {
+        $oldmemlimit = @ini_get('memory_limit');
+        if(empty($oldmemlimit)) {
             // PHP not compiled with memory limits, this means that it's
-            // probably limited to 8M so we have a problem...
-            return true;
+            // probably limited to 8M or in case of Windows not at all.
+            // We can ignore it for now - there is not much to test anyway
+            // TODO: add manual test that fills memory??
+            return false;
         }
-        // Otherwise, raise_memory_limit in setup.php will do the trick
+        $oldmemlimit = get_real_size($oldmemlimit);
+        //now lets change the memory limit to something unique below 128M==134217728
+        @ini_set('memory_limit', 134217720);
+        $testmemlimit = get_real_size(@ini_get('memory_limit'));
+        //verify the change had any effect at all
+        if ($oldmemlimit == $testmemlimit) {
+            //memory limit can not be changed - is it big enough then?
+            if ($oldmemlimit < get_real_size('128M')) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        @ini_set('memory_limit', $oldmemlimit);
         return false;
     }
     function severity() {
-        return SEVERITY_ANNOYANCE;
+        return SEVERITY_NOTICE;
     }
     function description() {
-        return 'The settings for PHP on your server do not allow a script to request more memory during its execution. This means that most likely there is a hard limit of 8MB for each script. It is possible that certain operations within Moodle will require more than this amount in order to complete successfully, especially if there are lots of data to be processed. Therefore, it is recommended that you contact your server administrator to address this issue.';
+        return 'The settings for PHP on your server do not allow a script to request more memory during its execution. '.
+               'This means that there is a hard limit of '.@ini_get('memory_limit').' for each script. '.
+               'It is possible that certain operations within Moodle will require more than this amount in order '.
+               'to complete successfully, especially if there are lots of data to be processed.';
     }
     function solution() {
-        global $CFG;
-        return 'We need a good solution here. Enabling memory limit control means recompiling PHP... maybe this should be SEVERITY_NOTICE instead of SEVERITY_ANNOYANCE?';
+        return 'It is recommended that you contact your web server administrator to address this issue.';
     }
 }
 
@@ -398,7 +418,7 @@ class problem_000010 extends problem_base {
     }
     function exists() {
         if (!$this->is_enabled()) {
-            return true;   
+            return true;
         }
         if ($this->status() < 1) {
             return true;
@@ -408,7 +428,7 @@ class problem_000010 extends problem_base {
     function severity() {
         if ($this->is_enabled() and $this->status() == 0) {
             return SEVERITY_SIGNIFICANT;
-        } else { 
+        } else {
             return SEVERITY_ANNOYANCE;
         }
     }
@@ -416,12 +436,12 @@ class problem_000010 extends problem_base {
         global $CFG;
         $desc = 'Slasharguments are needed for relative linking in uploaded resources:<ul>';
         if (!$this->is_enabled()) {
-            $desc .= '<li>slasharguments are <strong>disabled</strong> in Moodle configuration</li>';   
+            $desc .= '<li>slasharguments are <strong>disabled</strong> in Moodle configuration</li>';
         } else {
-            $desc .= '<li>slasharguments are enabled in Moodle configuration</li>';   
+            $desc .= '<li>slasharguments are enabled in Moodle configuration</li>';
         }
         if ($this->status() == -1) {
-            $desc .= '<li>can not run automatic test, you can verify it <a href="'.$CFG->wwwroot.'/file.php/testslasharguments" target="_blank">here</a></li>';
+            $desc .= '<li>can not run automatic test, you can verify it <a href="'.$CFG->wwwroot.'/file.php/testslasharguments" target="_blank">here</a> manually</li>';
         } else if ($this->status() == 0) {
             $desc .= '<li>slashargument test <strong>failed</strong>, please check server configuration</li>';
         } else {
@@ -449,9 +469,9 @@ class problem_000010 extends problem_base {
             $solution .= 'Congratulations - everything seems OK now :-D';
         }
         if ($status < 1) {
-            $solution .= '<p>IIS:<ul><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li><li>do NOT enable AllowPathInfoForScriptMappings !!!</li><li>slasharguments may not work when using ISAPI and PHP 4.3.10 and older</li></ul></p>'; 
-            $solution .= '<p>Apache 1:<ul><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li></ul></p>'; 
-            $solution .= '<p>Apache 2:<ul><li>you must add <code>AcceptPathInfo on</code> to php.ini or .htaccess</li><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li></ul></p>'; 
+            $solution .= '<p>IIS:<ul><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li><li>do NOT enable AllowPathInfoForScriptMappings !!!</li><li>slasharguments may not work when using ISAPI and PHP 4.3.10 and older</li></ul></p>';
+            $solution .= '<p>Apache 1:<ul><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li></ul></p>';
+            $solution .= '<p>Apache 2:<ul><li>you must add <code>AcceptPathInfo on</code> to php.ini or .htaccess</li><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li></ul></p>';
         }
         return $solution;
     }
@@ -462,13 +482,13 @@ class problem_000010 extends problem_base {
     function status() {
         global $CFG;
         $handle = @fopen($CFG->wwwroot.'/file.php?file=/testslasharguments', "r");
-        $contents = trim(@fread($handle, 7));
+        $contents = @trim(fread($handle, 10));
         @fclose($handle);
         if ($contents != 'test -1') {
             return -1;
         }
         $handle = @fopen($CFG->wwwroot.'/file.php/testslasharguments', "r");
-        $contents = trim(@fread($handle, 6));
+        $contents = trim(@fread($handle, 10));
         @fclose($handle);
         switch ($contents) {
             case 'test 1': return 1;
@@ -499,7 +519,7 @@ class problem_000011 extends problem_base {
     }
     function solution() {
         global $CFG;
-        if (!empty($resetsesserrorcounter)) {
+        if (optional_param('resetsesserrorcounter', 0, PARAM_BOOL)) {
             if (get_field('config', 'name', 'name', 'session_error_counter')) {
                 delete_records('config', 'name', 'session_error_counter');
             }
@@ -535,6 +555,7 @@ class problem_00000x extends problem_base {
 TODO:
 
     session.save_path -- it doesn't really matter because we are already IN a session, right?
+    detect unsupported characters in $CFG->wwwroot - see bug Bug #6091 - relative vs absolute path during backup/restore process
 
 */
 

admin/index.php

@@ -5,25 +5,47 @@
         header('Location: ../install.php');
         die;
     }
-   
-    require_once('../config.php');
-    include_once($CFG->dirroot.'/lib/adminlib.php');  // Contains various admin-only functions
 
-    $id             = optional_param('id', '', PARAM_ALPHANUM);
-    $confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
-    $agreelicence = optional_param('agreelicence',0, PARAM_BOOL);
 /// Check that PHP is of a sufficient version
-
-    if (!check_php_version("4.1.0")) { //TODO: should we bump it up to 4.3.0??
+/// Moved here because older versions do not allow while(@ob_end_clean());
+    if (version_compare(phpversion(), "4.3.0") < 0) {
         $phpversion = phpversion();
-        print_heading("Sorry, Moodle requires PHP 4.1.0 or later (currently using version $phpversion)");
+        echo "Sorry, Moodle requires PHP 4.3.0 or later (currently using version $phpversion)";
         die;
     }
 
+/// Turn off time limits and try to flush everything all the time, sometimes upgrades can be slow.
+
+    @set_time_limit(0);
+    @ob_implicit_flush(true);
+    while(@ob_end_clean()); // ob_end_flush prevents sending of headers
+
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');  // Contains various admin-only functions
+    require_once($CFG->libdir.'/ddllib.php'); // Install/upgrade related db functions
+
+    $id             = optional_param('id', '', PARAM_ALPHANUM);
+    $confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
+    $confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL);
+    $agreelicense   = optional_param('agreelicense', 0, PARAM_BOOL);
+    $autopilot      = optional_param('autopilot', 0, PARAM_BOOL);
+    $ignoreupgradewarning = optional_param('ignoreupgradewarning', 0, PARAM_BOOL);
+
+/// check upgrade status first
+    if ($ignoreupgradewarning and !empty($_SESSION['upgraderunning'])) {
+        $_SESSION['upgraderunning'] = 0;
+    }
+    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 = "please read the <a href=\"../doc/?frame=install.html&amp;sub=webserver\">install documentation</a>";
+    $documentationlink = '<a href="http://docs.moodle.org/en/Installation">Installation docs</a>';
 
     if (ini_get_bool('session.auto_start')) {
         error("The PHP server variable 'session.auto_start' should be Off - $documentationlink");
@@ -37,6 +59,13 @@
         error("The PHP server variable 'file_uploads' is not turned On - $documentationlink");
     }
 
+    if (empty($CFG->prefix) && $CFG->dbfamily != 'mysql') {  //Enforce prefixes for everybody but mysql
+        error('$CFG->prefix can\'t be empty for your target DB (' . $CFG->dbtype . ')');
+    }
+
+    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.');
+    }
 
 /// Check that config.php has been edited
 
@@ -68,12 +97,13 @@
         $CFG->version = "";
     }
 
-/// Turn off time limits and try to flush everything all the time, sometimes upgrades can be slow.
+    if (is_readable("$CFG->dirroot/version.php")) {
+        include_once("$CFG->dirroot/version.php");              # defines $version
+    }
 
-    @set_time_limit(0);
-    @ob_implicit_flush(true);
-    @ob_end_flush();
- 
+    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.
 
@@ -84,7 +114,7 @@
         $maintables = true;
         $mtables = array("config", "course", "course_categories", "course_modules",
                          "course_sections", "log", "log_display", "modules",
-                         "user", "user_admins", "user_students", "user_teachers");
+                         "user");
         foreach ($mtables as $mtable) {
             if (!in_array($CFG->prefix.$mtable, $tables)) {
                 $maintables = false;
@@ -92,38 +122,110 @@
             }
         }
     }
-
     if (! $maintables) {
-        if (empty($agreelicence)) {
-            $strlicense = get_string("license");
+    /// hide errors from headers in case debug enabled in config.php
+        $origdebug = $CFG->debug;
+        $CFG->debug = DEBUG_MINIMAL;
+        error_reporting($CFG->debug);
+        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, "", "", false, "&nbsp;", "&nbsp;");
-        if (file_exists("$CFG->libdir/db/$CFG->dbtype.sql")) {
-            $db->debug = true;
-            if (modify_database("$CFG->libdir/db/$CFG->dbtype.sql")) {
-                $db->debug = false;
-                notify($strdatabasesuccess, "green");
-            } else {
-                $db->debug = false;
-                error("Error: Main databases NOT set up successfully");
-            }
-        } else {
-            error("Error: Your database ($CFG->dbtype) is not yet fully supported by Moodle.  See the lib/db directory.");
+        print_header($strdatabasesetup, $strdatabasesetup, $strdatabasesetup,
+                        "", upgrade_get_javascript(), false, "&nbsp;", "&nbsp;");
+    /// return to original debugging level
+        $CFG->debug = $origdebug;
+        error_reporting($CFG->debug);
+        upgrade_log_start();
+        $db->debug = true;
+
+    /// Both old .sql files and new install.xml are supported
+    /// But we prioritise install.xml (XMLDB) if present
+    
+        change_db_encoding(); // first try to change db encoding to utf8
+        if (!setup_is_unicodedb()) {
+            // If could not convert successfully, throw error, and prevent installation
+            print_error('unicoderequired', 'admin');  
         }
-        print_continue("index.php");
+    
+        $status = false;
+        if (file_exists("$CFG->libdir/db/install.xml")) {
+            $status = install_from_xmldb_file("$CFG->libdir/db/install.xml"); //New method
+        } else if (file_exists("$CFG->libdir/db/$CFG->dbtype.sql")) {
+            $status = modify_database("$CFG->libdir/db/$CFG->dbtype.sql"); //Old method
+        } else {
+            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_once("$CFG->dirroot/group/db/upgrade.php");
+            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();
+            $adminroot->prune('backups'); // backup settings table not created yet
+            apply_default_settings($adminroot);
+
+            /// This is used to handle any settings that must exist in $CFG but which do not exist in
+            /// admin_get_root()/$ADMIN as admin_setting objects (there are some exceptions).
+            apply_default_exception_settings(array('alternateloginurl' => '',
+                                                   'auth' => 'email',
+                                                   'auth_pop3mailbox' => 'INBOX',
+                                                   'changepassword' => '',
+                                                   'enrol' => 'manual',
+                                                   'enrol_plugins_enabled' => 'manual',
+                                                   'guestloginbutton' => 1,
+                                                   'registerauth' => 'email',
+                                                   'style' => 'default',
+                                                   'template' => 'default',
+                                                   '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;
     }
 
@@ -131,133 +233,257 @@
 /// Check version of Moodle code on disk compared with database
 /// and upgrade if possible.
 
-    include_once("$CFG->dirroot/version.php");              # defines $version
-    include_once("$CFG->dirroot/lib/db/$CFG->dbtype.php");  # defines upgrades
+    if (file_exists("$CFG->dirroot/lib/db/$CFG->dbtype.php")) {
+        include_once("$CFG->dirroot/lib/db/$CFG->dbtype.php");  # defines old upgrades
+    }
+    if (file_exists("$CFG->dirroot/lib/db/upgrade.php")) {
+        include_once("$CFG->dirroot/lib/db/upgrade.php");  # defines new upgrades
+    }
 
     $stradministration = get_string("administration");
 
     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);
 
+            // hide errors from headers in case debug is enabled
+            $origdebug = $CFG->debug;
+            $CFG->debug = DEBUG_MINIMAL;
+            error_reporting($CFG->debug);
+
+            // logout in case we are upgrading from pre 1.7 version - prevention of weird session problems
+            if ($CFG->version < 2006050600) {
+                require_logout();
+            }
+
             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)){
+                $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'));
+
+                require_once($CFG->libdir.'/environmentlib.php');
+                print_heading(get_string('environment', 'admin'));
+                if (!check_moodle_environment($release, $environment_results, true)) {
+                    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"><div>';
+                    echo '<input type="hidden" name="confirmupgrade" value="1" />';
+                    echo '<input type="hidden" name="confirmrelease" value="1" />';
+                    echo '</div>';
+                    echo '<div class="continuebutton"><input name="autopilot" id="autopilot" type="checkbox" value="1" /><label for="autopilot">'.get_string('unattendedoperation', 'admin').'</label>';
+                    echo '<br /><br /><input type="submit" value="'.get_string('continue').'" /></div>';
+                    echo '</form>';
+                }
+
+                print_footer('none');
+                die;
             } else {
                 $strdatabasesuccess  = get_string("databasesuccess");
                 print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
-                        "", "", false, "&nbsp;", "&nbsp;");
+                        "", upgrade_get_javascript(), false, "&nbsp;", "&nbsp;");
+
+            /// return to original debugging level
+                $CFG->debug = $origdebug;
+                error_reporting($CFG->debug);
+                upgrade_log_start();
+
+            /// Upgrade current language pack if we can
+                upgrade_language_pack();   
+
                 print_heading($strdatabasechecking);
                 $db->debug=true;
-                if (main_upgrade($CFG->version)) {
-                    $db->debug=false;
+            /// Launch the old main upgrade (if exists)
+                $status = true;
+                if (function_exists('main_upgrade')) {
+                    $status = main_upgrade($CFG->version);
+                }
+            /// If succesful and exists launch the new main upgrade (XMLDB), called xmldb_main_upgrade
+                if ($status && function_exists('xmldb_main_upgrade')) {
+                    $status = xmldb_main_upgrade($CFG->version);
+                }
+                $db->debug=false;
+            /// 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");
+                        install_group_db();
+                        // Upgrade to the roles system.
+                        moodle_install_roles();
+                        set_config('rolesactive', 1);
+                    } else if (!update_capabilities()) {
+                        error('Had trouble upgrading the core capabilities for the Roles System');
+                    }
+                    require_once($CFG->libdir.'/statslib.php');
+                    if (!stats_upgrade_for_roles_wrapper()) {
+                        notify('Couldn\'t upgrade the stats tables to use the new roles system');
+                    }
                     if (set_config("version", $version)) {
                         remove_dir($CFG->dataroot . '/cache', true); // flush cache
                         notify($strdatabasesuccess, "green");
-                        print_continue("index.php");
+                        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 {
-                    $db->debug=false;
-                    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();
             }
         } else if ($version < $CFG->version) {
+            upgrade_log_start();
             notify("WARNING!!!  The code you are using is OLDER than the version that made these databases!");
+            upgrade_log_finish();
         }
-
     } else {
-        $strcurrentversion = get_string("currentversion");
-        print_header($strcurrentversion, $stradministration, $strcurrentversion,
-                     "", "", false, "&nbsp;", "&nbsp;");
-
         if (!set_config("version", $version)) {
-            $db->debug=true;
-            if (main_upgrade(0)) {
-                print_continue("index.php");
-            } else {
-                error("A problem occurred inserting current version into databases");
-            }
-            $db->debug=false;
+            error("A problem occurred inserting current version into databases");
         }
     }
 
 /// Updated human-readable release version if necessary
 
     if ($release <> $CFG->release) {  // Update the release version
-        $strcurrentrelease = get_string("currentrelease");
-        print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
-        print_heading("Moodle $release");
         if (!set_config("release", $release)) {
-            notify("ERROR: Could not update release version in database!!");
-        }
-        notice(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'), 'index.php');
-        exit;
-    }
-
-/// Insert default values for any important configuration variables
-
-    include_once("$CFG->dirroot/lib/defaults.php");
-
-    foreach ($defaults as $name => $value) {
-        if (!isset($CFG->$name)) {
-            $CFG->$name = $value;
-            set_config($name, $value);
-            $configchange = true;
+            error("ERROR: Could not update release version in database!!");
         }
     }
 
-/// Send $CFG->unicodedb to DB to have it available for next requests
-    set_config('unicodedb', $CFG->unicodedb);
+/// 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
 
-/// If any new configurations were found then send to the config page to check
-
-    if (!empty($configchange)) {
-        redirect("config.php");
-    }
 
 /// 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
 
 /// Check all questiontype plugins and upgrade if necessary
-    // It is important that this is done AFTER the quiz module has been upgraded
+/// first old *.php update and then the new upgrade.php script
+/// It is important that this is done AFTER the quiz module has been upgraded
     upgrade_plugins('qtype', 'question/type', "$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Upgrade backup/restore system if necessary
+/// first old *.php update and then the new upgrade.php script
     require_once("$CFG->dirroot/backup/lib.php");
     upgrade_backup_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Upgrade blocks system if necessary
+/// first old *.php update and then the new upgrade.php script
     require_once("$CFG->dirroot/lib/blocklib.php");
     upgrade_blocks_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Check all blocks and load (or upgrade them if necessary)
+/// first old *.php update and then the new upgrade.php script
     upgrade_blocks_plugins("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Check all enrolment plugins and upgrade if necessary
+/// 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 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
 
-/// Set up the overall site name etc.
+
+/// 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()) {
-        redirect("site.php");
+        // We are about to create the site "course"
+        require_once($CFG->libdir.'/blocklib.php');
+
+        $newsite = new Object();
+        $newsite->fullname = "";
+        $newsite->shortname = "";
+        $newsite->summary = "";
+        $newsite->newsitems = 3;
+        $newsite->numsections = 0;
+        $newsite->category = 0;
+        $newsite->format = 'site';  // Only for this course
+        $newsite->teacher = get_string("defaultcourseteacher");
+        $newsite->teachers = get_string("defaultcourseteachers");
+        $newsite->student = get_string("defaultcoursestudent");
+        $newsite->students = get_string("defaultcoursestudents");
+        $newsite->timemodified = time();
+
+        if ($newid = insert_record('course', $newsite)) {
+            // Site created, add blocks for it
+            $page = page_create_object(PAGE_COURSE_VIEW, $newid);
+            blocks_repopulate_page($page); // Return value not checked because you can always edit later
+
+            $cat = new Object();
+            $cat->name = get_string('miscellaneous');
+            if (insert_record('course_categories', $cat)) {
+                  redirect('index.php');
+            } else {
+                 error("Serious Error! Could not set up a default course category!");
+            }
+        } else {
+            error("Serious Error! Could not set up the site!");
+        }
+    }
+
+    // initialise default blocks on admin and site page if needed
+    if (empty($CFG->adminblocks_initialised)) {
+        require_once("$CFG->dirroot/$CFG->admin/pagelib.php");
+        require_once($CFG->libdir.'/blocklib.php');
+        page_map_class(PAGE_ADMIN, 'page_admin');
+        $page = page_create_object(PAGE_ADMIN, 0); // there must be some id number
+        blocks_repopulate_page($page);
+
+        //add admin_tree block to site if not already present
+        if ($admintree = get_record('block', 'name', 'admin_tree')) {
+            $page = page_create_object(PAGE_COURSE_VIEW, SITEID);
+            blocks_execute_action($page, blocks_get_by_page($page), 'add', (int)$admintree->id, false, false);
+            if ($admintreeinstance = get_record('block_instance', 'pagetype', $page->type, 'pageid', SITEID, 'blockid', $admintree->id)) {
+                blocks_execute_action($page, blocks_get_by_page($page), 'moveleft', $admintreeinstance, false, false);
+            }
+        }
+
+        set_config('adminblocks_initialised', 1);
     }
 
 /// Define the unique site ID code if it isn't already
     if (empty($CFG->siteidentifier)) {    // Unique site identification code
-        set_config('siteidentifier', random_string(32));
+        set_config('siteidentifier', random_string(32).$_SERVER['HTTP_HOST']);
     }
 
 /// Check if the guest user exists.  If not, create one.
@@ -269,6 +495,7 @@
         $guest->lastname    = " ";
         $guest->email       = "root@localhost";
         $guest->description = addslashes(get_string("guestuserinfo"));
+        $guest->mnethostid  = $CFG->mnet_localhost_id;
         $guest->confirmed   = 1;
         $guest->lang        = $CFG->lang;
         $guest->timemodified= time();
@@ -278,16 +505,22 @@
         }
     }
 
+
 /// Set up the admin user
-    if (! record_exists("user_admins")) {   // No admin user yet
-        redirect("user.php");
+    if (empty($CFG->rolesactive)) {
+        create_admin_user();
     }
 
 /// Check for valid admin user
     require_login();
 
-    if (!isadmin()) {
-        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+    $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+
+    require_capability('moodle/site:config', $context);
+
+/// check that site is properly customized
+    if (empty($site->shortname) or empty($site->shortname)) {
+        redirect('settings.php?section=frontpagesettings&amp;return=site');
     }
 
 /// Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders
@@ -298,185 +531,91 @@
         }
     }
 
-/// At this point everything is set up and the user is an admin, so print menu
+/// Everything should now be set up, and the user is an admin
 
-    $stradministration = get_string("administration");
-    print_header("$site->shortname: $stradministration","$site->fullname", "$stradministration");
-    print_simple_box_start('center', '100%', '', 20);
-    print_heading($stradministration);
+/// Print default admin page with notifications.
+
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('adminnotifications', $adminroot);
+    admin_externalpage_print_header($adminroot);
 
 /// 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');
     }
 
-    if (!empty($CFG->upgrade)) {  // Print notice about extra upgrading that needs to be done
-        print_simple_box(get_string("upgrade$CFG->upgrade", "admin",
-                                    "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"), "center", '60%');
-        print_spacer(10,10);
+/// Check for any special upgrades that might need to be run
+    if (!empty($CFG->upgrade)) {
+        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%');
+        print_box(get_string('globalsquoteswarning', 'admin'), 'generalbox adminwarning');
     }
 
+    if (is_dataroot_insecure()) {
+        print_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), '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 if we are currently in maintenance mode
-    if (empty($CFG->unicodedb)) {
-        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 
+/// You can set the "registered" variable to something far in the future
 /// if you really want to prevent this.   eg  9999999999
     if (!isset($CFG->registered) || $CFG->registered < (time() - 3600*24*30*6)) {
         $options = array();
         $options['sesskey'] = $USER->sesskey;
-        print_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;
     }
 
-    $table->tablealign = "center";
-    $table->align = array ("right", "left");
-    $table->wrap = array ("nowrap", "nowrap");
-    $table->cellpadding = 5;
-    $table->cellspacing = 0;
-    $table->width = '40%';
-
-    $configdata  = '<div class="adminlink"><a href="config.php">'.get_string('configvariables', 'admin').
-                   '</a> - <span class="explanation">'.get_string('adminhelpconfigvariables').'</span></div>';
-    $configdata .= '<div class="adminlink"><a href="site.php">'.get_string('sitesettings').
-                   '</a> - <span class="explanation">'.get_string('adminhelpsitesettings').'</span></div>';
-    $configdata .= '<div class="adminlink"><a href="../theme/index.php">'.get_string('themes').
-                   '</a> - <span class="explanation">'.get_string('adminhelpthemes').'</span></div>';
-    $configdata .= '<div class="adminlink"><a href="lang.php">'.get_string('language').
-                   '</a> - <span class="explanation">'.get_string('adminhelplanguage').'</span></div>';
-    $configdata .= '<div class="adminlink"><a href="modules.php">'.get_string('managemodules').
-                   '</a> - <span class="explanation">'.get_string('adminhelpmanagemodules').'</span></div>';
-    $configdata .= '<div class="adminlink"><a href="blocks.php">'.get_string('manageblocks').
-                   '</a> - <span class="explanation">'.get_string('adminhelpmanageblocks').'</span></div>';
-    $configdata .= '<div class="adminlink"><a href="filters.php">'.get_string('managefilters').
-                   '</a> - <span class="explanation">'.get_string('adminhelpmanagefilters').'</span></div>';
-    if (!isset($CFG->disablescheduledbackups)) {
-        $configdata .= '<div class="adminlink"><a href="backup.php">'.get_string('backup').
-                       '</a> - <span class="explanation">'.get_string('adminhelpbackup').'</span></div>';
-    }
-    $configdata .= '<div class="adminlink"><a href="editor.php">'.get_string('editorsettings').
-                   '</a> - <span class="explanation">'.get_string('adminhelpeditorsettings').'</span></div>';
-    $configdata .= '<div class="adminlink"><a href="calendar.php">'.get_string('calendarsettings', 'admin').
-                   '</a> - <span class="explanation">'.get_string('helpcalendarsettings', 'admin').'</span></div>';
-    $configdata .= '<div class="adminlink"><a href="maintenance.php">'.get_string('sitemaintenancemode', 'admin').
-                   '</a> - <span class="explanation">'.get_string('helpsitemaintenance', 'admin').'</span></div>';
-
-    $table->data[] = array('<strong><a href="configure.php">'.get_string('configuration').'</a></strong>', $configdata);
-
-
-    $userdata =  '<div class="adminlink"><a href="auth.php?sesskey='.$USER->sesskey.'">'.get_string("authentication").
-                 '</a> - <span class="explanation">'.get_string('adminhelpauthentication').'</span></div>';
-    $userdata .= '<div class="adminlink"><a href="user.php">'.get_string('edituser').
-                 '</a> - <span class="explanation">'.get_string('adminhelpedituser').'</span></div>';
-    $userdata .= '<div class="adminlink"><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/user.php?newuser=true&amp;sesskey='.$USER->sesskey.'">'.
-                 get_string('addnewuser').'</a> - <span class="explanation">'.get_string('adminhelpaddnewuser').'</span></div>';
-    $userdata .= '<div class="adminlink"><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/uploaduser.php?sesskey='.$USER->sesskey.'">'.
-                 get_string('uploadusers').'</a> - <span class="explanation">'.get_string('adminhelpuploadusers').'</span></div>';
-
-    $userdata .= '<hr /><div class="adminlink"><a href="enrol.php?sesskey='.$USER->sesskey.'">'.get_string('enrolmentplugins').
-                 '</a> - <span class="explanation">'.get_string('adminhelpenrolments').'</span></div>';
-    $userdata .= '<div class="adminlink"><a href="../course/index.php?edit=off&amp;sesskey='.$USER->sesskey.'">'.
-                 get_string('assignstudents').'</a> - <span class="explanation">'.get_string('adminhelpassignstudents').'</span></div>';
-
-    $userdata .= '<div class="adminlink"><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.
-                 get_string('assignteachers').'</a> - <span class="explanation">'.get_string('adminhelpassignteachers').
-                 ' <img src="../pix/t/user.gif" height="11" width="11" alt="" /></span></div>';
-    $userdata .= '<div class="adminlink"><a href="creators.php?sesskey='.$USER->sesskey.'">'.get_string('assigncreators').
-                 '</a> - <span class="explanation">'.get_string('adminhelpassigncreators').'</span></div>';
-    $userdata .= '<div class="adminlink"><a href="admin.php?sesskey='.$USER->sesskey.'">'.get_string('assignadmins').
-                 '</a> - <span class="explanation">'.get_string('adminhelpassignadmins').'</span></div>';
-
-    $table->data[] = array('<strong><a href="users.php">'.get_string('users').'</a></strong>', $userdata);
-
-    $table->data[] = array('<strong><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.get_string('courses').'</a></strong>',
-                           '<div class="explanation">'.get_string('adminhelpcourses').'</div>');
-    $table->data[] = array('<strong><a href="../files/index.php?id='.$site->id.'">'.get_string('sitefiles').'</a></strong>',
-                           '<div class="explanation">'.get_string('adminhelpsitefiles').'</div>');
-    $table->data[] = array('<strong><a href="stickyblocks.php">'.get_string('stickyblocks','admin').'</a></strong>',
-                           '<div class="explanation">'.get_string('adminhelpstickyblocks').'</div>');
-    $table->data[] = array('<strong><a href="report.php">'.get_string('reports').'</a></strong>', 
-                           '<div class="explanation">'.get_string('adminhelpreports').'</div>');
-    $table->data[] = array('<strong><a href="environment.php">'.get_string('environment','admin').'</a></strong>',
-                           '<div class="explanation">'.get_string('adminhelpenvironment').'</div>');
-
-/// Optional stuff
-    if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
-        $table->data[] = array("<strong><a href=\"$CFG->dbtype/frame.php\">".get_string('managedatabase').'</a></strong>',
-                               '<div class="explanation">'.get_string('adminhelpmanagedatabase').'</div>');
-    }
-
-/// Hooks for Matt Oquists contrib code for repositories and portfolio.  
-/// The eventual official versions may not look like this
-    if (isset($CFG->portfolio) && file_exists("$CFG->dirroot/$CFG->portfolio")) {
-                $table->data[] = array("<strong><a href=\"../portfolio/\">".get_string('portfolio','portfolio').'</a></
-trong>',
-                            '<div class="explanation">'.get_string('adminhelpportfolio','portfolio').'</div>');
-    }
-
-    if (isset($CFG->repo) && file_exists("$CFG->dirroot/$CFG->repo")) {
-            $table->data[] = array("<strong><a href=\"../repository/?repoid=1&action=list\">".get_string('repository','
-epository').'</a></strong>',
-                            '<div class="explanation">'.get_string('adminhelprepository','repository').'</div>');
-    }
-
-
-
-    print_table($table);
-
     //////////////////////////////////////////////////////////////////////////////////////////////////
-    ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO REMOVE OR MODIFY THE COPYRIGHT NOTICE BELOW ////
+    ////  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 />'.
                      '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');
     //////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-    echo '<div align="center">';
-    $options = array();
-    $options['sesskey'] = $USER->sesskey;
-    print_single_button('register.php', $options, get_string('registration'));
-    echo '</div>';
-
-
-    print_simple_box_end();
-
-    
-    if (optional_param('dbmigrate')) {               // ??? Is this actually used?
-        print_simple_box_start('center','60%');
-        require_once($CFG->dirroot.'/admin/utfdbmigrate.php');
-        db_migrate2utf8();
-        print_simple_box_end();
+    if (empty($registrationbuttonshown)) {
+        $options = array();
+        $options['sesskey'] = $USER->sesskey;
+        print_single_button('register.php', $options, get_string('registration'));
     }
 
 
-    print_footer($site);
+    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

@@ -1,32 +1,43 @@
 <?php
 
    require_once('../config.php');
+   require_once($CFG->libdir.'/adminlib.php');
+   $adminroot = admin_get_root();
+   admin_externalpage_setup('toinodb', $adminroot);
 
    $confirm = optional_param('confirm', 0, PARAM_BOOL);
 
    require_login();
 
-   if (!isadmin()) {
-       error('Admin only');
+   require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+   admin_externalpage_print_header($adminroot);
+   print_heading('Convert all MySQL tables from MYISAM to InnoDB');
+
+   if ($CFG->dbfamily != 'mysql') {
+        notice('This function is for MySQL databases only!', 'index.php');
    }
 
-   print_header("Convert all tables from MYISAM to InnoDB", "Convert all tables from MYISAM to InnoDB", 
-                "Convert all tables from MYISAM to InnoDB");
+   if (data_submitted() and $confirm and confirm_sesskey()) {
 
-
-   if ($confirm and confirm_sesskey()) {
-
-       print_heading("Please be patient and wait for this to complete...");
+       notify('Please be patient and wait for this to complete...', 'notifysuccess');
 
        if ($tables = $db->MetaTables()) {
            $db->debug = true;
            foreach ($tables as $table) {
                execute_sql("ALTER TABLE $table TYPE=INNODB; ");
            }
+           $db->debug = false;
        }
+       notify('... done.', 'notifysuccess');
+       print_continue('index.php');
+       admin_externalpage_print_footer($adminroot);
+
    } else {
-       notice_yesno("Are you sure you want convert all your tables to the InnoDB format?", 
-                    "innodb.php?confirm=1&sesskey=".sesskey(), "index.php");
+       $optionsyes = array('confirm'=>'1', 'sesskey'=>sesskey());
+       notice_yesno('Are you sure you want convert all your tables to the InnoDB format?',
+                    'innodb.php', 'index.php', $optionsyes, NULL, 'post', 'get');
+       admin_externalpage_print_footer($adminroot);
    }
 
 ?>

admin/lang.php

@@ -1,43 +1,73 @@
 <?PHP // $Id$
+    /**
+    * Display the admin/language menu and process strings translation.
+    */
 
     require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('langedit', $adminroot);    
+
+    define('LANG_SUBMIT_REPEAT', 1);            // repeat displaying submit button?
+    define('LANG_SUBMIT_REPEAT_EVERY', 20);     // if so, after how many lines?
+    define('LANG_DISPLAY_MISSING_LINKS', 1);    // display "go to first/next missing string" links?
+    define('LANG_DEFAULT_FILE', '');            // default file to translate. Empty allowed
+    define('LANG_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', 'moodle.php', PARAM_FILE);
+    $currentfile = optional_param('currentfile', LANG_DEFAULT_FILE, PARAM_FILE);
+    $uselocal    = optional_param('uselocal', -1, PARAM_INT);
 
-    require_login();
-
-    if (!isadmin()) {
-        error("You need to be admin to edit this page");
-    }     
-
-    if (! $site = get_site()) {
-        error("Site not defined!");
+    if ($uselocal == -1) {
+        if (isset($SESSION->langtranslateintolocal)) {
+            $uselocal = $SESSION->langtranslateintolocal;
+        } else {
+            $uselocal = LANG_DEFAULT_USELOCAL;
+        }
+    } else {
+        $SESSION->langtranslateintolocal = $uselocal;
     }
 
-    $stradministration = get_string("administration");
-    $strconfiguration = get_string("configuration");
     $strlanguage = get_string("language");
     $strcurrentlanguage = get_string("currentlanguage");
     $strmissingstrings = get_string("missingstrings");
     $streditstrings = get_string("editstrings", 'admin');
     $stredithelpdocs = get_string("edithelpdocs", 'admin');
     $strthislanguage = get_string("thislanguage");
+    $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('filecreated', 'admin');
+    $strprev = get_string('previous');
+    $strnext = get_string('next');
+
+
+    $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;
@@ -46,46 +76,32 @@
             break;
     }
 
-    $currentlang = current_language();
 
-    print_header("$site->shortname: $title", "$site->fullname",
-                 "<a href=\"index.php\">$stradministration</a> -> ".
-                 "<a href=\"configure.php\">$strconfiguration</a> -> $navigation",
-                 '', '', true, $button);
+    admin_externalpage_print_header($adminroot);
 
     if (!$mode) {
-        print_simple_box_start('center','80%');
-        echo '<table align="center" width="100%"><tr><td width="50%" align="center">';
-        print_string('managelang','admin');
-        echo '</td><td align="center" width="50%">';
-        print_string('editlang','admin');
-        echo '</td></tr><tr><td>';
-        print_string('lang16notify','admin');
-        echo '<p /><a href="langimport.php">'.get_string('langimport','admin').'</a>';
-        echo '</td><td>';
+        print_box_start();
         $currlang = current_language();
-        $langs = get_list_of_languages();
-        echo "<table align=\"center\"><tr><td align=\"right\">";
-        echo "<b>$strcurrentlanguage:</b>";
-        echo "</td><td>";
-        echo popup_form ("$CFG->wwwroot/$CFG->admin/lang.php?lang=", $langs, "chooselang", $currlang, "", "", "", true);
-        echo '</td></tr><tr><td colspan="2">';
-        $options["lang"] = $currentlang;
-        //print_single_button("http://moodle.org/download/lang/", $options, get_string("latestlanguagepack"));
-        echo "</td></tr></table>";
+        $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 '</td></tr></table>';
-        print_simple_box_end();
-        print_footer();
+        print_box_end();
+        admin_externalpage_print_footer($adminroot);
         exit;
     }
 
     // Get a list of all the root files in the English directory
 
-    $langdir = "$CFG->dataroot/lang/$currentlang";
+    $langbase = $CFG->dataroot . '/lang';
     $enlangdir = "$CFG->dirroot/lang/en_utf8";
+    if ($currentlang == 'en_utf8') {
+        $langdir = $enlangdir;
+    } else {
+        $langdir = "$langbase/$currentlang";
+    }
+    $locallangdir = "$langbase/{$currentlang}_local";
 
     if (! $stringfiles = get_directory_list($enlangdir, "", false)) {
         error("Could not find English language pack!");
@@ -105,20 +121,31 @@
             error ('to edit this language pack, you need to put it in '.$CFG->dataroot.'/lang');
         }
 
+        // Following variables store the HTML output to be echo-ed
+        $m = '';
+        $o = '';
+
         // For each file, check that a counterpart exists, then check all the strings
         foreach ($stringfiles as $file) {
             unset($string);
             include("$enlangdir/$file");
             $enstring = $string;  
+
+            ksort($enstring);
             
             unset($string);
 
             if (file_exists("$langdir/$file")) {
                 include("$langdir/$file");
+                $fileismissing = 0;
             } else {
-                notify(get_string("filemissing", "", "$langdir/$file"));
+                $fileismissing = 1;
+                // notify(get_string("filemissing", "", "$langdir/$file"));
+                $o .= '<div class="notifyproblem">'.get_string("filemissing", "", "$langdir/$file").'</div><br />';
                 $string = array();
             }
+
+            $missingcounter = 0;
     
             $first = true;
             foreach ($enstring as $key => $value) {
@@ -127,18 +154,37 @@
                     $value = str_replace("$"."a", "\\$"."a", $value);
                     $value = str_replace("%%","%",$value);
                     if ($first) {
-                        echo "<p><b>".get_string("stringsnotset","","$langdir/$file")."</b></p><pre>";
+                        $m .= "<a href=\"lang.php?mode=missing#$file\">$file";
+                        $m .= $fileismissing ? '*' : '';
+                        $m .= '</a> &nbsp; ';
+                        $o .= "<p><a name=\"$file\"></a><b>".get_string("stringsnotset","","$langdir/$file")."</b></p><pre>";
                         $first = false;
                         $somethingfound = true;
                     }
-                    echo "$"."string['$key'] = \"$value\";<br />";
+                    $missingcounter++;
+                    if (LANG_LINK_MISSING_STRINGS) {
+                        $missinglinkstart = "<a href=\"lang.php?mode=compare&amp;currentfile=$file#missing$missingcounter\">";
+                        $missinglinkend = '</a>';
+                    } else {
+                        $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 />";
                 }
             }
             if (!$first) {
-                echo '</pre><hr />';
+                $o .= '</pre><hr />';
             }
         }
   
+        if ($m <> '') {
+            print_box($m, 'filenames');
+        }
+        echo $o;
+
         if (! $files = get_directory_list("$CFG->dirroot/lang/en_utf8/help", "CVS")) {
             error("Could not find English language help files!");
         }
@@ -165,16 +211,38 @@
         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") {
-
-        if (!file_exists($langdir)) {
-            error ('to edit this language pack, you need to put it in '.$CFG->dataroot.'/lang');
+   
+        if (!file_exists($langbase) ){
+            if (!lang_make_directory($langbase) ){
+                error('ERROR: Could not create base lang directory ' . $langbase);
+            } else {
+                echo '<div class="notifysuccess">Created directory '.
+                                                     $langbase .'</div>'."<br />\n";
+            }
+        } 
+        if (!$uselocal && !file_exists($langdir)) {
+            if (!lang_make_directory($langdir)) {
+                error('ERROR: Could not create directory '.$langdir);
+            } else {
+                echo '<div class="notifysuccess">Created directory '.
+                                                     $langdir .'</div>'."<br />\n";
+            }
         }
-
-
+        if ($uselocal && !file_exists($locallangdir)) {
+            if (!lang_make_directory($locallangdir)) {
+                echo '<div class="notifyproblem">ERROR: Could not create directory '.
+                                     $locallangdir .'</div>'."<br />\n";
+                $uselocal = 0;
+            } else {
+                echo '<div class="notifysuccess">Created directory '.
+                                                     $locallangdir .'</div>'."<br />\n";
+            }
+        }
+        
         if (isset($_POST['currentfile'])){   // Save a file
             if (!confirm_sesskey()) {
                 error(get_string('confirmsesskeybad', 'error'));
@@ -188,17 +256,32 @@
             }
             
             unset($newstrings['currentfile']);
-            if (lang_save_file($langdir, $currentfile, $newstrings)) {
-                notify(get_string("changessaved")." ($langdir/$currentfile)", "green");
+
+            if ($uselocal) {
+                include("$langdir/$currentfile");
+                if (isset($string)) {
+                    $packstring = $string;
+                } else {
+                    $packstring = array();
+                }
+                unset($string);
+                $saveinto = $locallangdir;
             } else {
-                error("Could not save the file '$currentfile'!", "lang.php?mode=compare&amp;currentfile=$currentfile");
+                $packstring = array();  
+                $saveinto = $langdir;
             }
-        }
+            
+            if (lang_save_file($saveinto, $currentfile, $newstrings, $uselocal, $packstring)) {
+                notify(get_string("changessaved")." ($saveinto/$currentfile)", "green");
+            } else {
+                error("Could not save the file '$saveinto/$currentfile'!", "lang.php?mode=compare&amp;currentfile=$currentfile");
+            }
+            unset($packstring);
+        } 
 
         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; ";
@@ -206,166 +289,420 @@
                 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_box_start();
+        echo $strfilestoredin;
+        echo $uselocal ? "{$currentlang}_local" : $currentlang;
+        helpbutton('langswitchstorage', $strfilestoredinhelp, 'moodle');
         
-        print_heading("$currentfile", "center", 4);
-
-        if (!file_exists("$langdir/$currentfile")) {
-            if (!touch("$langdir/$currentfile")) {
-                echo "<p><font color=\"red\">".get_string("filemissing", "", "$langdir/$currentfile")."</font></p>";
-                continue;
+        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="'.$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"), '', 4, 'error');
+                } else {
+                    print_heading($strfilecreated, '', 4, 'notifysuccess');
+                }
+            }
+            if ($currentlang == "en_utf8" && !$uselocal) {
+                $editable = false;
+                print_heading($streditennotallowed, '', 4);
+            } elseif ($f = fopen("$saveto/$currentfile","r+")) {
+                $editable = true;
+                fclose($f);
+            } else {
+                $editable = false;
+                echo "<p><font size=\"1\">".get_string("makeeditable", "", "$saveto/$currentfile")."</font></p>";
+            }
+            error_reporting($CFG->debug);
+            
+            print_heading("$currentfile", "", 4);
+            if (LANG_DISPLAY_MISSING_LINKS && $editable) {
+                print_heading('<a href="#missing1">'.$strgotofirst.'</a>', "", 4);
             }
-        }
 
-        error_reporting(0);
-        if ($f = fopen("$langdir/$currentfile","r+") && ($currentlang != "en_utf8")) {
-            $editable = true;
-            fclose($f);
-        } else {
-            $editable = false;
-            echo "<p><font size=\"1\">".get_string("makeeditable", "", "$langdir/$currentfile")."</font></p>";
-        }
-        ///added code here to prevent en_utf8 being edited
-        
-        error_reporting(7);
+            unset($string);
+            include("$enlangdir/$currentfile");
+            $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:  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 >>";
+            }
+            ksort($enstring);
 
+            unset($string);
 
-        unset($string);
-        include("$enlangdir/$currentfile");
-        $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['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 >>";
-        }
-        ksort($enstring);
-
-        unset($string);
-        include("$langdir/$currentfile");
-
-        if ($editable) {
-            echo "<form name=\"$currentfile\" action=\"lang.php\" method=\"post\">";
-        }
-        echo "<table width=\"100%\" cellpadding=\"2\" cellspacing=\"3\" border=\"0\" class=\"generalbox\">";
-        foreach ($enstring as $key => $envalue) {
-            $envalue = nl2br(htmlspecialchars($envalue));
-            $envalue = preg_replace('/(\$a\-\&gt;[a-zA-Z0-9]*|\$a)/', '<b>$0</b>', $envalue);  // Make variables bold. 
-            $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";
-
-            $value = $string[$key];
-            $value = str_replace("\r","",$value);              // Bad character caused by Windows
-            $value = preg_replace("/\n{3,}/", "\n\n", $value); // Collapse runs of blank lines
-            $value = trim($value, "\n");                       // Delete leading/trailing lines
-            $value = str_replace("\\","",$value);              // Delete all slashes
-            $value = str_replace("%%","%",$value);
-            $value = str_replace("<","&lt;",$value);
-            $value = str_replace(">","&gt;",$value);
-            $value = str_replace('"',"&quot;",$value);
-
-            $cellcolour = $value ? '': 'class="highlight"';
+            @include("$locallangdir/$currentfile");
+            $localstring = isset($string) ? $string : array();
+            unset($string);
+            
+            @include("$langdir/$currentfile");
 
             if ($editable) {
-                echo '<td width="40%" '.$cellcolour.' valign="top">'."\n";
-                if (isset($string[$key])) {
-                    $valuelen = strlen($value);
-                } else {
-                    $valuelen = strlen($envalue);
-                }
-                $cols=50;
-                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";
-                } else {
-                    if ($valuelen) {
-                        $cols = $valuelen + 2;
-                    }
-                    echo '<input type="text" name="stringXXX'.lang_form_string_key($key).'" value="'.$value.'" size="'.$cols.'" />';
-                }
-                echo '</td>';
-
-            } else {
-                echo '<td width="40%" bgcolor="'.$cellcolour.'" valign="top">'.$value.'</td>';
+                echo "<form id=\"$currentfile\" action=\"lang.php\" method=\"post\">";
+                echo '<div>';
             }
-        }
-        if ($editable) {
-            echo '<tr><td colspan="2">&nbsp;<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" />';
-            echo '    <input type="submit" name="update" value="'.get_string('savechanges').': '.$currentfile.'" />';
-            echo '</td></tr>';
-        }
-        echo '</table>';
-        echo '</form>'; 
+            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>&nbsp;</td><td><br />';
+                    echo '    <input type="submit" name="update" value="'.get_string('savechanges').': '.$currentfile.'" />';
+                    echo '<br />&nbsp;</td></tr>';
+                }
+                $envalue = nl2br(htmlspecialchars($envalue));
+                $envalue = preg_replace('/(\$a\-\&gt;[a-zA-Z0-9]*|\$a)/', '<b>$0</b>', $envalue);  // Make variables bold. 
+                $envalue = str_replace("%%","%",$envalue);
+                $envalue = str_replace("\\","",$envalue);              // Delete all slashes
 
+                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);
+                if ($uselocal) {
+                    $value = lang_fix_value_from_file($localstring[$key]);
+                    $value2 = lang_fix_value_from_file($string[$key]);
+                    if ($value == '') {
+                        $value = $value2;
+                    }
+                } else {
+                    $value = lang_fix_value_from_file($string[$key]);
+                    $value2 = lang_fix_value_from_file($localstring[$key]);
+                }
+                error_reporting($CFG->debug);
+
+                // Color highlighting:
+                // red #ef6868 - translation missing in both system and local pack
+                // yellow #feff7f - translation missing in system pack but is translated in local
+                // green #AAFFAA - translation present in both system and local but is different
+                if (!$value) {
+                    if (!$value2) {
+                        $cellcolour = 'class="bothmissing"';
+                    } else {
+                        $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" class="iconsmall" alt="'.$strnext.'" /></a>';
+                        $missingprev = '<a href="#missing'.($missingcounter-1).'">'.
+                        '<img src="' . $CFG->pixpath . '/t/up.gif" class="iconsmall" alt="'.$strprev.'" /></a>';
+                    } else {
+                        $missingtarget = '';
+                        $missingnext = '';
+                        $missingprev = '';
+                    }
+                } else {
+                    if ($value <> $value2 && $value2 <> '') {
+                        $cellcolour = 'class="localdifferent"';
+                    } else {
+                        $cellcolour = '';
+                    }
+                    $missingtarget = '';
+                    $missingnext = '';
+                    $missingprev = '';
+                }
+
+                if ($editable) {
+                    echo '<td '.$cellcolour.' valign="top">'. $missingprev . $missingtarget."\n";
+                    if (isset($string[$key])) {
+                        $valuelen = strlen($value);
+                    } else {
+                        $valuelen = strlen($envalue);
+                    }
+                    $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";
+                    } else {
+                        if ($valuelen) {
+                            $cols = $valuelen + 5;
+                        }
+                        echo '<input type="text" name="stringXXX'.lang_form_string_key($key).'" value="'.$value.'" size="'.$cols.'" />';
+                    }
+                    if ($value2 <> '' && $value <> $value2) {
+                        echo '<br /><span style="font-size:small">'.$value2.'</span>';
+                    }
+                    echo $missingnext . '</td>';
+
+                } else {
+                    echo '<td '.$cellcolour.' valign="top">'.$value.'</td>';
+                }
+                echo '</tr>'."\n";
+            }
+            if ($editable) {
+                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" />';
+                echo '    <input type="submit" name="update" value="'.get_string('savechanges').': '.$currentfile.'" />';
+                echo '</td></tr>';
+            }
+            echo '</table>';
+            if ($editable) {
+                echo '</div>'; 
+                echo '</form>'; 
+            }
+
+        } else {
+            // no $currentfile specified
+            print_heading($strchoosefiletoedit, "", 4);
+        }
     }
 
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 //////////////////////////////////////////////////////////////////////
 
-function lang_save_file($path, $file, $strings) {
-// Thanks to Petri Asikainen for the original version of code 
-// used to save language files.
-//
-// $path is a full pathname to the file
-// $file is the file to overwrite.
-// $strings is an array of strings to write
-
+/**
+ * Save language translation file.
+ *
+ * Thanks to Petri Asikainen for the original version of code 
+ * used to save language files.
+ *
+ * @uses $CFG
+ * @uses $USER
+ * @param string $path Full pathname to the directory to use
+ * @param string $file File to overwrite
+ * @param array $strings Array of strings to write
+ * @param bool $local Should *_local version be saved?
+ * @param array $packstrings Array of default langpack strings (needed if $local)
+ * @return bool Created successfully?
+ */ 
+function lang_save_file($path, $file, $strings, $local, $packstrings) {
     global $CFG, $USER;
-
-    error_reporting(0);
-    if (!$f = fopen("$path/$file","w")) {
+    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;
     }
-    error_reporting(7);
-
 
     fwrite($f, "<?PHP // \$Id\$ \n");
-    fwrite($f, "      // $file - created with Moodle $CFG->release ($CFG->version)\n\n\n");
-
+    fwrite($f, "      // $file - created with Moodle $CFG->release ($CFG->version)\n");
+    if ($local) {
+        fwrite($f, "      // local modifications from $CFG->wwwroot\n");
+    }
+    fwrite($f, "\n\n");
     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
+        @list($id, $stringname) = explode('XXX',$key);
+        $value = lang_fix_value_before_save($value);
         if ($id == "string" and $value != ""){
-            fwrite($f,"\$string['$stringname'] = '$value';\n");
+            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");
     fclose($f);
-
     return true;
 }
 
+/**
+ * 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
+ */
+function lang_fix_value_from_file($value='') {
+    $value = str_replace("\r","",$value);              // Bad character caused by Windows
+    $value = preg_replace("/\n{3,}/", "\n\n", $value); // Collapse runs of blank lines
+    $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
+    }
+    $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;
+}
 
-/// Following functions are required because '.' in form input names
-/// get replaced by '_' by PHP.
+/**
+ * Try and create a new language directory.
+ *
+ * @uses $CFG
+ * @param string $directory full path to the directory under $langbase
+ * @return string|false Returns full path to directory if successful, false if not
+ */
+function lang_make_directory($dir, $shownotices=true) {
+    global $CFG;
+    umask(0000);
+    if (! file_exists($dir)) {
+        if (! @mkdir($dir, $CFG->directorypermissions)) {
+            return false;
+        }
+        //@chmod($dir, $CFG->directorypermissions);  // Just in case mkdir didn't do it
+    }
+    return $dir;
+}
 
+/**
+ * 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

@@ -1,15 +1,18 @@
 <?php // $Id$
 
 /**
-This script enables Moodle translators to edit /docs and /help language
-files directly via WWW interface.
-
-Author:     mudrd8mz@uxit.pedf.cuni.cz (http://moodle.cz)
-Based on:   lang.php in 1.4.3+ release
-Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job and all moodlers
-            for intensive testing of this my first contribution
-*/
+ * This script enables Moodle translators to edit /docs and /help language
+ * files directly via WWW interface.
+ *
+ * Author:     mudrd8mz@uxit.pedf.cuni.cz (http://moodle.cz)
+ * Based on:   lang.php in 1.4.3+ release
+ * Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job and all moodlers
+ *             for intensive testing of this my first contribution
+ */
     require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('langedit', $adminroot);
 
     //
     // Some local configuration
@@ -24,28 +27,12 @@ Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job a
 
     $currentfile = optional_param('currentfile', 'docs/README.txt', PARAM_PATH); 
 
-    require_login();
-
-    if (!isadmin()) {
-        error("You need to be admin to edit this page");
-    }     
-
-    if (! $site = get_site()) {
-        error("Site not defined!");
-    }
-
-    $stradministration = get_string("administration");
-    $strconfiguration = get_string("configuration");
     $strlanguage = get_string("language");
     $strcurrentlanguage = get_string("currentlanguage");
     $strthislanguage = get_string("thislanguage");
     $stredithelpdocs = get_string('edithelpdocs', 'admin');
 
-    print_header("$site->shortname: $stredithelpdocs: $currentfile", "$site->fullname",
-                 "<a href=\"index.php\">$stradministration</a> -> ".
-                 "<a href=\"configure.php\">$strconfiguration</a> -> 
-                  <a href=\"lang.php\">$strlanguage</a> -> $stredithelpdocs",
-                 'choosefile.popup', '', true);
+    admin_externalpage_print_header($adminroot);
 
     $currentlang = current_language();
     $langdir = "$CFG->dataroot/lang/$currentlang";
@@ -53,7 +40,7 @@ Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job a
 
 
     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?
 
@@ -62,7 +49,7 @@ Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job a
             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);
             }
         }
     }
@@ -74,7 +61,7 @@ Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job a
     // 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();
@@ -94,7 +81,7 @@ Thanks:     Jaime Villate for important bug fixing, koen roggemans for his job a
     // 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.
@@ -171,7 +158,10 @@ $langdir/$currentfile")."</font></p>";
         echo htmlspecialchars(file_get_contents("$enlangdir/$currentfile"));
         echo "</textarea>\n";
         //link_to_popup_window("/lang/en_utf8/$currentfile", "popup", get_string("preview"));
-        link_to_popup_window(help_preview_url($currentfile).'&amp;forcelang=en_utf8', 'popup', get_string('preview'));
+        $preview_url = langdoc_preview_url($currentfile);
+        if ($preview_url) {
+            link_to_popup_window($preview_url.'&amp;forcelang=en_utf8', 'popup', get_string('preview'));
+        }
         echo "</td>\n";
         if ($fileeditorinline == 1) {
             echo "</tr>\n<tr valign=\"center\">\n";
@@ -179,30 +169,32 @@ $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.'" />';
-        }
 
-        echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"filedata\">\n";
-        if (file_exists("$langdir/$currentfile")) {
-	    echo htmlspecialchars(file_get_contents("$langdir/$currentfile"));
-        } else {
-            echo ($filetemplate);
-        }
-        echo "</textarea>\n";
-        link_to_popup_window(help_preview_url($currentfile), 'popup', get_string('preview'));
-        echo "</td>\n</tr>\n</table>";
-
-        if ($editable) {
+            echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"filedata\">\n";
+            if (file_exists("$langdir/$currentfile")) {
+                echo htmlspecialchars(file_get_contents("$langdir/$currentfile"));
+            } else {
+                echo ($filetemplate);
+            }
+            echo "</textarea>\n";
+            $preview_url = langdoc_preview_url($currentfile);
+            if ($preview_url) {
+                link_to_popup_window($preview_url, 'popup', get_string('preview'));
+            }
             echo '<div align="center"><input type="submit" value="'.get_string('savechanges').': lang/'.$currentlang.'/'.$currentfile.'" /></div>';
             echo '</form>';
         }
 
+        echo "</td>\n</tr>\n</table>";
+
+
         error_reporting($CFG->debug);
     }
 
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 //////////////////////////////////////////////////////////////////////
 
@@ -240,18 +232,26 @@ function langdoc_save_file($path, $file, $content) {
     return true;
 }
 
-
-function help_preview_url($currentfile) {
+/**
+ * Return a preview URL for the file, if available.
+ *
+ * Documentation will be moved into moodle.org wiki and current version 1.6 does not
+ * seem to be able to display local documentation. Thus, return empty URL for doc files.
+ * See lib/moodlelib.php document_file() - it still relies on old pre-UTF8 lang/ location.
+ */
+function langdoc_preview_url($currentfile) {
     if (substr($currentfile, 0, 5) == 'help/') {
         $currentfile = substr($currentfile, 5);
-    }
-    $currentpathexp = explode('/', $currentfile);
-    if (count($currentpathexp) > 1) {
-        $url = '/help.php?module='.$currentpathexp[0].'&amp;file='.$currentpathexp[1];
+        $currentpathexp = explode('/', $currentfile);
+        if (count($currentpathexp) > 1) {
+            $url = '/help.php?module='.$currentpathexp[0].'&amp;file='.$currentpathexp[1];
+        } else {
+            $url = '/help.php?module=moodle&amp;file='.$currentfile;
+        }
     } else {
-        $url = '/help.php?module=moodle&amp;file='.$currentfile;
+        $url = '';
     }
     return $url;
 }
 
-?>
+?>

admin/langimport.php

@@ -5,6 +5,9 @@
 ///This helps to avoid confusion.
 
     require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('langimport', $adminroot);
 
     $mode          = optional_param('mode', 0, PARAM_INT);     //phase
     $pack          = optional_param('pack', '', PARAM_FILE);   //pack to install
@@ -18,50 +21,39 @@
     define('DELETION_OF_SELECTED_LANG', 4);
     define('UPDATE_ALL_LANG', 5);
 
-    require_login();
-
-    if (!isadmin()) {
-        error('You must be an admin');
-    }
-    
-    if (!$site = get_site()) {
-        error("Site not defined!");
-    }
-    
     $strlang = get_string('langimport','admin');
-    
-    $stradministration = get_string("administration");
-    $strconfiguration = get_string("configuration");
+
     $strlanguage = get_string("language");
     $strthislanguage = get_string("thislanguage");
     $title = $strlang;
-    
-    print_header("$site->shortname: $title", "$site->fullname",
-                 "<a href=\"index.php\">$stradministration</a> -> ".
-                 "<a href=\"configure.php\">$strconfiguration</a> -> ".
-                 "<a href=\"lang.php\">$strlanguage</a> -> $strlang",
-                 '', '', true, '');
-    
-    print_heading('');
+
+    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 {
@@ -70,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:
@@ -100,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&amp;uninstalllang='.$uninstalllang.'&amp;confirm=1&amp;sesskey='.sesskey(),
                              'langimport.php');
             } else if (confirm_sesskey()) {
@@ -117,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,
@@ -134,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
 
@@ -199,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 {
@@ -222,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';
@@ -250,70 +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
-            
-            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) {
@@ -328,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="&larr; '.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();
 
@@ -354,8 +326,8 @@
 
     }    //close of main switch
 
-    print_footer();
-    
+    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
@@ -372,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
@@ -387,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) {
@@ -400,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

@@ -2,14 +2,12 @@
       // Enables/disables maintenance mode
 
     require('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
 
     $action = optional_param('action', '', PARAM_ALPHA);
 
-    require_login();
-
-    if (!isadmin()) {
-        error('You need to be admin to use this page');
-    }
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('maintenancemode', $adminroot);
 
     //Check folder exists
     if (! make_upload_directory(SITEID)) {   // Site folder
@@ -22,57 +20,51 @@
         if (confirm_sesskey()) {
             if ($form->action == "disable") {
                 unlink($filename);
-                redirect('index.php', get_string('sitemaintenanceoff','admin'));
+                redirect('maintenance.php', get_string('sitemaintenanceoff','admin'));
             } else {
                 $file = fopen($filename, 'w');
                 fwrite($file, stripslashes($form->text));
                 fclose($file);
-                redirect('index.php', get_string('sitemaintenanceon', 'admin'));
+                redirect('maintenance.php', get_string('sitemaintenanceon', 'admin'));
             }
         }
     }
 
 /// Print the header stuff
 
-    $strmaintenance = get_string('sitemaintenancemode', 'admin');
-    $stradmin = get_string('administration');
-    $strconfiguration = get_string('configuration');
-
-    print_header("$SITE->shortname: $strmaintenance", $SITE->fullname,
-                  "<a href=\"index.php\">$stradmin</a> -> ".
-                  "<a href=\"configure.php\">$strconfiguration</a> -> $strmaintenance");
-
-    print_heading($strmaintenance);
+    admin_externalpage_print_header($adminroot);
 
 /// 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();
         }
     }
 
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 ?>

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 $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 $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>
+</center>
+<?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", "promiscuous"))) {
+                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,176 @@
+<?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 (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"></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,151 @@
+<?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);
+    }
+
+    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

@@ -2,16 +2,9 @@
        // module.php - allows admin to edit all local configuration variables for a module
 
     require_once('../config.php');
-
-    require_login();
-
-    if (!isadmin()) {
-        error("Only an admin can use this page");
-    }
-
-    if (!$site = get_site()) {
-        error("Site isn't defined!");
-    }
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('managemodules', $adminroot);
 
 /// If data submitted, then process and store.
 
@@ -52,29 +45,23 @@
     $module = required_param('module', PARAM_SAFEDIR);
     require_once("$CFG->dirroot/mod/$module/lib.php");
 
-    $stradmin = get_string("administration");
-    $strconfiguration = get_string("configuration");
-    $strmanagemodules = get_string("managemodules");
     $strmodulename = get_string("modulename", $module);
-    
+
     // $CFG->pagepath is used to generate the body and id attributes for the body tag
     // of the page. It is also used to generate the link to the Moodle Docs for this view.
     $CFG->pagepath = 'mod/' . $module . '/config';
-    
-    print_header("$site->shortname: $strmodulename: $strconfiguration", $site->fullname,
-                  "<a href=\"index.php\">$stradmin</a> -> ".
-                  "<a href=\"configure.php\">$strconfiguration</a> -> ".
-                  "<a href=\"modules.php\">$strmanagemodules</a> -> $strmodulename");
+
+    admin_externalpage_print_header($adminroot);
 
     print_heading($strmodulename);
 
-    print_simple_box("<center>".get_string("configwarning", 'admin')."</center>", "center", "60%");
+    print_simple_box(get_string("configwarning", 'admin'), "center", "60%");
     echo "<br />";
 
     print_simple_box_start("center", "");
     include("$CFG->dirroot/mod/$module/config.html");
     print_simple_box_end();
 
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/modules.php

@@ -3,28 +3,24 @@
 
     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);
 
     $show    = optional_param('show', '', PARAM_SAFEDIR);
     $hide    = optional_param('hide', '', PARAM_SAFEDIR);
     $delete  = optional_param('delete', '', PARAM_SAFEDIR);
     $confirm = optional_param('confirm', '', PARAM_BOOL);
 
-    require_login();
-
-    if (!isadmin()) {
-        error("Only administrators can use this page!");
-    }
-
-    if (!$site = get_site()) {
-        error("Site isn't defined!");
-    }
-
 
 /// Print headings
 
-    $stradministration = get_string("administration");
-    $strconfiguration = get_string("configuration");
-    $strmanagemodules = get_string("managemodules");
+    $stractivities = get_string("activities");
     $strdelete = get_string("delete");
     $strversion = get_string("version");
     $strhide = get_string("hide");
@@ -32,15 +28,14 @@
     $strsettings = get_string("settings");
     $stractivities = get_string("activities");
     $stractivitymodule = get_string("activitymodule");
+    $strshowmodulecourse = get_string('showmodulecourse');
 
-    print_header("$site->shortname: $strmanagemodules", "$site->fullname", 
-                 "<a href=\"index.php\">$stradministration</a> -> ".
-                 "<a href=\"configure.php\">$strconfiguration</a> -> $strmanagemodules");
+    admin_externalpage_print_header($adminroot);
+
+    print_heading($stractivities);
+
+    $coursesaffected = false;
 
-    print_heading($strmanagemodules);
-   
-    $courseaffected = false;
-    
 
 /// If data submitted, then process and store.
 
@@ -65,14 +60,14 @@
     }
 
     if (!empty($delete) and confirm_sesskey()) {
-      
+
         $strmodulename = get_string("modulename", "$delete");
 
         if (!$confirm) {
-            notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename), 
-                         "modules.php?delete=$delete&amp;confirm=1&amp;sesskey=$USER->sesskey", 
+            notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename),
+                         "modules.php?delete=$delete&amp;confirm=1&amp;sesskey=$USER->sesskey",
                          "modules.php");
-            print_footer();
+            admin_externalpage_print_footer($adminroot);
             exit;
 
         } else {  // Delete everything!!
@@ -99,7 +94,7 @@
                 notify("Error occurred while deleting all $strmodulename records in course_modules table");
             }
 
-            // Then delete all the logs 
+            // Then delete all the logs
             if (!delete_records("log", "module", $module->name)) {
                 notify("Error occurred while deleting all $strmodulename records in log table");
             }
@@ -125,9 +120,11 @@
                         }
                     }
                 }
-            }  
+            }
+            // Delete the capabilities that were defined by this module
+            capabilities_cleanup('mod/'.$module->name);
 
-            //rebuild_course_cache();  // Because things have changed
+            // rebuild_course_cache();  // Because things have changed
             $coursesaffected = true;
 
             $a->module = $strmodulename;
@@ -135,11 +132,11 @@
             notice(get_string("moduledeletefiles", "", $a), "modules.php");
         }
     }
-    
+
     if ($coursesaffected) {
         rebuild_course_cache();  // Because things have changed
     }
-    
+
 
 /// Get and sort the existing modules
 
@@ -149,25 +146,28 @@
 
     foreach ($modules as $module) {
         $strmodulename = get_string("modulename", "$module->name");
-	// Deal with modules which are lacking the language string
-	if ($strmodulename == '[[modulename]]') {
-	    $strmodulename = $module->name;
-	}
+        // Deal with modules which are lacking the language string
+        if ($strmodulename == '[[modulename]]') {
+            $strmodulename = $module->name;
+        }
         $modulebyname[$strmodulename] = $module;
     }
     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>";
 
@@ -177,28 +177,42 @@
             $settings = "";
         }
 
-        $count = count_records("$module->name");
+        $count = count_records_select("$module->name",'course<>0');
+        if ($count>0) {
+            $countlink = "<a href=\"{$CFG->wwwroot}/course/search.php?modulelist=$module->name" .
+                "&amp;sesskey={$USER->sesskey}\" title=\"$strshowmodulecourse\">$count</a>";
+        }
+        else {
+            $countlink = "$count";
+        }
 
         if ($module->visible) {
             $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=$USER->sesskey\" title=\"$strhide\">".
-                       "<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);
+
+        $table->add_data(array(
+            '<span'.$class.'>'.$icon.' '.$modulename.'</span>', 
+            $countlink, 
+            '<span'.$class.'>'.$module->version.'</span>', 
+            $visible, 
+            $delete, 
+            $settings
+        ));
     }
-    print_table($table);
 
-    echo "<br /><br />";
+    $table->print_html();
 
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/multilangupgrade.php

@@ -0,0 +1,112 @@
+<?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.'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];
+                        $search = '/(<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)(\s*<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)+/is';
+                        $newtext = preg_replace_callback($search, 'multilangupgrade_impl', $text);
+                        if ($newtext != $text) {
+                            $newtext = addslashes($newtext);
+                            execute_sql("UPDATE $table SET $column='$newtext' WHERE id=".$rs->fields['id'], false);
+                        }
+                        if ($i % 600 == 0) {
+                            echo '<br />';
+                        }
+                        if ($i % 10 == 0) {
+                            echo '.';
+                        }
+                        $i++;
+                        $rs->MoveNext();
+                    }
+                }
+            }
+        }
+    }
+}
+
+// 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

@@ -3,19 +3,17 @@
 if (!isset($CFG)) {
 
     require('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('oacleanup', $adminroot);
 
     require_login();
 
-    if (!isadmin()) {
-        error('You must be an admin to use this script');
-        exit;
-    }
-    
-    print_header_simple('Online Assignment Cleanup','Online Assignment Cleanup', 'Admin');
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
+    admin_externalpage_print_header($adminroot);
     online_assignment_cleanup(true);
-
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 }
 
@@ -48,7 +46,7 @@ function online_assignment_cleanup($output=false) {
 
 
     /// get a list of all courses on this site
-    $courses = get_courses();
+    $courses = get_records('course');
 
     /// cycle through each course
     foreach ($courses as $course) {
@@ -75,7 +73,7 @@ function online_assignment_cleanup($output=false) {
                 /// cycle through the instances
                 foreach ($instances as $instance) {
                     /// is this an instance of an online assignment
-                    $sql = "SELECT a.id 
+                    $sql = "SELECT a.id
                         FROM  {$CFG->prefix}course_modules cm,
                     {$CFG->prefix}assignment a
                     WHERE cm.id = '$instance' AND
@@ -101,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;
                         }
 
@@ -140,7 +138,7 @@ function online_assignment_cleanup($output=false) {
 
                         set_field('course_sections', 'sequence', $section->sequence, 'id', $section->id);
 
-                        
+
                         if ($output) echo 'Online Assignment (instance '.$instance.') moved from section '.$section->id.': to section '.$newsection.'<br />';
 
                     }

admin/pagelib.php

@@ -0,0 +1,138 @@
+<?php // $Id$
+
+require_once($CFG->libdir.'/pagelib.php');
+
+define('PAGE_ADMIN', 'admin');
+
+// 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 {
+
+    var $section;
+    var $pathtosection;
+    var $visiblepathtosection;
+
+    // hack alert!
+    // this function works around the inability to store the section name
+    // in default block, maybe we should "improve" the blocks a bit?
+    function init_extra($section) { 
+        global $CFG;
+
+        if($this->full_init_done) {
+            return;
+        }
+
+        $adminroot = admin_get_root();
+
+        // fetch the path parameter
+        $this->section = $section;
+
+        $this->visiblepathtosection = array();
+        
+        // this part is (potentially) processor-intensive... there's gotta be a better way
+        // of handling this
+        if ($this->pathtosection = $adminroot->path($this->section)) {
+            foreach($this->pathtosection as $element) {
+                if ($pointer = $adminroot->locate($element)) {
+                    array_push($this->visiblepathtosection, $pointer->visiblename);
+                }
+            }
+        }
+
+        // all done
+        $this->full_init_done = true;
+    }
+    
+    function blocks_get_default() {
+        return 'admin_tree,admin_bookmarks';
+    }
+
+    // seems reasonable that the only people that can edit blocks on the admin pages
+    // are the admins... but maybe we want a role for this?
+    function user_allowed_editing() { 
+        return has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    }
+
+    // has to be fixed. i know there's a "proper" way to do this
+    function user_is_editing() { 
+        global $USER;
+        return $USER->adminediting;
+    }
+
+    function url_get_path() { 
+        global $CFG;
+
+        $adminroot = admin_get_root();
+
+        $root = $adminroot->locate($this->section);
+        if (is_a($root, 'admin_externalpage')) {
+            return $root->url;
+        } else {
+            return ($CFG->wwwroot . '/' . $CFG->admin . '/settings.php');
+        }
+    }
+
+    function url_get_parameters() {  // only handles parameters relevant to the admin pagetype
+        return array('section' => (isset($this->section) ? $this->section : ''));
+    }
+
+    function blocks_get_positions() { 
+        return array(BLOCK_POS_LEFT, BLOCK_POS_RIGHT);
+    }
+
+    function blocks_default_position() { 
+        return BLOCK_POS_LEFT;
+    }
+
+    function blocks_move_position(&$instance, $move) {
+        if($instance->position == BLOCK_POS_LEFT && $move == BLOCK_MOVE_RIGHT) {
+            return BLOCK_POS_RIGHT;
+        } else if ($instance->position == BLOCK_POS_RIGHT && $move == BLOCK_MOVE_LEFT) {
+            return BLOCK_POS_LEFT;
+        }
+        return $instance->position;
+    }
+
+    // does anything need to be done here?
+    function init_quick($data) {
+        parent::init_quick($data);
+    }
+
+    function print_header($section = '') {
+        global $USER, $CFG, $SITE;
+
+        $this->init_full($section); // we're trusting that init_full() has already been called by now; it should have.
+                                    // if not, print_header() has to be called with a $section parameter
+
+	// The search page currently doesn't handle block editing 
+        if ($this->section != 'search' and $this->user_allowed_editing()) {
+            $buttons = '<div><form '.$CFG->frametarget.' method="get" action="' . $this->url_get_path() . '">'.
+                       '<div><input type="hidden" name="adminedit" value="'.($this->user_is_editing()?'off':'on').'" />'.
+                       '<input type="hidden" name="section" value="'.$this->section.'" />'.
+                       '<input type="submit" value="'.get_string($this->user_is_editing()?'blockseditoff':'blocksediton').'" /></div></form></div>';
+        } else {
+            $buttons = '&nbsp;';
+        }
+        
+        print_header("$SITE->shortname: " . implode(": ",$this->visiblepathtosection), $SITE->fullname, 
+                       implode(" -> ",$this->visiblepathtosection),'', '', true, $buttons, '');
+    }
+
+    function get_type() {
+        return PAGE_ADMIN;
+    }
+}
+
+?>

admin/phpinfo.php

@@ -2,38 +2,37 @@
        // phpinfo.php - shows phpinfo for the current server
 
     require_once("../config.php");
+    require_once($CFG->libdir.'/adminlib.php');
 
-    $topframe    = optional_param('topframe', false, PARAM_BOOL);
-    $bottomframe = optional_param('bottomframe', false, PARAM_BOOL);
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('phpinfo', $adminroot);
 
     require_login();
 
-    if (!isadmin()) {
-        error("Only the admin can use this page");
-    }
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
-    if (!$topframe && !$bottomframe) {
-        ?>
+    admin_externalpage_print_header($adminroot);
 
-        <head>
-        <title>PHP info</title>
-        </head>
+    echo '<div class="phpinfo">';
 
-        <frameset rows="80,*">
-           <frame src="phpinfo.php?topframe=true&amp;sesskey=<?php echo $USER->sesskey ?>">
-           <frame src="phpinfo.php?bottomframe=true&amp;sesskey=<?php echo $USER->sesskey ?>">
-        </frameset>
+    ob_start();
+    phpinfo(INFO_GENERAL + INFO_CONFIGURATION + INFO_MODULES);
+    $html = ob_get_contents();
+    ob_end_clean();
 
-        <?php
-    } else if ($topframe && confirm_sesskey()) {
-        $stradministration = get_string("administration");
-        $site = get_site();
+/// 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;
+
+    echo '</div>';
+
+    admin_externalpage_print_footer($adminroot);
 
-        print_header("$site->shortname: phpinfo", "$site->fullname",
-                     "<a target=\"$CFG->framename\" href=\"index.php\">$stradministration</a> -> PHP info");
-        exit;
-    } else if ($bottomframe && confirm_sesskey()) {
-        phpinfo();
-        exit;
-    }
 ?>

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

admin/questiontypes.php

@@ -1,171 +0,0 @@
-<?PHP // $Id$
-      // Allows the admin to manage questiontypes
-      // This page is adapted from modules.php
-      
-      // This page is not yet in service, the whole plug-in architecture
-      // for question types is still under construction.
-
-    require_once('../config.php');
-
-    $show    = optional_param('show', '', PARAM_SAFEDIR);
-    $hide    = optional_param('hide', '', PARAM_SAFEDIR);
-    $delete  = optional_param('delete', '', PARAM_SAFEDIR);
-    $confirm = optional_param('confirm', '', PARAM_BOOL);
-
-    require_login();
-
-    if (!isadmin()) {
-        error("Only administrators can use this page!");
-    }
-
-    if (!$site = get_site()) {
-        error("Site isn't defined!");
-    }
-
-
-/// Print headings
-
-    $stradministration = get_string("administration");
-    $strconfiguration = get_string("configuration");
-    $strdelete = get_string("delete");
-    $strversion = get_string("version");
-    $strhide = get_string("hide");
-    $strshow = get_string("show");
-    $strsettings = get_string("settings");
-    $strquestions = get_string("questions");
-    $strquestiontype = get_string("questiontype", 'quiz');
-
-    print_header("$site->shortname: $strquestions", "$site->fullname", 
-                 "<a href=\"index.php\">$stradministration</a> -> ".
-                 "<a href=\"configure.php\">$strconfiguration</a> -> $strquestions");
-
-    print_heading($strquestions);
-   
-
-/// If data submitted, then process and store.
-
-    if (!empty($hide) and confirm_sesskey()) {
-        if (!$qtype = get_record("question_types", "name", $hide)) {
-            error("Question type doesn't exist!");
-        }
-        set_field("question_types", "visible", "0", "id", $qtype->id);            // Hide question type
-    }
-
-    if (!empty($show) and confirm_sesskey()) {
-        if (!$qtype = get_record("question_types", "name", $show)) {
-            error("Question type doesn't exist!");
-        }
-        set_field("question_types", "visible", "1", "id", $qtype->id);            // Show question type
-    }
-
-    if (!empty($delete) and confirm_sesskey()) {
-      
-        $strqtypename = get_string("qtypename", "qtype_$delete");
-
-        if (!$confirm) {
-            notice_yesno(get_string("qtypedeleteconfirm", "admin", $strqtypename), 
-                         "questiontypes.php?delete=$delete&amp;confirm=1&amp;sesskey=$USER->sesskey", 
-                         "questiontypes.php");
-            print_footer();
-            exit;
-
-        } else {  // Delete everything!!
-
-            if ($delete == "random") {
-                error("You can not delete the random question type!!");
-            }
-
-            if (!$qtype = get_record("question_types", "name", $delete)) {
-                error("Question type doesn't exist!");
-            }
-
-            // OK, first delete all the questions
-            if ($questions = get_records("quiz_questions", "qtype", $qtype->id)) {
-                foreach ($questions as $question) {
-                    if (! quiz_delete_question($coursemod->id, $coursemod->section)) {
-                        notify("Could not delete the $strqtypename with id = $question->id");
-                    }
-                }
-            }
-
-            // And the qtype entry itself
-            if (!delete_records("question_types", "name", $qtype->name)) {
-                notify("Error occurred while deleting the $strqtypename record from question_types table");
-            }
-
-            // Then the tables themselves
-
-            if ($tables = $db->Metatables()) {
-                $prefix = $CFG->prefix.$qtype->name;
-                foreach ($tables as $table) {
-                    if (strpos($table, $prefix) === 0) {
-                        if (!execute_sql("DROP TABLE $table", false)) {
-                            notify("ERROR: while trying to drop table $table");
-                        }
-                    }
-                }
-            }  
-
-            $a->qtype = $strqtypename;
-            $a->directory = "$CFG->dirroot/qtype/$delete";
-            notice(get_string("qtypedeletefiles", "", $a), "questiontypes.php");
-        }
-    }
-
-/// Get and sort the existing questiontypes
-
-    if (!$qtypes = get_records("question_types")) {
-        error("No question types found!!");        // Should never happen
-    }
-
-    foreach ($qtypes as $qtype) {
-        $strqtypename = get_string("qtypename", "qtype_$qtype->name");
-        $qtypebyname[$strqtypename] = $qtype;
-    }
-    ksort($qtypebyname);
-
-/// Print the table of all questiontypes
-
-    $table->head  = array ($strquestiontype, $strquestions, $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";
-
-    foreach ($qtypebyname as $qtypename => $qtype) {
-
-        $icon = "<img src=\"$CFG->dirroot/mod/quiz/questiontypes/$qtype->name/icon.gif\" hspace=\"10\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" />";
-
-        if (file_exists("$CFG->dirroot/mod/quiz/questiontypes/$qtype->name/config.html")) {
-            $settings = "<a href=\"questiontype.php?qtype=$qtype->name\">$strsettings</a>";
-        } else {
-            $settings = "";
-        }
-
-        $count = count_records('quiz_questions', 'qtype', $qtype->id);
-
-        $delete = $count ? '' : "<a href=\"questiontypes.php?delete=$qtype->name&amp;sesskey=$USER->sesskey\">$strdelete</a>";
-        
-        if ($qtype->visible) {
-            $visible = "<a href=\"questiontypes.php?hide=$qtype->name&amp;sesskey=$USER->sesskey\" title=\"$strhide\">".
-                       "<img src=\"$CFG->pixpath/i/hide.gif\" align=\"middle\" height=\"16\" width=\"16\" border=\"0\" alt=\"\" /></a>";
-            $class = "";
-        } else {
-            $visible = "<a href=\"questiontypes.php?show=$qtype->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\"";
-        }
-        if ($qtype->name == "random") {
-            $delete = "";
-            $visible = "";
-            $class = "";
-        }
-        $table->data[] = array ("<span $class>$icon $qtypename</span>", $count, $qtype->version, $visible, $delete, $settings);
-    }
-    print_table($table);
-
-    echo "<br /><br />";
-
-    print_footer();
-
-?>

admin/register.php

@@ -5,9 +5,7 @@
 
     require_login();
 
-    if (!isadmin()) {
-        error("Only the admin can use this page");
-    }
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
     if (!$site = get_site()) {
         redirect("index.php");
@@ -26,7 +24,7 @@
     }
 
     if (empty($CFG->siteidentifier)) {    // Unique site identification code
-        set_config('siteidentifier', random_string(32));
+        set_config('siteidentifier', random_string(32).$_SERVER['HTTP_HOST']);
     }
 
 
@@ -36,159 +34,157 @@
     $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')-1;
+    $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 />';
 
-    $count = count_records('user_students');
-    echo get_string("enrolments").": ".$count;
-    echo "<input type=\"hidden\" name=\"enrolments\" value=\"$count\">\n";
+    // 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 '<br />';
 
-    $count = count_records('user_teachers');
+    // first find all distinct roles with mod/course:update
+    // please change the name and strings to something appropriate to reflect the new data collected
+    $sql = "SELECT COUNT(DISTINCT u.id)
+            FROM {$CFG->prefix}role_capabilities rc, 
+                 {$CFG->prefix}role_assignments ra,
+                 {$CFG->prefix}user u
+            WHERE (rc.capability = 'moodle/course:update' or rc.capability='moodle/site:doanything')
+                   AND rc.roleid = ra.roleid
+                   AND u.id = ra.userid";
+    
+    $count = count_records_sql($sql);
     echo get_string("teachers").": ".$count;
-    echo "<input type=\"hidden\" name=\"teachers\" 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

@@ -2,32 +2,37 @@
       /// 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('replace', $adminroot);
 
 $search  = optional_param('search', '', PARAM_RAW);
 $replace = optional_param('replace', '', PARAM_RAW);
 
 require_login();
 
-if (!isadmin()) {
-    error("Admins only");
-}
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
 ###################################################################
-print_header('Search and replace throughout the whole database', 'Replace text within the whole database');
+admin_externalpage_print_header($adminroot);
+
+print_heading('Search and replace text throughout the whole database');
 
 
-if (!$search or !$replace or !confirm_sesskey()) {   /// Print a form
+if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Print a form
 
     print_simple_box_start('center');
     echo '<div align="center">';
-    echo '<form action="replace.php">';
-    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 '<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 />';
+    echo '<input type="submit" value="Yes, do it now" /><br />';
     echo '</form>';
     echo '</div>';
     print_simple_box_end();
+    admin_externalpage_print_footer($adminroot);
     die;
 }
 
@@ -37,6 +42,13 @@ if (!$tables = $db->Metatables() ) {    // No tables yet at all.
 }
 
 print_simple_box_start('center');
+
+/// Turn off time limits, sometimes upgrades can be slow.
+
+@set_time_limit(0);
+@ob_implicit_flush(true);
+while(@ob_end_flush());
+
 foreach ($tables as $table) {
     if (in_array($table, array($CFG->prefix.'config'))) {      // Don't process these
         continue;
@@ -51,8 +63,16 @@ foreach ($tables as $table) {
         }
     }
 }
+
 print_simple_box_end();
 
+/// Rebuild course cache which might be incorrect now
+notify('Rebuilding course cache...');
+rebuild_course_cache();
+notify('...finished');
+
 print_continue('index.php');
 
+admin_externalpage_print_footer($adminroot);
+
 ?>

admin/report.php

@@ -1,26 +0,0 @@
-<?php // $Id$
-      // Display all the reports available in admin/report
-
-    require_once('../config.php');
-
-    if (!isadmin()) {
-        error("You are not allowed to look at this page");
-    }
-
-    $stradmin = get_string('administration');
-    $strreports = get_string('reports');
-
-    print_header($strreports, $strreports,
-                 '<a href="index.php">'.$stradmin.'</a> -> '.$strreports);
-
-    $directories = get_list_of_plugins('admin/report');
-
-    foreach ($directories as $directory) {
-        echo '<div class="plugin '.$directory.'">';
-        include_once($CFG->dirroot.'/admin/report/'.$directory.'/mod.php');  // Fragment for listing
-        echo '</div>';
-    }
-
-    print_footer();
-?>
-

admin/report/courseoverview/index.php

@@ -2,20 +2,24 @@
 
     require_once('../../../config.php');
     require_once($CFG->dirroot.'/lib/statslib.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $adminroot = admin_get_root();
+
+    admin_externalpage_setup('reportcourseoverview', $adminroot);
+
+    admin_externalpage_print_header($adminroot);
 
     $report     = optional_param('report', STATS_REPORT_ACTIVE_COURSES, PARAM_INT);
     $time       = optional_param('time', 0, PARAM_INT);
     $numcourses = optional_param('numcourses', 20, PARAM_INT);
 
+    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));  // needed?
+
     if (empty($CFG->enablestats)) {
-        error("Stats is not enabled.");
+        redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3, $adminroot);
     }
 
-    require_login();
-
-    if (!isadmin()) {
-        error("This page is for admins only");
-    }
 
     $course = get_site();
     stats_check_uptodate($course->id);
@@ -23,16 +27,14 @@
     $strreports = get_string('reports');
     $strcourseoverview = get_string('courseoverview');
 
-    $strnav = '<a href="'.$CFG->wwwroot.'/admin/index.php">'.get_string('administration').'</a> -> <a href="'.$CFG->wwwroot.'/admin/report.php">'.$strreports.'</a> -> '.$strcourseoverview;
-    
     $reportoptions = stats_get_report_options($course->id,STATS_MODE_RANKED);
 
     $tableprefix = $CFG->prefix.'stats_';
 
-    $earliestday = get_field_sql('SELECT timeend FROM '.$tableprefix.'daily ORDER BY timeend LIMIT 1');
-    $earliestweek = get_field_sql('SELECT timeend FROM '.$tableprefix.'weekly ORDER BY timeend LIMIT 1');
-    $earliestmonth = get_field_sql('SELECT timeend FROM '.$tableprefix.'monthly ORDER BY timeend LIMIT 1');
-    
+    $earliestday = get_field_sql('SELECT timeend FROM '.$tableprefix.'daily ORDER BY timeend');
+    $earliestweek = get_field_sql('SELECT timeend FROM '.$tableprefix.'weekly ORDER BY timeend');
+    $earliestmonth = get_field_sql('SELECT timeend FROM '.$tableprefix.'monthly ORDER BY timeend');
+
     if (empty($earliestday)) $earliestday = time();
     if (empty($earliestweek)) $earliestweek = time();
     if (empty($earliestmonth)) $earliestmonth = time();
@@ -44,15 +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);
     }
 
-    print_header($strcourseoverview, $strcourseoverview, $strnav,'','',true,'&nbsp');
-
     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,59 +60,61 @@
                            '<input type="submit" value="'.get_string('view').'" />') ;
 
     print_table($table);
+    echo '</fieldset>';
     echo '</form>';
 
     if (!empty($report) && !empty($time)) {
         $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
-        
-        $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
-            ." WHERE timeend >= ".$param->timeafter
-            ." GROUP BY courseid "
-            .$param->extras
-            ." ORDER BY ".$param->orderby
-            ." LIMIT ".$numcourses;
-        
-        $courses = get_records_sql($sql);
+
+        if (!empty($param->sql)) {
+            $sql = $param->sql;
+        } else {
+            $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
+                ." WHERE timeend >= ".$param->timeafter.' AND stattype = \'activity\''
+                ." GROUP BY courseid "
+                .$param->extras
+                ." ORDER BY ".$param->orderby;
+        }
+        error_log($sql);
+
+        $courses = get_records_sql($sql, 0, $numcourses);
 
         if (empty($courses)) {
-            error(get_string('statsnodata'),$CFG->wwwroot.'/admin/report/courseoverview/index.php');
-        }
+            notify(get_string('statsnodata'));echo '</td></tr></table>';echo '<p>after notify</p>';
 
-        echo '<center><img src="'.$CFG->wwwroot.'/admin/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></center>';
-        
-        $table = new object();
-        $table->align = array('left','center','center','center');
-        $table->head = array(get_string('course'),$param->line1);
-        if (!empty($param->line2)) {
-            $table->head[] = $param->line2; 
-        }
-        if (!empty($param->line3)) {
-            $table->head[] = $param->line3;
-        }
-        
-        foreach  ($courses as $c) {
-            $a = array();
-            $a[] = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$c->courseid.'">'.get_field('course','shortname','id',$c->courseid).'</a>';
-            $a[] = print_numeric_value($c->line1);
-            if (isset($c->line2)) {
-                $a[] = print_numeric_value($c->line2);
+        } else {
+            if (empty($CFG->gdversion)) {
+                echo '<div class="boxaligncenter">(' . get_string("gdneed") .')</div>';
+            } else {
+                echo '<div class="boxaligncenter"><img alt="'.get_string('courseoverviewgraph').'" src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></div>';
             }
-            if (isset($c->line3)) {
-                $a[] = print_numeric_value($c->line3);
+
+            $table = new StdClass;
+            $table->align = array('left','center','center','center');
+            $table->head = array(get_string('course'),$param->line1);
+            if (!empty($param->line2)) {
+                $table->head[] = $param->line2;
             }
-            $table->data[] = $a;
+            if (!empty($param->line3)) {
+                $table->head[] = $param->line3;
+            }
+
+            foreach  ($courses as $c) {
+                $a = array();
+                $a[] = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$c->courseid.'">'.get_field('course','shortname','id',$c->courseid).'</a>';
+
+                $a[] = $c->line1;
+                if (isset($c->line2)) {
+                    $a[] = $c->line2;
+                }
+                if (isset($c->line3)) {
+                    $a[] = round($c->line3,2);
+                }
+                $table->data[] = $a;
+            }
+            print_table($table);
         }
-        print_table($table);
     }
-    
-    print_footer();
-
-function print_numeric_value($value) {
-    list($whole, $decimals) = split ('[.,]', $value, 2);
-    if (intval($decimals) > 0)
-        return number_format($value,2,".",",");
-    else
-        return $value;
-}
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/report/courseoverview/mod.php

@@ -1,11 +0,0 @@
-<?php
-
-    if (!defined('MOODLE_INTERNAL')) {
-        die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-    }
-
-    if (!empty($CFG->enablestats)) {
-        echo '<a href="'.$CFG->wwwroot.'/admin/report/courseoverview/index.php">'.get_string('courseoverview').'</a>';
-    }
-?>
-

admin/report/courseoverview/reportsgraph.php

@@ -10,27 +10,28 @@
 
     require_login();
 
-    if (!isadmin()) {
-        error("You must be an admin to use this page");
-    }
+    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
     stats_check_uptodate($course->id);
 
     $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
 
-    $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
-        ." WHERE timeend >= ".$param->timeafter
-        ." GROUP BY courseid "
-        .$param->extras
-        ." ORDER BY ".$param->orderby
-        ." LIMIT ".$numcourses;
-    
-    $courses = get_records_sql($sql);
-    
-    if (empty($courses)) {
-        error(get_string('statsnodata'),$CFG->wwwroot.'/admin/report/course/index.php');
+    if (!empty($param->sql)) {
+        $sql = $param->sql;
+    } else {
+        $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
+            ." WHERE timeend >= ".$param->timeafter.' AND stattype = \'activity\''
+            ." GROUP BY courseid "
+            .$param->extras
+            ." ORDER BY ".$param->orderby;
     }
-    
+
+    $courses = get_records_sql($sql, 0, $numcourses);
+
+    if (empty($courses)) {
+        error(get_string('statsnodata'),$CFG->wwwroot.'/'.$CFG->admin.'/report/course/index.php');
+    }
+
 
     $graph = new graph(750,400);
 
@@ -38,6 +39,8 @@
     $graph->parameter['legend_size'] = 10;
     $graph->parameter['x_axis_angle'] = 90;
     $graph->parameter['title'] = false; // moodle will do a nicer job.
+    $graph->y_tick_labels = null;
+    $graph->offset_relation = null;
     if ($report != STATS_REPORT_ACTIVE_COURSES) {
         $graph->parameter['y_decimal_left'] = 2;
     }
@@ -50,5 +53,5 @@
     $graph->y_format['bar1'] = array('colour' => 'blue','bar' => 'fill','legend' => $param->{$param->graphline});
 
     $graph->draw_stack();
-    
+
 ?>

admin/report/log/index.php

@@ -0,0 +1,33 @@
+<?php // $Id$
+
+    require_once('../../../config.php');
+    require_once($CFG->dirroot.'/course/lib.php');
+    require_once($CFG->dirroot.'/course/report/log/lib.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $adminroot = admin_get_root();
+
+    admin_externalpage_setup('reportlog', $adminroot);
+
+    admin_externalpage_print_header($adminroot);
+
+
+    $course = get_site();
+
+    print_heading(get_string('chooselogs') .':');
+
+    print_mnet_log_selector_form($CFG->mnet_localhost_id, $course);
+
+    echo '<br />';
+    print_heading(get_string('chooselivelogs') .':');
+
+    $heading = link_to_popup_window('/course/report/log/live.php?id='. $course->id,
+                                    'livelog', get_string('livelogs'),
+                                    500, 800, '', 'none', true);
+
+    print_heading($heading, 'center', 3);
+
+
+    admin_externalpage_print_footer($adminroot);
+
+?>

admin/report/log/mod.php

@@ -1,23 +0,0 @@
-<?php
-
-    if (!defined('MOODLE_INTERNAL')) {
-        die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-    }
-
-    require_once($CFG->dirroot.'/course/lib.php');
-    require_once($CFG->dirroot.'/course/report/log/lib.php');
-
-    $course = get_site();
-
-    print_heading(get_string('chooselogs') .':');
-
-    print_log_selector_form($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>';
-
-?>

admin/report/simpletest/ex_reporter.php

@@ -0,0 +1,195 @@
+<?php
+/**
+ * A SimpleTest report format for Moodle.
+ *
+ * @copyright &copy; 2006 The Open University
+ * @author N.D.Freear@open.ac.uk, T.J.Hunt@open.ac.uk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @version $Id$
+ * @package SimpleTestEx
+ */
+
+/** */
+require_once(dirname(__FILE__) . '/../../../config.php');
+require_once($CFG->libdir . '/moodlelib.php');
+require_once($CFG->libdir . '/simpletestlib/reporter.php');
+
+/**
+ * Extended in-browser test displayer. HtmlReporter generates
+ * only failure messages and a pass count. ExHtmlReporter also
+ * generates pass messages and a time-stamp.
+ *
+ * @package SimpleTestEx
+ */
+class ExHtmlReporter extends HtmlReporter {
+
+    // Options set when the class is created.
+    var $showpasses;
+
+    // Lang strings. Set in the constructor.
+    var $strrunonlyfolder;
+    var $strrunonlyfile;
+
+    var $strseparator;
+
+    /**
+     * Constructor.
+     *
+     * @param bool $showpasses Whether this reporter should output anything for passes.
+     */
+    function ExHtmlReporter($showpasses) {
+        global $CFG, $THEME;
+
+        $this->HtmlReporter();
+        $this->showpasses = $showpasses;
+
+        $this->strrunonlyfolder = $this->get_string('runonlyfolder');
+        $this->strrunonlyfile = $this->get_string('runonlyfile');
+        $this->strseparator = get_separator();
+    }
+
+    /**
+     * Called when a pass needs to be output.
+     */
+    function paintPass($message) {
+        //(Implicitly call grandparent, as parent not implemented.)
+        parent::paintPass($message);
+        if ($this->showpasses) {
+            $this->_paintPassFail('pass', $message);
+        }
+    }
+
+    /**
+     * Called when a fail needs to be output.
+     */
+    function paintFail($message) {
+        // Explicitly call grandparent, not parent::paintFail.
+        SimpleScorer::paintFail($message);
+        $this->_paintPassFail('fail', $message);
+    }
+
+    /**
+     * Called when an error (uncaught exception or PHP error) needs to be output.
+     */
+    function paintError($message) {
+        // Explicitly call grandparent, not parent::paintFail.
+        SimpleScorer::paintError($message);
+        $this->_paintPassFail('exception', $message);
+    }
+
+    /**
+     * Private method. Used by printPass/Fail/Error.
+     */
+    function _paintPassFail($passorfail, $message) {
+        global $FULLME, $CFG;
+
+        print_simple_box_start('', '100%', '', 5, $passorfail . ' generalbox');
+        $url = $this->_htmlEntities($this->_stripParameterFromUrl($FULLME, 'path'));
+        echo '<b class="', $passorfail, '">', $this->get_string($passorfail), '</b>: ';
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        $file = array_shift($breadcrumb);
+        $pathbits = preg_split('/\/|\\\\/', substr($file, strlen($CFG->dirroot) + 1));
+        $file = array_pop($pathbits);
+        $folder = '';
+        foreach ($pathbits as $pathbit) {
+            $folder .= $pathbit . '/';
+            echo "<a href=\"{$url}path=$folder\" title=\"$this->strrunonlyfolder\">$pathbit</a>/";
+        }
+        echo "<a href=\"{$url}path=$folder$file\" title=\"$this->strrunonlyfile\">$file</a>";
+        echo $this->strseparator, implode($this->strseparator, $breadcrumb);
+        echo $this->strseparator, '<br />', $this->_htmlEntities($message), "\n\n";
+        print_simple_box_end();
+        flush();
+    }
+
+    /**
+     * Called when a notice needs to be output.
+     */
+    function paintNotice($message) {
+        $this->paintMessage($this->_htmlEntities($message));
+    }
+
+    /**
+     * Paints a simple supplementary message.
+     * @param string $message Text to display.
+     */
+    function paintMessage($message) {
+        if ($this->showpasses) {
+            print_simple_box_start('', '100%');
+            echo '<span class="notice">', $this->get_string('notice'), '</span>: ';
+            $breadcrumb = $this->getTestList();
+            array_shift($breadcrumb);
+            echo implode($this->strseparator, $breadcrumb);
+            echo $this->strseparator, '<br />', $message, "\n";
+            print_simple_box_end();
+            flush();
+        }
+    }
+
+    /**
+     * Output anything that should appear above all the test output.
+     */
+    function paintHeader($test_name) {
+        // We do this the moodle way instead.
+    }
+
+    /**
+     * Output anything that should appear below all the test output, e.g. summary information.
+     */
+    function paintFooter($test_name) {
+        $summarydata = new stdClass;
+        $summarydata->run = $this->getTestCaseProgress();
+        $summarydata->total = $this->getTestCaseCount();
+        $summarydata->passes = $this->getPassCount();
+        $summarydata->fails = $this->getFailCount();
+        $summarydata->exceptions = $this->getExceptionCount();
+
+        if ($summarydata->fails == 0 && $summarydata->exceptions == 0) {
+            $status = "pass";
+        } else {
+            $status = "fail";
+        }
+        echo '<div class="unittestsummary ', $status, '">';
+        echo $this->get_string('summary', $summarydata);
+        echo '</div>';
+
+        echo '<div class="performanceinfo">',
+                $this->get_string('runat', date('<b>d-m-Y H:i T</b>')),
+                $this->get_string('version', SimpleTestOptions::getVersion()),
+                '</div>';
+    }
+
+    /**
+     * Strip a specified parameter from the query string of a URL, if present.
+     * Adds a separator to the end of the URL, so that a new parameter
+     * can easily be appended. For example (assuming $param = 'frog'):
+     *
+     * http://example.com/index.php               -> http://example.com/index.php?
+     * http://example.com/index.php?frog=1        -> http://example.com/index.php?
+     * http://example.com/index.php?toad=1        -> http://example.com/index.php?toad=1&
+     * http://example.com/index.php?frog=1&toad=1 -> http://example.com/index.php?toad=1&
+     *
+     * @param string $url the URL to modify.
+     * @param string $param the parameter to strip from the URL, if present.
+     *
+     * @return string The modified URL.
+     */
+    function _stripParameterFromUrl($url, $param) {
+        $url = preg_replace('/(\?|&)' . $param . '=[^&]*&?/', '$1', $url);
+        if (strpos($url, '?') === false) {
+            $url = $url . '?';
+        } else {
+            $url = $url . '&';
+        }
+        return $url;
+    }
+
+    /**
+     * Look up a lang string in the appropriate file.
+     */
+    function get_string($identifier, $a = NULL) {
+        return get_string($identifier, 'simpletest', $a);
+    }
+}
+?>

admin/report/simpletest/ex_simple_test.php

@@ -0,0 +1,208 @@
+<?php
+/**
+ * A SimpleTest GroupTest that automatically finds all the
+ * test files in a directory tree according to certain rules.
+ *
+ * @copyright &copy; 2006 The Open University
+ * @author N.D.Freear@open.ac.uk, T.J.Hunt@open.ac.uk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @version $Id$
+ * @package SimpleTestEx
+ */
+
+/** */
+require_once(dirname(__FILE__) . '/../../../config.php');
+require_once($CFG->libdir . '/simpletestlib/test_case.php');
+
+/**
+ * This is a composite test class for finding test cases and
+ * other RunnableTest classes in a directory tree and combining
+ * them into a group test.
+ * @package SimpleTestEx
+ */
+class AutoGroupTest extends GroupTest {
+
+    var $thorough;
+    var $showsearch;
+
+    function AutoGroupTest($showsearch, $thorough, $test_name = null) {
+        $this->GroupTest($test_name);
+        $this->showsearch = $showsearch;
+        $this->thorough = $thorough;
+    }
+
+    function setLabel($test_name) {
+        //:HACK: there is no GroupTest::setLabel, so access parent::_label.
+        $this->_label = $test_name;
+    }
+
+    function addIgnoreFolder($ignorefolder) {
+        $this->ignorefolders[]=$ignorefolder;
+    }
+
+    function _recurseFolders($path) {
+        if ($this->showsearch) {
+            echo '<li>' . basename(realpath($path)) . '<ul>';
+        }
+
+        $files = scandir($path);
+        static $s_count = 0;
+
+        foreach ($files as $file) {
+            if ($file == '.' || $file == '..') {
+                continue;
+            }
+            $file_path = $path . '/' . $file;
+            if (is_dir($file_path)) {
+                if ($file != 'CVS' && !in_array($file_path, $this->ignorefolders)) {
+                    $this->_recurseFolders($file_path);
+                }
+            } elseif (preg_match('/simpletest(\/|\\\\)test.*\.php$/', $file_path) ||
+                    ($this->thorough && preg_match('/simpletest(\/|\\\\)slowtest.*\.php$/', $file_path))) {
+
+                $s_count++;
+                // OK, found: this shows as a 'Notice' for any 'simpletest/test*.php' file.
+                $this->addTestCase(new FindFileNotice($file_path, 'Found unit test file, '. $s_count));
+
+                // addTestFile: Unfortunately this doesn't return fail/success (bool).
+                $this->addTestFile($file_path, true);
+            }
+        }
+
+        if ($this->showsearch) {
+            echo '</ul></li>';
+        }
+        return $s_count;
+    }
+
+    function findTestFiles($dir) {
+        if ($this->showsearch) {
+            echo '<p>Searching folder: ' . realpath($dir) . '</p><ul>';
+        }
+        $path = $dir;
+        $count = $this->_recurseFolders($path);
+        if ($count <= 0) {
+            $this->addTestCase(new BadAutoGroupTest($path, 'Search complete. No unit test files found'));
+        } else {
+            $this->addTestCase(new AutoGroupTestNotice($path, 'Search complete. Total unit test files found: '. $count));
+        }
+        if ($this->showsearch) {
+                echo '</ul>';
+        }
+        return $count;
+    }
+
+    function addTestFile($file, $internalcall = false) {
+        if ($this->showsearch) {
+            if ($internalcall) {
+                echo '<li><b>' . basename($file) . '</b></li>';
+            } else {
+                echo '<p>Adding test file: ' . realpath($file) . '</p>';
+            }
+            // Make sure that syntax errors show up suring the search, otherwise you often
+            // get blank screens because evil people turn down error_reporting elsewhere.
+            error_reporting(E_ALL);
+        }
+        if(!is_file($file) ){
+            parent::addTestCase(new BadTest($file, 'Not a file or does not exist'));
+        }
+        parent::addTestFile($file);
+    }
+}
+
+
+/* ======================================================================= */
+// get_class_ex: Insert spaces to prettify the class-name.
+function get_class_ex($object) {
+    return preg_replace('/(.?)([A-Z])/', '${1} ${2}', get_class($object));
+}
+
+
+/**
+ * A failing test base-class for when a test suite has NOT loaded properly.
+ * See class, simple_test.php: BadGroupTest.
+ * @package SimpleTestEx
+ */
+class BadTest {
+
+    var $label;
+    var $error;
+
+    function BadTest($label, $error) {
+        $this->label = $label;
+        $this->error = $error;
+    }
+
+    function getLabel() {
+        return $this->label;
+    }
+
+    function run(&$reporter) {
+        $reporter->paintGroupStart(basename(__FILE__), $this->getSize());
+        $reporter->paintFail(get_class_ex($this) .' [' . $this->getLabel() .
+                '] with error [' . $this->error . ']');
+        $reporter->paintGroupEnd($this->getLabel());
+        return $reporter->getStatus();
+    }
+
+    /**
+     * @return int the number of test cases starting.
+     */
+    function getSize() {
+        return 0;
+  }
+}
+
+/**
+ * An informational notice base-class for when a test suite is being processed.
+ * See class, simple_test.php: BadGroupTest.
+ * @package SimpleTestEx
+ */
+class Notice {
+
+    var $label;
+    var $status;
+
+    function Notice($label, $error) {
+        $this->label = $label;
+        $this->status = $error;
+    }
+
+    function getLabel() {
+        return $this->label;
+    }
+
+    function run(&$reporter) {
+        $reporter->paintGroupStart(basename(__FILE__), $this->getSize());
+        $reporter->paintNotice(get_class_ex($this) .
+                ' ['. $this->getLabel() .'] with status [' . $this->status . ']');
+        $reporter->paintGroupEnd($this->getLabel());
+        return $reporter->getStatus();
+    }
+
+    function getSize() {
+        return 0;
+    }
+}
+
+/**
+ * A failing folder test for when the test-user specifies an invalid directory
+ * (run.php?folder=woops).
+ * @package SimpleTestEx
+ */
+class BadFolderTest extends BadTest { }
+
+/**
+ * A failing auto test for when no unit test files are found.
+ * @package SimpleTestEx
+ */
+class BadAutoGroupTest extends BadTest { }
+
+/**
+ * Auto group test notices - 1. Search complete. 2. A test file has been found.
+ * @package SimpleTestEx
+ */
+class AutoGroupTestNotice extends Notice { }
+
+class FindFileNotice extends Notice { }
+?>

admin/report/simpletest/index.php

@@ -0,0 +1,111 @@
+<?php
+/**
+ * Run the unit tests.
+ *
+ * @copyright &copy; 2006 The Open University
+ * @author N.D.Freear@open.ac.uk, T.J.Hunt@open.ac.uk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @version $Id$
+ * @package SimpleTestEx
+ */
+
+/** */
+require_once(dirname(__FILE__) . '/../../../config.php');
+require_once($CFG->libdir . '/moodlelib.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once('ex_simple_test.php');
+require_once('ex_reporter.php');
+
+require_login();
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+/* The UNITTEST constant can be checked elsewhere if you need to know
+ * when your code is being run as part of a unit test. */
+define('UNITTEST', true);
+$langfile = 'simpletest';
+
+// CGI arguments
+$path = optional_param('path', null, PARAM_PATH);
+$showpasses = optional_param('showpasses', false, PARAM_BOOL);
+$showsearch = optional_param('showsearch', false, PARAM_BOOL);
+$thorough = optional_param('thorough', false, PARAM_BOOL);
+
+// Print the header.
+$adminroot = admin_get_root();
+admin_externalpage_setup('reportsimpletest', $adminroot);
+$strtitle = get_string('unittests', $langfile);
+admin_externalpage_print_header($adminroot);
+
+if (!is_null($path)) {
+    // Create the group of tests.
+    $test =& new AutoGroupTest($showsearch, $thorough);
+
+    // OU specific. We use the _nonproject folder for stuff we want to
+    // keep in CVS, but which is not really relevant. It does no harm
+    // to leave this here.
+    $test->addIgnoreFolder($CFG->dirroot . '/_nonproject');
+
+    // Make the reporter, which is what displays the results.
+    $reporter = new ExHtmlReporter($showpasses);
+
+    if ($showsearch) {
+        print_heading('Searching for test cases');
+    }
+    flush();
+
+    // Work out what to test.
+    if (substr($path, 0, 1) == '/') {
+        $path = substr($path, 1);
+    }
+    $path = $CFG->dirroot . '/' . $path;
+    if (substr($path, -1) == '/') {
+        $path = substr($path, 0, -1);
+    }
+    $displaypath = substr($path, strlen($CFG->dirroot) + 1);
+    $ok = true;
+    if (is_file($path)) {
+        $test->addTestFile($path);
+    } else if (is_dir($path)){
+        $test->findTestFiles($path);
+    } else {
+        print_simple_box(get_string('pathdoesnotexist', $langfile, $path), '', '', '', '', 'errorbox');
+        $ok = false;
+    }
+
+    // If we have something to test, do it.
+    if ($ok) {
+        if ($path == $CFG->dirroot) {
+            $title = get_string('moodleunittests', $langfile, get_string('all', $langfile));
+        } else {
+            $title = get_string('moodleunittests', $langfile, $displaypath);
+        }
+        print_heading($title);
+        $test->run($reporter);
+    }
+
+    $formheader = get_string('retest', $langfile);
+} else {
+    $displaypath = '';
+    $formheader = get_string('rununittests', $langfile);
+}
+// Print the form for adjusting options.
+print_simple_box_start('center', '70%');
+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="40" />';
+echo '</p>';
+echo '<input type="submit" value="' . get_string('runtests', $langfile) . '" />';
+echo '</fieldset>';
+echo '</form>';
+print_simple_box_end();
+
+// Footer.
+admin_externalpage_print_footer($adminroot);
+
+?>

admin/report/stats/index.php

@@ -0,0 +1,77 @@
+<?php  // $Id$
+
+    require_once('../../../config.php');
+    require_once($CFG->dirroot.'/lib/statslib.php');
+    require_once($CFG->dirroot.'/course/report/stats/lib.php');
+
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $adminroot = admin_get_root();
+
+    admin_externalpage_setup('reportstats', $adminroot);
+
+    admin_externalpage_print_header($adminroot);
+
+
+    $courseid = optional_param('course', SITEID, PARAM_INT);
+    $report   = optional_param('report', 0, PARAM_INT);
+    $time     = optional_param('time', 0, PARAM_INT);
+    $mode     = optional_param('mode', STATS_MODE_GENERAL, PARAM_INT);
+    $userid   = optional_param('userid', 0, PARAM_INT);
+    $roleid   = 0;
+
+    if ($report > 50) {
+        $roleid = substr($report,1);
+        $report = 5;
+    }
+
+    if ($report == STATS_REPORT_USER_LOGINS) {
+        $courseid = SITEID; //override
+    }
+
+    if ($mode == STATS_MODE_RANKED) {
+        redirect($CFG->wwwroot.'/'.$CFG->admin.'/report/stats/index.php?time='.$time, '', 3, $adminroot);
+    }
+
+    if (!$course = get_record("course","id",$courseid)) {
+        error("That's an invalid course id");
+    }
+
+    if (!empty($userid)) {
+        if (!$user = get_record('user','id',$userid)) {
+            error("That's an invalid user id");
+        }
+    }
+
+    require_login();
+
+    if (empty($CFG->enablestats)) {
+        redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3, $adminroot);
+    }
+
+    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_COURSE, $course->id));
+
+    add_to_log($course->id, "course", "report stats", "report/stats/index.php?course=$course->id", $course->id);
+
+    stats_check_uptodate($course->id);
+
+
+//    $strreports = get_string("reports");
+//    $strstats = get_string('stats');
+//
+//    $menu = report_stats_mode_menu($course, $mode, $time); // add 4th $url parameter if uncommented!
+//
+//
+//    $crumb = "<a href=\"{$CFG->wwwroot}/admin\">".get_string('administration')."</a> ->
+//             <a href=\"{$CFG->wwwroot}/admin/report.php\">$strreports</a> ->
+//             $strstats";
+
+//    print_header("$course->shortname: $strstats", "$course->fullname",
+//                  $crumb, '', '', true, '&nbsp;', $menu);
+
+
+    require_once($CFG->dirroot.'/course/report/stats/report.php');
+
+    admin_externalpage_print_footer($adminroot);
+
+?>

admin/roles/allowassign.php

@@ -0,0 +1,102 @@
+<?php
+/**
+ * this page defines what roles can access (grant user that role and override that roles'
+ * capabilities in different context. For example, we can say that Teachers can only grant
+ * student role or modify student role's capabilities. Note that you need both the right
+ * capability moodle/role:assign or moodle/role:manage and this database table roles_deny_grant
+ * to be able to grant roles. If a user has moodle/role:manage at site level assignment
+ * then he can modify the roles_allow_assign table via this interface.
+ */
+    require_once('../../config.php');
+/// check capabilities here
+
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('defineroles', $adminroot);
+
+
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    require_capability('moodle/role:manage', $sitecontext);
+
+/// form processiong here
+
+/// get all roles
+
+    $roles = get_all_roles();
+
+    if ($grant = data_submitted()) {
+
+        foreach ($grant as $grole => $val) {
+            if ($grole == 'dummy') {
+                continue;
+            }
+
+            $string = explode('_', $grole);
+            $temp[$string[1]][$string[2]] = 1; // if set, means can access
+        }
+
+// if current assignment is in data_submitted, ignore, else, write deny into db
+        foreach ($roles as $srole) {
+            foreach ($roles as $trole) {
+                if (isset($temp[$srole->id][$trole->id])) { // if set, need to write to db
+                    if (!$record = get_record('role_allow_assign', 'roleid', $srole->id, 'allowassign', $trole->id)) {
+                        allow_assign($srole->id, $trole->id);
+                    }
+                } else { //if set, means can access, attempt to remove it from db
+                    delete_records('role_allow_assign', 'roleid', $srole->id, 'allowassign', $trole->id);
+                }
+            }
+        }
+    }
+/// displaying form here
+
+    admin_externalpage_print_header($adminroot);
+
+    $currenttab='allowassign';
+    require_once('managetabs.php');
+
+    $table->tablealign = 'center';
+    $table->cellpadding = 5;
+    $table->cellspacing = 0;
+    $table->width = '90%';
+    $table->align[] = 'right';
+
+/// get all the roles identifier
+    foreach ($roles as $role) {
+        $rolesname[] = format_string($role->name);
+        $roleids[] = $role->id;
+        $table->align[] = 'center';
+        $table->wrap[] = 'nowrap';
+    }
+
+    $table->head = array_merge(array(''), $rolesname);
+
+    foreach ($roles as $role) {
+        $beta = get_box_list($role->id, $roleids);
+        $table->data[] = array_merge(array(format_string($role->name)), $beta);
+    }
+
+    print_simple_box(get_string('configallowassign', 'admin'), 'center');
+
+    echo '<form action="allowassign.php" method="post">';
+    print_table($table);
+    echo '<div class="buttons"><input type="submit" value="'.get_string('savechanges').'"/>';
+    echo '<input type="hidden" name="dummy" value="1" />'; // this is needed otherwise we do not know a form has been submitted
+    echo '</div></form>';
+
+    admin_externalpage_print_footer($adminroot);
+
+
+
+function get_box_list($roleid, $arraylist){
+
+    foreach ($arraylist as $targetid) {
+        if (get_record('role_allow_assign', 'roleid', $roleid, 'allowassign', $targetid)) {
+            $array[] = '<input type="checkbox" name="s_'.$roleid.'_'.$targetid.'" value="1" checked="checked"/>';
+        } else {
+            $array[] = '<input type="checkbox" name="s_'.$roleid.'_'.$targetid.'" value="1" />';
+        }
+    }
+    return $array;
+}
+?>

admin/roles/allowoverride.php

@@ -0,0 +1,99 @@
+<?php
+/**
+ * this page defines what roles can override (override roles in different context. For example,
+ * we can say that Admin can override teacher roles in a course
+ * To be able to override roles. If a user has moodle/role:override at context level
+ * and be in the roles_allow_override table.
+ */
+    require_once('../../config.php');
+/// check capabilities here
+
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('defineroles', $adminroot);
+
+
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    require_capability('moodle/role:manage', $sitecontext);
+
+/// form processiong here
+
+/// get all roles
+
+    $roles = get_all_roles();
+
+    if ($grant = data_submitted()) {
+
+        foreach ($grant as $grole => $val) {
+            if ($grole == 'dummy') {
+                continue;
+            }
+
+            $string = explode('_', $grole);
+            $temp[$string[1]][$string[2]] = 1; // if set, means can access
+        }
+
+// if current assignment is in data_submitted, ignore, else, write deny into db
+        foreach ($roles as $srole) {
+            foreach ($roles as $trole) {
+                if (isset($temp[$srole->id][$trole->id])) { // if set, need to write to db
+                    if (!$record = get_record('role_allow_override', 'roleid', $srole->id, 'allowoverride', $trole->id)) {
+                        allow_override($srole->id, $trole->id);
+                    }
+                } else { //if set, means can access, attempt to remove it from db
+                    delete_records('role_allow_override', 'roleid', $srole->id, 'allowoverride', $trole->id);
+                }
+            }
+        }
+    }
+/// displaying form here
+
+    admin_externalpage_print_header($adminroot);
+
+    $currenttab='allowoverride';
+    require_once('managetabs.php');
+
+    $table->tablealign = 'center';
+    $table->cellpadding = 5;
+    $table->cellspacing = 0;
+    $table->width = '90%';
+    $table->align[] = 'right';
+
+/// get all the roles identifier
+    foreach ($roles as $role) {
+        $rolesname[] = format_string($role->name);
+        $roleids[] = $role->id;
+        $table->align[] = 'center';
+        $table->wrap[] = 'nowrap';
+    }
+
+    $table->head = array_merge(array(''), $rolesname);
+
+    foreach ($roles as $role) {
+        $beta = get_box_list($role->id, $roleids);
+        $table->data[] = array_merge(array(format_string($role->name)), $beta);
+    }
+
+    print_simple_box(get_string('configallowoverride', 'admin'), 'center');
+
+    echo '<form action="allowoverride.php" method="post">';
+    print_table($table);
+    echo '<div class="buttons"><input type="submit" value="'.get_string('savechanges').'"/>';
+    echo '<input type="hidden" name="dummy" value="1" />'; // this is needed otherwise we do not know a form has been submitted
+    echo '</div></form>';
+
+    admin_externalpage_print_footer($adminroot);
+
+// returns array
+function get_box_list($roleid, $arraylist){
+
+    foreach ($arraylist as $targetid) {
+        if (get_record('role_allow_override', 'roleid', $roleid, 'allowoverride', $targetid)) {
+            $array[] = '<input type="checkbox" name="s_'.$roleid.'_'.$targetid.'" value="1" checked="checked"/>';
+        } else {
+            $array[] = '<input type="checkbox" name="s_'.$roleid.'_'.$targetid.'" value="1" />';
+        }
+    }
+    return $array;
+}
+?>

admin/roles/assign.html

@@ -0,0 +1,114 @@
+<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 summary="" style="margin-left:auto;margin-right:auto" border="0" cellpadding="5" cellspacing="0">
+    <tr>
+      <td valign="top">
+          <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) {
+                $fullname = fullname($contextuser, true);
+                if ($contextuser->hidden) {
+                    $hidden=' ('.get_string('hiddenassign').') ';
+                } else {
+                    $hidden="";
+                }
+                echo "<option value=\"$contextuser->id\">".$fullname.", ".$contextuser->email.$hidden."</option>\n";
+                $i++;    
+            }
+            if ($i==0) {
+                echo '<option/>'; // empty select breaks xhtml strict
+            }
+          ?>
+          
+          </select></td>
+      <td valign="top">
+        <br />
+        <label title="<?php print_string('hiddenassign') ?>">
+            <input type="checkbox" name="hidden" value="1" />
+            <img src="<?php echo $CFG->pixpath; ?>/t/hide.gif" alt="<?php print_string('hiddenassign') ?>" class="hide-show-image" />
+            <?php helpbutton('hiddenassign', get_string('hiddenassign')); ?>
+        </label>
+        <?php check_theme_arrows(); ?>
+        <p class="arrow_button">
+            <input name="add" id="add" type="submit" value="<?php echo '&nbsp;'.$THEME->larrow.' &nbsp; &nbsp; '.get_string('add'); ?>" title="<?php print_string('add'); ?>" />
+            <br />
+            <input name="remove" id="remove" type="submit" value="<?php echo '&nbsp; '.$THEME->rarrow.' &nbsp; &nbsp; '.get_string('remove'); ?>" title="<?php print_string('remove'); ?>" />
+        </p>
+      </td>
+      <td valign="top">
+          <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 (" . $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";
+                        $i++;
+                    }
+                }
+                echo "</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";
+                            $i++;
+                        }
+                    }
+                }
+            }
+            if ($i==0) {
+                echo '<option/>'; // empty select breaks xhtml strict
+            }
+          ?>
+         </select>
+         <br />
+         <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) {
+                                    getElementById('assignform').previoussearch.value=1;
+                                    getElementById('assignform').submit();
+                               } " />
+         <input name="search" id="search" type="submit" value="<?php p($strsearch) ?>" />
+         <?php
+              if (!empty($searchtext)) {
+                  echo '<input name="showall" id="showall" type="submit" value="'.$strshowall.'" />'."\n";
+              }
+         ?>
+       </td>
+    </tr>
+  </table>
+</div>
+</form>
+
+

admin/roles/assign.php

@@ -0,0 +1,297 @@
+<?php // $Id$
+      // Script to assign users to contexts
+
+    require_once('../../config.php');
+    require_once($CFG->dirroot.'/mod/forum/lib.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    define("MAX_USERS_PER_PAGE", 5000);
+
+    $contextid      = required_param('contextid',PARAM_INT); // context id
+    $roleid         = optional_param('roleid', 0, PARAM_INT); // required role id
+    $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);
+    $hidden         = optional_param('hidden', 0, PARAM_BOOL); // whether this assignment is hidden
+    $timestart      = optional_param('timestart', 0, PARAM_INT);
+    $timeend        = optional_param('timened', 0, PARAM_INT);
+    $userid         = optional_param('userid', 0, PARAM_INT); // needed for user tabs
+    $courseid       = optional_param('courseid', 0, PARAM_INT); // needed for user tabs
+
+    $errors = array();
+
+    $previoussearch = ($searchtext != '') or ($previoussearch) ? 1:0;
+
+    $baseurl = 'assign.php?contextid='.$contextid;
+    if (!empty($userid)) {
+        $baseurl .= '&amp;userid='.$userid;
+    }
+    if (!empty($courseid)) {
+        $baseurl .= '&amp;courseid='.$courseid;
+    }
+
+    if (! $context = get_context_instance_by_id($contextid)) {
+        error("Context ID was incorrect (can't find it)");
+    }
+
+    $inmeta = 0;
+    if ($context->contextlevel == CONTEXT_COURSE) {
+        $courseid = $context->instanceid;
+        if ($course = get_record('course', 'id', $courseid)) {
+            $inmeta = $course->metacourse;
+        } else {
+            error('Invalid course id');
+        }
+    } else if (!empty($courseid)){ // we need this for user tabs in user context
+        if (!$course = get_record('course', 'id', $courseid)) {
+            error('Invalid course id');
+        }
+    } else {
+        $courseid = SITEID;
+        $course = clone($SITE);
+    }
+
+    require_login($course);
+
+    if ($context->contextlevel == CONTEXT_COURSE) {
+        require_login($context->instanceid);
+    } else {
+        require_login();
+    }
+
+    require_capability('moodle/role:assign', $context);
+
+/// needed for tabs.php
+    $overridableroles = get_overridable_roles($context);
+    $assignableroles  = get_assignable_roles($context);
+
+/// 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');
+
+
+
+/// Make sure this user can assign that role
+
+    if ($roleid) {
+        if (!user_can_assign($context, $roleid)) {
+            error ('you can not override this role in this context');
+        }
+    }
+
+    if ($userid) {
+        $user = get_record('user', 'id', $userid);
+        $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
+    }
+
+
+/// Print the header and tabs
+
+    if ($context->contextlevel == CONTEXT_USER) {
+        /// course header
+        if ($courseid != SITEID) {
+            print_header("$fullname", "$fullname",
+                     "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->
+                      <a href=\"$CFG->wwwroot/user/index.php?id=$course->id\">$strparticipants</a> -> <a href=\"$CFG->wwwroot/user/view.php?id=$userid&amp;course=$courseid\">$fullname</a> ->".$straction,
+                      "", "", true, "&nbsp;", navmenu($course));
+
+        /// site header
+        } else {
+            print_header("$course->fullname: $fullname", $course->fullname,
+                        "<a href=\"$CFG->wwwroot/user/view.php?id=$userid&amp;course=$courseid\">$fullname</a> -> $straction", "", "", true, "&nbsp;", navmenu($course));
+        }
+
+        $showroles = 1;
+        $currenttab = 'assign';
+        include_once($CFG->dirroot.'/user/tabs.php');
+    } else if ($context->contextlevel == CONTEXT_SYSTEM) {
+        $adminroot = admin_get_root();
+        admin_externalpage_setup('assignroles', $adminroot);
+        admin_externalpage_print_header($adminroot);
+    } 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()) {
+
+        if ($add and !empty($frm->addselect) and confirm_sesskey()) {
+
+            $timemodified = time();
+
+            foreach ($frm->addselect as $adduser) {
+                if (!$adduser = clean_param($adduser, PARAM_INT)) {
+                    continue;
+                }
+                $allow = true;
+                if ($inmeta) {
+                    if (has_capability('moodle/course:managemetacourse', $context, $adduser)) {
+                        //ok
+                    } else {
+                        $managerroles = get_roles_with_capability('moodle/course:managemetacourse', CAP_ALLOW, $context);
+                        if (!empty($managerroles) and !array_key_exists($roleid, $managerroles)) {
+                            $erruser = get_record('user', 'id', $adduser, '','','','', 'id, firstname, lastname');
+                            $errors[] = get_string('metaassignerror', 'role', fullname($erruser));
+                            $allow = false;
+                        }
+                    }
+                }
+                if ($allow) {
+                    if (! role_assign($roleid, $adduser, 0, $context->id, $timestart, $timeend, $hidden)) {
+                        $errors[] = "Could not add user with id $adduser to this role!";
+                    }
+                }
+            }
+
+        } 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) {
+                    if ($adminrole->id == $roleid) {
+                        $topleveladmin = true;
+                    }
+                }
+            }
+
+            foreach ($frm->removeselect as $removeuser) {
+                $removeuser = clean_param($removeuser, PARAM_INT);
+
+                if ($topleveladmin && ($removeuser == $USER->id)) {   // Prevent unassigning oneself from being admin
+                    continue;
+                }
+
+                if (! role_unassign($roleid, $removeuser, 0, $context->id)) {
+                    $errors[] = "Could not remove user with id $removeuser from this role!";
+                } else if ($inmeta) {
+                    sync_metacourse($courseid);
+                    $newroles = get_user_roles($context, $removeuser, false);
+                    if (!empty($newroles) and !array_key_exists($roleid, $newroles)) {
+                        $erruser = get_record('user', 'id', $removeuser, '','','','', 'id, firstname, lastname');
+                        $errors[] = get_string('metaunassignerror', 'role', fullname($erruser));
+                        $allow = false;
+                    }
+                }
+            }
+
+        } else if ($showall) {
+            $searchtext = '';
+            $previoussearch = 0;
+        }
+    }
+
+    if ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID) {
+        print_heading_with_help(get_string('frontpageroles', 'admin'), 'assignroles');
+    } else {
+        print_heading_with_help(get_string('assignroles', 'role'), 'assignroles');
+    }
+
+    if ($context->contextlevel==CONTEXT_SYSTEM) {
+        print_box(get_string('globalroleswarning', 'role'));
+    }
+    
+    if ($roleid) {        /// prints a form to swap roles
+
+    /// Get all existing participants in this context.
+        // Why is this not done with get_users???
+
+        if (!$contextusers = get_role_users($roleid, $context, false, 'u.id, u.firstname, u.lastname, u.email, r.hidden')) {
+            $contextusers = array();
+        }
+
+        $select  = "username <> 'guest' AND deleted = 0 AND confirmed = 1";
+
+        $usercount = count_records_select('user', $select) - count($contextusers);
+
+        $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%') ";
+        }
+
+        $availableusers = get_recordset_sql('SELECT id, firstname, lastname, email
+                                               FROM '.$CFG->prefix.'user
+                                              WHERE '.$select.'
+                                            ORDER BY lastname ASC, firstname ASC');
+
+        /// In the .html file below we loop through these results and exclude any in $contextusers
+
+        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');
+        print_simple_box_end();
+
+        if (!empty($errors)) {
+            $msg = '<p>';
+            foreach ($errors as $e) {
+                $msg .= $e.'<br />';
+            }
+            $msg .= '</p>';
+            print_simple_box_start('center');
+            notify($msg);
+            print_simple_box_end();
+        }
+
+    } else {   // Print overview table
+
+        // sync metacourse enrolments if needed
+        if ($inmeta) {
+            sync_metacourse($course);
+        }
+
+        $table->tablealign = 'center';
+        $table->cellpadding = 5;
+        $table->cellspacing = 0;
+        $table->width = '60%';
+        $table->head = array(get_string('roles', 'role'), get_string('description'), get_string('users'));
+        $table->wrap = array('nowrap', '', 'nowrap');
+        $table->align = array('right', 'left', 'center');
+
+        foreach ($assignableroles as $roleid => $rolename) {
+            $countusers = count_role_users($roleid, $context);
+            $description = format_string(get_field('role', 'description', 'id', $roleid));
+            $table->data[] = array('<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$rolename.'</a>',$description, $countusers);
+        }
+
+        print_table($table);
+    }
+
+    if ($context->contextlevel == CONTEXT_SYSTEM or ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID)) {
+        admin_externalpage_print_footer($adminroot);
+    } else {
+        print_footer($course);
+    }
+
+?>

admin/roles/manage.html

@@ -0,0 +1,217 @@
+<?php  //$Id$
+
+    switch ($action) {
+        case 'add':
+            $submitlabel = get_string('addrole', 'role');
+            break;
+        case 'edit':
+        default:
+            $submitlabel = get_string('savechanges');
+    }
+
+    if ($action == 'view') {
+?>
+<?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); } ?>" />
+</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('notset','role');
+    $strallow = get_string('allow','role');
+    $strprevent = get_string('prevent','role');
+    $strprohibit = get_string('prohibit','role');
+?>
+
+<table class="rolecap">
+
+<tr>
+<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
+
+// init these 2
+$contextlevel = 0;
+$component = '';
+
+$strrisks = s(get_string('risks', 'role'));
+$strcapabilities = 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>'.
+               get_component_string($capability->component, $capability->contextlevel).'</strong></td></tr>');
+    }
+
+    // these 2 are used to see to group same mod/core capabilities together
+    $contextlevel = $capability->contextlevel;
+    $component = $capability->component;
+
+    if (empty($errors)) {
+       // check the capability override for this cap, this role in this context
+        $localoverride = get_local_override($roleid, $sitecontext->id, $capability->name);
+    } else {
+        $localoverride = new object();
+        $localoverride->permission = $role->{$capability->name};
+    }
+
+    $disabled = ($action != 'edit' and $action != 'add') ? ' disabled="disabled" ' : '';
+
+    $riskinfo = '<td class="risk managetrust">';
+    $rowclasses = '';
+    if (RISK_MANAGETRUST & (int)$capability->riskbitmask) {
+        $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 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 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 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 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 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; ?>
+
+        </tr>
+
+<?php } ?>
+</table>
+
+<?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') ?>" />
+</div>
+<?php } ?>
+
+</form>

admin/roles/manage.php

@@ -0,0 +1,592 @@
+<?php //$Id$
+
+    require_once('../../config.php');
+
+    require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+
+    admin_externalpage_setup('defineroles', $adminroot);
+
+    $roleid      = optional_param('roleid', 0, PARAM_INT);             // if set, we are editing a role
+    $name        = optional_param('name', '', PARAM_MULTILANG);        // new role name
+    $shortname   = optional_param('shortname', '', PARAM_RAW);         // new role shortname, special cleaning before storage
+    $description = optional_param('description', '', PARAM_CLEAN);     // new role desc
+    $action      = optional_param('action', '', PARAM_ALPHA);
+    $confirm     = optional_param('confirm', 0, PARAM_BOOL);
+    $cancel      = optional_param('cancel', 0, PARAM_BOOL);
+
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+
+    require_capability('moodle/role:manage', $sitecontext);
+
+    if ($cancel) {
+        redirect('manage.php');
+    }
+
+    $errors = array();
+    $newrole = false;
+
+    $roles = get_all_roles();
+    $rolescount = count($roles);
+
+/// fix sort order if needed
+    $rolesort = array();
+    $i = 0;
+    foreach ($roles as $rolex) {
+        $rolesort[$i] = $rolex->id;
+        if ($rolex->sortorder != $i) {
+            $r = new object();
+            $r->id = $rolex->id;
+            $r->sortorder = $i;
+            update_record('role', $r);
+            $roles[$rolex->id]->sortorder = $i;
+        }
+        $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) {
+        case 'add':
+            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');
+                } else if (count_records('role', 'name', $name)) {
+                    $errors['name'] = get_string('errorexistsrolename', 'role');
+                }
+
+                if (empty($shortname)) {
+                    $errors['shortname'] = get_string('errorbadroleshortname', 'role');
+                } else if (count_records('role', 'shortname', $shortname)) {
+                    $errors['shortname'] = get_string('errorexistsroleshortname', 'role');
+                }
+
+                if (empty($errors)) {
+                    $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->description = $description;
+                    $newrole->legacytype  = $legacytype;
+                }
+
+                $allowed_values = array(CAP_INHERIT, CAP_ALLOW, CAP_PREVENT, CAP_PROHIBIT);
+                $capabilities = fetch_context_capabilities($sitecontext); // capabilities applicable in this context
+
+                foreach ($capabilities as $cap) {
+                    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)) {
+                        continue;
+                    }
+
+                    if (empty($errors)) {
+                        assign_capability($capname, $value, $newroleid, $sitecontext->id);
+                    } else {
+                        $newrole->$capname = $value;
+                    }
+                }
+
+                if (empty($errors)) {
+                    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');
+                } else if ($rs = get_records('role', 'name', $name)) {
+                    unset($rs[$roleid]);
+                    if (!empty($rs)) {
+                        $errors['name'] = get_string('errorexistsrolename', 'role');
+                    }
+                }
+
+                if (empty($shortname)) {
+                    $errors['shortname'] = get_string('errorbadroleshortname', 'role');
+                } else if ($rs = get_records('role', 'shortname', $shortname)) {
+                    unset($rs[$roleid]);
+                    if (!empty($rs)) {
+                        $errors['shortname'] = get_string('errorexistsroleshortname', 'role');
+                    }
+                }
+                if (!empty($errors)) {
+                    $newrole = new object();
+                    $newrole->name        = $name;
+                    $newrole->shortname   = $shortname;
+                    $newrole->description = $description;
+                    $newrole->legacytype  = $legacytype;
+                }
+
+                $allowed_values = array(CAP_INHERIT, CAP_ALLOW, CAP_PREVENT, CAP_PROHIBIT);
+                $capabilities = fetch_context_capabilities($sitecontext); // capabilities applicable in this context
+
+                foreach ($capabilities as $cap) {
+                    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)) {
+                        continue;
+                    }
+
+                    if (!empty($errors)) {
+                        $newrole->$capname = $value;
+                        continue;
+                    }
+
+                    // edit default caps
+                    $SQL = "SELECT * FROM {$CFG->prefix}role_capabilities
+                            WHERE roleid = $roleid AND capability = '$capname'
+                              AND contextid = $sitecontext->id";
+
+                    $localoverride = get_record_sql($SQL);
+
+                    if ($localoverride) { // update current overrides
+                        if ($value == CAP_INHERIT) { // inherit = delete
+                            unassign_capability($capname, $roleid, $sitecontext->id);
+
+                        } else {
+                            $localoverride->permission = $value;
+                            $localoverride->timemodified = time();
+                            $localoverride->modifierid = $USER->id;
+                            update_record('role_capabilities', $localoverride);
+                        }
+                    } else { // insert a record
+                        if ($value != CAP_INHERIT) {
+                            assign_capability($capname, $value, $roleid, $sitecontext->id);
+                        }
+                    }
+
+                }
+
+                if (empty($errors)) {
+                    // update normal role settings
+                    $role->id = $roleid;
+                    $role->name = $name;
+                    $role->shortname = $shortname;
+                    $role->description = $description;
+
+                    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);
+                        } 
+                    }                    
+
+                    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);
+                }
+
+            } else if (confirm_sesskey()){
+                // show confirmation
+                admin_externalpage_print_header($adminroot);
+                $optionsyes = array('action'=>'delete', 'roleid'=>$roleid, 'sesskey'=>sesskey(), 'confirm'=>1);
+                $a = new object();
+                $a->id = $roleid;
+                $a->name = $roles[$roleid]->name;
+                $a->shortname = $roles[$roleid]->shortname;
+                $a->count = (int)count_records('role_assignments', 'roleid', $roleid);
+                notice_yesno(get_string('deleterolesure', 'role', $a), 'manage.php', 'manage.php', $optionsyes, NULL, 'post', 'get');
+                admin_externalpage_print_footer($adminroot);
+                die;
+            }
+
+            redirect('manage.php');
+            break;
+
+        case 'moveup':
+            if (array_key_exists($roleid, $roles) and confirm_sesskey()) {
+                $role = $roles[$roleid];
+                if ($role->sortorder > 0) {
+                    $above = $roles[$rolesort[$role->sortorder - 1]];
+
+                    if (!switch_roles($role, $above)) {
+                        error("Cannot move role with ID $roleid");
+                    }
+                }
+            }
+
+            redirect('manage.php');
+            break;
+
+        case 'movedown':
+            if (array_key_exists($roleid, $roles) and confirm_sesskey()) {
+                $role = $roles[$roleid];
+                if ($role->sortorder + 1 < $rolescount) {
+                    $below = $roles[$rolesort[$role->sortorder + 1]];
+
+                    if (!switch_roles($role, $below)) {
+                        error("Cannot move role with ID $roleid");
+                    }
+                }
+            }
+
+            redirect('manage.php');
+            break;
+
+        case 'duplicate':
+            if (!array_key_exists($roleid, $roles)) {
+                redirect('manage.php');
+            }
+
+            if ($confirm and data_submitted() and confirm_sesskey()) {
+                //ok - lets duplicate!
+            } else {
+                // show confirmation
+                admin_externalpage_print_header($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);
+            }
+            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);
+                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
+
+    admin_externalpage_print_header($adminroot);
+
+    $currenttab = 'manage';
+    include_once('managetabs.php');
+
+    if (($roleid and ($action == 'view' or $action == 'edit')) or $action == 'add') { // view or edit role details
+
+        if ($action == 'add') {
+            $roleid = 0;
+            if (empty($errors) or empty($newrole)) {
+                $role = new object();
+                $role->name        = '';
+                $role->shortname   = '';
+                $role->description = '';
+                $role->legacytype  = '';
+            } else {
+                $role = stripslashes_safe($newrole);
+            }
+        } else if ($action == 'edit' and !empty($errors) and !empty($newrole)) {
+                $role = stripslashes_safe($newrole);
+        } else {
+            if(!$role = get_record('role', 'id', $roleid)) {
+                error('Incorrect role ID!');
+            }
+            $role->legacytype = get_legacy_type($role->id);
+        }
+
+        foreach ($roles as $rolex) {
+            $roleoptions[$rolex->id] = strip_tags(format_string($rolex->name));
+        }
+
+        // this is the array holding capabilities of this role sorted till this context
+        $r_caps = role_context_capabilities($roleid, $sitecontext);
+
+        // this is the available capabilities assignable in this context
+        $capabilities = fetch_context_capabilities($sitecontext);
+
+        $usehtmleditor = can_use_html_editor();
+
+        switch ($action) {
+            case 'add':
+                print_heading_with_help(get_string('addrole', 'role'), 'roles');
+                break;
+            case 'view':
+                print_heading_with_help(get_string('viewrole', 'role'), 'roles');
+                break;
+            case 'edit':
+                print_heading_with_help(get_string('editrole', 'role'), 'roles');
+                break;
+        }
+
+        echo '<div class="selector">';
+        if ($action == 'view') {
+            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>';
+
+        $lang = str_replace('_utf8', '', current_language());
+
+        print_simple_box_start('center');
+        include_once('manage.html');
+        print_simple_box_end();
+
+        if ($usehtmleditor) {
+            use_html_editor('description');
+        }
+
+    } else {
+
+        print_heading_with_help(get_string('roles', 'role'), 'roles');
+
+        $table = new object;
+
+        $table->tablealign = 'center';
+        $table->align = array('right', 'left', 'left', 'left');
+        $table->wrap = array('nowrap', '', 'nowrap','nowrap');
+        $table->cellpadding = 5;
+        $table->cellspacing = 0;
+        $table->width = '90%';
+        $table->data = array();
+
+        $table->head = array(get_string('name'),
+                             get_string('description'),
+                             get_string('shortname'),
+                             get_string('edit'));
+
+        /*************************
+         * List all current roles *
+         **************************/
+
+        foreach ($roles as $role) {
+
+            $stredit     = get_string('edit');
+            $strdelete   = get_string('delete');
+            $strmoveup   = get_string('moveup');
+            $strmovedown = get_string('movedown');
+
+            $row = array();
+            $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&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] .= '<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&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" class="iconsmall" alt="" /> ';
+            }
+
+            $table->data[] = $row;
+
+        }
+        print_table($table);
+
+        $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);
+    die;
+
+
+/// ================ some internal functions ====================////
+
+function switch_roles($first, $second) {
+    $status = true;
+    //first find temorary sortorder number
+    $tempsort = count_records('role') + 3;
+    while (get_record('role','sortorder', $tempsort)) {
+        $tempsort += 3;
+    }
+
+    $r1 = new object();
+    $r1->id = $first->id;
+    $r1->sortorder = $tempsort;
+    $r2 = new object();
+    $r2->id = $second->id;
+    $r2->sortorder = $first->sortorder;
+
+    if (!update_record('role', $r1)) {
+        debugging("Can not update role with ID $r1->id!");
+        $status = false;
+    }
+
+    if (!update_record('role', $r2)) {
+        debugging("Can not update role with ID $r2->id!");
+        $status = false;
+    }
+
+    $r1->sortorder = $second->sortorder;
+    if (!update_record('role', $r1)) {
+        debugging("Can not update role with ID $r1->id!");
+        $status = false;
+    }
+
+    return $status;
+}
+
+// duplicates all the base definitions of a role
+function role_cap_duplicate($sourcerole, $targetrole) {
+    global $CFG;
+    $systemcontext = get_context_instance(CONTEXT_SYSTEM);
+    $caps = get_records_sql("SELECT * FROM {$CFG->prefix}role_capabilities
+                             WHERE roleid = $sourcerole->id
+                             AND contextid = $systemcontext->id");
+    // adding capabilities
+    foreach ($caps as $cap) {
+        unset($cap->id);
+        $cap->roleid = $targetrole;
+        insert_record('role_capabilities', $cap);
+    }
+}
+?>

admin/roles/managetabs.php

@@ -0,0 +1,20 @@
+<?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'));
+
+    $toprow[] = new tabobject('allowoverride', $CFG->wwwroot.'/'.$CFG->admin.'/roles/allowoverride.php', get_string('allowoverride', 'role'));
+
+    $tabs = array($toprow);
+
+    print_tabs($tabs, $currenttab);
+
+?>

admin/roles/override.html

@@ -0,0 +1,145 @@
+<?php
+    $strinherit = get_string('inherit','role');
+    $strallow = get_string('allow','role');
+    $strprevent = get_string('prevent','role');
+    $strprohibit = get_string('prohibit','role');
+?>
+
+<form id="overrideform" action="override.php" method="post">
+    <fieldset class="invisiblefieldset">
+    <input type="hidden" name="contextid" value="<?php p($contextid) ?>" />
+    <input type="hidden" name="roleid" value="<?php p($roleid) ?>" />
+    <input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
+    <input type="hidden" name="userid" value="<?php p($userid) ?>" />
+    <input type="hidden" name="courseid" value="<?php p($courseid) ?>" />
+    </fieldset>
+
+    <table class="rolecap">
+        <tr>
+            <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
+
+        // init these 2
+        $contextlevel = 0;
+        $component = '';
+
+        $strrisks = s(get_string('risks', 'role'));
+        $strcapabilities = 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>');
+            }
+
+            // these 2 are used to see to group same mod/core capabilities together
+            $contextlevel = $capability->contextlevel;
+            $component = $capability->component;
+
+            // check the capability override for this cap, this role in this context
+            if (isset($localoverrides[$capability->name])) {
+                $localpermission = $localoverrides[$capability->name]->permission;
+            } else {
+                $localpermission = 0;  // Just inherit
+            }
+
+            if (isset($r_caps[$capability->name])) {
+                $isallow = $r_caps[$capability->name] > 0;
+                $isprevent = $r_caps[$capability->name] < 0 && $r_caps[$capability->name] > -500;
+                $isprohibit = $r_caps[$capability->name] <= -500;
+            } else {
+                $isallow = 0;
+                $isprevent = 0;
+                $isprohibit = 0;
+            }
+
+            $isdisabled = $isprohibit;
+
+            $riskinfo = '<td class="risk managetrust">';
+            $rowclasses = '';
+            if (RISK_MANAGETRUST & (int)$capability->riskbitmask) {
+                $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 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 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 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 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>';
+
+
+        ?>
+
+        <tr class="rolecap <?php echo $rowclasses; ?>">
+             <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 ($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 ($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 ($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 ($isdisabled)                      {echo ' disabled="disabled"';}?> />
+             </td>
+            <?php echo $riskinfo; ?>
+        </tr>
+
+        <?php } ?>
+    </table>
+    <div class="submit buttons">
+        <input type="submit" value="<?php print_string('savechanges') ?>" />
+        <input type="submit" name="cancel" value="<?php print_string('cancel') ?>" />
+    </div>
+</form>

admin/roles/override.php

@@ -0,0 +1,233 @@
+<?php  //$Id$
+
+    require_once('../../config.php');
+
+    $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
+    $cancel    = optional_param('cancel', 0, PARAM_BOOL);
+
+    if (!$context = get_record('context', 'id', $contextid)) {
+        error('Bad context ID');
+    }
+
+    if (!$sitecontext = get_context_instance(CONTEXT_SYSTEM)) {
+        error('No site ID');
+    }
+
+    if ($context->id == $sitecontext->id) {
+        error('Can not override base role capabilities');
+    }
+
+    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 = clone($SITE);
+        $courseid = SITEID;
+    }
+
+    require_login($course);
+
+    $baseurl = 'override.php?contextid='.$context->id;
+    if (!empty($userid)) {
+        $baseurl .= '&amp;userid='.$userid;
+    }
+    if ($courseid != SITEID) {
+        $baseurl .= '&amp;courseid='.$courseid;
+    }
+
+    if ($cancel) {
+        redirect($baseurl);
+    }
+
+/// needed for tabs.php
+    $overridableroles = get_overridable_roles($context);
+    $assignableroles  = get_assignable_roles($context);
+
+/// Get some language strings
+
+    $strroletooverride = get_string('roletooverride', 'role');
+    $stroverrideusers  = get_string('overrideusers', 'role');
+    $straction         = get_string('overrideroles', 'role');
+    $strcurrentrole    = get_string('currentrole', 'role');
+    $strcurrentcontext = get_string('currentcontext', 'role');
+    $strparticipants   = get_string('participants');
+
+/// Make sure this user can override that role
+
+    if ($roleid) {
+        if (!user_can_override($context, $roleid)) {
+            error ('you can not override this role in this context');
+        }
+    }
+
+    if ($userid) {
+        $user = get_record('user', 'id', $userid);
+        $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);
+
+        $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)) {
+                 continue;
+            }
+
+            if (isset($localoverrides[$capname])) {    // Something exists, so update it
+                if ($value == CAP_INHERIT) {       // inherit = delete
+                    delete_records('role_capabilities', 'roleid', $roleid, 'contextid', $context->id,
+                                                        'capability', $capname);
+                } else {
+                    $localoverride = new object();
+                    $localoverride->id = $localoverrides[$capname]->id;
+                    $localoverride->permission = $value;
+                    $localoverride->timemodified = time();
+                    $localoverride->modifierid = $USER->id;
+                    if (!update_record('role_capabilities', $localoverride)) {
+                        error('Could not update a capability!');
+                    }
+                }
+
+            } else { // insert a record
+                if ($value != CAP_INHERIT) {    // Ignore inherits
+                    $localoverride = new object();
+                    $localoverride->capability = $capname;
+                    $localoverride->contextid = $context->id;
+                    $localoverride->roleid = $roleid;
+                    $localoverride->permission = $value;
+                    $localoverride->timemodified = time();
+                    $localoverride->modifierid = $USER->id;
+                    if (!insert_record('role_capabilities', $localoverride)) {
+                        error('Could not insert a capability!');
+                    }
+                }
+            }
+        }
+        redirect($baseurl);
+    }
+
+
+/// Print the header and tabs
+
+    if ($context->contextlevel == CONTEXT_USER) {
+
+        /// course header
+        if ($course->id != SITEID) {
+            print_header("$fullname", "$fullname",
+                     "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->
+                      <a href=\"$CFG->wwwroot/user/index.php?id=$course->id\">$strparticipants</a> -> <a href=\"$CFG->wwwroot/user/view.php?id=$userid&amp;course=$course->id\">$fullname</a> -> $straction",
+                      "", "", true, "&nbsp;", navmenu($course));
+
+        /// site header
+        } else {
+            print_header("$course->fullname: $fullname", $course->fullname,
+                        "<a href=\"$CFG->wwwroot/user/view.php?id=$userid&amp;course=$course->id\">$fullname</a> -> $straction", "", "", true, "&nbsp;", navmenu($course));
+        }
+        $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';
+        include_once('tabs.php');
+    }
+
+    print_heading_with_help(get_string('overrides', 'role'), 'overrides');
+
+    if ($roleid) {
+    /// prints a form to swap roles
+        echo '<div class="selector">';
+        echo $strcurrentcontext.': '.print_context_name($context).'<br/>';
+        $overridableroles = array('0'=>get_string('listallroles', 'role').'...') + $overridableroles;
+        popup_form("$CFG->wwwroot/$CFG->admin/roles/override.php?userid=$userid&amp;courseid=$courseid&amp;contextid=$contextid&amp;roleid=",
+            $overridableroles, 'switchrole', $roleid, '', '', '', false, 'self', $strroletooverride);
+        echo '</div>';
+
+        $parentcontexts = get_parent_contexts($context);
+        if (!empty($parentcontexts)) {
+            $parentcontext = array_shift($parentcontexts);
+            $parentcontext = get_context_instance_by_id($parentcontext);
+        } else {
+            $parentcontext = $context; // site level in override??
+        }
+
+        $r_caps = role_context_capabilities($roleid, $parentcontext);
+
+        $localoverrides = get_records_select('role_capabilities', "roleid = $roleid AND contextid = $context->id",
+                                             '', 'capability, permission, id');
+
+        $lang = str_replace('_utf8', '', current_language());
+
+        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);
+        }
+
+    } else {   // Print overview table
+
+        $table->tablealign = 'center';
+        $table->cellpadding = 5;
+        $table->cellspacing = 0;
+        $table->width = '60%';
+        $table->head = array(get_string('roles', 'role'), get_string('description'), get_string('overrides', 'role'));
+        $table->wrap = array('nowrap', '', 'nowrap');
+        $table->align = array('right', 'left', 'center');
+
+        foreach ($overridableroles as $roleid => $rolename) {
+            $countusers = 0;
+            $overridecount = count_records_select('role_capabilities', "roleid = $roleid AND contextid = $context->id");
+            $description = format_string(get_field('role', 'description', 'id', $roleid));
+            $table->data[] = array('<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$rolename.'</a>', $description, $overridecount);
+        }
+
+        print_table($table);
+    }
+
+    if ($context->contextlevel == CONTEXT_SYSTEM or ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID)) {
+        admin_externalpage_print_footer($adminroot);
+    } else {
+        print_footer($course);
+    }
+
+?>

admin/roles/tabs.php

@@ -0,0 +1,193 @@
+<?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) {
+
+        case CONTEXT_SYSTEM:
+            $stradministration = get_string('administration');
+            print_header($SITE->fullname, "$SITE->fullname","<a href=\"../index.php\">$stradministration</a> -> $straction");
+            break;
+
+        case CONTEXT_PERSONAL:
+            break;
+
+        case CONTEXT_USER:
+            print_header();
+            break;
+
+        case CONTEXT_COURSECAT:
+            $category = get_record('course_categories', 'id', $context->instanceid);
+            $strcategories = get_string("categories");
+            $strcategory = get_string("category");
+            $strcourses = get_string("courses");
+            print_header("$SITE->shortname: $category->name", "$SITE->fullname: $strcourses",
+                    "<a href=\"$CFG->wwwroot/course/index.php\">$strcategories</a> -> <a href=\"$CFG->wwwroot/course/category.php?id=$category->id\">$category->name</a> -> $straction", "", "", true);
+            break;
+
+        case CONTEXT_COURSE:
+            if ($context->instanceid != SITEID) {
+                $streditcoursesettings = get_string("editcoursesettings");
+
+                $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:
+            break;
+
+        case CONTEXT_MODULE:
+            // get module type?
+            if (!$cm = get_record('course_modules','id',$context->instanceid)) {
+                error('Bad course module ID');
+            }
+            if (!$module = get_record('modules','id',$cm->module)) {  //$module->name;
+                error('Bad module ID');
+            }
+            if (!$course = get_record('course','id',$cm->course)) {
+                error('Bad course ID');
+            }
+            if (!$instance = get_record($module->name, 'id', $cm->instance)) {
+                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);
+            $strmodulenameplural = get_string("modulenameplural", $module->name);
+
+            if ($module->name == "label") {
+                $focuscursor = "";
+            } else {
+                $focuscursor = "form.name";
+            }
+
+            print_header_simple($streditinga, '',
+                    "<a href=\"$CFG->wwwroot/mod/$module->name/index.php?id=$course->id\">$strmodulenameplural</a> ->
+                    $strnav <a href=\"$CFG->wwwroot/course/mod.php?update=$cm->id&amp;sesskey=".sesskey()."\">$streditinga</a> -> $straction", $focuscursor, "", false);
+
+            break;
+
+        case CONTEXT_BLOCK:
+            if ($blockinstance = get_record('block_instance', 'id', $context->instanceid)) {
+                if ($block = get_record('block', 'id', $blockinstance->blockid)) {
+                    $blockname = print_context_name($context);
+                    $navigation = $blockname. ' -> '.$straction;
+
+                    switch ($blockinstance->pagetype) {
+                        case 'course-view':
+                            if ($course = get_record('course', 'id', $blockinstance->pageid)) {
+
+                                require_login($course);
+
+                                if ($course->id != SITEID) {
+                                    $navigation = "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> $navigation";
+                                }
+                                print_header("$straction: $blockname", $course->fullname, $navigation);
+                            }
+                            break;
+
+                        case 'blog-view':
+                            $strblogs = get_string('blogs','blog');
+                            $navigation = '<a href="'.$CFG->wwwroot.'/blog/index.php">'.
+                                $strblogs.'</a> -> '.$navigation;
+                            print_header("$straction: $strblogs", $SITE->fullname, $navigation);
+                            break;
+
+                        default:
+                            print_header("$straction: $blockname", $SITE->fullname, $navigation);
+                            break;
+                    }
+                }
+            }
+            break;
+
+        default:
+            error ('This is an unknown context (' . $context->contextlevel . ') in admin/roles/tabs.php!');
+            return false;
+
+    }
+}
+
+
+if ($context->contextlevel != CONTEXT_SYSTEM) {    // Print tabs for anything except SYSTEM context
+
+    if ($context->contextlevel == CONTEXT_MODULE) { // only show update button if module?
+
+        $toprow[] = new tabobject('update', $CFG->wwwroot.'/course/mod.php?update='.
+                       $context->instanceid.'&amp;return=true&amp;sesskey='.sesskey(), get_string('update'));
+
+    }
+
+    $toprow[] = new tabobject('roles', $CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.
+                               $context->id, get_string('roles'));
+
+    if (!empty($tabsmode)) {
+
+        if (!empty($assignableroles)) {
+            $secondrow[] = new tabobject('assign',
+                                         $CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$context->id,
+                                         get_string('assignroles', 'role'),
+                                         get_string('showallroles', 'role'),
+                                         true);
+        }
+
+        if (!empty($overridableroles)) {
+            $secondrow[] = new tabobject('override',
+                               $CFG->wwwroot.'/'.$CFG->admin.'/roles/override.php?contextid='.$context->id,
+                               get_string('overrideroles', 'role'),
+                               get_string('showallroles', 'role'),
+                               true);
+        }
+
+        $inactive[] = 'roles';
+        $activetwo = array('roles');
+        $currenttab = $tabsmode;
+
+    } else {
+        $inactive[] = '';
+        $activetwo = array();
+    }
+
+/// 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)) {
+        $tabs = array($toprow, $secondrow);
+    } else {
+        $tabs = array($toprow);
+    }
+
+    print_tabs($tabs, $currenttab, $inactive, $activetwo);
+}
+
+?>

admin/search.php

@@ -0,0 +1,157 @@
+<?php // $Id$
+
+// searches for admin settings
+
+require_once('../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+
+$query = trim(stripslashes_safe(required_param('query', PARAM_NOTAGS)));  // Search string
+
+$adminroot = admin_get_root();
+admin_externalpage_setup('search', $adminroot); // now hidden page
+
+$CFG->adminsearchquery = $query;  // So we can reference it in search boxes later in this invocation
+
+
+// now we'll deal with the case that the admin has submitted the form with changed settings
+
+$statusmsg = '';
+
+if ($data = data_submitted()) {
+    $unslashed = (array)stripslashes_recursive($data);
+    if (confirm_sesskey()) {
+        $olddbsessions = !empty($CFG->dbsessions);
+        $changedsettings = search_settings(admin_get_root(), $query);
+        $errors = '';
+
+        foreach($changedsettings as $changedsetting) {
+            if (!isset($unslashed['s_' . $changedsetting->name])) {
+                $unslashed['s_' . $changedsetting->name] = ''; // needed for checkboxes
+            }
+            $errors .= $changedsetting->write_setting($unslashed['s_' . $changedsetting->name]);
+        }
+
+        if ($olddbsessions != !empty($CFG->dbsessions)) {
+            require_logout();
+        }
+
+        if (empty($errors)) {
+            $statusmsg = get_string('changessaved');
+        } else {
+            $statusmsg = get_string('errorwithsettings', 'admin') . ' <br />' . $errors;
+        }
+    } else {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
+    // now update $SITE - it might have been changed
+    $SITE = get_record('course', 'id', $SITE->id);
+    $COURSE = clone($SITE);
+}
+
+// and finally, if we get here, then there are matching settings and we have to print a form
+// to modify them
+admin_externalpage_print_header($adminroot);
+
+if ($statusmsg != '') {
+    notify ($statusmsg);
+}
+
+$resultshtml = search_settings_html(admin_get_root(), $query);
+
+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 != '') {
+    echo $resultshtml;
+    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="' . get_string('savechanges','admin') . '" /></div>';
+} else {
+    echo get_string('noresults','admin');
+}
+echo '</fieldset>';
+echo '</form>';
+
+admin_externalpage_print_footer($adminroot);
+
+
+/**
+ * Find settings using a query.
+ *
+ * @param string &$node The node at which to start searching. Should be $ADMIN for all external calls to this function.
+ * @param string $query The search string.
+ * @return array An array containing admin_setting objects that match $query.
+ */
+function search_settings(&$node, $query) {
+
+    if (is_a($node, 'admin_category')) {
+        $return = array();
+        $entries = array_keys($node->children);
+        foreach ($entries as $entry) {
+            $return = array_merge($return, search_settings($node->children[$entry], $query));
+        }
+        return $return;
+    }
+
+    if (is_a($node, 'admin_settingpage')) {
+        $return = array();
+        foreach ($node->settings as $setting) {
+            if (stristr($setting->name,$query) || stristr($setting->visiblename,$query) || stristr($setting->description,$query)) {
+                $return[] =& $setting;
+            }
+            unset($setting); // needed to prevent odd (imho) reference behaviour
+                             // see http://www.php.net/manual/en/language.references.whatdo.php#AEN6399
+        }
+        return $return;
+    }
+
+    return array();
+
+}
+
+function search_settings_html(&$node, $query) {
+
+    global $CFG;
+
+    if ($query == ''){
+        return '';
+    }
+
+    if (is_a($node, 'admin_category')) {
+        $entries = array_keys($node->children);
+        $return = '';
+        foreach ($entries as $entry) {
+            $return .= search_settings_html($node->children[$entry], $query);
+        }
+        return $return;
+    }
+
+    if (is_a($node, 'admin_settingpage')) {
+        $foundsettings = array();
+        foreach ($node->settings as $setting) {
+            if (stristr($setting->name,$query) || stristr($setting->visiblename,$query) || stristr($setting->description,$query)) {
+                $foundsettings[] =& $setting;
+            }
+            unset($setting); // needed to prevent odd (imho) reference behaviour
+                             // see http://www.php.net/manual/en/language.references.whatdo.php#AEN6399
+        }
+        $return = '';
+        if (count($foundsettings) > 0) {
+            $return .= print_heading(get_string('searchresults','admin').' - '. '<a href="' . $CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=' . $node->name . '">' . $node->visiblename . '</a>', '', 2, 'main', true);
+            $return .= '<fieldset class="adminsettings">' . "\n";
+            foreach ($foundsettings as $foundsetting) {
+                $return .= '<div class="clearer"><!-- --></div>' . "\n";
+                $return .= highlight($query,$foundsetting->output_html());
+            }
+            $return .= '</fieldset>';
+        }
+        return $return;
+    }
+
+    return '';
+
+}
+
+?>

admin/settings.php

@@ -0,0 +1,203 @@
+<?php // $Id$
+
+require_once('../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir.'/blocklib.php');
+require_once($CFG->dirroot.'/'.$CFG->admin.'/pagelib.php');
+
+if ($site = get_site()) {
+    require_login();
+}
+
+
+page_map_class(PAGE_ADMIN, 'page_admin');
+
+$PAGE = page_create_object(PAGE_ADMIN, 0); // there must be any constant id number
+
+$section = optional_param('section', '', PARAM_ALPHAEXT);
+
+$PAGE->init_extra($section); // hack alert!
+
+$adminediting = optional_param('adminedit', -1, PARAM_BOOL);
+$return       = optional_param('return','', PARAM_ALPHA);
+
+if (!isset($USER->adminediting)) {
+    $USER->adminediting = false;
+}
+
+if ($PAGE->user_allowed_editing()) {
+    if ($adminediting == 1) {
+        $USER->adminediting = true;
+    } elseif ($adminediting == 0) {
+        $USER->adminediting = false;
+    }
+}
+
+$adminroot = admin_get_root();
+
+$root = $adminroot->locate($PAGE->section);
+
+if (!is_a($root, 'admin_settingpage')) {
+    error(get_string('sectionerror', 'admin'));
+    die;
+}
+
+if (!($root->check_access())) {
+    error(get_string('accessdenied', 'admin'));
+    die;
+}
+
+$CFG->pagepath = 'admin/setting/'.$section;
+
+
+
+/// WRITING SUBMITTED DATA (IF ANY) -------------------------------------------------------------------------------
+
+$statusmsg = '';
+
+if ($data = data_submitted()) {
+    if (confirm_sesskey()) {
+        $olddbsessions = !empty($CFG->dbsessions);
+        $unslashed = (array)stripslashes_recursive($data);
+        $errors = $root->write_settings($unslashed);
+        //force logout if dbsession setting changes
+        if ($olddbsessions != !empty($CFG->dbsessions)) {
+            require_logout();
+        }
+        if (empty($errors)) {
+            switch ($return) {
+                case 'site':
+                    redirect("$CFG->wwwroot/");
+                case 'admin':
+                    redirect("$CFG->wwwroot/$CFG->admin/");
+                default:
+                    $statusmsg = get_string('changessaved');
+            }
+        } else {
+            $statusmsg = get_string('errorwithsettings', 'admin') . ' <br />' . $errors;
+        }
+    } else {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
+    // now update $SITE - it might have been changed
+    $SITE = get_record('course', 'id', $SITE->id);
+    $COURSE = clone($SITE);
+}
+
+
+/// print header stuff ------------------------------------------------------------
+// header must be printed after the redirects and require_logout
+
+if (empty($SITE->fullname)) {
+    print_header();
+    print_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);
+
+    $preferred_width_left  = bounded_number(BLOCK_L_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
+                                            BLOCK_L_MAX_WIDTH);
+    $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]),
+                                            BLOCK_R_MAX_WIDTH);
+
+    $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">';
+    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>';
+
+    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($THEME->roundcorners)) {
+        echo '</div></div></div>';
+        echo '<div class="bb"><div></div></div>';
+    }
+    echo '</td>';
+            break;
+            case 'right':
+    if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT)) {
+        echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">';
+        if (!empty($THEME->roundcorners)) {
+            echo '<div class="bt"><div></div></div>';
+            echo '<div class="i1"><div class="i2"><div class="i3">';
+        }
+        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)) {
+    use_html_editor();
+}
+
+print_footer();
+
+?>

admin/settings/appearance.php

@@ -0,0 +1,114 @@
+<?php // $Id$
+
+// This file defines settingpages and externalpages under the "appearance" category
+
+$ADMIN->add('appearance', new admin_category('themes', get_string('themes')));
+// "themesettings" settingpage
+$temp = new admin_settingpage('themesettings', get_string('themesettings', 'admin'));
+$temp->add(new admin_setting_configtext('themelist', get_string('themelist', 'admin'), get_string('configthemelist','admin'), '', PARAM_NOTAGS));
+$temp->add(new admin_setting_configcheckbox('allowuserthemes', get_string('allowuserthemes', 'admin'), get_string('configallowuserthemes', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('allowcoursethemes', get_string('allowcoursethemes', 'admin'), get_string('configallowcoursethemes', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('allowuserblockhiding', get_string('allowuserblockhiding', 'admin'), get_string('configallowuserblockhiding', 'admin'), 1));
+$temp->add(new admin_setting_configcheckbox('showblocksonmodpages', get_string('showblocksonmodpages', 'admin'), get_string('configshowblocksonmodpages', 'admin'), 0));
+$ADMIN->add('themes', $temp);
+$ADMIN->add('themes', new admin_externalpage('themeselector', get_string('themeselector','admin'), $CFG->wwwroot . '/theme/index.php'));
+
+# 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'),
+        1 => get_string('monday', 'calendar'),
+        2 => get_string('tuesday', 'calendar'),
+        3 => get_string('wednesday', 'calendar'),
+        4 => get_string('thursday', 'calendar'),
+        5 => get_string('friday', 'calendar'),
+        6 => get_string('saturday', 'calendar')
+    )));
+$temp->add(new admin_setting_special_calendar_weekend());
+$temp->add(new admin_setting_configtext('calendar_lookahead',get_string('configlookahead','admin'),get_string('helpupcominglookahead', 'admin'),21,PARAM_INT));
+$temp->add(new admin_setting_configtext('calendar_maxevents',get_string('configmaxevents','admin'),get_string('helpupcomingmaxevents', 'admin'),10,PARAM_INT));
+$ADMIN->add('appearance', $temp);
+
+// "filtersettings" settingpage
+$temp = new admin_settingpage('filtersettings', get_string('filtersettings', 'admin'));
+$temp->add(new admin_setting_configselect('cachetext', get_string('cachetext', 'admin'), get_string('configcachetext', 'admin'), 60, array(604800 => get_string('numdays','',7),
+                                                                                                                                       86400 => get_string('numdays','',1),
+                                                                                                                                       43200 => get_string('numhours','',12),
+                                                                                                                                       10800 => get_string('numhours','',3),
+                                                                                                                                       7200 => get_string('numhours','',2),
+                                                                                                                                       3600 => get_string('numhours','',1),
+                                                                                                                                       2700 => get_string('numminutes','',45),
+                                                                                                                                       1800 => get_string('numminutes','',30),
+                                                                                                                                       900 => get_string('numminutes','',15),
+                                                                                                                                       600 => get_string('numminutes','',10),
+                                                                                                                                       540 => get_string('numminutes','',9),
+                                                                                                                                       480 => get_string('numminutes','',8),
+                                                                                                                                       420 => get_string('numminutes','',7),
+                                                                                                                                       360 => get_string('numminutes','',6),
+                                                                                                                                       300 => get_string('numminutes','',5),
+                                                                                                                                       240 => get_string('numminutes','',4),
+                                                                                                                                       180 => get_string('numminutes','',3),
+                                                                                                                                       120 => get_string('numminutes','',2),
+                                                                                                                                       60 => get_string('numminutes','',1),
+                                                                                                                                       30 => get_string('numseconds','',30),
+                                                                                                                                       0 => get_string('no'))));
+$temp->add(new admin_setting_configselect('filteruploadedfiles', get_string('filteruploadedfiles', 'admin'), get_string('configfilteruploadedfiles', 'admin'), 0, array('0' => get_string('none'),
+                                                                                                                                                                     '1' => get_string('allfiles'),
+                                                                                                                                                                        '2' => get_string('htmlfilesonly'))));
+$temp->add(new admin_setting_configcheckbox('filtermatchoneperpage', get_string('filtermatchoneperpage', 'admin'), get_string('configfiltermatchoneperpage', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('filtermatchonepertext', get_string('filtermatchonepertext', 'admin'), get_string('configfiltermatchonepertext', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('filterall', get_string('filterall', 'admin'), get_string('configfilterall', 'admin'), 0));
+$ADMIN->add('appearance', $temp);
+
+
+
+
+
+// "htmleditor" settingpage
+$temp = new admin_settingpage('htmleditor', get_string('htmleditor', 'admin'));
+$temp->add(new admin_setting_configcheckbox('htmleditor', get_string('usehtmleditor', 'admin'), get_string('confightmleditor','admin'), 1));
+$temp->add(new admin_setting_configtext('editorbackgroundcolor', get_string('editorbackgroundcolor', 'admin'), get_string('edhelpbgcolor'), '#ffffff', PARAM_NOTAGS));
+$temp->add(new admin_setting_configtext('editorfontfamily', get_string('editorfontfamily', 'admin'), get_string('edhelpfontfamily'), 'Trebuchet MS,Verdana,Arial,Helvetica,sans-serif', PARAM_NOTAGS));
+$temp->add(new admin_setting_configtext('editorfontsize', get_string('editorfontsize', 'admin'), get_string('edhelpfontsize'), '', PARAM_NOTAGS));
+$temp->add(new admin_setting_special_editorfontlist());
+$temp->add(new admin_setting_configcheckbox('editorkillword', get_string('editorkillword', 'admin'), get_string('edhelpcleanword'), 1));
+if (!empty($CFG->aspellpath)) { // make aspell settings disappear if path isn't set
+  $temp->add(new admin_setting_configcheckbox('editorspelling', get_string('editorspelling', 'admin'), get_string('editorspellinghelp', 'admin'), 0));
+  $temp->add(new admin_setting_special_editordictionary());
+}
+$temp->add(new admin_setting_special_editorhidebuttons());
+$ADMIN->add('appearance', $temp);
+
+// "documentation" settingpage
+$temp = new admin_settingpage('documentation', get_string('moodledocs'));
+$temp->add(new admin_setting_configtext('docroot', get_string('docroot', 'admin'), get_string('configdocroot', 'admin'), 'http://docs.moodle.org', PARAM_URL));
+$temp->add(new admin_setting_configcheckbox('doctonewwindow', get_string('doctonewwindow', 'admin'), get_string('configdoctonewwindow', 'admin'), 0));
+$ADMIN->add('appearance', $temp);
+
+$temp = new admin_settingpage('mymoodle', get_string('mymoodle', 'admin'));
+$temp->add(new admin_setting_configcheckbox('mymoodleredirect', get_string('mymoodleredirect', 'admin'), get_string('configmymoodleredirect', 'admin'), 0));
+$ADMIN->add('appearance', $temp);
+
+// new CFG variable for gradebook (what roles to display)
+$temp = new admin_settingpage('gradebook', get_string('gradebook', 'admin'));
+$temp->add(new admin_setting_special_gradebookroles());
+$ADMIN->add('appearance', $temp);
+
+// new CFG variable for coursemanager (what roles to display)
+$temp = new admin_settingpage('coursemanager', get_string('coursemanager', 'admin'));
+$temp->add(new admin_setting_special_coursemanager());
+$ADMIN->add('appearance', $temp);
+
+$ADMIN->add('appearance', new admin_externalpage('stickyblocks', get_string('stickyblocks', 'admin'), "$CFG->wwwroot/$CFG->admin/stickyblocks.php"));
+
+?>

admin/settings/courses.php

@@ -0,0 +1,50 @@
+<?php // $Id$
+
+// 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('enrolment', get_string('enrolments'), $CFG->wwwroot . '/'.$CFG->admin.'/enrol.php'));
+
+// "courserequests" settingpage
+$temp = new admin_settingpage('courserequest', get_string('courserequest'));
+$temp->add(new admin_setting_configcheckbox('enablecourserequests', get_string('enablecourserequests', 'admin'), get_string('configenablecourserequests', 'admin'), 0));
+require_once($CFG->dirroot.'/course/lib.php');
+$temp->add(new admin_setting_configselect('defaultrequestcategory', get_string('defaultrequestcategory', 'admin'), get_string('configdefaultrequestcategory', 'admin'), 1, make_categories_options()));
+$ADMIN->add('courses', $temp);
+
+
+
+// "backups" settingpage
+$temp = new admin_settingpage('backups', get_string('backups','admin'));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_modules', get_string('includemodules'), get_string('backupincludemoduleshelp'), 0));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_withuserdata', get_string('includemoduleuserdata'), get_string('backupincludemoduleuserdatahelp'), 0));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_metacourse', get_string('metacourse'), get_string('backupmetacoursehelp'), 0));
+$temp->add(new admin_setting_backupselect('backup_sche_users', get_string('users'), get_string('backupusershelp'), 0, array(0 => get_string('all'),
+                                                                                                                            1 => get_string('course'))));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_logs', get_string('logs'), get_string('backuplogshelp'), 0));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_userfiles', get_string('userfiles'), get_string('backupuserfileshelp'), 0));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_coursefiles', get_string('coursefiles'), get_string('backupcoursefileshelp'), 0));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_messages', get_string('messages', 'message'), get_string('backupmessageshelp','message'), 0));
+$temp->add(new admin_setting_backupselect('backup_sche_keep', get_string('keep'), get_string('backupkeephelp'), 1, array(0 => get_string('all'),
+                                                                                                                         1 => '1',
+                                                                                                                         2 => '2',
+                                                                                                                         5 => '5',
+                                                                                                                         10 => '10',
+                                                                                                                         20 => '20',
+                                                                                                                         30 => '30',
+                                                                                                                         40 => '40',
+                                                                                                                         50 => '50',
+                                                                                                                         100 => '100',
+                                                                                                                         200 => '200',
+                                                                                                                         300 => '300',
+                                                                                                                         400 => '400',
+                                                                                                                         500 => '500')));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_active', get_string('active'), get_string('backupactivehelp'), 0));
+$temp->add(new admin_setting_special_backupdays());
+$temp->add(new admin_setting_special_backuptime());
+$temp->add(new admin_setting_special_backupsaveto());
+$ADMIN->add('courses', $temp);
+
+?>

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

@@ -0,0 +1,22 @@
+<?php // $Id$
+
+// This file defines settingpages and externalpages under the "appearance" category
+
+// "languageandlocation" settingpage
+$temp = new admin_settingpage('langsettings', get_string('languagesettings', 'admin'));
+$temp->add(new admin_setting_configselect('lang', get_string('lang', 'admin'), get_string('configlang', 'admin'), current_language(), get_list_of_languages())); // $CFG->lang might be set in installer already, default en or en_utf8 is in setup.php
+$temp->add(new admin_setting_configcheckbox('langmenu', get_string('langmenu', 'admin'), get_string('configlangmenu', 'admin'), 1));
+$temp->add(new admin_setting_langlist());
+$temp->add(new admin_setting_configcheckbox('langcache', get_string('langcache', 'admin'), get_string('configlangcache', 'admin'), 1));
+$temp->add(new admin_setting_configtext('locale', get_string('localetext', 'admin'), get_string('configlocale', 'admin'), '', PARAM_FILE));
+
+// 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

@@ -0,0 +1,28 @@
+<?php // $Id$
+
+// "locations" settingpage
+$temp = new admin_settingpage('locationsettings', get_string('locationsettings', 'admin'));
+$options = get_list_of_timezones();
+$options[99] = get_string('serverlocaltime');
+$temp->add(new admin_setting_configselect('timezone', get_string('timezone','admin'), get_string('configtimezone', 'admin'), 99, $options));
+$options = get_list_of_timezones();
+$options[99] = get_string('timezonenotforced', 'admin');
+$temp->add(new admin_setting_configselect('forcetimezone', get_string('forcetimezone', 'admin'), get_string('helpforcetimezone', 'admin'), 99, $options));
+$options = get_list_of_countries();
+$options[0] = get_string('choose') .'...';
+$temp->add(new admin_setting_configselect('country', get_string('country', 'admin'), get_string('configcountry', 'admin'), 0, $options));
+
+$iplookups = array();
+if ($plugins = get_list_of_plugins('iplookup')) {
+    foreach ($plugins as $plugin) {
+        $iplookups[$plugin] = $plugin;
+    }
+}
+$temp->add(new admin_setting_configselect('iplookup', get_string('iplookup', 'admin'), get_string('configiplookup', 'admin'), 'hostip', $iplookups));
+
+$ADMIN->add('location', $temp);
+
+
+$ADMIN->add('location', new admin_externalpage('timezoneimport', get_string('updatetimezones', 'admin'), "$CFG->wwwroot/$CFG->admin/timezoneimport.php"));
+
+?>

admin/settings/misc.php

@@ -0,0 +1,22 @@
+<?php // $Id$
+
+// * Miscellaneous settings
+
+// Experimental settings page
+$temp = new admin_settingpage('experimental', get_string('experimental', 'admin'));
+$temp->add(new admin_setting_configcheckbox('enableajax', get_string('enableajax', 'admin'), get_string('configenableajax', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('enableglobalsearch', get_string('enableglobalsearch', 'admin'), get_string('configenableglobalsearch', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('smartpix', get_string('smartpix', 'admin'), get_string('configsmartpix', 'admin'), 0));
+$ADMIN->add('misc', $temp);
+
+// XMLDB editor
+$ADMIN->add('misc', new admin_externalpage('xmldbeditor', get_string('xmldbeditor'), "$CFG->wwwroot/$CFG->admin/xmldb/"));
+
+
+// hidden scripts linked from elsewhere
+$ADMIN->add('misc', new admin_externalpage('oacleanup', 'Online Assignment Cleanup', $CFG->wwwroot.'/'.$CFG->admin.'/oacleanup.php', 'moodle/site:config', true));
+$ADMIN->add('misc', new admin_externalpage('upgradeforumread', 'Upgrade forum', $CFG->wwwroot.'/'.$CFG->admin.'/upgradeforumread.php', 'moodle/site:config', true));
+$ADMIN->add('misc', new admin_externalpage('upgradelogs', 'Upgrade logs', $CFG->wwwroot.'/'.$CFG->admin.'/upgradelogs.php', 'moodle/site:config', true));
+$ADMIN->add('misc', new admin_externalpage('multilangupgrade', get_string('multilangupgrade', 'admin'), $CFG->wwwroot.'/'.$CFG->admin.'/multilangupgrade.php', 'moodle/site:config', !empty($CFG->filter_multilang_converted)));
+
+?>

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

@@ -0,0 +1,98 @@
+<?php // $Id$
+
+
+
+// "sitepolicies" settingpage
+$temp = new admin_settingpage('sitepolicies', get_string('sitepolicies', 'admin'));
+$temp->add(new admin_setting_configcheckbox('protectusernames', get_string('protectusernames', 'admin'), get_string('configprotectusernames', 'admin'), 1));
+$temp->add(new admin_setting_configcheckbox('forcelogin', get_string('forcelogin', 'admin'), get_string('configforcelogin', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('forceloginforprofiles', get_string('forceloginforprofiles', 'admin'), get_string('configforceloginforprofiles', 'admin'), 1));
+$temp->add(new admin_setting_configcheckbox('opentogoogle', get_string('opentogoogle', 'admin'), get_string('configopentogoogle', 'admin'), 0));
+$temp->add(new admin_setting_configtext('maxbytes', get_string('maxbytes', 'admin'), get_string('configmaxbytes', 'admin'), 0, PARAM_INT));
+$temp->add(new admin_setting_configcheckbox('messaging', get_string('messaging', 'admin'), get_string('configmessaging','admin'), 1));
+$temp->add(new admin_setting_configcheckbox('allowobjectembed', get_string('allowobjectembed', 'admin'), get_string('configallowobjectembed', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('enabletrusttext', get_string('enabletrusttext', 'admin'), get_string('configenabletrusttext', 'admin'), 0));
+$temp->add(new admin_setting_configselect('maxeditingtime', get_string('maxeditingtime','admin'), get_string('configmaxeditingtime','admin'), 1800,
+             array(60 => get_string('numminutes', '', 1),
+                   300 => get_string('numminutes', '', 5),
+                   900 => get_string('numminutes', '', 15),
+                   1800 => get_string('numminutes', '', 30),
+                   2700 => get_string('numminutes', '', 45),
+                   3600 => get_string('numminutes', '', 60))));
+$temp->add(new admin_setting_configselect('fullnamedisplay', get_string('fullnamedisplay', 'admin'), get_string('configfullnamedisplay', 'admin'),
+              'firstname lastname', array('language' => get_string('language'),
+              'firstname lastname' => get_string('firstname') . ' + ' . get_string('lastname'),
+              'lastname firstname' => get_string('lastname') . ' + ' . get_string('firstname'),
+              'firstname' => get_string('firstname'))));
+$temp->add(new admin_setting_configcheckbox('extendedusernamechars', get_string('extendedusernamechars', 'admin'), get_string('configextendedusernamechars', 'admin'), 0));
+$temp->add(new admin_setting_configtext('sitepolicy', get_string('sitepolicy', 'admin'), get_string('configsitepolicy', 'admin'), '', PARAM_RAW));
+$temp->add(new admin_setting_configselect('bloglevel', get_string('bloglevel', 'admin'), get_string('configbloglevel', 'admin'), 4, array(5 => get_string('worldblogs','blog'),
+                                                                                                                                          4 => get_string('siteblogs','blog'),
+                                                                                                                                          3 => get_string('courseblogs','blog'),
+                                                                                                                                          2 => get_string('groupblogs','blog'),
+                                                                                                                                          1 => get_string('personalblogs','blog'),
+                                                                                                                                          0 => get_string('disableblogs','blog'))));
+
+$temp->add(new admin_setting_configcheckbox('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));
+
+$ADMIN->add('security', $temp);
+
+
+
+
+// "httpsecurity" settingpage
+$temp = new admin_settingpage('httpsecurity', get_string('httpsecurity', 'admin'));
+$temp->add(new admin_setting_configcheckbox('loginhttps', get_string('loginhttps', 'admin'), get_string('configloginhttps', 'admin'), 0));
+$ADMIN->add('security', $temp);
+
+
+// "modulesecurity" settingpage
+$temp = new admin_settingpage('modulesecurity', get_string('modulesecurity', 'admin'));
+$temp->add(new admin_setting_configselect('restrictmodulesfor', get_string('restrictmodulesfor', 'admin'), get_string('configrestrictmodulesfor', 'admin'), 'none', array('none' => 'No courses',
+                                                                                                                                                                          'all' => 'All courses',
+                                                                                                                                                                          'requested' => 'Requested courses')));
+$temp->add(new admin_setting_configcheckbox('restrictbydefault', get_string('restrictbydefault', 'admin'), get_string('configrestrictbydefault', 'admin'), 0));
+if (!$options = get_records("modules")) {
+    $options = array();
+}
+$options2 = array();
+foreach ($options as $option) {
+    $options2[$option->id] = $option->name;
+}
+$temp->add(new admin_setting_configmultiselect('defaultallowedmodules', get_string('defaultallowedmodules', 'admin'), get_string('configdefaultallowedmodules', 'admin'), array(), $options2));
+$ADMIN->add('security', $temp);
+
+
+
+// "notifications" settingpage
+$temp = new admin_settingpage('notifications', get_string('notifications', 'admin'));
+$temp->add(new admin_setting_configselect('displayloginfailures', get_string('displayloginfailures', 'admin'), get_string('configdisplayloginfailures', 'admin'), '', array('' => get_string('nobody'),
+                                                                                                                                                                            'admin' => get_string('administrators'),
+                                                                                                                                                                            'teacher' => get_string('administratorsandteachers'),
+                                                                                                                                                                            'everybody' => get_string('everybody'))));
+$temp->add(new admin_setting_configselect('notifyloginfailures', get_string('notifyloginfailures', 'admin'), get_string('confignotifyloginfailures', 'admin'), '', array('' => get_string('nobody'),
+                                                                                                                                                                         'mainadmin' => get_string('administrator'),
+                                                                                                                                                                         'alladmins' => get_string('administratorsall'))));
+$options = array();
+for ($i = 1; $i <= 100; $i++) {
+    $options[$i] = $i;
+}
+$temp->add(new admin_setting_configselect('notifyloginthreshold', get_string('notifyloginthreshold', 'admin'), get_string('confignotifyloginthreshold', 'admin'), '10', $options));
+$ADMIN->add('security', $temp);
+
+
+
+
+
+
+// "antivirus" settingpage
+$temp = new admin_settingpage('antivirus', get_string('antivirus', 'admin'));
+$temp->add(new admin_setting_configcheckbox('runclamonupload', get_string('runclamavonupload', 'admin'), get_string('configrunclamavonupload', 'admin'), 0));
+$temp->add(new admin_setting_configtext('pathtoclam', get_string('pathtoclam', 'admin'), get_string('configpathtoclam', 'admin'), '', PARAM_RAW)); // TODO: add path validation
+$temp->add(new admin_setting_configtext('quarantinedir', get_string('quarantinedir', 'admin'), get_string('configquarantinedir', 'admin'), '', PARAM_RAW)); // TODO: add path validation
+$temp->add(new admin_setting_configselect('clamfailureonupload', get_string('clamfailureonupload', 'admin'), get_string('configclamfailureonupload', 'admin'), 'donothing', array('donothing' => get_string('configclamdonothing', 'admin'),
+                                                                                                                                                                                  'actlikevirus' => get_string('configclamactlikevirus', 'admin'))));
+$ADMIN->add('security', $temp);
+
+?>

admin/settings/server.php

@@ -0,0 +1,205 @@
+<?php // $Id$
+
+// This file defines settingpages and externalpages under the "server" category
+
+// "systempaths" settingpage
+$temp = new admin_settingpage('systempaths', get_string('systempaths','admin'));
+$temp->add(new admin_setting_configselect('gdversion', get_string('gdversion','admin'), get_string('configgdversion', 'admin'), check_gd_version(), array('0' => get_string('gdnot'),
+                                                                                                                                                          '1' => get_string('gd1'),
+                                                                                                                                                          '2' => get_string('gd2'))));
+$temp->add(new admin_setting_configtext('zip', get_string('pathtozip','admin'), get_string('configzip', 'admin'), '', PARAM_RAW)); // TODO: add path validation
+$temp->add(new admin_setting_configtext('unzip', get_string('pathtounzip','admin'), get_string('configunzip', 'admin'), '', PARAM_RAW)); // TODO: add path validation
+$temp->add(new admin_setting_configtext('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'), '', PARAM_RAW)); // TODO: add path validation
+$temp->add(new admin_setting_configtext('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'), '', PARAM_RAW)); // TODO: add path validation
+$ADMIN->add('server', $temp, 0);
+
+
+
+// "email" settingpage
+$temp = new admin_settingpage('mail', get_string('mail','admin'));
+$temp->add(new admin_setting_configtext('smtphosts', get_string('smtphosts', 'admin'), get_string('configsmtphosts', 'admin'), '', PARAM_HOST));
+$temp->add(new admin_setting_configtext('smtpuser', get_string('smtpuser', 'admin'), get_string('configsmtpuser', 'admin'), '', PARAM_NOTAGS));
+$temp->add(new admin_setting_configtext('smtppass', get_string('smtppass', 'admin'), get_string('configsmtpuser', 'admin'), '', PARAM_RAW));
+$temp->add(new admin_setting_configtext('noreplyaddress', get_string('noreplyaddress', 'admin'), get_string('confignoreplyaddress', 'admin'), 'noreply@' . $_SERVER['HTTP_HOST'], PARAM_NOTAGS));
+$temp->add(new admin_setting_configtext('allowemailaddresses', get_string('allowemailaddresses', 'admin'), get_string('configallowemailaddresses', 'admin'), '', PARAM_NOTAGS));
+$temp->add(new admin_setting_configtext('denyemailaddresses', get_string('denyemailaddresses', 'admin'), get_string('configdenyemailaddresses', 'admin'), '', PARAM_NOTAGS));
+$temp->add(new admin_setting_configselect('digestmailtime', get_string('digestmailtime', 'admin'), get_string('configdigestmailtime', 'admin'), 17, array('00' => '00',
+                                                                                                                                                          '01' => '01',
+                                                                                                                                                          '02' => '02',
+                                                                                                                                                          '03' => '03',
+                                                                                                                                                          '04' => '04',
+                                                                                                                                                          '05' => '05',
+                                                                                                                                                          '06' => '06',
+                                                                                                                                                          '07' => '07',
+                                                                                                                                                          '08' => '08',
+                                                                                                                                                          '09' => '09',
+                                                                                                                                                          '10' => '10',
+                                                                                                                                                          '11' => '11',
+                                                                                                                                                          '12' => '12',
+                                                                                                                                                          '13' => '13',
+                                                                                                                                                          '14' => '14',
+                                                                                                                                                          '15' => '15',
+                                                                                                                                                          '16' => '16',
+                                                                                                                                                          '17' => '17',
+                                                                                                                                                          '18' => '18',
+                                                                                                                                                          '19' => '19',
+                                                                                                                                                          '20' => '20',
+                                                                                                                                                          '21' => '21',
+                                                                                                                                                          '22' => '22',
+                                                                                                                                                          '23' => '23')));
+$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);
+
+
+
+// "sessionhandling" settingpage
+$temp = new admin_settingpage('sessionhandling', get_string('sessionhandling', 'admin'));
+$temp->add(new admin_setting_configcheckbox('dbsessions', get_string('dbsessions', 'admin'), get_string('configdbsessions', 'admin'), 0));
+$temp->add(new admin_setting_configselect('sessiontimeout', get_string('sessiontimeout', 'admin'), get_string('configsessiontimeout', 'admin'), 7200, array(14400 => get_string('numhours', '', 4),
+                                                                                                                                                      10800 => get_string('numhours', '', 3),
+                                                                                                                                                      7200 => get_string('numhours', '', 2),
+                                                                                                                                                      5400 => get_string('numhours', '', '1.5'),
+                                                                                                                                                      3600 => get_string('numminutes', '', 60),
+                                                                                                                                                      2700 => get_string('numminutes', '', 45),
+                                                                                                                                                      1800 => get_string('numminutes', '', 30),
+                                                                                                                                                      900 => get_string('numminutes', '', 15),
+                                                                                                                                                      300 => get_string('numminutes', '', 5))));
+$temp->add(new admin_setting_configtext('sessioncookie', get_string('sessioncookie', 'admin'), get_string('configsessioncookie', 'admin'), '', PARAM_ALPHANUM));
+$temp->add(new admin_setting_configtext('sessioncookiepath', get_string('sessioncookiepath', 'admin'), get_string('configsessioncookiepath', 'admin'), '/', PARAM_LOCALURL));
+$ADMIN->add('server', $temp, 50);
+
+
+
+// "rss" settingpage
+$temp = new admin_settingpage('rss', get_string('rss'));
+$temp->add(new admin_setting_configcheckbox('enablerssfeeds', get_string('enablerssfeeds', 'admin'), get_string('configenablerssfeeds', 'admin'), 0));
+$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);
+
+
+// "stats" settingpage
+$temp = new admin_settingpage('stats', get_string('stats'));
+$temp->add(new admin_setting_configcheckbox('enablestats', get_string('enablestats', 'admin'), get_string('configenablestats', 'admin'), 0));
+$temp->add(new admin_setting_configselect('statsfirstrun', get_string('statsfirstrun', 'admin'), get_string('configstatsfirstrun', 'admin'), 'none', array('none' => get_string('none'),
+                                                                                                                                                           60*60*24*7 => get_string('numweeks','moodle',1),
+                                                                                                                                                           60*60*24*14 => get_string('numweeks','moodle',2),
+                                                                                                                                                           60*60*24*21 => get_string('numweeks','moodle',3),
+                                                                                                                                                           60*60*24*28 => get_string('nummonths','moodle',1),
+                                                                                                                                                           60*60*24*56 => get_string('nummonths','moodle',2),
+                                                                                                                                                           60*60*24*84 => get_string('nummonths','moodle',3),
+                                                                                                                                                           60*60*24*112 => get_string('nummonths','moodle',4),
+                                                                                                                                                           60*60*24*140 => get_string('nummonths','moodle',5),
+                                                                                                                                                           60*60*24*168 => get_string('nummonths','moodle',6),
+                                                                                                                                                           'all' => get_string('all') )));
+$temp->add(new admin_setting_configselect('statsmaxruntime', get_string('statsmaxruntime', 'admin'), get_string('configstatsmaxruntime', 'admin'), 0, array(0 => get_string('untilcomplete'),
+                                                                                                                                                            60*60 => '1 '.get_string('hour'),
+                                                                                                                                                            60*60*2 => '2 '.get_string('hours'),
+                                                                                                                                                            60*60*3 => '3 '.get_string('hours'),
+                                                                                                                                                            60*60*4 => '4 '.get_string('hours'),
+                                                                                                                                                            60*60*5 => '5 '.get_string('hours'),
+                                                                                                                                                            60*60*6 => '6 '.get_string('hours'),
+                                                                                                                                                            60*60*7 => '7 '.get_string('hours'),
+                                                                                                                                                            60*60*8 => '8 '.get_string('hours') )));
+$temp->add(new admin_setting_configtime('statsruntimestarthour', 'statsruntimestartminute', get_string('statsruntimestart', 'admin'), get_string('configstatsruntimestart', 'admin'), array('h' => 0, 'm' => 0)));
+$temp->add(new admin_setting_configtext('statsuserthreshold', get_string('statsuserthreshold', 'admin'), get_string('configstatsuserthreshold', 'admin'), 0, PARAM_INT));
+$ADMIN->add('server', $temp);
+
+
+// "http" settingpage
+$temp = new admin_settingpage('http', get_string('http', 'admin'));
+$temp->add(new admin_setting_configtext('framename', get_string('framename', 'admin'), get_string('configframename', 'admin'), '_top', PARAM_ALPHAEXT));
+$temp->add(new admin_Setting_configcheckbox('slasharguments', get_string('slasharguments', 'admin'), get_string('configslasharguments', 'admin'), 1));
+$temp->add(new admin_setting_configtext('proxyhost', get_string('proxyhost', 'admin'), get_string('configproxyhost', 'admin'), '', PARAM_HOST));
+$temp->add(new admin_setting_configtext('proxyport', get_string('proxyport', 'admin'), get_string('configproxyport', 'admin'), 0, PARAM_INT));
+$ADMIN->add('server', $temp);
+
+$ADMIN->add('server', new admin_externalpage('maintenancemode', get_string('sitemaintenancemode', 'admin'), "$CFG->wwwroot/$CFG->admin/maintenance.php"));
+
+
+$temp = new admin_settingpage('cleanup', get_string('cleanup', 'admin'));
+$temp->add(new admin_setting_configselect('longtimenosee', get_string('longtimenosee', 'admin'), get_string('configlongtimenosee', 'admin'), 120, array(0 => get_string('never'),
+                                                                                                                                                        1000 => get_string('numdays', '', 1000),
+                                                                                                                                                        365 => get_string('numdays', '', 365),
+                                                                                                                                                        180 => get_string('numdays', '', 180),
+                                                                                                                                                        150 => get_string('numdays', '', 150),
+                                                                                                                                                        120 => get_string('numdays', '', 120),
+                                                                                                                                                        90 => get_string('numdays', '', 90),
+                                                                                                                                                        60 => get_string('numdays', '', 60),
+                                                                                                                                                        30 => get_string('numdays', '', 30),
+                                                                                                                                                        21 => get_string('numdays', '', 21),
+                                                                                                                                                        14 => get_string('numdays', '', 14),
+                                                                                                                                                        7 => get_string('numdays', '', 7) )));
+$temp->add(new admin_setting_configselect('deleteunconfirmed', get_string('deleteunconfirmed', 'admin'), get_string('configdeleteunconfirmed', 'admin'), 168, 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),
+                                                                                                                                                                    12 => get_string('numhours', '', 12),
+                                                                                                                                                                    6 => get_string('numhours', '', 6),
+                                                                                                                                                                    1 => get_string('numhours', '', 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),
+                                                                                                                                                180 => get_string('numdays', '', 180),
+                                                                                                                                                150 => get_string('numdays', '', 150),
+                                                                                                                                                120 => get_string('numdays', '', 120),
+                                                                                                                                                90 => get_string('numdays', '', 90),
+                                                                                                                                                60 => get_string('numdays', '', 60),
+                                                                                                                                                30 => get_string('numdays', '', 30))));
+
+$ADMIN->add('server', $temp);
+
+
+
+$ADMIN->add('server', new admin_externalpage('environment', get_string('environment','admin'), "$CFG->wwwroot/$CFG->admin/environment.php"));
+$ADMIN->add('server', new admin_externalpage('phpinfo', get_string('phpinfo'), "$CFG->wwwroot/$CFG->admin/phpinfo.php"));
+
+
+// "performance" settingpage
+$temp = new admin_settingpage('performance', get_string('performance', 'admin'));
+$temp->add(new admin_setting_configselect('cachetype', get_string('cachetype', 'admin'), 
+                                          get_string('configcachetype', 'admin'), false, 
+                                          array( '' => 'none', 
+                                                 'internal' => 'internal', 
+                                                 'memcached' => 'memcached', 
+                                                 '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->add('server', new admin_externalpage('database', get_string('managedatabase'), "$CFG->wwwroot/$CFG->admin/mysql/frame.php"));
+}
+
+?>

admin/settings/top.php

@@ -0,0 +1,47 @@
+<?php // $Id$
+
+// This is the first file read by the lib/adminlib.php script
+// We use it to create the categories in correct order,
+// since they need to exist *before* settingpages and externalpages
+// are added to them.
+
+$ADMIN->add('root', new admin_externalpage('adminnotifications', get_string('notifications'), "$CFG->wwwroot/$CFG->admin/index.php"));
+
+ // hidden upgrade script
+$ADMIN->add('root', new admin_externalpage('upgradesettings', get_string('upgradesettings', 'admin'), "$CFG->wwwroot/$CFG->admin/upgradesettings.php", 'moodle/site:config', true));
+
+// hidden search script
+$ADMIN->add('root', new admin_externalpage('search', get_string('search', 'admin'), "$CFG->wwwroot/$CFG->admin/search.php", 'moodle/site:config', true));
+
+$ADMIN->add('root', new admin_category('users', get_string('users','admin')));
+$ADMIN->add('root', new admin_category('courses', get_string('courses','admin')));
+$ADMIN->add('root', new admin_category('location', get_string('location','admin')));
+$ADMIN->add('root', new admin_category('language', get_string('language')));
+
+$ADMIN->add('root', new admin_category('modules', get_string('plugins', 'admin')));
+$ADMIN->add('modules', new admin_externalpage('managemodules', get_string('activities'), "$CFG->wwwroot/$CFG->admin/modules.php"));
+$ADMIN->add('modules', new admin_externalpage('manageblocks', get_string('blocks'), "$CFG->wwwroot/$CFG->admin/blocks.php"));
+$ADMIN->add('modules', new admin_externalpage('managefilters', get_string('managefilters'), "$CFG->wwwroot/$CFG->admin/filters.php"));
+
+$ADMIN->add('root', new admin_category('security', get_string('security','admin')));
+$ADMIN->add('root', new admin_category('appearance', get_string('appearance','admin')));
+$ADMIN->add('root', new admin_category('frontpage', get_string('frontpage','admin')));
+$ADMIN->add('root', new admin_category('server', get_string('server','admin')));
+$ADMIN->add('root', new admin_category('mnet', get_string('net','mnet')));
+
+$ADMIN->add('root', new admin_category('reports', get_string('reports')));
+foreach (get_list_of_plugins('admin/report') as $plugin) {
+/// This snippet is temporary until simpletest can be fixed to use xmldb.   See MDL-7377   XXX TODO
+    if ($plugin == 'simpletest' && $CFG->dbfamily != 'mysql' && $CFG->dbfamily != 'postgres') {
+        continue;
+    }
+/// End of removable snippet
+    $ADMIN->add('reports', new admin_externalpage('report'.$plugin, get_string($plugin, 'admin'), "$CFG->wwwroot/$CFG->admin/report/$plugin/index.php"));
+}
+
+$ADMIN->add('root', new admin_category('misc', get_string('miscellaneous')));
+
+// hidden unsupported category
+$ADMIN->add('root', new admin_category('unsupported', get_string('unsupported', 'admin'), true));
+
+?>

admin/settings/unsupported.php

@@ -0,0 +1,11 @@
+<?php // $Id$
+
+// This file defines settingpages and externalpages in the "unsupported" hidden category, use wisely!
+
+$ADMIN->add('unsupported', new admin_externalpage('purgemoodledata', 'Purge moodledata', $CFG->wwwroot.'/'.$CFG->admin.'/delete.php'));
+$ADMIN->add('unsupported', new admin_externalpage('healthcenter', get_string('healthcenter'), $CFG->wwwroot.'/'.$CFG->admin.'/health.php'));
+$ADMIN->add('unsupported', new admin_externalpage('toinodb', 'Convert to InnoDB', $CFG->wwwroot.'/'.$CFG->admin.'/innodb.php'));
+$ADMIN->add('unsupported', new admin_externalpage('replace', 'Search and replace', $CFG->wwwroot.'/'.$CFG->admin.'/replace.php'));
+
+
+?>

admin/settings/users.php

@@ -0,0 +1,100 @@
+<?php // $Id$
+
+// This file defines settingpages and externalpages under the "users" category
+
+
+$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'), "$securewwwroot/user/editadvanced.php?id=-1", 'moodle/user:create'));
+$ADMIN->add('accounts', new admin_externalpage('uploadusers', get_string('uploadusers'), "$CFG->wwwroot/$CFG->admin/uploaduser.php", 'moodle/site:uploadusers'));
+$ADMIN->add('accounts', new admin_externalpage('profilefields', get_string('profilefields','admin'), "$CFG->wwwroot/user/profile/index.php", 'moodle/site:config'));
+
+
+// stuff under the "roles" subcategory
+$ADMIN->add('users', new admin_category('roles', get_string('permissions', 'role')));
+$ADMIN->add('roles', new admin_externalpage('defineroles', get_string('defineroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/manage.php"));
+$sitecontext = get_context_instance(CONTEXT_SYSTEM);
+$ADMIN->add('roles', new admin_externalpage('assignroles', get_string('assignglobalroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=" . $sitecontext->id));
+
+
+// "userpolicies" settingpage
+$temp = new admin_settingpage('userpolicies', get_string('userpolicies', 'admin'));
+
+$context = get_context_instance(CONTEXT_SYSTEM);
+if (!$guestrole = get_guest_role()) {
+    $guestrole->id = 0;
+}
+if ($studentroles = get_roles_with_capability('moodle/legacy:student', CAP_ALLOW)) {
+    $studentrole = array_shift($studentroles);   /// Take the first one
+} else {
+    $studentrole->id = 0;
+}
+if ($userroles = get_roles_with_capability('moodle/legacy:user', CAP_ALLOW)) {
+    $userrole = array_shift($userroles);   /// Take the first one
+} else {
+    $userrole->id = 0;
+}
+if (empty($CFG->creatornewroleid)) {
+    if ($teacherroles = get_roles_with_capability('moodle/legacy:editingteacher', CAP_ALLOW, $context)) {
+        $teachereditrole = array_shift($teacherroles);
+        set_config('creatornewroleid', $teachereditrole->id);
+    } else {
+        set_config('creatornewroleid', 0);
+    }
+}
+// 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, $allroles ));
+$temp->add(new admin_setting_configselect('guestroleid', get_string('guestroleid', 'admin'),
+              get_string('configguestroleid', 'admin'), $guestrole->id, $allroles));
+$temp->add(new admin_setting_configselect('defaultuserroleid', get_string('defaultuserroleid', 'admin'),
+              get_string('configdefaultuserroleid', 'admin'), $userrole->id, $allroles));
+$temp->add(new admin_setting_configselect('defaultcourseroleid', get_string('defaultcourseroleid', 'admin'),
+              get_string('configdefaultcourseroleid', 'admin'), $studentrole->id, $allroles));
+$temp->add(new admin_setting_configselect('creatornewroleid', get_string('creatornewroleid', 'admin'),
+              get_string('configcreatornewroleid', 'admin'), $CFG->creatornewroleid, $allroles));
+
+$temp->add(new admin_setting_configcheckbox('autologinguests', get_string('autologinguests', 'admin'), get_string('configautologinguests', 'admin'), 0));
+
+$temp->add(new admin_setting_configmultiselect('nonmetacoursesyncroleids', get_string('nonmetacoursesyncroleids', 'admin'),
+              get_string('confignonmetacoursesyncroleids', 'admin'), array(), $allroles));
+
+//$temp->add(new admin_setting_configcheckbox('allusersaresitestudents', get_string('allusersaresitestudents', 'admin'), get_string('configallusersaresitestudents','admin'), 1));
+$temp->add(new admin_setting_configmultiselect('hiddenuserfields', get_string('hiddenuserfields', 'admin'),
+           get_string('confighiddenuserfields', 'admin'), array(),
+               array('none' => get_string('none'),
+                     'description' => get_string('description'),
+                     'city' => get_string('city'),
+                     'country' => get_string('country'),
+                     'webpage' => get_string('webpage'),
+                     'icqnumber' => get_string('icqnumber'),
+                     'skypeid' => get_string('skypeid'),
+                     'yahooid' => get_string('yahooid'),
+                     'aimid' => get_string('aimid'),
+                     'msnid' => get_string('msnid'),
+                     'lastaccess' => get_string('lastaccess'))));
+//$temp->add(new admin_setting_special_adminseesall());
+
+
+$ADMIN->add('roles', $temp);
+
+
+?>

admin/site.html

@@ -1,130 +0,0 @@
-<form method="post" action="site.php" name="form">
-<table cellpadding="9" cellspacing="0" >
-<tr valign="top">
-    <td align="right"><?php print_string("fullsitename") ?>:</td>
-    <td><input type="text" name="fullname" size="50" maxlength="254" value="<?php p($form->fullname) ?>" alt="<?php print_string("fullsitename") ?>" />
-    <?php if (isset($err["fullname"])) formerr($err["fullname"]); ?>
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string("shortsitename") ?>:</td>
-    <td><input type="text" name="shortname" size="15" maxlength="15" value="<?php p($form->shortname) ?>" alt="<?php print_string("shortsitename") ?>" />
-    <?php if (isset($err["shortname"])) formerr($err["shortname"]); ?>
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string("frontpagedescription") ?>:<br /><br />
-     <?PHP
-        helpbutton("writing", get_string("helpwriting"), "moodle", true, true);
-        echo "<br />";
-        if ($usehtmleditor) {
-           helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
-        } else {
-           helpbutton("html", get_string("helphtml"), "moodle", true, true);
-        }
-        echo "<br />";
-      ?>
-    </td>
-    <td><?php  print_textarea($usehtmleditor, 20, 50, 600, 400, "summary", $form->summary); ?></td>
-</tr>
-<tr valign="top">
-        <td align="right"><?php print_string("frontpageformat") ?>:</td>
-        <td>
-          <table width="100%" cellpadding="0" cellspacing="0" border="0">
-            <tr>
-        <?php
-           $options = array(FRONTPAGENEWS           =>  get_string("frontpagenews"),
-                            FRONTPAGECOURSELIST     =>  get_string("frontpagecourselist"),
-                            FRONTPAGECATEGORYNAMES  =>  get_string("frontpagecategorynames"),
-                            );
-           $values = array(get_string('hide'), get_string('order1', 'admin'), get_string('order2', 'admin'));
-           $seq = array_flip(explode(',',$form->frontpage));
-           foreach ($seq as $k => $s) {
-               $seq[$k]++;
-           }
-           if (count_records("course") > 200) {
-               unset($options[FRONTPAGECOURSELIST]);
-               if (isset($seq[FRONTPAGECOURSELIST])) {
-                   $form->frontpage = 2;
-               }
-           } else {
-               $values[] = get_string('order3', 'admin');
-           }
-           foreach ($options as $key => $option) {
-               echo "<td>$option<br />";
-               choose_from_menu ($values, "frontpage[$key]", isset($seq[$key])?$seq[$key]:0, "");
-               echo '</td>';
-           }
-        ?>
-            </tr>
-          </table>
-        </td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php  print_string("sitesection") ?>:</td>
-    <td><?php
-    unset($choices);
-    $choices["0"] = get_string("no");
-    $choices["1"] = get_string("yes");
-    choose_from_menu ($choices, "numsections", $form->numsections, "");
-    ?>
-    </td>
-</tr>
-<tr valign="top">
-        <td align="right"><?php print_string("newsitemsnumber") ?>:</td>
-        <td><?php
-           $newsitem  = get_string("newsitem");
-           $newsitems = get_string("newsitems");
-           $options = array("0"  =>  "0 $newsitems",
-                            "1"  =>  "1 $newsitem",
-                            "2"  =>  "2 $newsitems",
-                            "3"  =>  "3 $newsitems",
-                            "4"  =>  "4 $newsitems",
-                            "5"  =>  "5 $newsitems",
-                            "6"  =>  "6 $newsitems",
-                            "7"  =>  "7 $newsitems",
-                            "8"  =>  "8 $newsitems",
-                            "9"  =>  "9 $newsitems",
-                            "10" => "10 $newsitems");
-           choose_from_menu ($options, "newsitems", "$form->newsitems", "");
-        ?>
-        </td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string("wordforteacher") ?>:</td>
-    <td><input type="text" name="teacher" maxlength="100" size="25" value="<?php p($form->teacher) ?>" alt="<?php print_string("wordforteacher") ?>" />
-    (<?php print_string("wordforteachereg") ?>)
-    <?php if (isset($err["teacher"])) formerr($err["teacher"]); ?>
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string("wordforteachers") ?>:</td>
-    <td><input type="text" name="teachers" maxlength="100" size="25" value="<?php p($form->teachers) ?>" alt="<?php print_string("wordforteachers") ?>" />
-    (<?php print_string("wordforteacherseg") ?>)
-    <?php if (isset($err["teachers"])) formerr($err["teachers"]); ?>
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string("wordforstudent") ?>:</td>
-    <td><input type="text" name="student" maxlength="100" size="25" value="<?php p($form->student) ?>" alt="<?php print_string("wordforstudent") ?>" />
-    (<?php print_string("wordforstudenteg") ?>)
-    <?php if (isset($err["student"])) formerr($err["student"]); ?>
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string("wordforstudents") ?>:</td>
-    <td><input type="text" name="students" maxlength="100" size="25" value="<?php p($form->students) ?>" alt="<?php print_string("wordforstudents") ?>" />
-    (<?php print_string("wordforstudentseg") ?>)
-    <?php if (isset($err["students"])) formerr($err["students"]); ?>
-    </td>
-</tr>
-<tr>
-    <td></td>
-    <td><input type="submit" value="<?php print_string("savechanges") ?>" /></td>
-</tr>
-</table>
-<input type="hidden" name="id" value="<?php p($form->id) ?>" />
-<input type="hidden" name="category" value="<?php p($form->category) ?>" />
-<input type="hidden" name="format" value="<?php p($form->format) ?>" />
-<input type="hidden" name="sesskey" value="<?php p($sesskey) ?>" />
-</form>

admin/site.php

@@ -1,160 +0,0 @@
-<?php // $Id$
-
-    require_once('../config.php');
-    require_once('../course/lib.php');
-
-    if ($site = get_site()) {
-        require_login();
-        if (!isadmin()) {
-            error("You need to be admin to edit this page");
-        }
-        $site->format = "social";   // override
-    }
-
-    $focus = "form.fullname";
-
-/// If data submitted, then process and store.
-
-    if ($form = data_submitted()) {
-
-        if (!empty($USER->id)) {             // Additional identity check
-            if (!confirm_sesskey()) {
-                error(get_string('confirmsesskeybad', 'error'));
-            }
-        }
-
-        validate_form($form, $err);
-
-        if (count($err) == 0) {
-
-            $form->frontpage = array_flip($form->frontpage);
-            unset($form->frontpage[0]);
-            $form->frontpage = array_flip($form->frontpage);
-            asort($form->frontpage);
-            $form->frontpage = implode(',',array_flip($form->frontpage));
-            set_config("frontpage", $form->frontpage);
-            if ($form->frontpage == '') {
-                $form->numsections = 1;    // Force the topic display for this format
-            }
-
-            $form->timemodified = time();
-
-            if ($form->id) {
-                if (update_record("course", $form)) {
-                    redirect("$CFG->wwwroot/", get_string("changessaved"));
-                } else {
-                    error("Serious Error! Could not update the site record! (id = $form->id)");
-                }
-            } else {
-                // We are about to create the site "course"
-                require_once($CFG->dirroot.'/lib/blocklib.php');
-
-                if ($newid = insert_record('course', $form)) {
-
-                    // Site created, add blocks for it
-                    $page = page_create_object(PAGE_COURSE_VIEW, $newid);
-                    blocks_repopulate_page($page); // Return value not checked because you can always edit later
-
-                    $cat->name = get_string('miscellaneous');
-                    if (insert_record('course_categories', $cat)) {
-                        redirect("$CFG->wwwroot/$CFG->admin/index.php", get_string("changessaved"), 1);
-                    } else {
-                        error("Serious Error! Could not set up a default course category!");
-                    }
-                } else {
-                    error("Serious Error! Could not set up the site!");
-                }
-            }
-            die;
-
-        } else {
-            foreach ($err as $key => $value) {
-                $focus = "form.$key";
-            }
-        }
-    }
-
-/// Otherwise fill and print the form.
-
-    if ($site and empty($form)) {
-        $form = $site;
-        $course = $site;
-        $firsttime = false;
-    } else {
-        $form->fullname = "";
-        $form->shortname = "";
-        $form->summary = "";
-        $form->newsitems = 3;
-        $form->numsections = 0;
-        $form->id = "";
-        $form->category = 0;
-        $form->format = 'site';  // Only for this course
-        $form->teacher = get_string("defaultcourseteacher");
-        $form->teachers = get_string("defaultcourseteachers");
-        $form->student = get_string("defaultcoursestudent");
-        $form->students = get_string("defaultcoursestudents");
-        $firsttime = true;
-    }
-
-    if (isset($CFG->frontpage)) {
-        $form->frontpage = $CFG->frontpage;
-
-    } else {
-        $form->frontpage = FRONTPAGECOURSELIST;  // Show course list by default
-        set_config("frontpage", $form->frontpage);
-    }
-
-    $stradmin = get_string("administration");
-    $strconfiguration = get_string("configuration");
-    $strsitesettings = get_string("sitesettings");
-
-    if ($firsttime) {
-        print_header();
-        print_heading($strsitesettings);
-        print_simple_box(get_string("configintrosite", 'admin'), "center", "50%");
-        echo "<br />";
-    } else {
-        print_header("$site->shortname: $strsitesettings", "$site->fullname",
-                      "<a href=\"index.php\">$stradmin</a> -> ".
-                      "<a href=\"configure.php\">$strconfiguration</a> -> $strsitesettings", "$focus");
-        print_heading($strsitesettings);
-    }
-
-    if (empty($USER->id)) {  // New undefined admin user
-        $USER->htmleditor = true;
-        $sesskey = '';
-    } else {
-        $sesskey = $USER->sesskey;
-    }
-    $usehtmleditor = can_use_html_editor();
-    $defaultformat = FORMAT_HTML;
-
-    print_simple_box_start("center", "");
-    include("site.html");
-    print_simple_box_end();
-
-    if ($usehtmleditor) { 
-        use_html_editor();
-    }
-
-    if (!$firsttime) {
-        print_footer();
-    }
-
-    exit;
-
-/// Functions /////////////////////////////////////////////////////////////////
-
-function validate_form(&$form, &$err) {
-
-    if (empty($form->fullname))
-        $err["fullname"] = get_string("missingsitename");
-
-    if (empty($form->shortname))
-        $err["shortname"] = get_string("missingshortsitename");
-
-    return;
-}
-
-
-?>

admin/stickyblocks.php

@@ -9,7 +9,7 @@
 
     $pagetypes = array(PAGE_MY_MOODLE => array('id' => PAGE_MY_MOODLE,
                                               'lib' => '/my/pagelib.php',
-                                              'name' => get_string('stickyblocksmymoodle','admin')),
+                                              'name' => get_string('mymoodle','admin')),
                        PAGE_COURSE_VIEW => array('id' => PAGE_COURSE_VIEW, 
                                                 'lib' => '/lib/pagelib.php',
                                                 'name' => get_string('stickyblockscourseview','admin'))
@@ -24,63 +24,61 @@
 
     require_login();
   
-    if (!isadmin()) {
-        error("Only the admin can use this page");
-    }
+    require_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
     // first thing to do is print the dropdown menu
 
     $strtitle = get_string('stickyblocks','admin');
     $strheading = get_string('adminhelpstickyblocks');
     
-    print_header($strtitle,$strtitle,'<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/index.php">'.
-                 get_string('admin').'</a> -> '.$strtitle);
-
-    echo '<table border="0" cellpadding="3" cellspacing="0" width="100%" id="layout-table">';
-    echo '<tr valign="top">';
     
 
     if (!empty($pt)) {
+
         require_once($CFG->dirroot.$pagetypes[$pt]['lib']);
         
         define('ADMIN_STICKYBLOCKS',$pt);
         
-        $PAGE = page_create_object($pt);
-        
+        $PAGE = page_create_object($pt, SITEID);
         $blocks = blocks_setup($PAGE,BLOCKS_PINNED_TRUE);
-        
         $blocks_preferred_width = bounded_number(180, blocks_preferred_width($blocks[BLOCK_POS_LEFT]), 210);
-        echo '<td style="vertical-align: top; width: '.$blocks_preferred_width.'px;" id="left-column">';
+
+        print_header($strtitle,$strtitle,'<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/index.php">'.
+                     get_string('administration').'</a> -> '.$strtitle);
+    
+        echo '<table border="0" cellpadding="3" cellspacing="0" width="100%" id="layout-table">';
+        echo '<tr valign="top">';
+
+        echo '<td valign="top" style="width: '.$blocks_preferred_width.'px;" id="left-column">';
         
         blocks_print_group($PAGE, $blocks, BLOCK_POS_LEFT);
+        echo '</td>';
+        echo '<td valign="top" id="middle-column">';
+
     } else {
-        echo '<td style="vertical-align: top;" id="left-column">';
+        require_once($CFG->libdir.'/adminlib.php');
+        $adminroot = admin_get_root();
+        admin_externalpage_setup('stickyblocks', $adminroot);
+        admin_externalpage_print_header($adminroot);
     }
-    echo '</td>';
 
 
-    echo '<td valign="top" width="*" id="middle-column">';
-    print_simple_box_start('center');
+    print_box_start();
     print_heading($strheading);
-    echo '<form method="post" action="'.$CFG->wwwroot.'/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();
-    echo '</td>';
+    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 style="vertical-align: top; width: '.$blocks_preferred_width.'px;" id="left-column">';
+        echo '</td>';
+        echo '<td valign="top" style="width: '.$blocks_preferred_width.'px;" id="left-column">';
         blocks_print_group($PAGE, $blocks, BLOCK_POS_RIGHT);
+        echo '</td>';
+        echo '</tr></table>';
+        print_footer();
+    } else {
+        admin_externalpage_print_footer($adminroot);
     }
-    echo '<td style="vertical-align: top;" id="left-column">';
-    echo '</td>';
-  
-    echo '</tr></table>';
 
-    print_footer();
-    
-
-?>
+?>

admin/timezone.php

@@ -6,9 +6,7 @@
 
     require_login();
 
-    if (!isadmin()) {
-        error("You must be an admin");
-    }
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
     $strtimezone = get_string("timezone");
     $strsavechanges = get_string("savechanges");
@@ -35,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

@@ -1,50 +1,39 @@
 <?php // $Id$
 
     // Automatic update of Timezones from a new source
-
+    
     require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
     require_once($CFG->libdir.'/filelib.php');
     require_once($CFG->libdir.'/olson.php');
 
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('timezoneimport', $adminroot);
+
     $ok = optional_param('ok', 0, PARAM_BOOL);
 
-    require_login();
-
-    if (!isadmin()) {
-        error('Only administrators can use this page!');
-    }
-
-    if (!$site = get_site()) {
-        error('Site isn\'t defined!');
-    }
 
 /// Print headings
 
-    $stradministration = get_string('administration');
-    $strconfiguration = get_string('configuration');
-    $strcalendarsettings = get_string('calendarsettings', 'admin');
     $strimporttimezones = get_string('importtimezones', 'admin');
 
-    print_header("$site->shortname: $strcalendarsettings", "$site->fullname",
-                 "<a href=\"index.php\">$stradministration</a> -> ".
-                 "<a href=\"configure.php\">$strconfiguration</a> -> ".
-                 "<a href=\"calendar.php\">$strcalendarsettings</a> -> $strimporttimezones");
+    admin_externalpage_print_header($adminroot);
 
     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 .= '<br />';
 
         $message = get_string("configintrotimezones", 'admin', $message);
 
-        notice_yesno($message, 'timezoneimport.php?ok=1&sesskey='.sesskey(), 'calendar.php');
+        notice_yesno($message, 'timezoneimport.php?ok=1&amp;sesskey='.sesskey(), 'index.php');
 
-        print_footer();
+        admin_externalpage_print_footer($adminroot);
         exit;
     }
 
@@ -110,7 +99,7 @@
         $a->source  = $importdone;
         print_heading(get_string('importtimezonescount', 'admin', $a), '', 3);
 
-        print_continue('calendar.php');
+        print_continue('index.php');
 
         $timezonelist = array();
         foreach ($timezones as $timezone) {
@@ -131,9 +120,9 @@
 
     } else {
         print_heading(get_string('importtimezonesfailed', 'admin'), '', 3);
-        print_continue('calendar.php');
+        print_continue('index.php');
     }
 
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>