Bumping to release 1.8!

2. Added 2 buttons to disable state when pseudogroup is selected

.gitignore

@@ -1,27 +0,0 @@
-# This file specifies intentionally untracked files that all Moodle git
-# repositories should ignore. It is recommended not to modify this file in your
-# local clone. Instead, use .git/info/exclude and add new records there as
-# needed.
-#
-# Example: if you deploy a contributed plugin mod/foobar into your site, put
-# the following line into .git/info/exclude file in your Moodle clone:
-# /mod/foobar/
-#
-# See gitignore(5) man page for more details
-#
-/config.php
-/lib/editor/tinymce/extra/tools/temp/
-*~
-*.swp
-/tags
-/TAGS
-/cscope.*
-/.patches/
-/.idea/
-/nbproject/
-CVS
-.DS_Store
-/.settings/
-/.project
-/.buildpath
-/.cache

README.txt

@@ -1,4 +1,4 @@
-README      $Id$
+README     $Id$
 ------
 
 QUICK INSTALL
@@ -24,7 +24,7 @@ a few minutes:
 
 For more information, see the INSTALL DOCUMENTATION:
 
-   http://docs.moodle.org/19/en/Installing_Moodle
+   http://docs.moodle.org/en/Installing_Moodle 
 
 A local copy can also be found in 
 

admin/auth.php

@@ -11,10 +11,8 @@ require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/tablelib.php');
 
-require_login();
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
-
-$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageauths";
+$adminroot = admin_get_root();
+admin_externalpage_setup('userauthentication', $adminroot);
 
 $action = optional_param('action', '', PARAM_ACTION);
 $auth   = optional_param('auth', '', PARAM_SAFEDIR);
@@ -22,6 +20,13 @@ $auth   = optional_param('auth', '', PARAM_SAFEDIR);
 // get currently installed and enabled auth plugins
 $authsavailable = get_list_of_plugins('auth');
 
+//revert auth_plugins_enabled
+if (isset($CFG->auth_plugins_enabled)) {
+    set_config('auth', $CFG->auth_plugins_enabled);
+    delete_records('config', 'name', 'auth_plugins_enabled');
+    unset($CFG->auth_plugins_enabled);
+}
+
 get_enabled_auth_plugins(true); // fix the list of enabled auths
 if (empty($CFG->auth)) {
     $authsenabled = array();
@@ -29,18 +34,44 @@ if (empty($CFG->auth)) {
     $authsenabled = explode(',', $CFG->auth);
 }
 
-if (!empty($auth) and !exists_auth_plugin($auth)) {
-    print_error('pluginnotinstalled', 'auth', $url, $auth);
+if (!isset($CFG->registerauth)) {
+    set_config('registerauth', '');
 }
 
+if (!isset($CFG->auth_instructions)) {
+    set_config('auth_instructions', '');
+}
+
+if (!empty($auth) and !exists_auth_plugin($auth)) {
+    error(get_string('pluginnotinstalled', 'auth', $auth), $url);
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // process actions
 
-if (!confirm_sesskey()) {
-    redirect($returnurl);
-}
+$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;
+
     case 'disable':
         // remove from enabled list
         $key = array_search($auth, $authsenabled);
@@ -67,7 +98,7 @@ switch ($action) {
         $key = array_search($auth, $authsenabled);
         // check auth plugin is valid
         if ($key === false) {
-            print_error('pluginnotenabled', 'auth', $url, $auth);
+            error(get_string('pluginnotenabled', 'auth', $auth), $url);
         }
         // move down the list
         if ($key < (count($authsenabled) - 1)) {
@@ -82,7 +113,7 @@ switch ($action) {
         $key = array_search($auth, $authsenabled);
         // check auth is valid
         if ($key === false) {
-            print_error('pluginnotenabled', 'auth', $url, $auth);
+            error(get_string('pluginnotenabled', 'auth', $auth), $url);
         }
         // move up the list
         if ($key >= 1) {
@@ -97,6 +128,176 @@ switch ($action) {
         break;
 }
 
-redirect ($returnurl);
+// 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>";
+    }
+
+    // up/down link (only if auth is enabled)
+    $updown = '';
+    if ($enabled) {
+        if ($updowncount > 1) {
+            $updown .= "<a href=\"$url&amp;action=up&amp;auth=$auth\">";
+            $updown .= "<img src=\"{$CFG->pixpath}/t/up.gif\" alt=\"up\" /></a>&nbsp;";
+        }
+        else {
+            $updown .= "<img src=\"{$CFG->pixpath}/spacer.gif\" class=\"icon\" alt=\"\" />&nbsp;";
+        }
+        if ($updowncount < $authcount) {
+            $updown .= "<a href=\"$url&amp;action=down&amp;auth=$auth\">";
+            $updown .= "<img src=\"{$CFG->pixpath}/t/down.gif\" alt=\"down\" /></a>";
+        }
+        else {
+            $updown .= "<img src=\"{$CFG->pixpath}/spacer.gif\" class=\"icon\" alt=\"\" />";
+        }
+        ++ $updowncount;
+    }
+
+    // settings link
+    $settings = "<a href=\"auth_config.php?sesskey={$USER->sesskey}&amp;auth=$auth\">{$txt->settings}</a>";
+
+    // add a row to the table
+    $table->add_data(array($displayname, $hideshow, $updown, $settings));
+}
+
+// output form
+admin_externalpage_print_header($adminroot);
+
+//print stus messages
+if ($status !== '') {
+    notify($status, 'notifysuccess');
+}
+
+print_simple_box(get_string('configauthenticationplugins', 'admin'), 'center', '700');
+
+$table->print_html();
+
+////////////////////////////////////////////////////////////////////////////////
+
+$guestoptions = array();
+$guestoptions[0] = get_string("hide");
+$guestoptions[1] = get_string("show");
+
+echo '<hr />';
+
+echo '<form '.$CFG->frametarget.' id="adminsettings" method="post" action="auth.php">';
+echo '<div class="settingsform">';
+print_heading(get_string('auth_common_settings', 'auth'));
+echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
+echo '<input type="hidden" name="action" value="save" />';
+echo '<fieldset>';
+##echo '<table cellspacing="0" cellpadding="5" border="0" style="margin-left:auto;margin-right:auto">';
+
+// User self registration
+echo '<div class="form-item" id="admin-register">';
+echo '<label for = "menuregister">' . get_string("selfregistration", "auth");
+echo '<span class="form-shortname">registerauth</span>';
+echo '</label>';
+choose_from_menu($registrationauths, "register", $CFG->registerauth, "");
+echo '<div class="description">' . get_string("selfregistration_help", "auth") . '</div>';
+echo '</div>';
+
+// Login as guest button enabled
+echo '<div class="form-item" id="admin-guestloginbutton">';
+echo '<label for = "menuguestloginbutton">' . get_string("guestloginbutton", "auth");
+echo '<span class="form-shortname">guestloginbutton</span>';
+echo '</label>';
+choose_from_menu($guestoptions, "guestloginbutton", $CFG->guestloginbutton, "");
+echo '<div class="description">' . get_string("showguestlogin", "auth") . '</div>';
+echo '</div>';
+
+/// An alternate url for the login form. It means we can use login forms that are integrated
+/// into non-moodle pages
+echo '<div class="form-item" id="admin-alternateloginurl">';
+echo '<label for = "alternateloginurl">' . get_string("alternateloginurl", "auth");
+echo '<span class="form-shortname">alternateloginurl</span>';
+echo '</label>';
+echo '<input type="text" size="60" name="alternateloginurl" id="alternateloginurl" value="'.$CFG->alternateloginurl."\" />\n";
+echo '<div class="description">' . get_string("alternatelogin", "auth", htmlspecialchars($CFG->wwwroot.'/login/index.php')) . '</div>';
+echo '</div>';
+
+/// Instructions about login/password
+/// to be showed to users
+echo '<div class="form-item" id="admin-auth_instructions">';
+echo '<label for = "auth_instructions">' . get_string("instructions", "auth");
+echo '<span class="form-shortname">auth_instructions</span>';
+echo '</label>';
+echo '<textarea cols="30" rows="4" name="auth_instructions" id="auth_instructions">'.s($CFG->auth_instructions)."</textarea>\n";
+echo '<div class="description">' . get_string("authinstructions", "auth") . '</div>';
+echo '</div>';
+
+echo '</fieldset>';
+
+////////////////////////////////////////////////////////////////////////////////
+echo '<div class="form-buttons"><input class="form-submit" type="submit" value="'.get_string('savechanges', 'admin').'" /></div>';
+echo '</div>';
+echo '</form>';
+admin_externalpage_print_footer($adminroot);
 
 ?>

admin/auth_config.php

@@ -6,19 +6,19 @@
 require_once '../config.php';
 require_once $CFG->libdir.'/adminlib.php';
 
+$adminroot = admin_get_root();
+admin_externalpage_setup('userauthentication', $adminroot);
 $auth = required_param('auth', PARAM_SAFEDIR);
-
-$CFG->pagepath = 'auth/' . $auth;
-
-admin_externalpage_setup('authsetting'.$auth);
-
 $authplugin = get_auth_plugin($auth);
 $err = array();
 
-$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageauths";
-
 // save configuration changes
-if ($frm = data_submitted() and confirm_sesskey()) {
+if ($frm = data_submitted()) {
+
+    if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
+
     $frm = stripslashes_recursive($frm);
 
     $authplugin->validate_form($frm, $err);
@@ -38,7 +38,7 @@ if ($frm = data_submitted() and confirm_sesskey()) {
                     }
                 }
             }
-            redirect($returnurl);
+            redirect("auth.php");
             exit;
         }
     } else {
@@ -50,37 +50,35 @@ if ($frm = data_submitted() and confirm_sesskey()) {
     $frm = get_config("auth/$auth");
 }
 
-$user_fields = $authplugin->userfields;
-//$user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "institution", "department", "address", "city", "country", "description", "idnumber", "lang");
+$user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "department", "address", "city", "country", "description", "idnumber", "lang");
 
-/// Get the auth title (from core or own auth lang files)
-    $authtitle = $authplugin->get_title();
-/// Get the auth descriptions (from core or own auth lang files)
-    $authdescription = $authplugin->get_description();
+$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();
+admin_externalpage_print_header($adminroot);
 
 // choose an authentication method
 echo "<form $CFG->frametarget id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
-echo "<div>\n";
 echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />\n";
 echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";
 
 // auth plugin description
 print_simple_box_start('center', '80%');
-print_heading($authtitle);
-print_simple_box_start('center', '80%', '', 5, 'informationbox');
-echo $authdescription;
+print_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 '<center><p><input type="submit" value="' . get_string("savechanges") . "\" /></p></center>\n";
 echo "</form>\n";
 
-admin_externalpage_print_footer();
+admin_externalpage_print_footer($adminroot);
 exit;
 
 /// Functions /////////////////////////////////////////////////////////////////
@@ -136,11 +134,10 @@ function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts,
             $fieldname = get_string('language');
         } elseif (preg_match('/^(.+?)(\d+)$/', $fieldname, $matches)) {
             $fieldname =  get_string($matches[1]) . ' ' . $matches[2];
-        } elseif ($fieldname == 'url') {
-            $fieldname = get_string('webpage');
         } else {
             $fieldname = get_string($fieldname);
-        } 
+        }
+
         if ($retrieveopts) {
             $varname = 'field_map_' . $field;
 
@@ -149,7 +146,7 @@ function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts,
             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 '<div 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 />';

admin/block.php

@@ -4,16 +4,16 @@
 
     require_once('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('manageblocks', $adminroot);
     require_once($CFG->libdir.'/blocklib.php');
 
     $blockid = required_param('block', PARAM_INT);
 
-    if(!$blockrecord = blocks_get_record($blockid)) {
+    if(($blockrecord = blocks_get_record($blockid)) === false) {
         error('This block does not exist');
     }
 
-    admin_externalpage_setup('blocksetting'.$blockrecord->name);
-
     $block = block_instance($blockrecord->name);
     if($block === false) {
         error('Problem in instantiating block object');
@@ -31,7 +31,7 @@
     if ($config = data_submitted()) {
 
         if (!confirm_sesskey()) {
-             print_error('confirmsesskeybad', 'error');
+             error(get_string('confirmsesskeybad', 'error'));
         }
         if(!$block->has_config()) {
             error('This block does not support global configuration');
@@ -50,11 +50,16 @@
     $strmanageblocks = get_string('manageblocks');
     $strblockname = $block->get_title();
 
-    admin_externalpage_print_header();
+    // $CFG->pagepath is used to generate the body and id attributes for the body tag
+    // of the page. It is also used to generate the link to the Moodle Docs for this view.
+    $CFG->pagepath = 'block/' . $block->name() . '/config';
+
+
+    admin_externalpage_print_header($adminroot);
 
     print_heading($strblockname);
 
-    print_simple_box(get_string('configwarning', 'admin'), 'center', '50%');
+    print_simple_box('<center>'.get_string('configwarning', 'admin').'</center>', 'center', '50%');
     echo '<br />';
 
     echo '<form method="post" action="block.php">';
@@ -65,6 +70,6 @@
     echo '</p>';
     $block->config_print();
     echo '</form>';
-    print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/blocks.php

@@ -8,7 +8,8 @@
     require_once($CFG->libdir.'/tablelib.php');
     require_once($CFG->libdir.'/ddllib.php');
 
-    admin_externalpage_setup('manageblocks');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('manageblocks', $adminroot);
 
     $confirm  = optional_param('confirm', 0, PARAM_BOOL);
     $hide     = optional_param('hide', 0, PARAM_INT);
@@ -29,6 +30,10 @@
     $strmultiple = get_string('blockmultiple', 'admin');
     $strshowblockcourse = get_string('showblockcourse');
 
+    admin_externalpage_print_header($adminroot);
+
+    print_heading($strmanageblocks);
+
 /// If data submitted, then process and store.
 
     if (!empty($hide) && confirm_sesskey()) {
@@ -36,7 +41,6 @@
             error("Block doesn't exist!");
         }
         set_field('block', 'visible', '0', 'id', $block->id);      // Hide block
-        admin_get_root(true, false);  // settings not required - only pages
     }
 
     if (!empty($show) && confirm_sesskey() ) {
@@ -44,7 +48,6 @@
             error("Block doesn't exist!");
         }
         set_field('block', 'visible', '1', 'id', $block->id);      // Show block
-        admin_get_root(true, false);  // settings not required - only pages
     }
 
     if (!empty($multiple) && confirm_sesskey()) {
@@ -53,12 +56,9 @@
         }
         $block->multiple = !$block->multiple;
         update_record('block', $block);
-        admin_get_root(true, false);  // settings not required - only pages
     }
 
     if (!empty($delete) && confirm_sesskey()) {
-        admin_externalpage_print_header();
-        print_heading($strmanageblocks);
 
         if (!$block = blocks_get_record($delete)) {
             error("Block doesn't exist!");
@@ -76,7 +76,7 @@
             notice_yesno(get_string('blockdeleteconfirm', '', $strblockname),
                          'blocks.php?delete='.$block->id.'&confirm=1&sesskey='.$USER->sesskey,
                          'blocks.php');
-            admin_externalpage_print_footer();
+            admin_externalpage_print_footer($adminroot);
             exit;
 
         } else {
@@ -100,24 +100,34 @@
                 notify("Error occurred while deleting the $strblockname record from blocks table");
             }
 
-            drop_plugin_tables($block->name, "$CFG->dirroot/blocks/$block->name/db/install.xml", false); // old obsoleted table names
-            drop_plugin_tables('block_'.$block->name, "$CFG->dirroot/blocks/$block->name/db/install.xml", false);
-
+            // Then the tables themselves
+            if ($tables = $db->Metatables()) {
+                $prefix = $CFG->prefix.$block->name;
+                $prefix2 = $CFG->prefix.'block_'.$block->name;
+                foreach ($tables as $table) {
+                    if (strpos($table, $prefix) === 0 || strpos($table, $prefix2) === 0) {
+                    /// If the match has been due to the 1st condition, debug to developers
+                        if (strpos($table, $prefix) === 0) {
+                            debugging('This block has some wrongly named tables. See Moodle Docs coding guidelines (and MDL-6786)', DEBUG_DEVELOPER);
+                        }
+                    /// Strip prefix from $table
+                        $table = preg_replace("/^{$CFG->prefix}/", '', $table);
+                        $xmldb_table = new XMLDBTable($table);
+                        if (!drop_table($xmldb_table, true, false)) {
+                            notify("ERROR: while trying to drop table $table");
+                        }
+                    }
+                }
+            }
             // Delete the capabilities that were defined by this block
             capabilities_cleanup('block/'.$block->name);
 
-            // remove entent handlers and dequeue pending events
-            events_uninstall('block/'.$block->name);
-
             $a->block = $strblockname;
             $a->directory = $CFG->dirroot.'/blocks/'.$block->name;
             notice(get_string('blockdeletefiles', '', $a), 'blocks.php');
         }
     }
 
-    admin_externalpage_print_header();
-    print_heading($strmanageblocks);
-
 /// Main display starts here
 
 /// Get and sort the existing blocks
@@ -162,35 +172,21 @@
     foreach ($blockbyname as $blockname => $blockid) {
 
         $blockobject = $blockobjects[$blockid];
-        $block       = $blocks[$blockid];
 
         $delete = '<a href="blocks.php?delete='.$blockid.'&amp;sesskey='.$USER->sesskey.'">'.$strdelete.'</a>';
 
         $settings = ''; // By default, no configuration
-        if ($blockobject->has_config()) {
-            if (file_exists($CFG->dirroot.'/blocks/'.$block->name.'/settings.php')) {
-                $settings = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=blocksetting'.$block->name.'">'.$strsettings.'</a>';
-            } else {
-                $settings = '<a href="block.php?block='.$blockid.'">'.$strsettings.'</a>';
-            }
+        if($blockobject->has_config()) {
+            $settings = '<a href="block.php?block='.$blockid.'">'.$strsettings.'</a>';
         }
 
-        // MDL-11167, blocks can be placed on mymoodle, or the blogs page
-        // and it should not show up on course search page
-
-        $totalcount = count_records('block_instance', 'blockid', $blockid);
-
-        $count = count_records_sql('SELECT COUNT(*)
-                                        FROM '.$CFG->prefix.'block_instance
-                                        WHERE blockid = '.$blockid.' AND
-                                        pagetype = \'course-view\'');
-
+        $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\" >$totalcount</a>";
+            $blocklist .= "title=\"$strshowblockcourse\" >$count</a>";
         }
         else {
-            $blocklist = "$totalcount";
+            $blocklist = "$count";
         }
         $class = ''; // Nothing fancy, by default
 
@@ -250,6 +246,6 @@
         $table->print_html();
     }
 
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/cron.php

@@ -1,4 +1,4 @@
-<?php // $Id$
+<?PHP // $Id$
 
 /// This script looks through all the module directories for cron.php files
 /// and runs them.  These files can contain cleanup functions, email functions
@@ -10,7 +10,7 @@
 ///
 /// eg   wget -q -O /dev/null 'http://moodle.somewhere.edu/admin/cron.php'
 /// or   php /web/moodle/admin/cron.php 
-    set_time_limit(0);
+
     $starttime = microtime();
 
 /// The following is a hack necessary to allow this script to work well 
@@ -32,16 +32,6 @@
 
     require_once(dirname(__FILE__) . '/../config.php');
     require_once($CFG->libdir.'/adminlib.php');
-    require_once($CFG->libdir.'/gradelib.php');
-
-/// Extra debugging (set in config.php)
-    if (!empty($CFG->showcronsql)) {
-        $db->debug = true;
-    }
-    if (!empty($CFG->showcrondebugging)) {
-        $CFG->debug = DEBUG_DEVELOPER;
-        $CFG->debugdisplay = true;
-    }
 
 /// extra safety
     @session_write_close();
@@ -100,8 +90,7 @@
 /// Run all cron jobs for each module
 
     mtrace("Starting activity modules");
-    get_mailer('buffer');
-    if ($mods = get_records_select("modules", "cron > 0 AND (($timenow - lastcron) > cron) AND visible = 1 ")) {
+    if ($mods = get_records_select("modules", "cron > 0 AND (($timenow - lastcron) > cron)")) {
         foreach ($mods as $mod) {
             $libfile = "$CFG->dirroot/mod/$mod->name/lib.php";
             if (file_exists($libfile)) {
@@ -109,32 +98,20 @@
                 $cron_function = $mod->name."_cron";
                 if (function_exists($cron_function)) {
                     mtrace("Processing module function $cron_function ...", '');
-                    $pre_dbqueries = null;
-                    if (!empty($PERF->dbqueries)) {
-                        $pre_dbqueries = $PERF->dbqueries;
-                        $pre_time      = microtime(1);
-                    }
                     if ($cron_function()) {
                         if (! set_field("modules", "lastcron", $timenow, "id", $mod->id)) {
                             mtrace("Error: could not update timestamp for $mod->fullname");
                         }
                     }
-                    if (isset($pre_dbqueries)) {
-                        mtrace("... used " . ($PERF->dbqueries - $pre_dbqueries) . " dbqueries");
-                        mtrace("... used " . (microtime(1) - $pre_time) . " seconds");
-                    }
-                /// Reset possible changes by modules to time_limit. MDL-11597
-                    @set_time_limit(0);
                     mtrace("done.");
                 }
             }
         }
     }
-    get_mailer('close');
     mtrace("Finished activity modules");
 
     mtrace("Starting blocks");
-    if ($blocks = get_records_select("block", "cron > 0 AND (($timenow - lastcron) > cron) AND visible = 1")) {
+    if ($blocks = get_records_select("block", "cron > 0 AND (($timenow - lastcron) > cron)")) {
         // we will need the base class.
         require_once($CFG->dirroot.'/blocks/moodleblock.class.php');
         foreach ($blocks as $block) {
@@ -150,8 +127,6 @@
                             mtrace('Error: could not update timestamp for '.$block->name);
                         }
                     }
-                /// Reset possible changes by blocks to time_limit. MDL-11597
-                    @set_time_limit(0);
                     mtrace('done.');
                 }
             }
@@ -160,73 +135,26 @@
     }
     mtrace('Finished blocks');
 
-    mtrace('Starting admin reports');
-    // Admin reports do not have a database table that lists them. Instead a
-    // report includes cron.php with function report_reportname_cron() if it wishes
-    // to be cronned. It is up to cron.php to handle e.g. if it only needs to
-    // actually do anything occasionally.
-    $reports = get_list_of_plugins($CFG->admin.'/report');
-    foreach($reports as $report) {
-        $cronfile = $CFG->dirroot.'/'.$CFG->admin.'/report/'.$report.'/cron.php';
-        if (file_exists($cronfile)) {
-            require_once($cronfile);
-            $cronfunction = 'report_'.$report.'_cron';
-            mtrace('Processing cron function for '.$report.'...', '');
-            $pre_dbqueries = null;
-            if (!empty($PERF->dbqueries)) {
-                $pre_dbqueries = $PERF->dbqueries;
-                $pre_time      = microtime(true);
-            }
-            $cronfunction();
-            if (isset($pre_dbqueries)) {
-                mtrace("... used " . ($PERF->dbqueries - $pre_dbqueries) . " dbqueries");
-                mtrace("... used " . round(microtime(true) - $pre_time, 2) . " seconds");
-            }
-            mtrace('done.');
-        }
-    }
-    mtrace('Finished admin reports');
-
     if (!empty($CFG->langcache)) {
         mtrace('Updating languages cache');
-        get_list_of_languages(true);
+        get_list_of_languages();
     }
 
     mtrace('Removing expired enrolments ...', '');     // See MDL-8785
     $timenow = time();
-    $somefound = false;
-    // The preferred way saves memory, dmllib.php
-    // find courses where limited enrolment is enabled
-    global $CFG;
-    $rs_enrol = get_recordset_sql("SELECT ra.roleid, ra.userid, ra.contextid
-        FROM {$CFG->prefix}course c
-        INNER JOIN {$CFG->prefix}context cx ON cx.instanceid = c.id
-        INNER JOIN {$CFG->prefix}role_assignments ra ON ra.contextid = cx.id
-        WHERE cx.contextlevel = '".CONTEXT_COURSE."'
-        AND ra.timeend > 0
-        AND ra.timeend < '$timenow'
-        AND c.enrolperiod > 0
-        ");
-    while ($oldenrolment = rs_fetch_next_record($rs_enrol)) {
-        role_unassign($oldenrolment->roleid, $oldenrolment->userid, 0, $oldenrolment->contextid);
-        $somefound = true;
-    }
-    rs_close($rs_enrol);
-    if($somefound) {
+    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');
     }
 
 
-    mtrace('Starting main gradebook job ...');
-    grade_cron();
-    mtrace('done.');
-
-    mtrace('Starting processing the event queue...');
-    events_cron();
-    mtrace('done.');
-
 /// Run all core cron jobs, but not every time since they aren't too important.
 /// These don't have a timer to reduce load, so we'll use a random number 
 /// to randomly choose the percentage of times we should run these jobs.
@@ -240,110 +168,73 @@
         /// Unenrol users who haven't logged in for $CFG->longtimenosee
 
         if ($CFG->longtimenosee) { // value in days
-            $cuttime = $timenow - ($CFG->longtimenosee * 3600 * 24);
-            $rs = get_recordset_sql ("SELECT la.id, la.userid, la.courseid
-                                        FROM {$CFG->prefix}user_lastaccess la
-                                        JOIN {$CFG->prefix}course c
-                                          ON c.id = la.courseid
-                                       WHERE la.courseid != ".SITEID."
-                                         AND la.timeaccess < $cuttime
-                                         AND c.metacourse = 0 ");
-            while ($assign = rs_fetch_next_record($rs)) {
-                if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
-                    if (role_unassign(0, $assign->userid, 0, $context->id)) {
-                        mtrace("removing user $assign->userid from course $assign->courseid as they have not accessed the course for over $CFG->longtimenosee days");
+            $longtime = $timenow - ($CFG->longtimenosee * 3600 * 24);
+            if ($assigns = get_users_longtimenosee($longtime)) {
+                foreach ($assigns as $assign) {
+                    if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
+                        if (role_unassign(0, $assign->id, 0, $context->id)) {
+                            mtrace("Deleted assignment for user $assign->id from course $assign->courseid");
+                        }
                     }
                 }
             }
-            rs_close($rs);
-        /// Execute the same query again, looking for remaining records and deleting them
-        /// if the user hasn't moodle/course:view in the CONTEXT_COURSE context (orphan records)
-            $rs = get_recordset_sql ("SELECT id, userid, courseid
-                                        FROM {$CFG->prefix}user_lastaccess
-                                       WHERE courseid != ".SITEID."
-                                         AND timeaccess < $cuttime ");
-            while ($assign = rs_fetch_next_record($rs)) {
-                if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
-                    if (!has_capability('moodle/course:view', $context, $assign->userid)) {
-                        delete_records('user_lastaccess', 'userid', $assign->userid, 'courseid', $assign->courseid);
-                        mtrace("Deleted orphan user_lastaccess for user $assign->userid from course $assign->courseid");
-                    }
-                }
-            }
-            rs_close($rs);
         }
-        flush();
-
-
+    
+    
         /// Delete users who haven't confirmed within required period
 
         if (!empty($CFG->deleteunconfirmed)) {
-            $cuttime = $timenow - ($CFG->deleteunconfirmed * 3600);
-            $rs = get_recordset_sql ("SELECT id, firstname, lastname
-                                        FROM {$CFG->prefix}user
-                                       WHERE confirmed = 0
-                                         AND firstaccess > 0
-                                         AND firstaccess < $cuttime");
-            while ($user = rs_fetch_next_record($rs)) {
-                if (delete_records('user', 'id', $user->id)) {
-                    mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
+            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+            if ($users = get_users_unconfirmed($oneweek)) {
+                foreach ($users as $user) {
+                    if (delete_records('user', 'id', $user->id)) {
+                        mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
+                    }
                 }
             }
-            rs_close($rs);
         }
         flush();
 
 
+
         /// Delete users who haven't completed profile within required period
 
-        if (!empty($CFG->deleteincompleteusers)) {
-            $cuttime = $timenow - ($CFG->deleteincompleteusers * 3600);
-            $rs = get_recordset_sql ("SELECT id, username
-                                        FROM {$CFG->prefix}user
-                                       WHERE confirmed = 1
-                                         AND lastaccess > 0
-                                         AND lastaccess < $cuttime
-                                         AND deleted = 0
-                                         AND (lastname = '' OR firstname = '' OR email = '')");
-            while ($user = rs_fetch_next_record($rs)) {
-                if (delete_user($user)) {
-                    mtrace("Deleted not fully setup user $user->username ($user->id)");
+        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)");
+                    }
                 }
             }
-            rs_close($rs);
         }
         flush();
 
 
+    
         /// Delete old logs to save space (this might need a timer to slow it down...)
-
+    
         if (!empty($CFG->loglifetime)) {  // value in days
             $loglifetime = $timenow - ($CFG->loglifetime * 3600 * 24);
-            if (delete_records_select("log", "time < '$loglifetime'")) {
-                mtrace("Deleted old log records");
-            }
+            delete_records_select("log", "time < '$loglifetime'");
         }
         flush();
 
-
         /// Delete old cached texts
 
         if (!empty($CFG->cachetext)) {   // Defined in config.php
             $cachelifetime = time() - $CFG->cachetext - 60;  // Add an extra minute to allow for really heavy sites
-            if (delete_records_select('cache_text', "timemodified < '$cachelifetime'")) {
-                mtrace("Deleted old cache_text records");
-            }
+            delete_records_select('cache_text', "timemodified < '$cachelifetime'");
         }
         flush();
 
         if (!empty($CFG->notifyloginfailures)) {
             notify_login_failures();
-            mtrace('Notified login failured');
         }
         flush();
 
         sync_metacourses();
-        mtrace('Synchronised metacourses');
 
         //
         // generate new password emails for users 
@@ -351,42 +242,25 @@
         mtrace('checking for create_password');
         if (count_records('user_preferences', 'name', 'create_password', 'value', '1')) {
             mtrace('creating passwords for new users');
-            $newuserssql = "SELECT u.id as id, u.email, u.firstname, u.lastname, u.username, p.id as prefid
-                              FROM {$CFG->prefix}user u
-                              JOIN {$CFG->prefix}user_preferences p ON u.id=p.userid
-                             WHERE p.name='create_password' AND p.value='1' AND u.email !='' ";
-            if ($newusers = get_records_sql($newuserssql)) {
-                foreach ($newusers as $newuserid => $newuser) {
-                    $newuser->emailstop = 0; // send email regardless
-                    // email user
-                    if (setnew_password_and_mail($newuser)) {
-                        // remove user pref
-                        delete_records('user_preferences', 'id', $newuser->prefid);
-                    } else {
-                        trigger_error("Could not create and mail new user password!");
-                    }
+            $newusers = get_records_sql("SELECT  u.id as id, u.email, u.firstname, 
+                                                u.lastname, u.username,
+                                                p.id as prefid 
+                                        FROM {$CFG->prefix}user u 
+                                             JOIN {$CFG->prefix}user_preferences p ON u.id=p.userid
+                                        WHERE p.name='create_password' AND p.value=1 AND u.email !='' ");
+
+            foreach ($newusers as $newuserid => $newuser) {
+                $newuser->emailstop = 0; // send email regardless
+                // email user                               
+                if (setnew_password_and_mail($newuser)) {
+                    // remove user pref
+                    delete_records('user_preferences', 'id', $newuser->prefid);
+                } else {
+                    trigger_error("Could not create and mail new user password!");
                 }
             }
         }
 
-        if (!empty($CFG->usetags)) {
-            require_once($CFG->dirroot.'/tag/lib.php');
-            tag_cron();
-            mtrace ('Executed tag cron');
-        }
-        
-        // Accesslib stuff
-        cleanup_contexts();
-        mtrace ('Cleaned up contexts');
-        gc_cache_flags();
-        mtrace ('Cleaned cache flags');
-        // If you suspect that the context paths are somehow corrupt
-        // replace the line below with: build_context_path(true); 
-        build_context_path();
-        mtrace ('Built context paths');
-
-        mtrace("Finished clean-up tasks...");
-
     } // End of occasional clean-up tasks
 
 
@@ -430,23 +304,6 @@
         }
     }
 
-/// Run the auth cron, if any
-/// before enrolments because it might add users that will be needed in enrol plugins
-    $auths = get_enabled_auth_plugins();
-
-    mtrace("Running auth crons if required...");
-    foreach ($auths as $auth) {
-        $authplugin = get_auth_plugin($auth);
-        if (method_exists($authplugin, 'cron')) {
-            mtrace("Running cron for auth/$auth...");
-            $authplugin->cron();
-            if (!empty($authplugin->log)) {
-                mtrace($authplugin->log);
-            }
-        }
-        unset($authplugin);
-    }
-
 /// Run the enrolment cron, if any
     if (!($plugins = explode(',', $CFG->enrol_plugins_enabled))) {
         $plugins = array($CFG->enrol);
@@ -463,76 +320,67 @@
         unset($enrol);
     }
 
+/// Run the auth cron, if any
+    $auths = get_enabled_auth_plugins();
+
+    mtrace("Running auth crons if required...");
+    foreach ($auths as $auth) {
+        $authplugin = get_auth_plugin($auth);
+        if (method_exists($authplugin, 'cron')) {
+            mtrace("Running cron for auth/$auth...");
+            $authplugin->cron();
+            if (!empty($authplugin->log)) {
+                mtrace($authplugin->log);
+            }
+        }
+        unset($authplugin);
+    }
+
     if (!empty($CFG->enablestats) and empty($CFG->disablestatsprocessing)) {
-        require_once($CFG->dirroot.'/lib/statslib.php');
+
         // check we're not before our runtime
-        $timetocheck = stats_get_base_daily() + $CFG->statsruntimestarthour*60*60 + $CFG->statsruntimestartminute*60;
+        $timetocheck = strtotime("$CFG->statsruntimestarthour:$CFG->statsruntimestartminute today");
 
         if (time() > $timetocheck) {
-            // process configured number of days as max (defaulting to 31)
-            $maxdays = empty($CFG->statsruntimedays) ? 31 : abs($CFG->statsruntimedays);
-            if (stats_cron_daily($maxdays)) {
-                if (stats_cron_weekly()) {
-                    if (stats_cron_monthly()) {
-                        stats_clean_old();
-                    }
+            $time = 60*60*20; // set it to 20 here for first run... (overridden by $CFG)
+            $clobber = true;
+            if (!empty($CFG->statsmaxruntime)) {
+                $time = $CFG->statsmaxruntime+(60*30); // add on half an hour just to make sure (it could take that long to break out of the loop)
+            }
+            if (!get_field_sql('SELECT id FROM '.$CFG->prefix.'stats_daily')) {
+                // first run, set another lock. we'll check for this in subsequent runs to set the timeout to later for the normal lock.
+                set_cron_lock('statsfirstrunlock',true,$time,true);
+                $firsttime = true;
+            }
+            $time = 60*60*2; // this time set to 2.. (overridden by $CFG)
+            if (!empty($CFG->statsmaxruntime)) {
+                $time = $CFG->statsmaxruntime+(60*30); // add on half an hour to make sure (it could take that long to break out of the loop)
+            }
+            if ($config = get_record('config','name','statsfirstrunlock')) {
+                if (!empty($config->value)) {
+                    $clobber = false; // if we're on the first run, just don't clobber it.
                 }
             }
-            @set_time_limit(0);
-        } else {
-            mtrace('Next stats run after:'. userdate($timetocheck));
-        }
-    }
-
-    // run gradebook import/export/report cron
-    if ($gradeimports = get_list_of_plugins('grade/import')) {
-        foreach ($gradeimports as $gradeimport) {
-            if (file_exists($CFG->dirroot.'/grade/import/'.$gradeimport.'/lib.php')) {
-                require_once($CFG->dirroot.'/grade/import/'.$gradeimport.'/lib.php');
-                $cron_function = 'grade_import_'.$gradeimport.'_cron';
-                if (function_exists($cron_function)) {
-                    mtrace("Processing gradebook import function $cron_function ...", '');
-                    $cron_function();
+            if (set_cron_lock('statsrunning',true,$time, $clobber)) {
+                require_once($CFG->dirroot.'/lib/statslib.php');
+                $return = stats_cron_daily();
+                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
+                    stats_cron_weekly();
+                }
+                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
+                    $return = $return && stats_cron_monthly();
+                }
+                if (stats_check_runtime() && $return == STATS_RUN_COMPLETE) {
+                    stats_clean_old();
+                }
+                set_cron_lock('statsrunning',false);
+                if (!empty($firsttime)) {
+                    set_cron_lock('statsfirstrunlock',false);
                 }
             }
         }
     }
 
-    if ($gradeexports = get_list_of_plugins('grade/export')) {
-        foreach ($gradeexports as $gradeexport) {
-            if (file_exists($CFG->dirroot.'/grade/export/'.$gradeexport.'/lib.php')) {
-                require_once($CFG->dirroot.'/grade/export/'.$gradeexport.'/lib.php');
-                $cron_function = 'grade_export_'.$gradeexport.'_cron';
-                if (function_exists($cron_function)) {
-                    mtrace("Processing gradebook export function $cron_function ...", '');
-                    $cron_function();
-                }
-            }
-        }
-    }
-
-    if ($gradereports = get_list_of_plugins('grade/report')) {
-        foreach ($gradereports as $gradereport) {
-            if (file_exists($CFG->dirroot.'/grade/report/'.$gradereport.'/lib.php')) {
-                require_once($CFG->dirroot.'/grade/report/'.$gradereport.'/lib.php');
-                $cron_function = 'grade_report_'.$gradereport.'_cron';
-                if (function_exists($cron_function)) {
-                    mtrace("Processing gradebook report function $cron_function ...", '');
-                    $cron_function();
-                }
-            }
-        }
-    }
-
-    // run any customized cronjobs, if any
-    // looking for functions in lib/local/cron.php
-    if (file_exists($CFG->dirroot.'/local/cron.php')) {
-        mtrace('Processing customized cron script ...', '');
-        include_once($CFG->dirroot.'/local/cron.php');
-        mtrace('done.');
-    }
-
-
     //Unset session variables and destroy it
     @session_unset();
     @session_destroy();
@@ -542,7 +390,7 @@
     $difftime = microtime_diff($starttime, microtime());
     mtrace("Execution took ".$difftime." seconds"); 
 
-/// finish the IE hack
+/// finishe the IE hack
     if (check_browser_version('MSIE')) {
         echo "</xmp>";
     }

admin/dbperformance.php

@@ -12,17 +12,15 @@
 
     require_login();
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
     $strdatabaseperformance = get_string("databaseperformance");
     $stradministration = get_string("administration");
     $site = get_site();
 
-    $navigation = build_navigation(array(
-        array('name'=>$stradministration, 'link'=>'index.php', 'type'=>'misc'),
-        array('name'=>$strdatabaseperformance, 'link'=>null, 'type'=>'misc')));
     if (!empty($topframe)) {
-        print_header("$site->shortname: $strdatabaseperformance", "$site->fullname", $navigation);
+        print_header("$site->shortname: $strdatabaseperformance", "$site->fullname", 
+                     "<a $CFG->frametarget href=\"index.php\">$stradministration</a> -> Database performance");
         exit;
     }
 

admin/delete.php

@@ -5,26 +5,26 @@
 
     require_once('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
-
-    admin_externalpage_setup('purgemoodledata');
+    $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);
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
     $deletedir = $CFG->dataroot;   // The directory to delete!
 
-    admin_externalpage_print_header();
+    admin_externalpage_print_header($adminroot);
     print_heading('Purge moodledata');
 
     if (empty($sure)) {
         $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey());
         notice_yesno ('Are you completely sure you want to delete everything inside the directory '. $deletedir .' ?',
             'delete.php', 'index.php', $optionsyes, NULL, 'post', 'get');
-        admin_externalpage_print_footer();
+        admin_externalpage_print_footer($adminroot);
         exit;
     }
 
@@ -32,7 +32,7 @@
         $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey(), 'reallysure'=>'yes');
         notice_yesno ('Are you REALLY REALLY completely sure you want to delete everything inside the directory '. $deletedir .' (this includes all user images, and any other course files that have been created) ?',
             'delete.php', 'index.php', $optionsyes, NULL, 'post', 'get');
-        admin_externalpage_print_footer();
+        admin_externalpage_print_footer($adminroot);
         exit;
     }
 
@@ -46,7 +46,7 @@
 
     echo '<h1 align="center">Done!</h1>';
     print_continue($CFG->wwwroot);
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
     exit;
 
 
@@ -54,7 +54,7 @@ function delete_subdirectories($rootdir) {
 
     $dir = opendir($rootdir);
 
-    while (false !== ($file = readdir($dir))) {
+    while ($file = readdir($dir)) {
         if ($file != '.' and $file != '..') {
             $fullfile = $rootdir .'/'. $file;
             if (filetype($fullfile) == 'dir') {

admin/enrol.php

@@ -5,25 +5,21 @@
     require_once('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
 
-    $enrol        = optional_param('enrol', $CFG->enrol, PARAM_SAFEDIR);
-    $savesettings = optional_param('savesettings', 0, PARAM_BOOL);
-
+    $enrol = optional_param('enrol', $CFG->enrol, PARAM_SAFEDIR);
     $CFG->pagepath = 'enrol';
 
-    admin_externalpage_setup('enrolment');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('enrolment', $adminroot);
 
-    if (!isset($CFG->sendcoursewelcomemessage)) {
-        set_config('sendcoursewelcomemessage', 1);
-    }
 
 
     require_once("$CFG->dirroot/enrol/enrol.class.php");   /// Open the factory class
 
 /// Save settings
 
-    if ($frm = data_submitted() and !$savesettings) {
+    if ($frm = data_submitted()) {
         if (!confirm_sesskey()) {
-            print_error('confirmsesskeybad', 'error');
+            error(get_string('confirmsesskeybad', 'error'));
         }
         if (empty($frm->enable)) {
             $frm->enable = array();
@@ -39,19 +35,13 @@
         set_config('enrol_plugins_enabled', implode(',', $frm->enable));
         set_config('enrol', $frm->default);
         redirect("enrol.php", get_string("changessaved"), 1);
-
-    } else if ($frm = data_submitted() and $savesettings) {
-        if (!confirm_sesskey()) {
-            print_error('confirmsesskeybad', 'error');
-        }
-        set_config('sendcoursewelcomemessage', required_param('sendcoursewelcomemessage', PARAM_BOOL));
     }
 
 /// Print the form
 
     $str = get_strings(array('enrolmentplugins', 'users', 'administration', 'settings', 'edit'));
 
-    admin_externalpage_print_header();
+    admin_externalpage_print_header($adminroot);
 
     $modules = get_list_of_plugins("enrol");
     $options = array();
@@ -112,33 +102,6 @@
     echo "</div>";
     echo "</form>";
 
-    echo '<hr />';
+    admin_externalpage_print_footer($adminroot);
 
-    $yesnooptions = array(0=>get_string('no'), 1=>get_string('yes'));
-
-    echo '<form '.$CFG->frametarget.' id="adminsettings" method="post" action="enrol.php">';
-    echo '<div class="settingsform clearfix">';
-    print_heading(get_string('commonsettings', 'admin'));
-    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
-    echo '<input type="hidden" name="savesettings" value="1" />';
-    echo '<fieldset>';
-    echo '<div class="form-item clearfix" id="admin-sendcoursewelcomemessage">';
-    
-    echo '<div class="form-label"><label for = "menusendcoursewelcomemessage">' . get_string('sendcoursewelcomemessage', 'admin');
-    echo '<span class="form-shortname">sendcoursewelcomemessage</span>';
-    echo '</label></div>';
-    echo '<div class="form-setting"><div class="form-checkbox defaultsnext">';
-    choose_from_menu($yesnooptions, 'sendcoursewelcomemessage', $CFG->sendcoursewelcomemessage, '');
-    echo '</div><div class="form-defaultinfo">'.get_string('defaultsettinginfo', 'admin', get_string('yes')).'</div></div>';
-    echo '<div class="form-description">' . get_string('configsendcoursewelcomemessage', 'admin') . '</div>';
-    echo '</div>';
-
-    echo '</fieldset>';
-
-    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="'.get_string('savechanges', 'admin').'" /></div>';
-    echo '</div>';
-    echo '</form>';
-
-    admin_externalpage_print_footer();
-
-?>
+?>

admin/enrol_config.php

@@ -5,7 +5,8 @@
     require_once("../config.php");
     require_once($CFG->libdir.'/adminlib.php');
 
-    admin_externalpage_setup('enrolment');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('enrolment', $adminroot);
 
     $enrol = required_param('enrol', PARAM_ALPHA);
     $CFG->pagepath = 'enrol/' . $enrol;
@@ -19,7 +20,7 @@
 
     if ($frm = data_submitted()) {
         if (!confirm_sesskey()) {
-            print_error('confirmsesskeybad', 'error');
+            error(get_string('confirmsesskeybad', 'error'));
         }
         if ($enrolment->process_config($frm)) {
             redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
@@ -41,7 +42,7 @@
     }
     asort($options);
 
-    admin_externalpage_print_header();
+    admin_externalpage_print_header($adminroot);
 
     echo "<form $CFG->frametarget id=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">";
     echo "<div>";
@@ -65,7 +66,7 @@
     echo "</div>";
     echo "</form>";
 
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 
     exit;
 ?>

admin/environment.php

@@ -7,7 +7,7 @@
 // Moodle - Modular Object-Oriented Dynamic Learning Environment         //
 //          http://moodle.com                                            //
 //                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas     http://dougiamas.com  //
+// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
 //           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
 //                                                                       //
 // This program is free software; you can redistribute it and/or modify  //
@@ -34,7 +34,8 @@
     require_once($CFG->libdir.'/environmentlib.php');
     require_once($CFG->libdir.'/componentlib.class.php');
 
-    admin_externalpage_setup('environment');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('environment', $adminroot);
 
 /// Parameters
     $action  = optional_param('action', '', PARAM_ACTION);
@@ -52,7 +53,7 @@
     $strmisc = get_string('miscellaneous');
 
 /// Print the header stuff
-    admin_externalpage_print_header();
+    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>';
@@ -65,10 +66,10 @@
         if ($cd = new component_installer('http://download.moodle.org', 
                                           'environment', 
                                           'environment.zip')) {
-            $status = $cd->install(); //returns COMPONENT_(ERROR | UPTODATE | INSTALLED)
+            $status = $cd->install(); //returns ERROR | UPTODATE | INSTALLED
             switch ($status) {
-                case COMPONENT_ERROR:
-                    if ($cd->get_error() == 'remotedownloaderror') {
+                case ERROR:
+                    if ($cd->get_error() == 'remotedownloadnotallowed') {
                         $a = new stdClass();
                         $a->url = 'http://download.moodle.org/environment/environment.zip';
                         $a->dest= $CFG->dataroot.'/';
@@ -77,10 +78,10 @@
                         print_simple_box(get_string($cd->get_error(), 'error'), 'center', '', '', 5, 'errorbox');
                     }
                     break;
-                case COMPONENT_UPTODATE:
+                case UPTODATE:
                     print_simple_box(get_string($cd->get_error(), 'error'), 'center');
                     break;
-                case COMPONENT_INSTALLED:
+                case INSTALLED:
                     print_simple_box(get_string('componentinstalled', 'admin'), 'center');
                     break;
             }
@@ -132,5 +133,5 @@
     $status = check_moodle_environment($version, $environment_results);
 
 /// Print footer
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 ?>

admin/environment.xml

@@ -80,6 +80,7 @@
         <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" />
@@ -116,558 +117,6 @@
           <ON_CHECK message="tokenizerrecommended" />
         </FEEDBACK>
       </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="ctyperecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
     </PHP_EXTENSIONS>
   </MOODLE>
-  <MOODLE version="1.9">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mysql" version="4.1.16">
-        <FEEDBACK>
-          <ON_ERROR message="mysql416required" />
-        </FEEDBACK>
-      </VENDOR>
-      <VENDOR name="postgres" version="8.0" />
-      <VENDOR name="mssql" version="9.0" />
-      <VENDOR name="odbc_mssql" version="9.0" />
-      <VENDOR name="mssql_n" version="9.0" />
-      <VENDOR name="oracle" version="9.0" />
-    </DATABASE>
-    <PHP version="4.3.0" level="required">
-      <RESTRICT function="restrict_php50_version" message="php50restricted" />
-    </PHP>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="iconvrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="curlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="ctyperecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-    </PHP_EXTENSIONS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="question/upgrade.php" function="question_check_no_rqp_questions" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="qtyperqpwillberemovedanyway" />
-          <ON_OK message="qtyperqpwillberemoved" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="question/upgrade.php" function="question_random_check" level="optional">
-        <FEEDBACK>
-          <ON_OK message="questioncwqpfsok" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_register_globals" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="globalswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="2.0" requires="1.9">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mysql" version="5.0.25">
-        <FEEDBACK>
-          <ON_ERROR message="mysql416required" />
-        </FEEDBACK>
-      </VENDOR>
-      <VENDOR name="postgres" version="8.3" />
-      <VENDOR name="mssql" version="9.0" />
-      <VENDOR name="odbc_mssql" version="9.0" />
-      <VENDOR name="mssql_n" version="9.0" />
-      <VENDOR name="oracle" version="10.2" />
-      <VENDOR name="sqlite" version="2.0" />
-    </DATABASE>
-    <PHP version="5.2.8" level="required">
-    </PHP>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="gdrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="intlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="40M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="safe_mode" value="0" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingsafemode" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_php533" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="php533warning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="2.1" requires="1.9">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mysql" version="5.0.25">
-        <FEEDBACK>
-          <ON_ERROR message="mysql416required" />
-        </FEEDBACK>
-      </VENDOR>
-      <VENDOR name="postgres" version="8.3" />
-      <VENDOR name="mssql" version="9.0" />
-      <VENDOR name="odbc_mssql" version="9.0" />
-      <VENDOR name="mssql_n" version="9.0" />
-      <VENDOR name="oracle" version="10.2" />
-      <VENDOR name="sqlite" version="2.0" />
-    </DATABASE>
-    <PHP version="5.3.2" level="required">
-    </PHP>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="gdrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="intlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="40M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="safe_mode" value="0" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingsafemode" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-  </MOODLE>
-  <MOODLE version="2.2" requires="1.9">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mysql" version="5.0.25">
-        <FEEDBACK>
-          <ON_ERROR message="mysql416required" />
-        </FEEDBACK>
-      </VENDOR>
-      <VENDOR name="postgres" version="8.3" />
-      <VENDOR name="mssql" version="9.0" />
-      <VENDOR name="odbc_mssql" version="9.0" />
-      <VENDOR name="mssql_n" version="9.0" />
-      <VENDOR name="oracle" version="10.2" />
-      <VENDOR name="sqlite" version="2.0" />
-    </DATABASE>
-    <PHP version="5.3.2" level="required">
-    </PHP>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="gdrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="intlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="40M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="safe_mode" value="0" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingsafemode" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-  </MOODLE>
-  <MOODLE version="2.3" requires="2.2">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mysql" version="5.0.25">
-        <FEEDBACK>
-          <ON_ERROR message="mysql416required" />
-        </FEEDBACK>
-      </VENDOR>
-      <VENDOR name="postgres" version="8.3" />
-      <VENDOR name="mssql" version="9.0" />
-      <VENDOR name="odbc_mssql" version="9.0" />
-      <VENDOR name="mssql_n" version="9.0" />
-      <VENDOR name="oracle" version="10.2" />
-      <VENDOR name="sqlite" version="2.0" />
-    </DATABASE>
-    <PHP version="5.3.2" level="required">
-    </PHP>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opensslrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="gdrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_CHECK message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="intlrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="40M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="safe_mode" value="0" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingsafemode" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-  </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/filter.php

@@ -6,15 +6,21 @@
     require_once($CFG->libdir.'/adminlib.php');
     require_once($CFG->libdir.'/tablelib.php');
 
-    $filterfull = required_param('filter', PARAM_PATH);
-    $forcereset  = optional_param('reset', 0, PARAM_BOOL);
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('managefilters', $adminroot);
 
-    $filtername =  substr($filterfull, strpos( $filterfull, '/' )+1 ) ;
+    // get parameters
+    $param = new Object;
 
-    admin_externalpage_setup('filtersetting'.str_replace('/', '', $filterfull));
+    $param->filter = required_param('filter', PARAM_PATH);
+    $param->submit = optional_param('submit', 0, PARAM_BOOL);
+    $param->reset  = optional_param('reset', 0, PARAM_BOOL);
 
-    $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=managefilters";
+    $filtername =  substr($param->filter, strpos( $param->filter, '/' )+1 ) ;
 
+    // $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;
@@ -27,7 +33,12 @@
     //======================
 
     // if reset pressed let filter config page handle it
-    if ($config = data_submitted() and !$forcereset) {
+    $forcereset = false;
+    if (!empty($param->reset)) {
+        $forcereset = true;
+    }
+    else
+    if ($config = data_submitted()) {
 
         // check session key
         if (!confirm_sesskey()) {
@@ -51,10 +62,7 @@
                 set_config($name, stripslashes($value));
             }
         }
-
-        reset_text_filters_cache();
-
-        redirect($returnurl);
+        redirect("$CFG->wwwroot/$CFG->admin/filters.php");
         exit;
     }
 
@@ -63,28 +71,28 @@
     //==============================
 
     $filtername = ucfirst($filtername);
-    admin_externalpage_print_header();
+    admin_externalpage_print_header($adminroot);
     print_heading( $filtername );
 
-    print_simple_box(get_string("configwarning", "admin"), "center", "50%");
+    print_simple_box("<center>".get_string("configwarning", "admin")."</center>", "center", "50%");
     echo "<br />";
 
     print_simple_box_start("center",'');
 
     ?>
-    <form action="filter.php?filter=<?php echo urlencode($filterfull); ?>" method="post">
-    <div style="text-align: center">
+    <form action="filter.php?filter=<?php echo urlencode($param->filter); ?>" method="post">
     <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
 
-    <?php include "$CFG->dirroot/$filterfull/filterconfig.html"; ?>
+    <?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'); ?>" />
-    </div>
+    </center>
     </form>
 
     <?php
     print_simple_box_end();
 
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 ?>

admin/filters.php

@@ -1,73 +1,136 @@
 <?php // $Id$
+    // filters.php
+    // Edit list of available text filters
 
     require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    require_once($CFG->libdir.'/tablelib.php');
 
-    $action     = optional_param('action', '', PARAM_ACTION);
-    $filterpath = optional_param('filterpath', '', PARAM_PATH);
+    // defines
+    define('FILTER_TABLE','filter_administration_table');
 
-    require_login();
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('managefilters', $adminroot);
 
-    $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=managefilters";
+    // get values from page
+    $params = new object();
+    $params->action     = optional_param('action', '', PARAM_ACTION);
+    $params->filterpath = optional_param('filterpath', '', PARAM_PATH);
+    $params->cachetext  = optional_param('cachetext', 0, PARAM_INT);
+    $params->filterall  = optional_param('filterall', 0, PARAM_BOOL);
+    $params->filteruploadedfiles   = optional_param('filteruploadedfiles', 0, PARAM_INT);
+    $params->filtermatchoneperpage = optional_param('filtermatchoneperpage', 0, PARAM_BOOL);
+    $params->filtermatchonepertext = optional_param('filtermatchonepertext', 0, PARAM_BOOL);
 
-    if (!confirm_sesskey()) {
-        redirect($returnurl);
-    }
+    // some basic information
+    $url = 'filters.php';
+    $myurl = "$url?sesskey=" . sesskey();
+    $img = "$CFG->pixpath/t";
 
-    // get a list of installed filters
+    // get translated strings for use on page
+    $txt = new object();
+    $txt->managefilters = get_string('managefilters');
+    $txt->administration = get_string('administration');
+    $txt->configuration = get_string('configuration');
+    $txt->name = get_string('name');
+    $txt->hide = get_string('hide');
+    $txt->show = get_string('show');
+    $txt->hideshow = "$txt->hide/$txt->show";
+    $txt->settings = get_string('settings');
+    $txt->up = get_string('up');
+    $txt->down = get_string('down');
+    $txt->updown = "$txt->up/$txt->down";
+    $txt->cachetext = get_string('cachetext', 'admin');
+    $txt->configcachetext = get_string('configcachetext', 'admin');
+    $txt->filteruploadedfiles = get_string('filteruploadedfiles','admin');
+    $txt->configfilteruploadedfiles = get_string('configfilteruploadedfiles','admin');
+    $txt->filterall = get_string('filterall','admin');
+    $txt->filtermatchoneperpage = get_string('filtermatchoneperpage','admin');
+    $txt->filtermatchonepertext = get_string('filtermatchonepertext','admin');
+    $txt->configfilterall = get_string('configfilterall','admin');
+    $txt->configfiltermatchoneperpage = get_string('configfiltermatchoneperpage','admin');
+    $txt->configfiltermatchonepertext = get_string('configfiltermatchonepertext','admin');
+    $txt->cachecontrols = get_string('cachecontrols');
+    $txt->yes = get_string('yes');
+    $txt->no = get_string('no');
+    $txt->none = get_string('none');
+    $txt->allfiles = get_string('allfiles');
+    $txt->htmlfilesonly = get_string('htmlfilesonly');
+
+    // get a list of possible filters (and translate name if possible)
+    // note filters can be in the dedicated filters area OR in their
+    // associated modules
     $installedfilters = array();
+    $filtersettings = array();
     $filterlocations = array('mod','filter');
     foreach ($filterlocations as $filterlocation) {
         $plugins = get_list_of_plugins($filterlocation);
         foreach ($plugins as $plugin) {
             $pluginpath = "$CFG->dirroot/$filterlocation/$plugin/filter.php";
+            $settingspath = "$CFG->dirroot/$filterlocation/$plugin/filterconfig.html";
             if (is_readable($pluginpath)) {
-                $installedfilters["$filterlocation/$plugin"] = "$filterlocation/$plugin";
+                $name = trim(get_string("filtername", $plugin));
+                if (empty($name) or ($name == '[[filtername]]')) {
+                    $name = ucfirst($plugin);
+                }
+                $installedfilters["$filterlocation/$plugin"] = $name;
+                if (is_readable($settingspath)) {
+                    $filtersettings[] = "$filterlocation/$plugin";
+                }
             }
         }
     }
 
     // get all the currently selected filters
     if (!empty($CFG->textfilters)) {
-        $activefilters = explode(',', $CFG->textfilters);
+        $oldactivefilters = explode(',', $CFG->textfilters);
+        $oldactivefilters = array_unique($oldactivefilters);
     } else {
-        $activefilters = array();
+        $oldactivefilters = array();
+    }
+
+    // take this opportunity to clean up filters
+    $activefilters = array();
+    foreach ($oldactivefilters as $oldactivefilter) {
+        if (!empty($oldactivefilter) and array_key_exists($oldactivefilter, $installedfilters)) {
+            $activefilters[] = $oldactivefilter;
+        }
     }
 
     //======================
     // Process Actions
     //======================
 
-    switch ($action) {
-
-    case 'hide':
-        $key=array_search($filterpath, $activefilters);
+    if ($params->action=="") {
+        // store cleaned active filers in db
+        set_config('textfilters', implode(',', $activefilters));
+    } elseif (($params->action=="hide") and confirm_sesskey()) {
+        $key=array_search($params->filterpath, $activefilters);
         // check filterpath is valid
         if ($key===false) {
-            break;
+            // ignore it - doubleclick??
+        } else {
+            // just delete it
+            unset($activefilters[$key]);
+            set_config('textfilters', implode(',', $activefilters));
         }
-        // just delete it
-        unset($activefilters[$key]);
-        break;
-
-    case 'show':
+    } elseif (($params->action=="show") and confirm_sesskey()) {
         // check filterpath is valid
-        if (!array_key_exists($filterpath, $installedfilters)) {
-            error("Filter $filterpath is not currently installed", $url);
-        } elseif (array_search($filterpath,$activefilters)) {
+        if (!array_key_exists($params->filterpath, $installedfilters)) {
+            error("Filter $params->filterpath is not currently installed", $url);
+        } elseif (array_search($params->filterpath,$activefilters)) {
             // filterpath is already active - doubleclick??
         } else {
             // add it to installed filters
-            $activefilters[] = $filterpath;
+            $activefilters[] = $params->filterpath;
             $activefilters = array_unique($activefilters);
+            set_config('textfilters', implode(',', $activefilters));
         }
-        break;
-
-    case 'down':
-        $key=array_search($filterpath, $activefilters);
+    } elseif (($params->action=="down") and confirm_sesskey()) {
+        $key=array_search($params->filterpath, $activefilters);
         // check filterpath is valid
         if ($key===false) {
-            error("Filter $filterpath is not currently active", $url);
+            error("Filter $params->filterpath is not currently active", $url);
         } elseif ($key>=(count($activefilters)-1)) {
             // cannot be moved any further down - doubleclick??
         } else {
@@ -75,14 +138,13 @@
             $fsave = $activefilters[$key];
             $activefilters[$key] = $activefilters[$key+1];
             $activefilters[$key+1] = $fsave;
+            set_config('textfilters', implode(',', $activefilters));
         }
-        break;
-
-    case 'up':
-        $key=array_search($filterpath, $activefilters);
+    } elseif (($params->action=="up") and confirm_sesskey()) {
+        $key=array_search($params->filterpath, $activefilters);
         // check filterpath is valid
         if ($key===false) {
-            error("Filter $filterpath is not currently active", $url);
+            error("Filter $params->filterpath is not currently active", $url);
         } elseif ($key<1) {
             //cannot be moved any further up - doubleclick??
         } else {
@@ -90,13 +152,126 @@
             $fsave = $activefilters[$key];
             $activefilters[$key] = $activefilters[$key-1];
             $activefilters[$key-1] = $fsave;
+            set_config('textfilters', implode(',', $activefilters));
         }
-        break;
+    } elseif (($params->action=="config") and confirm_sesskey()) {
+        set_config('cachetext', $params->cachetext);
+        set_config('filteruploadedfiles', $params->filteruploadedfiles);
+        set_config('filterall', $params->filterall);
+        set_config('filtermatchoneperpage', $params->filtermatchoneperpage);
+        set_config('filtermatchonepertext', $params->filtermatchonepertext);
     }
 
-    // save, reset cache and return
-    set_config('textfilters', implode(',', $activefilters));
-    reset_text_filters_cache();
-    redirect($returnurl);
+    //======================
+    // Build Display Objects
+    //======================
+
+    // construct the display array with installed filters
+    // at the top in the right order
+    $displayfilters = array();
+    foreach ($activefilters as $activefilter) {
+        $name = $installedfilters[$activefilter];
+        $displayfilters[$activefilter] = $name;
+    }
+    foreach ($installedfilters as $key => $filter) {
+        if (!array_key_exists($key, $displayfilters)) {
+            $displayfilters[$key] = $filter;
+        }
+    }
+
+    // construct the flexible table ready to display
+    $table = new flexible_table(FILTER_TABLE);
+    $table->define_columns(array('name', 'hideshow', 'order', 'settings'));
+    $table->define_headers(array($txt->name, $txt->hideshow, $txt->updown, $txt->settings));
+    $table->define_baseurl("$CFG->wwwroot/$CFG->admin/filters.php");
+    $table->set_attribute('id', 'filters');
+    $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
+    $table->setup();
+
+    // iterate through filters adding to display table
+    $updowncount = 1;
+    $activefilterscount = count($activefilters);
+    foreach ($displayfilters as $path => $name) {
+        $upath = urlencode($path);
+        // get hide/show link
+        if (in_array($path, $activefilters)) {
+            $hideshow = "<a href=\"$myurl&amp;action=hide&amp;filterpath=$upath\">";
+            $hideshow .= "<img src=\"{$CFG->pixpath}/i/hide.gif\" class=\"icon\" alt=\"$txt->hide\" /></a>";
+            $hidden = false;
+            $displayname = "<span>$name</span>";
+        }
+        else {
+            $hideshow = "<a href=\"$myurl&amp;action=show&amp;filterpath=$upath\">";
+            $hideshow .= "<img src=\"{$CFG->pixpath}/i/show.gif\" class=\"icon\" alt=\"$txt->show\" /></a>";
+            $hidden = true;
+            $displayname = "<span class=\"dimmed_text\">$name</span>";
+        }
+
+        // get up/down link (only if not hidden)
+        $updown = '';
+        if (!$hidden) {
+            if ($updowncount>1) {
+                $updown .= "<a href=\"$myurl&amp;action=up&amp;filterpath=$upath\">";
+                $updown .= "<img src=\"$img/up.gif\" alt=\"$txt->up\" /></a>&nbsp;";
+            }
+            else {
+                $updown .= "<img src=\"$CFG->pixpath/spacer.gif\" class=\"icon\" alt=\"\" />&nbsp;";
+            }
+            if ($updowncount<$activefilterscount) {
+                $updown .= "<a href=\"$myurl&amp;action=down&amp;filterpath=$upath\">";
+                $updown .= "<img src=\"$img/down.gif\" alt=\"$txt->down\" /></a>";
+            }
+            else {
+                $updown .= "<img src=\"$CFG->pixpath/spacer.gif\" class=\"icon\" alt=\"\" />";
+            }
+            ++$updowncount;
+        }
+
+        // settings link (if defined)
+        $settings = '';
+        if (in_array($path, $filtersettings)) {
+            $settings = "<a href=\"filter.php?filter=" . urlencode($path) . "\">";
+            $settings .= "{$txt->settings}</a>";
+        }
+
+        // write data into the table object
+        $table->add_data(array($displayname, $hideshow, $updown, $settings));
+    }
+
+    // build options list for cache lifetime
+    $seconds = array(604800,86400,43200,10800,7200,3600,2700,1800,900,600,540,480,420,360,300,240,180,120,60,30,0);
+    unset($lifetimeoptions);
+    foreach ($seconds as $second) {
+        if ($second>=86400) {
+            $options[$second] = get_string('numdays','',$second/86400);
+        }
+        elseif ($second>=3600) {
+            $options[$second] = get_string('numhours','',$second/3600);
+        }
+        elseif ($second>=60) {
+            $options[$second] = get_string('numminutes','',$second/60);
+        }
+        elseif ($second>=1) {
+            $options[$second] = get_string('numseconds','',$second);
+        }
+        else {
+            $options[$second] = get_string('no');
+        }
+    }
+
+    //==============================
+    // Display logic
+    //==============================
+
+    admin_externalpage_print_header($adminroot);
+
+    print_heading_with_help($txt->managefilters, 'filters');
+
+    // print the table of all the filters
+    $table->print_html();
+
+    // cache control table has been removed
+
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/fixuserpix.php

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

admin/health.php

@@ -13,8 +13,8 @@
     }
 
     require_once($CFG->libdir.'/adminlib.php');
-
-    admin_externalpage_setup('healthcenter');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('healthcenter', $adminroot);
 
     define('SEVERITY_NOTICE',      'notice');
     define('SEVERITY_ANNOYANCE',   'annoyance');
@@ -24,11 +24,11 @@
     $solution = optional_param('solution', 0, PARAM_SAFEDIR); //in fact it is class name alhanumeric and _
 
     require_login();
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
     $site = get_site();
 
-    admin_externalpage_print_header();
+    admin_externalpage_print_header($adminroot);
 
 echo <<<STYLES
 <style type="text/css">
@@ -100,7 +100,7 @@ STYLES;
     }
 
 
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 
 function health_find_problems() {
@@ -363,11 +363,7 @@ class problem_000008 extends problem_base {
         }
         $oldmemlimit = get_real_size($oldmemlimit);
         //now lets change the memory limit to something unique below 128M==134217728
-        if (empty($CFG->extramemorylimit)) {
-            raise_memory_limit('128M');
-        } else {
-            raise_memory_limit($CFG->extramemorylimit);
-        }
+        @ini_set('memory_limit', 134217720);
         $testmemlimit = get_real_size(@ini_get('memory_limit'));
         //verify the change had any effect at all
         if ($oldmemlimit == $testmemlimit) {
@@ -378,7 +374,7 @@ class problem_000008 extends problem_base {
                 return false;
             }
         }
-        reduce_memory_limit($oldmemlimit);
+        @ini_set('memory_limit', $oldmemlimit);
         return false;
     }
     function severity() {
@@ -529,300 +525,11 @@ class problem_000011 extends problem_base {
             }
             return 'Error counter was cleared.';
         } else {
-            return '<p>Session errors can be caused by:</p><ul>' .
-            '<li>unresolved problem in server software (aka random switching of users),</li>' .
-            '<li>blocked or modified cookies,</li>' .
-            '<li>deleting of active session files.</li>' .
-            '</ul><p><a href="'.me().'&amp;resetsesserrorcounter=1">Reset counter</a></p>';
+            return '<p>Session errors can be caused by:<ul><li>unresolved problem in server software (aka random switching of users),</li><li>blocked or modified cookies,</li><li>deleting of active session files.</li></ul></p><p><a href="'.me().'&resetsesserrorcounter=1">Reset counter.</a></p>';
         }
     }
 }
 
-class problem_000012 extends problem_base {
-    function title() {
-        return 'Random questions data consistency';
-    }
-    function exists() {
-        return record_exists_select('question', "qtype = 'random' AND parent <> id");
-    }
-    function severity() {
-        return SEVERITY_ANNOYANCE;
-    }
-    function description() {
-        return '<p>For random questions, question.parent should equal question.id. ' .
-        'There are some questions in your database for which this is not true. ' .
-        'One way that this could have happened is for random questions restored from backup before ' .
-        '<a href="http://tracker.moodle.org/browse/MDL-5482">MDL-5482</a> was fixed.</p>';
-    }
-    function solution() {
-        global $CFG;
-        return '<p>Upgrade to Moodle 1.9.1 or later, or manually execute the SQL</p>' .
-        '<pre>UPDATE ' . $CFG->prefix . 'question SET parent = id WHERE qtype = \'random\' and parent &lt;> id;</pre>';
-    }
-}
-
-class problem_000013 extends problem_base {
-    function title() {
-        return 'Multi-answer questions data consistency';
-    }
-    function exists() {
-        global $CFG;
-        $positionexpr = sql_position(sql_concat("','", "q.id", "','"), 
-                sql_concat("','", "qma.sequence", "','"));
-        return record_exists_sql("
-                SELECT * FROM {$CFG->prefix}question q
-                    JOIN {$CFG->prefix}question_multianswer qma ON $positionexpr > 0
-                WHERE qma.question <> q.parent") ||
-            record_exists_sql("
-                SELECT * FROM {$CFG->prefix}question q
-                    JOIN {$CFG->prefix}question parent_q ON parent_q.id = q.parent
-                WHERE q.category <> parent_q.category");
-    }
-    function severity() {
-        return SEVERITY_ANNOYANCE;
-    }
-    function description() {
-        return '<p>For each sub-question whose id is listed in ' .
-        'question_multianswer.sequence, its question.parent field should equal ' .
-        'question_multianswer.question; and each sub-question should be in the same ' .
-        'category as its parent. There are questions in your database for ' .
-        'which this is not the case. One way that this could have happened is ' .
-        'for multi-answer questions restored from backup before ' .
-        '<a href="http://tracker.moodle.org/browse/MDL-14750">MDL-14750</a> was fixed.</p>';
-    }
-    function solution() {
-        return '<p>Upgrade to Moodle 1.9.1 or later, or manually execute the ' .
-        'code in question_multianswer_fix_subquestion_parents_and_categories in ' .
-        '<a href="http://cvs.moodle.org/moodle/question/type/multianswer/db/upgrade.php?revision=1.1.10.2&amp;view=markup">/question/type/multianswer/db/upgrade.php' .
-        'from the 1.9 stable branch</a>.</p>';
-    }
-}
-
-class problem_000014 extends problem_base {
-    function title() {
-        return 'Only multianswer and random questions should be the parent of another question';
-    }
-    function exists() {
-        global $CFG;
-        return record_exists_sql("
-                SELECT * FROM {$CFG->prefix}question q
-                    JOIN {$CFG->prefix}question parent_q ON parent_q.id = q.parent
-                WHERE parent_q.qtype NOT IN ('random', 'multianswer')");
-    }
-    function severity() {
-        return SEVERITY_ANNOYANCE;
-    }
-    function description() {
-        return '<p>You have questions that violate this in your databse. ' .
-        'You will need to investigate to determine how this happened.</p>';
-    }
-    function solution() {
-        return '<p>It is impossible to give a solution without knowing more about ' .
-        ' how the problem was caused. You may be able to get help from the ' .
-        '<a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a>.</p>';
-    }
-}
-
-class problem_000015 extends problem_base {
-    function title() {
-        return 'Question categories should belong to a valid context';
-    }
-    function exists() {
-        global $CFG;
-        return record_exists_sql("
-            SELECT qc.*, (SELECT COUNT(1) FROM {$CFG->prefix}question q WHERE q.category = qc.id) AS numquestions
-            FROM {$CFG->prefix}question_categories qc
-                LEFT JOIN {$CFG->prefix}context con ON qc.contextid = con.id
-            WHERE con.id IS NULL");
-    }
-    function severity() {
-        return SEVERITY_ANNOYANCE;
-    }
-    function description() {
-        global $CFG;
-        $problemcategories = get_records_sql("
-            SELECT qc.id, qc.name, qc.contextid, (SELECT COUNT(1) FROM {$CFG->prefix}question q WHERE q.category = qc.id) AS numquestions
-            FROM {$CFG->prefix}question_categories qc
-                LEFT JOIN {$CFG->prefix}context con ON qc.contextid = con.id
-            WHERE con.id IS NULL
-            ORDER BY numquestions DESC, qc.name");
-        $table = '<table><thead><tr><th>Cat id</th><th>Category name</th>' .
-        "<th>Context id</th><th>Num Questions</th></tr></thead><tbody>\n";
-        if ($problemcategories) {
-            foreach ($problemcategories as $cat) {
-                $table .= "<tr><td>$cat->id</td><td>" . s($cat->name) . "</td><td>" .
-                $cat->contextid ."</td><td>$cat->numquestions</td></tr>\n";
-            }
-        }
-        $table .= '</tbody></table>';
-        return '<p>All question categories are linked to a context id, and, ' .
-        'the context they are linked to must exist. The following categories ' .
-        'belong to a non-existant category:</p>' . $table . '<p>Any of these ' .
-        'categories that contain no questions can just be deleted form the database. ' .
-        'Other categories will require more thought.</p>';
-    }
-    function solution() {
-        global $CFG;
-        return '<p>You can delete the empty categories by executing the following SQL:</p><pre>
-DELETE FROM ' . $CFG->prefix . 'question_categories
-WHERE
-    NOT EXISTS (SELECT * FROM ' . $CFG->prefix . 'question q WHERE q.category = ' . $CFG->prefix . 'question_categories.id)
-AND NOT EXISTS (SELECT * FROM ' . $CFG->prefix . 'context con WHERE contextid = con.id)
-        </pre><p>Any remaining categories that contain questions will require more thought. ' .
-        'People in the <a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a> may be able to help.</p>';
-    }
-}
-
-class problem_000016 extends problem_base {
-    function title() {
-        return 'Question categories should belong to the same context as their parent';
-    }
-    function exists() {
-        global $CFG;
-        return record_exists_sql("
-            SELECT parent_qc.id AS parent, child_qc.id AS child, child_qc.contextid
-            FROM {$CFG->prefix}question_categories child_qc
-                JOIN {$CFG->prefix}question_categories parent_qc ON child_qc.parent = parent_qc.id
-            WHERE child_qc.contextid <> parent_qc.contextid");
-    }
-    function severity() {
-        return SEVERITY_ANNOYANCE;
-    }
-    function description() {
-        global $CFG;
-        $problemcategories = get_records_sql("
-            SELECT
-                parent_qc.id AS parentid, parent_qc.name AS parentname, parent_qc.contextid AS parentcon,
-                child_qc.id AS childid, child_qc.name AS childname, child_qc.contextid AS childcon
-            FROM {$CFG->prefix}question_categories child_qc
-                JOIN {$CFG->prefix}question_categories parent_qc ON child_qc.parent = parent_qc.id
-            WHERE child_qc.contextid <> parent_qc.contextid");
-        $table = '<table><thead><tr><th colspan="3">Child category</th><th colspan="3">Parent category</th></tr><tr>' .
-        '<th>Id</th><th>Name</th><th>Context id</th>' .
-        '<th>Id</th><th>Name</th><th>Context id</th>' .
-        "</tr></thead><tbody>\n";
-        if ($problemcategories) {
-            foreach ($problemcategories as $cat) {
-                $table .= "<tr><td>$cat->childid</td><td>" . s($cat->childname) .
-                "</td><td>$cat->childcon</td><td>$cat->parentid</td><td>" . s($cat->parentname) .
-                "</td><td>$cat->parentcon</td></tr>\n";
-            }
-        }
-        $table .= '</tbody></table>';
-        return '<p>When one question category is the parent of another, then they ' .
-        'should both belong to the same context. This is not true for the following categories:</p>' .
-        $table;
-    }
-    function solution() {
-        return '<p>An automated solution is difficult. It depends whether the ' .
-        'parent or child category is in the wrong pace.' .
-        'People in the <a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a> may be able to help.</p>';
-    }
-}
-
-class problem_000017 extends problem_base {
-    function title() {
-        return 'Question categories tree structure';
-    }
-    function find_problems() {
-        static $answer = null;
-
-        if (is_null($answer)) {
-            $categories = get_records('question_categories', '', '', 'id');
-
-            // Look for missing parents.
-            $missingparent = array();
-            foreach ($categories as $category) {
-                if ($category->parent != 0 && !array_key_exists($category->parent, $categories)) {
-                    $missingparent[$category->id] = $category;
-                }
-            }
-
-            // Look for loops.
-            $loops = array();
-            while (!empty($categories)) {
-                $current = array_pop($categories);
-                $thisloop = array($current->id => $current);
-                while (true) {
-                    if (isset($thisloop[$current->parent])) {
-                        // Loop detected
-                        $loops[$current->id] = $thisloop;
-                        break;
-                    } else if (!isset($categories[$current->parent])) {
-                        // Got to the top level, or a category we already know is OK.
-                        break;
-                    } else {
-                        // Continue following the path.
-                        $current = $categories[$current->parent];
-                        $thisloop[$current->id] = $current;
-                        unset($categories[$current->id]);
-                    }
-                }
-            }
-
-            $answer = array($missingparent, $loops);
-        }
-
-        return $answer;
-    }
-    function exists() {
-        list($missingparent, $loops) = $this->find_problems();
-        return !empty($missingparent) || !empty($loops);
-    }
-    function severity() {
-        return SEVERITY_ANNOYANCE;
-    }
-    function description() {
-        list($missingparent, $loops) = $this->find_problems();
-
-        $description = '<p>The question categories should be arranged into tree ' .
-                ' structures by the question_categories.parent field. Sometimes ' .
-                ' this tree structure gets messed up.</p>';
-
-        if (!empty($missingparent)) {
-            $description .= '<p>The following categories are missing their parents:</p><ul>';
-            foreach ($missingparent as $cat) {
-                $description .= "<li>Category $cat->id: " . s($cat->name) . "</li>\n";
-            }
-            $description .= "</ul>\n";
-        }
-
-        if (!empty($loops)) {
-            $description .= '<p>The following categories form a loop of parents:</p><ul>';
-            foreach ($loops as $loop) {
-                $description .= "<li><ul>\n";
-                foreach ($loop as $cat) {
-                    $description .= "<li>Category $cat->id: " . s($cat->name) . " has parent $cat->parent</li>\n";
-                }
-                $description .= "</ul></li>\n";
-            }
-            $description .= "</ul>\n";
-        }
-
-        return $description;
-    }
-    function solution() {
-        global $CFG;
-        list($missingparent, $loops) = $this->find_problems();
-
-        $solution = '<p>Consider executing the following SQL queries. These fix ' .
-                'the problem by moving some categories to the top level.</p>';
-
-        if (!empty($missingparent)) {
-            $solution .= "<pre>UPDATE " . $CFG->prefix . "question_categories\n" .
-                    "        SET parent = 0\n" .
-                    "        WHERE id IN (" . implode(',', array_keys($missingparent)) . ");</pre>\n";
-        }
-
-        if (!empty($loops)) {
-            $solution .= "<pre>UPDATE " . $CFG->prefix . "question_categories\n" .
-                    "        SET parent = 0\n" .
-                    "        WHERE id IN (" . implode(',', array_keys($loops)) . ");</pre>\n";
-        }
-
-        return $solution;
-    }
-}
 
 class problem_00000x extends problem_base {
     function title() {

admin/index.php

@@ -24,15 +24,13 @@
     require_once('../config.php');
     require_once($CFG->libdir.'/adminlib.php');  // Contains various admin-only functions
     require_once($CFG->libdir.'/ddllib.php'); // Install/upgrade related db functions
-    require_once($CFG->libdir.'/db/upgradelib.php');  // Upgrade-related functions
 
-    $id             = optional_param('id', '', PARAM_TEXT);
+    $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);
-    $confirmplugincheck = optional_param('confirmplugincheck', 0, PARAM_BOOL);
 
 /// check upgrade status first
     if ($ignoreupgradewarning and !empty($_SESSION['upgraderunning'])) {
@@ -47,7 +45,7 @@
 
 /// Check some PHP server settings
 
-    $documentationlink = '<a href="http://docs.moodle.org/19/en/Installation">Installation docs</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");
@@ -61,10 +59,6 @@
         error("The PHP server variable 'file_uploads' is not turned On - $documentationlink");
     }
 
-    if (is_float_problem()) {
-        print_error('phpfloatproblem', 'admin', '', $documentationlink);
-    }
-
     if (empty($CFG->prefix) && $CFG->dbfamily != 'mysql') {  //Enforce prefixes for everybody but mysql
         error('$CFG->prefix can\'t be empty for your target DB (' . $CFG->dbtype . ')');
     }
@@ -128,7 +122,6 @@
             }
         }
     }
-    
     if (! $maintables) {
     /// hide errors from headers in case debug enabled in config.php
         $origdebug = $CFG->debug;
@@ -136,23 +129,21 @@
         error_reporting($CFG->debug);
         if (empty($agreelicense)) {
             $strlicense = get_string('license');
-            $navigation = build_navigation(array(array('name'=>$strlicense, 'link'=>null, 'type'=>'misc')));
-            print_header($strlicense, $strlicense, $navigation, "", "", false, "&nbsp;", "&nbsp;");
+            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_box(text_to_html(get_string('gpl')), 'copyrightnotice');
             echo "<br />";
             notice_yesno(get_string('doyouagree'), "index.php?agreelicense=1",
-                                                   "http://docs.moodle.org/dev/License");
+                                                   "http://docs.moodle.org/en/License");
             print_footer('none');
             exit;
         }
         if (empty($confirmrelease)) {
             $strcurrentrelease = get_string("currentrelease");
-            $navigation = build_navigation(array(array('name'=>$strcurrentrelease, 'link'=>null, 'type'=>'misc')));
-            print_header($strcurrentrelease, $strcurrentrelease, $navigation, "", "", false, "&nbsp;", "&nbsp;");
+            print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
             print_heading("Moodle $release");
-            print_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/19/en/Release_Notes'), 'generalbox boxaligncenter boxwidthwide');
+            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" />';
@@ -164,11 +155,9 @@
             die;
         }
 
-
         $strdatabasesetup    = get_string("databasesetup");
         $strdatabasesuccess  = get_string("databasesuccess");
-        $navigation = build_navigation(array(array('name'=>$strdatabasesetup, 'link'=>null, 'type'=>'misc')));
-        print_header($strdatabasesetup, $strdatabasesetup, $navigation,
+        print_header($strdatabasesetup, $strdatabasesetup, $strdatabasesetup,
                         "", upgrade_get_javascript(), false, "&nbsp;", "&nbsp;");
     /// return to original debugging level
         $CFG->debug = $origdebug;
@@ -178,13 +167,13 @@
 
     /// Both old .sql files and new install.xml are supported
     /// But we prioritise install.xml (XMLDB) if present
-
+    
         change_db_encoding(); // first try to change db encoding to utf8
         if (!setup_is_unicodedb()) {
             // If could not convert successfully, throw error, and prevent installation
-            print_error('unicoderequired', 'admin');
+            print_error('unicoderequired', 'admin');  
         }
-
+    
         $status = false;
         if (file_exists("$CFG->libdir/db/install.xml")) {
             $status = install_from_xmldb_file("$CFG->libdir/db/install.xml"); //New method
@@ -200,31 +189,31 @@
     /// Continue with the instalation
         $db->debug = false;
         if ($status) {
-
-            /// Groups install is now in core above.
-
             // Install the roles system.
             moodle_install_roles();
             set_config('statsrolesupgraded',time());
 
-            // install core event handlers
-            events_update_definition();
+            // Write default settings unconditionally (i.e. even if a setting is already set, overwrite it)
+            // (this should only have any effect during initial install).
+            $adminroot = admin_get_root();
+            $adminroot->prune('backups'); // backup settings table not created yet
+            apply_default_settings($adminroot);
 
             /// This is used to handle any settings that must exist in $CFG but which do not exist in
             /// admin_get_root()/$ADMIN as admin_setting objects (there are some exceptions).
-            apply_default_exception_settings(array('auth' => 'email',
+            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));
 
-            // Write default settings unconditionally (i.e. even if a setting is already set, overwrite it)
-            // (this should only have any effect during initial install).
-            admin_apply_default_settings(NULL, true);
-
             notify($strdatabasesuccess, "green");
             require_once $CFG->dirroot.'/mnet/lib.php';
         } else {
@@ -266,85 +255,46 @@
             $CFG->debug = DEBUG_MINIMAL;
             error_reporting($CFG->debug);
 
-            // logo ut in case we are upgrading from pre 1.9 version in order to prevent
-            // weird session/role problems caused by incorrect data in USER and SESSION
-            if ($CFG->version < 2007101500) {
+            // 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)) {
-                $navigation = build_navigation(array(array('name'=>$strdatabasechecking, 'link'=>null, 'type'=>'misc')));
-                print_header($strdatabasechecking, $stradministration, $navigation,
+                print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
                         "", "", false, "&nbsp;", "&nbsp;");
 
                 notice_yesno(get_string('upgradesure', 'admin', $a->newversion), 'index.php?confirmupgrade=1', 'index.php');
-                print_footer('none');
                 exit;
 
             } else if (empty($confirmrelease)){
                 $strcurrentrelease = get_string("currentrelease");
-                $navigation = build_navigation(array(array('name'=>$strcurrentrelease, 'link'=>null, 'type'=>'misc')));
-                print_header($strcurrentrelease, $strcurrentrelease, $navigation, "", "", false, "&nbsp;", "&nbsp;");
+                print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
                 print_heading("Moodle $release");
-                print_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/19/en/Release_Notes'));
+                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'));
-                remove_dir($CFG->dataroot . '/environment'); /// Always delete downloaded env. info to force use of the released one. MDL-9796
                 if (!check_moodle_environment($release, $environment_results, true)) {
-                    if (empty($CFG->skiplangupgrade)) {
-                        print_box_start('generalbox', 'notice'); // MDL-8330
-                        print_string('langpackwillbeupdated', 'admin');
-                        print_box_end();
-                    }
-                    notice_yesno(get_string('environmenterrorupgrade', 'admin'),
-                                 'index.php?confirmupgrade=1&amp;confirmrelease=1', 'index.php');
+                    notice_yesno(get_string('environmenterrorupgrade', 'admin'), 
+                                 'index.php?confirmupgrade=1&confirmrelease=1', 'index.php');
                 } else {
                     notify(get_string('environmentok', 'admin'), 'notifysuccess');
-                    if (empty($CFG->skiplangupgrade)) {
-                        print_box_start('generalbox', 'notice'); // MDL-8330
-                        print_string('langpackwillbeupdated', 'admin');
-                        print_box_end();
-                    }
+
                     echo '<form action="index.php"><div>';
                     echo '<input type="hidden" name="confirmupgrade" value="1" />';
                     echo '<input type="hidden" name="confirmrelease" value="1" />';
                     echo '</div>';
-                    echo '<div class="continuebutton">';
+                    echo '<div class="continuebutton"><input name="autopilot" id="autopilot" type="checkbox" value="0" /><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;
-            } elseif (empty($confirmplugincheck)) { 
-                $strplugincheck = get_string('plugincheck');
-                $navigation = build_navigation(array(array('name'=>$strplugincheck, 'link'=>null, 'type'=>'misc')));
-                print_header($strplugincheck, $strplugincheck, $navigation, "", "", false, "&nbsp;", "&nbsp;");
-                print_heading($strplugincheck);
-                print_box_start('generalbox', 'notice'); // MDL-8330
-                print_string('pluginchecknotice');
-                print_box_end();
-                print_plugin_tables();
-                echo "<br />";
-                echo '<div class="continuebutton">';
-                echo '<a href="index.php?confirmupgrade=1&amp;confirmrelease=1" title="'.get_string('reload').'" ><img src="'.$CFG->pixpath.'/i/reload.gif" alt="" /> '.get_string('reload').'</a>';
-                echo '</div><br />';
-                echo '<form action="index.php"><div>';
-                echo '<input type="hidden" name="confirmupgrade" value="1" />';
-                echo '<input type="hidden" name="confirmrelease" value="1" />';
-                echo '<input type="hidden" name="confirmplugincheck" value="1" />';
-                echo '</div>';
-                echo '<div class="continuebutton"><input name="autopilot" id="autopilot" type="checkbox" value="1" /><label for="autopilot">'.get_string('unattendedoperation', 'admin').'</label>';
-                echo '<br /><br /><input type="submit" value="'.get_string('continue').'" /></div>';
-                echo '</form>';
-                print_footer('none');
-                die();
-    
             } else {
                 $strdatabasesuccess  = get_string("databasesuccess");
-                $navigation = build_navigation(array(array('name'=>$strdatabasesuccess, 'link'=>null, 'type'=>'misc')));
-                print_header($strdatabasechecking, $stradministration, $navigation,
+                print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
                         "", upgrade_get_javascript(), false, "&nbsp;", "&nbsp;");
 
             /// return to original debugging level
@@ -353,9 +303,7 @@
                 upgrade_log_start();
 
             /// Upgrade current language pack if we can
-                if (empty($CFG->skiplangupgrade)) {
-                    upgrade_language_pack();
-                }
+                upgrade_language_pack();   
 
                 print_heading($strdatabasechecking);
                 $db->debug=true;
@@ -372,18 +320,12 @@
             /// If successful, continue upgrading roles and setting everything properly
                 if ($status) {
                     if (empty($CFG->rolesactive)) {
-
-                        /// Groups upgrade is now in core above.
-
                         // Upgrade to the roles system.
                         moodle_install_roles();
                         set_config('rolesactive', 1);
                     } else if (!update_capabilities()) {
                         error('Had trouble upgrading the core capabilities for the Roles System');
                     }
-                    // update core events
-                    events_update_definition();
-
                     require_once($CFG->libdir.'/statslib.php');
                     if (!stats_upgrade_for_roles_wrapper()) {
                         notify('Couldn\'t upgrade the stats tables to use the new roles system');
@@ -400,7 +342,7 @@
             /// Main upgrade not success
                 } else {
                     notify('Main Upgrade failed!  See lib/db/upgrade.php');
-                    print_continue('index.php?confirmupgrade=1&amp;confirmrelease=1&amp;confirmplugincheck=1');
+                    print_continue('index.php?confirmupgrade=1&amp;confirmrelease=1');
                     print_footer('none');
                     die;
                 }
@@ -425,9 +367,6 @@
         }
     }
 
-/// Groups install/upgrade is now in core above.
-
-
 /// Find and check all main modules and load them up or upgrade them if necessary
 /// first old *.php update and then the new upgrade.php script
     upgrade_activity_modules("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
@@ -455,9 +394,6 @@
 /// first old *.php update and then the new upgrade.php script
     upgrade_plugins('enrol', 'enrol', "$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
-/// Check all auth plugins and upgrade if necessary
-    upgrade_plugins('auth','auth',"$CFG->wwwroot/$CFG->admin/index.php");
-
 /// Check all course formats and upgrade if necessary
     upgrade_plugins('format','course/format',"$CFG->wwwroot/$CFG->admin/index.php");
 
@@ -466,24 +402,14 @@
     require_once("$CFG->dirroot/lib/locallib.php");
     upgrade_local_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
+/// Check for new groups and upgrade if necessary. TODO:
+    require_once("$CFG->dirroot/group/db/upgrade.php");
+    upgrade_group_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
+
 /// Check for changes to RPC functions
-    require_once("$CFG->dirroot/$CFG->admin/mnet/adminlib.php");
+    require_once($CFG->dirroot.'/admin/mnet/adminlib.php');
     upgrade_RPC_functions("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
-/// Upgrade all plugins for gradebook
-    upgrade_plugins('gradeexport', 'grade/export', "$CFG->wwwroot/$CFG->admin/index.php");
-    upgrade_plugins('gradeimport', 'grade/import', "$CFG->wwwroot/$CFG->admin/index.php");
-    upgrade_plugins('gradereport', 'grade/report', "$CFG->wwwroot/$CFG->admin/index.php");
-
-/// Check all message output plugins and upgrade if necessary
-    upgrade_plugins('message','message/output',"$CFG->wwwroot/$CFG->admin/index.php");
-
-/// Check all course report plugins and upgrade if necessary
-    upgrade_plugins('coursereport', 'course/report', "$CFG->wwwroot/$CFG->admin/index.php");
-
-/// Check all admin report plugins and upgrade if necessary
-    upgrade_plugins('report', $CFG->admin.'/report', "$CFG->wwwroot/$CFG->admin/index.php");
-
 
 /// just make sure upgrade logging is properly terminated
     upgrade_log_finish();
@@ -495,10 +421,10 @@
         // We are about to create the site "course"
         require_once($CFG->libdir.'/blocklib.php');
 
-        $newsite = new object();
+        $newsite = new Object();
         $newsite->fullname = "";
         $newsite->shortname = "";
-        $newsite->summary = NULL;
+        $newsite->summary = "";
         $newsite->newsitems = 3;
         $newsite->numsections = 0;
         $newsite->category = 0;
@@ -509,27 +435,21 @@
         $newsite->students = get_string("defaultcoursestudents");
         $newsite->timemodified = time();
 
-        if (!$newid = insert_record('course', $newsite)) {
+        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!");
         }
-        // make sure course context exists
-        get_context_instance(CONTEXT_COURSE, $newid);
-
-        // Site created, add blocks for it
-        $page = page_create_object(PAGE_COURSE_VIEW, $newid);
-        blocks_repopulate_page($page); // Return value not checked because you can always edit later
-
-        $cat = new object();
-        $cat->name = get_string('miscellaneous');
-        $cat->depth = 1;
-        if (!$catid = insert_record('course_categories', $cat)) {
-            error("Serious Error! Could not set up a default course category!");
-        }
-        // make sure category context exists
-        get_context_instance(CONTEXT_COURSECAT, $catid);
-        mark_context_dirty('/'.SYSCONTEXTID);
-
-        redirect('index.php');
     }
 
     // initialise default blocks on admin and site page if needed
@@ -543,23 +463,35 @@
         //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);
-            $pageblocks=blocks_get_by_page($page);
-            blocks_execute_action($page, $pageblocks, 'add', (int)$admintree->id, false, false);
+            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)) {
-                $pageblocks=blocks_get_by_page($page); // Needs to be re-got, since has just changed
-                blocks_execute_action($page, $pageblocks, 'moveleft', $admintreeinstance, false, false);
+                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 set. This getter does that as a side-effect.
-    get_site_identifier();
+/// Define the unique site ID code if it isn't already
+    if (empty($CFG->siteidentifier)) {    // Unique site identification code
+        set_config('siteidentifier', random_string(32).$_SERVER['HTTP_HOST']);
+    }
 
 /// Check if the guest user exists.  If not, create one.
     if (! record_exists("user", "username", "guest")) {
-        if (! $guest = create_guest_record()) {
+        $guest->auth        = "manual";
+        $guest->username    = "guest";
+        $guest->password    = md5("guest");
+        $guest->firstname   = addslashes(get_string("guestuser"));
+        $guest->lastname    = " ";
+        $guest->email       = "root@localhost";
+        $guest->description = addslashes(get_string("guestuserinfo"));
+        $guest->mnethostid  = $CFG->mnet_localhost_id;
+        $guest->confirmed   = 1;
+        $guest->lang        = $CFG->lang;
+        $guest->timemodified= time();
+
+        if (! $guest->id = insert_record("user", $guest)) {
             notify("Could not create guest user record !!!");
         }
     }
@@ -567,23 +499,19 @@
 
 /// Set up the admin user
     if (empty($CFG->rolesactive)) {
-        build_context_path(); // just in case - should not be needed
         create_admin_user();
     }
 
-/// Check for valid admin user - no guest autologin
-    require_login(0, false);
+/// Check for valid admin user
+    require_login();
 
-    $context = get_context_instance(CONTEXT_SYSTEM);
+    $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
 
     require_capability('moodle/site:config', $context);
 
 /// check that site is properly customized
-    if (empty($site->shortname)) {
-        // probably new installation - lets return to frontpage after this step
-        // remove settings that we want uninitialised
-        unset_config('registerauth');
-        redirect('upgradesettings.php?return=site');
+    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
@@ -594,25 +522,13 @@
         }
     }
 
-/// setup critical warnings before printing admin tree block
-    $insecuredataroot         = is_dataroot_insecure(true);
-    $register_globals_enabled = ini_get_bool('register_globals'); 
-
-    $SESSION->admin_critical_warning = ($register_globals_enabled || $insecuredataroot==INSECURE_DATAROOT_ERROR); 
-
-    $adminroot =& admin_get_root();
-
-/// Check if there are any new admin settings which have still yet to be set
-    if (any_new_admin_settings($adminroot)){
-        redirect('upgradesettings.php');
-    }
-
 /// Everything should now be set up, and the user is an admin
 
 /// Print default admin page with notifications.
 
-    admin_externalpage_setup('adminnotifications');
-    admin_externalpage_print_header();
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('adminnotifications', $adminroot);
+    admin_externalpage_print_header($adminroot);
 
 /// Deprecated database! Warning!!
     if (!empty($CFG->migrated_to_new_db)) {
@@ -624,31 +540,12 @@
         print_box(get_string("upgrade$CFG->upgrade", "admin", "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"));
     }
 
-    if ($register_globals_enabled) {
-        print_box(get_string('globalswarning', 'admin'), 'generalbox adminerror');
+    if (ini_get_bool('register_globals') && !ini_get_bool('magic_quotes_gpc')) {
+        print_box(get_string('globalsquoteswarning', 'admin'), 'generalbox adminwarning');
     }
 
-    if ($insecuredataroot == INSECURE_DATAROOT_WARNING) {
+    if (is_dataroot_insecure()) {
         print_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'generalbox adminwarning');
-    } else if ($insecuredataroot == INSECURE_DATAROOT_ERROR) {
-        print_box(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'generalbox adminerror');
-        
-    }
-
-    if (empty($CFG->passwordsaltmain)) {
-        $path = $CFG->docroot.'/'.str_replace('_utf8', '', current_language()).'/report/security/report_security_check_passwordsaltmain';
-        print_box(get_string('upgrade197notice', 'admin')."\n".get_string('upgrade197salt', 'admin', $path));
-    }
-
-    if (defined('WARN_DISPLAY_ERRORS_ENABLED')) {
-        print_box(get_string('displayerrorswarning', 'admin'), 'generalbox adminwarning');
-    }
-
-    if (substr($CFG->wwwroot, -1) == '/') {
-        print_box(get_string('cfgwwwrootslashwarning', 'admin'), 'generalbox adminwarning');
-    }
-    if (strpos($ME, $CFG->httpswwwroot.'/') === false) {
-        print_box(get_string('cfgwwwrootwarning', 'admin'), 'generalbox adminwarning');
     }
 
 /// If no recently cron run
@@ -670,30 +567,46 @@
     }
 
 
-/// Print slightly annoying registration button
-    $options = array();
-    $options['sesskey'] = $USER->sesskey;
-    print_box_start('generalbox adminwarning');
-    if(!isset($CFG->registered)) {
-       print_string('pleaseregister', 'admin');
+/// Print slightly annoying registration button every six months   ;-)
+/// You can set the "registered" variable to something far in the future
+/// if you really want to prevent this.   eg  9999999999
+    if (!isset($CFG->registered) || $CFG->registered < (time() - 3600*24*30*6)) {
+        $options = array();
+        $options['sesskey'] = $USER->sesskey;
+        print_box_start('generalbox adminwarning');
+        print_string('pleaseregister', 'admin');
+        print_single_button('register.php', $options, get_string('registration'));
+        print_box_end();
+        $registrationbuttonshown = true;
     }
-    else { /* if (isset($CFG->registered) && $CFG->registered < (time() - 3600*24*30*6)) { */
-       print_string('pleaserefreshregistration', 'admin', userdate($CFG->registered));
-    }
-    print_single_button('register.php', $options, get_string('registration'));
-    print_box_end();
-
 
     //////////////////////////////////////////////////////////////////////////////////////////////////
     ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
     $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
-                     '<a href="http://docs.moodle.org/dev/Releases" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
+                     '<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/dev/Credits">many other contributors</a>.<br />'.
-                     '<a href="http://docs.moodle.org/dev/License">GNU Public License</a>';
+                     'and <a href="http://docs.moodle.org/en/Credits">many other contributors</a>.<br />'.
+                     '<a href="http://docs.moodle.org/en/License">GNU Public License</a>';
     print_box($copyrighttext, 'copyright');
     //////////////////////////////////////////////////////////////////////////////////////////////////
 
-    admin_externalpage_print_footer();
+
+    if (empty($registrationbuttonshown)) {
+        $options = array();
+        $options['sesskey'] = $USER->sesskey;
+        print_single_button('register.php', $options, get_string('registration'));
+    }
+
+
+    if (optional_param('dbmigrate')) {               // ??? Is this actually used?
+        print_box_start();
+        require_once($CFG->dirroot.'/'.$CFG->admin.'/utfdbmigrate.php');
+        db_migrate2utf8();
+        print_box_end();
+    }
+
+
+    admin_externalpage_print_footer($adminroot);
+
 
 ?>

admin/innodb.php

@@ -2,16 +2,16 @@
 
    require_once('../config.php');
    require_once($CFG->libdir.'/adminlib.php');
-
-   admin_externalpage_setup('toinodb');
+   $adminroot = admin_get_root();
+   admin_externalpage_setup('toinodb', $adminroot);
 
    $confirm = optional_param('confirm', 0, PARAM_BOOL);
 
    require_login();
 
-   require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+   require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
-   admin_externalpage_print_header();
+   admin_externalpage_print_header($adminroot);
    print_heading('Convert all MySQL tables from MYISAM to InnoDB');
 
    if ($CFG->dbfamily != 'mysql') {
@@ -31,13 +31,13 @@
        }
        notify('... done.', 'notifysuccess');
        print_continue('index.php');
-       admin_externalpage_print_footer();
+       admin_externalpage_print_footer($adminroot);
 
    } else {
        $optionsyes = array('confirm'=>'1', 'sesskey'=>sesskey());
        notice_yesno('Are you sure you want convert all your tables to the InnoDB format?',
                     'innodb.php', 'index.php', $optionsyes, NULL, 'post', 'get');
-       admin_externalpage_print_footer();
+       admin_externalpage_print_footer($adminroot);
    }
 
 ?>

admin/langdoc.php

@@ -11,7 +11,8 @@
  */
     require_once('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
-    admin_externalpage_setup('langedit');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('langedit', $adminroot);
 
     //
     // Some local configuration
@@ -31,10 +32,7 @@
     $strthislanguage = get_string("thislanguage");
     $stredithelpdocs = get_string('edithelpdocs', 'admin');
 
-    admin_externalpage_print_header();
-
-    notify('NOTICE: This interface is obsolete now and will be removed. You should use 
-        improved <a href="lang.php?mode=helpfiles">lang.php</a> interface.');
+    admin_externalpage_print_header($adminroot);
 
     $currentlang = current_language();
     $langdir = "$CFG->dataroot/lang/$currentlang";
@@ -42,7 +40,7 @@
 
 
     if (!file_exists($langdir)) {
-        error ('to edit this language pack, you need to put it in '.$CFG->dataroot.'/lang');
+        error ('to edit this language pack, you need to put it in '.$CFG->dataroot.'/lang','',$adminroot);
     }
     // Shall I save POSTed data?
 
@@ -51,7 +49,7 @@
             if (langdoc_save_file($langdir, $currentfile, $_POST['filedata'])) {
                 notify(get_string("changessaved")." ($langdir/$currentfile)", "green");
             } else {
-                error("Could not save the file '$currentfile'!", "langdoc.php?currentfile=$currentfile&sesskey=$USER->sesskey");
+                error("Could not save the file '$currentfile'!", "langdoc.php?currentfile=$currentfile&sesskey=$USER->sesskey", $adminroot);
             }
         }
     }
@@ -63,7 +61,7 @@
     // Get all files from /docs directory
 
     if (! $files = get_directory_list("$CFG->dirroot/lang/en_utf8/docs", "CVS")) {
-        error("Could not find English language docs files!");
+        error("Could not find English language docs files!",'',$adminroot);
     }
 
     $options = array();
@@ -83,7 +81,7 @@
     // Get all files from /help directory
 
     if (! $files = get_directory_list("$CFG->dirroot/lang/en_utf8/help", "CVS")) {
-        error("Could not find English language help files!");
+        error("Could not find English language help files!",'',$adminroot);
     }
 
     foreach ($files as $filekey => $file) {    // check all the help files.
@@ -112,7 +110,7 @@
             for ($a=0; $a < count($pathparts)-1 ; $a++) {
                 $checkpath .= "/".$pathparts[$a];
                 if(!file_exists($checkpath)){
-                     if(!mkdir($checkpath, $CFG->directorypermissions)){
+                     if(!mkdir($checkpath)){
                          echo ("Cannot create directory: $checkpath");
                      }    
                 }    
@@ -186,7 +184,7 @@ $langdir/$currentfile")."</font></p>";
             if ($preview_url) {
                 link_to_popup_window($preview_url, 'popup', get_string('preview'));
             }
-            echo '<div class="mdl-align"><input type="submit" value="'.get_string('savechanges').': lang/'.$currentlang.'/'.$currentfile.'" /></div>';
+            echo '<div align="center"><input type="submit" value="'.get_string('savechanges').': lang/'.$currentlang.'/'.$currentfile.'" /></div>';
             echo '</form>';
         }
 
@@ -196,7 +194,7 @@ $langdir/$currentfile")."</font></p>";
         error_reporting($CFG->debug);
     }
 
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 //////////////////////////////////////////////////////////////////////
 
@@ -246,7 +244,7 @@ function langdoc_preview_url($currentfile) {
         $currentfile = substr($currentfile, 5);
         $currentpathexp = explode('/', $currentfile);
         if (count($currentpathexp) > 1) {
-            $url = '/help.php?module='.implode('/',array_slice($currentpathexp,0,count($currentpathexp)-1)).'&amp;file='.end($currentpathexp); 
+            $url = '/help.php?module='.$currentpathexp[0].'&amp;file='.$currentpathexp[1];
         } else {
             $url = '/help.php?module=moodle&amp;file='.$currentfile;
         }

admin/langimport.php

@@ -6,105 +6,93 @@
 
     require_once('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
-    require_once($CFG->libdir.'/filelib.php');
-    require_once($CFG->libdir.'/componentlib.class.php');
-
-    admin_externalpage_setup('langimport');
-
-    if (!empty($CFG->skiplangupgrade)) {
-        admin_externalpage_print_header();
-        print_box(get_string('langimportdisabled', 'admin'));
-        print_footer();
-        die;
-    }
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('langimport', $adminroot);
 
     $mode          = optional_param('mode', 0, PARAM_INT);     //phase
-    $pack          = optional_param('pack', array(), PARAM_FILE);   //pack to install
+    $pack          = optional_param('pack', '', PARAM_FILE);   //pack to install
     $displaylang   = $pack;
     $uninstalllang = optional_param('uninstalllang', '', PARAM_FILE);
     $confirm       = optional_param('confirm', 0, PARAM_BOOL);
     $sitelang      = optional_param('sitelangconfig', '', PARAM_FILE);
 
     define('INSTALLATION_OF_SELECTED_LANG', 2);
+    define('CHANGE_SITE_LANG', 3);
     define('DELETION_OF_SELECTED_LANG', 4);
     define('UPDATE_ALL_LANG', 5);
 
-    $strlang         = get_string('langimport','admin');
-    $strlanguage     = get_string('language');
-    $strthislanguage = get_string('thislanguage');
-    $title           = $strlang;
+    $strlang = get_string('langimport','admin');
 
-    //reset and diagnose lang cache permissions
-    @unlink($CFG->dataroot.'/cache/languages');
-    if (file_exists($CFG->dataroot.'/cache/languages')) {
-        error('Language cache can not be deleted, please fix permissions in dataroot/cache/languages!');
-    }
-    get_list_of_languages(true); //refresh lang cache
+    $strlanguage = get_string("language");
+    $strthislanguage = get_string("thislanguage");
+    $title = $strlang;
+
+    admin_externalpage_print_header($adminroot);
 
-    $notice_ok     = array();
-    $notice_error = array();
 
     switch ($mode){
 
         case INSTALLATION_OF_SELECTED_LANG:    ///installation of selected language pack
 
-            if (confirm_sesskey() and !empty($pack)) {
-                set_time_limit(0);
-                @mkdir ($CFG->dataroot.'/temp/', $CFG->directorypermissions);    //make it in case it's a fresh install, it might not be there
-                @mkdir ($CFG->dataroot.'/lang/', $CFG->directorypermissions);
+            if (confirm_sesskey()) {
+                @mkdir ($CFG->dataroot.'/temp/');    //make it in case it's a fresh install, it might not be there
+                @mkdir ($CFG->dataroot.'/lang/');
 
-                if (is_array($pack)) {
-                    $packs = $pack;
-                } else {
-                    $packs = array($pack);
-                }
+                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) {
 
-                foreach ($packs as $pack) {
-                    if ($cd = new component_installer('http://download.moodle.org', 'lang16',
-                                                        $pack.'.zip', 'languages.md5', 'lang')) {
-                        $status = $cd->install(); //returns COMPONENT_(ERROR | UPTODATE | INSTALLED)
-                        switch ($status) {
+                        case ERROR: 
+                            if ($cd->get_error() == 'remotedownloadnotallowed') {
+                                $a = new stdClass();
+                                $a->url = 'http://download.moodle.org/lang16/'.$pack.'.zip';
+                                $a->dest= $CFG->dataroot.'/lang';
+                                error(get_string($cd->get_error(), 'error', $a));
+                            } else {
+                                error(get_string($cd->get_error(), 'error'));
+                            }
+                        break;
 
-                            case COMPONENT_ERROR:
-                                if ($cd->get_error() == 'remotedownloaderror') {
-                                    $a = new object();
-                                    $a->url = 'http://download.moodle.org/lang16/'.$pack.'.zip';
-                                    $a->dest= $CFG->dataroot.'/lang';
-                                    print_error($cd->get_error(), 'error', 'langimport.php', $a);
-                                } else {
-                                    print_error($cd->get_error(), 'error', 'langimport.php');
-                                }
-                            break;
+                        case INSTALLED:
+                            @unlink($CFG->dataroot.'/cache/languages');
+                            redirect('langimport.php', get_string('langpackupdated','admin',$pack), -1, $adminroot);
+                        break;
 
-                            case COMPONENT_INSTALLED:
-                                $notice_ok[] = get_string('langpackinstalled','admin',$pack);
-                            break;
+                        case UPTODATE:
+                        break;
 
-                            case COMPONENT_UPTODATE:
-                            break;
-
-                        }
-                    } else {
-                        notify('Had an unspecified error with the component installer, sorry.');
                     }
+                } else {
+                    notify('Had an unspecified error with the component installer, sorry.');
                 }
             }
         break;
 
+        case CHANGE_SITE_LANG:    //change site language
+
+            if (confirm_sesskey()) {
+                $langconfig = get_record('config','name','lang');
+                $langconfig->value = $sitelang;
+                if (!empty($sitelang) && update_record('config',$langconfig)){
+                    redirect('langimport.php', get_string('sitelangchanged','admin'));
+                } else {
+                    error('Could not update the default site language!');
+                }
+            }
+
+        break;
         case DELETION_OF_SELECTED_LANG:    //delete a directory(ies) containing a lang pack completely
 
-            if ($uninstalllang == 'en_utf8') {
-                $notice_error[] = 'en_utf8 can not be uninstalled!';
-
-            } else if (!$confirm && confirm_sesskey()) {
-                admin_externalpage_print_header();
+            if (!$confirm && confirm_sesskey()) {
                 notice_yesno(get_string('uninstallconfirm', 'admin', $uninstalllang),
-                             'langimport.php?mode='.DELETION_OF_SELECTED_LANG.'&uninstalllang='.$uninstalllang.'&confirm=1&sesskey='.sesskey(),
+                             'langimport.php?mode=4&uninstalllang='.$uninstalllang.'&confirm=1&sesskey='.sesskey(),
                              'langimport.php');
-                print_footer();
-                die;
-
             } else if (confirm_sesskey()) {
+                if ($uninstalllang == 'en_utf8') {
+                    error ('en_utf8 can not be uninstalled!');
+                }
                 $dest1 = $CFG->dataroot.'/lang/'.$uninstalllang;
                 $dest2 = $CFG->dirroot.'/lang/'.$uninstalllang;
                 $rm1 = false;
@@ -115,30 +103,31 @@
                 if (file_exists($dest2)){
                     $rm2 = remove_dir($dest2);
                 }
-                get_list_of_languages(true); //refresh lang cache
                 //delete the direcotries
                 if ($rm1 or $rm2) {
-                    $notice_ok[] = get_string('langpackremoved','admin');
+                    redirect('langimport.php', get_string('langpackremoved','admin'));
                 } else {    //nothing deleted, possibly due to permission error
-                    $notice_error[] = 'An error has occurred, language pack is not completely uninstalled, please check file permissions';
+                    error('An error has occurred, language pack is not completely uninstalled, please check file permissions');
                 }
             }
+            @unlink($CFG->dataroot.'/cache/languages');
         break;
 
         case UPDATE_ALL_LANG:    //1 click update for all updatable language packs
-            set_time_limit(0);
 
             //0th pull a list from download.moodle.org,
             //key = langname, value = md5
+            $source = 'http://download.moodle.org/lang16/languages.md5';
             $md5array = array();
             $updated = 0;    //any packs updated?
-            $alllangs = array_keys(get_list_of_languages(false, true)); //get all available langs
+            unset($CFG->langlist);   // ignore admin's langlist
+            $alllangs = array_keys(get_list_of_languages());
             $lang16 = array();   //all the Moodle 1.6 unicode lang packs (updated and not updated)
             $packs = array();    //all the packs that needs updating
 
 
-            if (!$availablelangs = get_remote_list_of_languages()) {
-                print_error('cannotdownloadlanguageupdatelist');
+            if (!$availablelangs = proxy_url($source)) {
+                error ('can not read from course');
             }
 
             //and build an associative array
@@ -146,12 +135,8 @@
                 $md5array[$alang[0]] = $alang[1];
             }
 
-            //filtering out non-16 and unofficial packs
+            //filtering out non-16 packs
             foreach ($alllangs as $clang) {
-                if (!array_key_exists($clang, $md5array)) {
-                    $notice_ok[] = get_string('langpackupdateskipped', 'admin', $clang);
-                    continue;
-                }
                 $dest1 = $CFG->dataroot.'/lang/'.$clang;
                 $dest2 = $CFG->dirroot.'/lang/'.$clang;
 
@@ -167,13 +152,12 @@
                 }
             }
 
-            @mkdir ($CFG->dataroot.'/temp/', $CFG->directorypermissions);
-            @mkdir ($CFG->dataroot.'/lang/', $CFG->directorypermissions);
+            @mkdir ($CFG->dataroot.'/temp/');
+            @mkdir ($CFG->dataroot.'/lang/');
             foreach ($packs as $pack){    //for each of the remaining in the list, we
                 if ($pack == 'en_utf8') {    // no update for en_utf8
                     continue;
                 }
-
                 //1. delete old director(ies)
 
                 $dest1 = $CFG->dataroot.'/lang/'.$pack;
@@ -181,40 +165,38 @@
                 $rm1 = false;
                 $rm2 = false;
                 if (file_exists($dest1)) {
-                    if (!remove_dir($dest1)) {
-                        $notice_error[] = 'Could not delete old directory '.$dest1.', update of '.$pack.' failed, please check permissions.';
-                        continue;
-                    }
+                    $rm1 = remove_dir($dest1);
                 }
                 if (file_exists($dest2)) {
-                    if (!remove_dir($dest2)) {
-                        $notice_error[] = 'Could not delete old directory '.$dest2.', update of '.$pack.' failed, please check permissions.';
-                        continue;
-                    }
+                    $rm2 = remove_dir($dest2);
+                }
+                if (!($rm1 || $rm2)) {
+                    error ('could not delete old directory, update failed');
                 }
 
                 //2. copy & unzip into new
 
+                require_once($CFG->libdir.'/componentlib.class.php');
                 if ($cd = new component_installer('http://download.moodle.org', 'lang16',
                                        $pack.'.zip', 'languages.md5', 'lang')) {
-                $status = $cd->install(); //returns COMPONENT_(ERROR | UPTODATE | INSTALLED)
+                $status = $cd->install(); //returns ERROR | UPTODATE | INSTALLED
                 switch ($status) {
 
-                    case COMPONENT_ERROR:
-                        if ($cd->get_error() == 'remotedownloaderror') {
+                    case ERROR:
+                        if ($cd->get_error() == 'remotedownloadnotallowed') {
                             $a = new stdClass();
                             $a->url = 'http://download.moodle.org/lang16/'.$pack.'.zip';
                             $a->dest= $CFG->dataroot.'/lang';
-                            print_error($cd->get_error(), 'error', "", $a); // not probable
+                            error(get_string($cd->get_error(), 'error', $a));
                         } else {
-                            print_error($cd->get_error(), 'error'); // not probable
+                            error(get_string($cd->get_error(), 'error'));
                         }
                     break;
-                    case COMPONENT_UPTODATE:
+                    case UPTODATE:
                         //Print error string or whatever you want to do
                     break;
-                    case COMPONENT_INSTALLED:
-                        $notice_ok[] = get_string('langpackupdated', 'admin', $pack);
+                    case INSTALLED:
+                        notify(get_string('langpackupdated','admin',$pack), 'notifysuccess');
                         $updated = true;
                         //Print/do whatever you want
                     break;
@@ -226,178 +208,132 @@
             }
 
             if ($updated) {
-                $notice_ok[] = get_string('langupdatecomplete','admin');
+                notice(get_string('langupdatecomplete','admin'), 'langimport.php', NULL, $adminroot);
             } else {
-                $notice_ok[] = get_string('nolangupdateneeded','admin');
+                notice(get_string('nolangupdateneeded','admin'), 'langimport.php', NULL, $adminroot);
             }
 
         break;
+
+        default:    //display choice mode
+
+            $source = 'http://download.moodle.org/lang16/languages.md5';
+            $remote = 0;    //flag for reading from remote or local
+
+            if ($availablelangs = proxy_url($source)) {
+                $remote = 1;
+            } else {
+                $availablelangs = get_local_list_of_languages();
+            }
+/*
+            if ($fp = fopen($source, 'r')){    /// attempt to get the list from Moodle.org.
+                while(!feof ($fp)) {
+                    $availablelangs[] = split(',', fgets($fp,1024));
+                }
+                $remote = 1;    //can read from download.moodle.org
+            } else {    /// fopen failed, we find local copy of list.
+                $availablelangs = get_local_list_of_languages();
+            }
+*/
+            if (!$remote) {
+                print_box_start();
+                print_string('remotelangnotavailable','admin',$CFG->dataroot.'/lang/');
+                print_box_end();
+            }
+
+            print_box_start();
+            echo '<table summary="">';
+            echo '<tr><td align="center" valign="top">';
+            echo '<form id="uninstallform" action="langimport.php?mode=4" method="post">';
+            echo '<fieldset class="invisiblefieldset">';
+            echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
+            unset($CFG->langlist);   // ignore admin's langlist
+            $installedlangs = get_list_of_languages();
+
+            /// display installed langs here
+
+            echo '<label for="uninstalllang">'.get_string('installedlangs','admin')."</label><br />\n";
+            echo '<select name="uninstalllang" id="uninstalllang" size="15">';
+            foreach ($installedlangs as $clang =>$ilang){
+                echo '<option value="'.$clang.'">'.$ilang.'</option>';
+            }
+            echo '</select>';
+            echo '<br /><input type="submit" value="'.get_string('uninstall','admin').'" />';
+            echo '</fieldset>';
+            echo '</form>';
+            echo '<form id="updateform" action="langimport.php?mode=5" method="post">';
+            echo '<div>';
+            echo '<br /><input type="submit" value="'.get_string('updatelangs','admin').'" />';
+            echo '</div>';
+            echo '</form>';
+
+            /// Display option to change site language
+
+            /// display to be installed langs here
+
+            echo '</td><td align="center" valign="top">';
+            //availabe langs table
+            $empty = 1;    //something to pring
+
+            /// if this language pack is not already installed, then we allow installation
+
+            echo '<form id="installform" method="post" action="langimport.php?mode=2">';
+            echo '<fieldset class="invisiblefieldset">';
+            echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
+            echo '<label for="pack">'.get_string('availablelangs','admin')."</label><br />\n";
+            if ($remote) {
+                echo '<select name="pack" id="pack" size="15">';
+            }
+
+            foreach ($availablelangs as $alang) {
+                if (trim($alang[0]) != "en_utf8") {
+                    if ($remote){
+                        if (substr($alang[0], -5) == '_utf8') {   //Remove the _utf8 suffix from the lang to show
+                            $shortlang = substr($alang[0], 0, -5);
+                        } else {
+                            $shortlang = $alang[0];
+                        }
+                        if (!is_installed_lang($alang[0], $alang[1])){    //if not already installed
+                            echo '<option value="'.$alang[0].'">'.$alang[2].' ('.$shortlang.')</option>';
+                        }
+                    } else {    //print list in local format, and instruction to install
+                        echo '<tr><td>'.$alang[2].'</td><td><a href="http://download.moodle.org/lang16/'.$alang[0].'.zip">'.get_string('download','admin').'</a></td></tr>';
+                    }
+                    $empty = 0;
+                }
+            }
+            if ($remote) {
+                echo '</select>';
+                echo '<br /><input type="submit" value="&larr; '.get_string('install','admin').'" />';
+            }
+            echo '</fieldset>';
+            echo '</form>';
+
+            if ($empty) {
+                echo '<br />';
+                print_string('nolanguagetodownload','admin');
+            }
+
+            //close available langs table
+            echo '</td></tr></table>';
+            print_simple_box_end();
+
+        break;
+
     }    //close of main switch
 
+    admin_externalpage_print_footer($adminroot);
 
-    admin_externalpage_print_header();
-
-    $installedlangs = get_list_of_languages(true, true);
-
-    $missingparents = array();
-    $oldlang = isset($SESSION->lang) ? $SESSION->lang : null; // override current lang
-
-    foreach($installedlangs as $l=>$unused) {
-        $SESSION->lang = $l;
-        $parent = get_string('parentlanguage');
-        if ($parent == 'en_utf8') {
-            continue;
-        }
-        if (empty($parent) || strpos($parent, '[[') !== false) {
-            continue; // no parent
-        }
-        if (!isset($installedlangs[$parent])) {
-            $missingparents[$l] = $parent;
-        }
-    }
-    if (isset($oldlang)) {
-        $SESSION->lang = $oldlang;
-    } else {
-        unset($SESSION->lang);
-    }
-
-    if ($availablelangs = get_remote_list_of_languages()) {
-        $remote = 1;
-    } else {
-        $remote = 0;    //flag for reading from remote or local
-        $availablelangs = get_local_list_of_languages();
-    }
-
-    if (!$remote) {
-        print_box_start();
-        print_string('remotelangnotavailable', 'admin', $CFG->dataroot.'/lang/');
-        print_box_end();
-    }
-
-    if ($notice_ok) {
-        $info = implode('<br />', $notice_ok);
-        notify($info, 'notifysuccess');
-    }
-
-    if ($notice_error) {
-        $info = implode('<br />', $notice_error);
-        notify($info, 'notifyproblem');
-    }
-
-    if ($missingparents) {
-        foreach ($missingparents as $l=>$parent) {
-            $a = new object();
-            $a->lang   = $installedlangs[$l];
-            $a->parent = $parent;
-            foreach ($availablelangs as $alang) {
-                if ($alang[0] == $parent) {
-                    if (substr($alang[0], -5) == '_utf8') {   //Remove the _utf8 suffix from the lang to show
-                        $shortlang = substr($alang[0], 0, -5);
-                    } else {
-                        $shortlang = $alang[0];
-                    }
-                    $a->parent = $alang[2].' ('.$shortlang.')';
-                }
-            }
-            $info = get_string('missinglangparent', 'admin', $a);
-            notify($info, 'notifyproblem');
-        }
-    }
-
-    print_box_start();
-    echo '<table summary="">';
-    echo '<tr><td align="center" valign="top">';
-    echo '<form id="uninstallform" action="langimport.php?mode='.DELETION_OF_SELECTED_LANG.'" method="post">';
-    echo '<fieldset class="invisiblefieldset">';
-    echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
-
-    /// display installed langs here
-
-    echo '<label for="uninstalllang">'.get_string('installedlangs','admin')."</label><br />\n";
-    echo '<select name="uninstalllang" id="uninstalllang" size="15">';
-    foreach ($installedlangs as $clang =>$ilang){
-        echo '<option value="'.$clang.'">'.$ilang.'</option>';
-    }
-    echo '</select>';
-    echo '<br /><input type="submit" value="'.get_string('uninstall','admin').'" />';
-    echo '</fieldset>';
-    echo '</form>';
-
-    if ($remote) {
-        echo '<form id="updateform" action="langimport.php?mode='.UPDATE_ALL_LANG.'" method="post">';
-        echo '<div>';
-        echo '<br /><input type="submit" value="'.get_string('updatelangs','admin').'" />';
-        echo '</div>';
-        echo '</form>';
-    }
-
-    /// Display option to change site language
-
-    /// display to be installed langs here
-
-    echo '</td><td align="center" valign="top">';
-    //availabe langs table
-    $empty = 1;    //something to pring
-
-    /// if this language pack is not already installed, then we allow installation
-
-    echo '<form id="installform" method="post" action="langimport.php?mode='.INSTALLATION_OF_SELECTED_LANG.'">';
-    echo '<fieldset class="invisiblefieldset">';
-    echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
-    echo '<label for="pack">'.get_string('availablelangs','admin')."</label><br />\n";
-    if ($remote) {
-        echo '<select name="pack[]" id="pack" size="15" multiple="multiple">';
-    }
-
-    foreach ($availablelangs as $alang) {
-        if ($alang[0] == '') {
-            continue;
-        }
-        if (trim($alang[0]) != "en_utf8") {
-            if ($remote) {
-                if (substr($alang[0], -5) == '_utf8') {   //Remove the _utf8 suffix from the lang to show
-                    $shortlang = substr($alang[0], 0, -5);
-                } else {
-                    $shortlang = $alang[0];
-                }
-                if (!is_installed_lang($alang[0], $alang[1])){    //if not already installed
-                    echo '<option value="'.$alang[0].'">'.$alang[2].' ('.$shortlang.')</option>';
-                }
-            } else {    //print list in local format, and instruction to install
-                echo '<tr><td>'.$alang[2].'</td><td><a href="http://download.moodle.org/lang16/'.$alang[0].'.zip">'.get_string('download','admin').'</a></td></tr>';
-            }
-            $empty = 0;
-        }
-    }
-    if ($remote) {
-        echo '</select>';
-        echo '<br /><input type="submit" value="'.$THEME->larrow.' '.get_string('install','admin').'" />';
-    }
-    echo '</fieldset>';
-    echo '</form>';
-
-    if ($empty) {
-        echo '<br />';
-        print_string('nolanguagetodownload','admin');
-    }
-
-    //close available langs table
-    echo '</td></tr></table>';
-    print_box_end();
-
-    admin_externalpage_print_footer();
-
-    /**
-     * Returns a list of available language packs from a
+    /* returns a list of available language packs from a
      * local copy shipped with standard moodle distro
-     * this is for site that can't download components.
+     * this is for site that can't perform fopen
      * @return array
      */
     function get_local_list_of_languages() {
         global $CFG;
-        $source = $CFG->dirroot.'/lib/languages.md5';
+        $source = $CFG->wwwroot.'/lib/languages.md5';
         $availablelangs = array();
-        if ($fp = fopen($source, 'r')) {
+        if ($fp = fopen($source, 'r')){
             while(!feof ($fp)) {
                 $availablelangs[] = split(',', fgets($fp,1024));
             }
@@ -405,8 +341,7 @@
         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
@@ -421,26 +356,40 @@
         return false;
     }
 
-    /**
-     * Returns the latest list of available language packs from
-     * moodle.org
-     * @return array or false if can not download
-     */
-    function get_remote_list_of_languages() {
-        $source = 'http://download.moodle.org/lang16/languages.md5';
-        $availablelangs = array();
+    //returns an array of languages, or false if can not read from source
+    //uses a socket if proxy is set as a config variable
+    function proxy_url($url) {
+        global $CFG;
 
-        if ($content = download_file_content($source)) {
-            $alllines = split("\n", $content);
-            foreach($alllines as $line) {
-                if (!empty($line)){
-                    $availablelangs[] = split(',', $line);
+        if ($CFG->proxyhost && $CFG->proxyport) {
+
+            $proxy_fp = fsockopen($CFG->proxyhost, $CFG->proxyport);
+            if (!$proxy_fp) {
+                return false;    //failed
+            }
+            fputs($proxy_fp, "GET $url HTTP/1.0\r\nHost: $CFG->proxyhost\r\n\r\n");
+
+            $headers_done = false;
+            while(!feof($proxy_fp)) {
+                $string = fgets($proxy_fp, 1024);
+                if(!$headers_done){
+                    // A new line indicates end of HTTP headers
+                    $headers_done = ("\r\n" == $string);
+                } else {
+                    $availablelangs[] = split(',', $string);
                 }
             }
-            return $availablelangs;
+            fclose($proxy_fp);
 
-        } else {
-            return false;
+        } else {    //proxy not in use
+            if ($fp = fopen($url, 'r')){    /// attempt to get the list from Moodle.org.
+                while(!feof ($fp)) {
+                    $availablelangs[] = split(',', fgets($fp,1024));
+                }
+            } else {    /// fopen failed, return false.
+                return false;
+            }
         }
+        return $availablelangs;
     }
 ?>

admin/mailout-debugger.php

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

admin/maintenance.php

@@ -6,7 +6,8 @@
 
     $action = optional_param('action', '', PARAM_ALPHA);
 
-    admin_externalpage_setup('maintenancemode');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('maintenancemode', $adminroot);
 
     //Check folder exists
     if (! make_upload_directory(SITEID)) {   // Site folder
@@ -31,38 +32,31 @@
 
 /// Print the header stuff
 
-    admin_externalpage_print_header();
-
-    print_heading(get_string('sitemaintenancemode', 'admin'));
-
-    print_box_start();
+    admin_externalpage_print_header($adminroot);
 
 /// Print the appropriate form
 
     if (file_exists($filename)) {   // We are in maintenance mode
-        echo '<div class="buttons">';
-        echo '<p>'.get_string('sitemaintenanceon', 'admin').'</p>';
+        echo '<div style="margin-left:auto;margin-right:auto">';
         echo '<form action="maintenance.php" method="post">';
-        echo '<div>';
         echo '<input type="hidden" name="action" value="disable" />';
         echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
         echo '<p><input type="submit" value="'.get_string('disable').'" /></p>';
-        echo '</div>';
         echo '</form>';
         echo '</div>';
     } else {                        // We are not in maintenance mode
         $usehtmleditor = can_use_html_editor();
 
-        echo '<div class="buttons">';
+        echo '<div style="text-align:center;margin-left:auto;margin-right:auto">';
         echo '<form action="maintenance.php" method="post">';
         echo '<div>';
         echo '<input type="hidden" name="action" value="enable" />';
         echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
         echo '<p><input type="submit" value="'.get_string('enable').'" /></p>';
         echo '<p>'.get_string('optionalmaintenancemessage', 'admin').':</p>';
-        echo '<div class="editor" style="width:600px;">';  // contains the editor
+        echo '<table><tr><td>';
         print_textarea($usehtmleditor, 20, 50, 600, 400, "text");
-        echo '</div>';
+        echo '</td></tr></table>';
         echo '</div>';
         echo '</form>';
         echo '</div>';
@@ -72,7 +66,5 @@
         }
     }
 
-    print_box_end();
-
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 ?>

admin/mnet/access_control.php

@@ -13,13 +13,15 @@ $perpage      = optional_param('perpage', 30, PARAM_INT);
 $action       = trim(strtolower(optional_param('action', '', PARAM_ALPHA)));
 
 require_login();
+$adminroot = admin_get_root();
 
-admin_externalpage_setup('ssoaccesscontrol');
 
-admin_externalpage_print_header();
+admin_externalpage_setup('ssoaccesscontrol', $adminroot);
+
+admin_externalpage_print_header($adminroot);
 
 if (!extension_loaded('openssl')) {
-    print_error('requiresopenssl', 'mnet');
+    print_error('requiresopenssl', 'mnet', '', NULL, true);
 }
 
 $sitecontext = get_context_instance(CONTEXT_SYSTEM);
@@ -39,13 +41,13 @@ if (!empty($action) and confirm_sesskey()) {
     
     // boot if insufficient permission
     if (!has_capability('moodle/user:delete', $sitecontext)) {
-        print_error('nomodifyacl','mnet');
+        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)) {
-        print_error('recordnoexists','mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+        error(get_string('recordnoexists','mnet'), '/admin/mnet/access_control.php');
     }
 
     switch ($action) {
@@ -60,7 +62,7 @@ if (!empty($action) and confirm_sesskey()) {
             // require the access parameter, and it must be 'allow' or 'deny'
             $accessctrl = trim(strtolower(required_param('accessctrl', PARAM_ALPHA)));
             if ($accessctrl != 'allow' and $accessctrl != 'deny') {
-                print_error('invalidaccessparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+                error(get_string('invalidaccessparam', 'mnet') , '/admin/mnet/access_control.php');
             }
 
             if (mnet_update_sso_access_control($idrec->username, $idrec->mnet_host_id, $accessctrl)) {
@@ -73,7 +75,7 @@ if (!empty($action) and confirm_sesskey()) {
             break;
 
         default:
-            print_error('invalidactionparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+            print_error('invalidactionparam', 'mnet', '/admin/mnet/access_control.php');
     }
 }
 
@@ -84,7 +86,7 @@ if ($form = data_submitted() and confirm_sesskey()) {
 
     // check permissions and verify form input
     if (!has_capability('moodle/user:delete', $sitecontext)) {
-        print_error('nomodifyacl','mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+        error(get_string('nomodifyacl','mnet'), '/admin/mnet/access_control.php');
     }
     if (empty($form->username)) {
         $formerror['username'] = get_string('enterausername','mnet');
@@ -178,7 +180,7 @@ if (!$acl) {
         }
         $deletecolumn = "<a href=\"?id={$aclrecord->id}&amp;action=delete&amp;sesskey={$USER->sesskey}\">"
                 . get_string('delete') . "</a>";
-        $table->data[] = array (s($aclrecord->username), $aclrecord->mnet_host_id, $accesscolumn, $deletecolumn);
+        $table->data[] = array ($aclrecord->username, $aclrecord->mnet_host_id, $accesscolumn, $deletecolumn);
     }
 }
 
@@ -232,6 +234,6 @@ foreach ($formerror as $error) {
 }
 
 print_simple_box_end();
-admin_externalpage_print_footer();
+admin_externalpage_print_footer($adminroot);
 
 ?>

admin/mnet/adminlib.php

@@ -29,7 +29,7 @@ function mnet_get_functions($type, $parentname) {
         $docname = 'rpclib.php';
         $relname  = '/mod/'.$parentname.'/'.$docname;
         $filename = $CFG->dirroot.$relname;
-        if (file_exists($filename)) include_once $filename;
+        if (file_exists($filename)) include $filename;
         $mnet_publishes = $parentname.'_mnet_publishes';
         if (function_exists($mnet_publishes)) {
             (array)$publishes = $mnet_publishes();
@@ -38,7 +38,7 @@ function mnet_get_functions($type, $parentname) {
         // auth or enrol
         $relname  = '/'.$type.'/'.$parentname.'/'.$docname;
         $filename = $CFG->dirroot.$relname;
-        if (file_exists($filename)) include_once $filename;
+        if (file_exists($filename)) include $filename;
         $class = $type.($type=='enrol'? 'ment':'').'_plugin_'.$parentname;
         if (class_exists($class)) {
             $object = new $class();
@@ -64,7 +64,7 @@ function mnet_get_functions($type, $parentname) {
         foreach($rpcrecords as $rpc) {
             if (!array_key_exists($rpc->function_name, $methodServiceArray)) {
                 $rpc->enabled = 0;
-                update_record('mnet_rpc', addslashes_recursive($rpc));
+                update_record('mnet_rpc', $rpc);
             }
         }
     }
@@ -72,7 +72,7 @@ function mnet_get_functions($type, $parentname) {
     if (!file_exists($filename)) return false;
 
     if (extension_loaded('tokenizer')) {
-        include_once "$CFG->dirroot/$CFG->admin/mnet/MethodTable.php";
+        include_once $CFG->dirroot.'/admin/mnet/MethodTable.php';
         $functions = (array)MethodTable::create($filename,false);
     }
 
@@ -85,7 +85,7 @@ function mnet_get_functions($type, $parentname) {
             } else {
                 array_unshift($profile, $details['returns']);
             }
-            $dataobject->profile       = addslashes(serialize($profile));
+            $dataobject->profile       = serialize($profile);
             $dataobject->help          = addslashes($details['description']);
         } else {
             $dataobject->profile       = serialize(array(array('type' => 'void', 'description' => 'No return value')));

admin/mnet/delete.html

@@ -1,15 +1,12 @@
 <?php
-$navlinks = array();
-$navlinks[] = array('name' => $stradministration, 'link' => "$CFG->wwwroot/$CFG->admin/index.php", 'type' => 'misc');
-$navlinks[] = array('name' => get_string('mnetsettings', 'mnet'), 'link' => "$CFG->wwwroot/$CFG->admin/mnet/index.php", 'type' => 'misc');
-$navlinks[] = array('name' => get_string('deletehost', 'mnet'), 'link' => null, 'type' => 'misc');
-$navigation = build_navigation($navlinks);
-print_header("$site->shortname: $strmnetsettings", "$site->fullname", $navigation);
+print_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">
+<center>
+    <table align="center"   class="generalbox" border="0" cellpadding="5" cellspacing="0">
         <tr>
             <td  class="generalboxcontent">
             <table cellpadding="9" cellspacing="0" >
@@ -17,7 +14,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
                     <td colspan="2" class="header" cellpadding="0"><span><?php print_string('deleteaserver', 'mnet'); ?>Deleting a Server</span></td>
                 </tr>
                 <?php
-                if (count($warn) > 0){
+                if (count($warn) > 0):
                 ?>
                 <tr valign="top">
                     <td align="right" colspan="2"><?php print_string('receivedwarnings','mnet'); ?>:<br />
@@ -25,7 +22,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
                     </td>
                 </tr>
                 <?php
-                }
+                endif;
                 ?>
                 <tr valign="top">
                     <td colspan="2"><?php print_string('reallydeleteserver','mnet'); ?>: "<?php echo $mnet_peer->name; ?>"?</td>
@@ -49,7 +46,7 @@ print_heading(get_string('mnetsettings', 'mnet'));
             </td>
         </tr>
     </table>
-</div>
+</center>
 <?php
 print_footer();
 ?>

admin/mnet/delete.php

@@ -31,8 +31,6 @@
         redirect('index.php', get_string('postrequired','mnet') ,7);
     }
 
-    require_sesskey();
-
     if ('verify' == $step) {
         $mnet_peer = new mnet_peer();
         $mnet_peer->set_id($hostid);

admin/mnet/enr_course_enrol.html

@@ -1,11 +1,10 @@
 
 <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">
+  <table align="center" border="0" cellpadding="5" cellspacing="0">
     <tr>
       <td valign="top">
           <?php print_string('existingusers', 'role', count($mnetenrolledusers)); ?>
@@ -100,5 +99,4 @@
       <td valign="top"></td>
     </tr>
   </table>
-  </div>
 </form>

admin/mnet/enr_course_enrol.php

@@ -7,10 +7,11 @@
     include_once($CFG->dirroot.'/mnet/xmlrpc/client.php');
 
     if (!confirm_sesskey()) {
-        print_error('confirmsesskeybad', 'error');
+        error(get_string('confirmsesskeybad', 'error'));
     }
 
-    admin_externalpage_setup('mnetenrol');
+    $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
@@ -85,21 +86,9 @@
     $mnet_request->set_method('enrol/mnet/enrol.php/course_enrolments');
     $mnet_request->add_param($course->remoteid, 'int');
     $mnet_request->send($mnet_peer);
-    $raw_all_enrolled_users = $mnet_request->response;
-    unset($mnet_request);
+    $all_enrolled_users = $mnet_request->response;
 
-    $all_enrolled_users = array();
-    if (!empty($raw_all_enrolled_users)) {
-        // Try to repair keying of remote users array, numeric usernames get lost in the fracas
-        foreach ($raw_all_enrolled_users as $username => $userdetails) {
-            if (empty($userdetails['username']) || !is_numeric($username)) {
-                //Not able to repair, or no need to repair
-                $all_enrolled_users[$username] = $userdetails;
-            } else {
-                $all_enrolled_users[$userdetails['username']] = $userdetails;
-            }
-        }
-    }
+    unset($mnet_request);
     
     $select = '';
     $all_enrolled_usernames = '';
@@ -130,7 +119,7 @@
                 a.courseid
             FROM
                 {$CFG->prefix}user u
-            JOIN
+            LEFT JOIN
                 {$CFG->prefix}mnet_enrol_assignments a
             ON
                 a.userid = u.id AND a.courseid={$courseid}
@@ -255,6 +244,7 @@
 $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');
@@ -265,7 +255,7 @@ $strshowall = get_string('showall');
 $strparticipants = get_string('participants');
 $strsearchresults = get_string('searchresults');
 
-admin_externalpage_print_header();
+admin_externalpage_print_header($adminroot);
 
 print_box('<strong>' . s($mnet_peer->name) . ' : ' 
           . format_string($course->shortname) .' '. format_string($course->fullname) 
@@ -286,6 +276,6 @@ if (!empty($errors)) {
 }
 
 
-admin_externalpage_print_footer();
+admin_externalpage_print_footer($adminroot);
 
 ?>

admin/mnet/enr_courses.php

@@ -6,11 +6,12 @@
     require_once($CFG->libdir.'/adminlib.php');
 
     if (!confirm_sesskey()) {
-        print_error('confirmsesskeybad', 'error');
+        error(get_string('confirmsesskeybad', 'error'));
     }
 
 
-    admin_externalpage_setup('mnetenrol');
+    $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
@@ -23,23 +24,22 @@
 
     /// Print the page
 
-    admin_externalpage_print_header();
+    admin_externalpage_print_header($adminroot);
 
     print_box('<strong>' . s($host->name) . ' </strong><br />'
               . get_string("enrolcourses_desc", "mnet"));
 
-    echo '<hr />';
+    echo "<hr />";
 
-    echo '<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->'
-           . '<table class="generaltable">';
+    print ('<table align="center" >');
 
     $icon  = "<img src=\"$CFG->pixpath/i/course.gif\"".
     " class=\"icon\" alt=\"".get_string("course")."\" />";
 
     foreach ($courses as $course) {
-        $link = "$CFG->wwwroot/$CFG->admin/mnet/enr_course_enrol.php?"
+        $link = $CFG->wwwroot . '/admin/mnet/enr_course_enrol.php?'
             . "host={$mnethost}&amp;courseid={$course->id}&amp;sesskey={$USER->sesskey}";
-        echo '<tr>'
+        print ('<tr>'
                . "<td>$icon</td>"
                . "<td><a href=\"$link\">".format_string($course->fullname). "</a></td>"
                . '</tr><tr>'
@@ -48,10 +48,10 @@
                . '</tr><tr>'
                . '<td></td>'
                . "<td align=\"left\" >{$course->summary}</td>"
-               . '</tr>';
+               . '</tr>');
     }
-    echo '</table></div>';
+    print ('</table>');
 
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/mnet/enr_hosts.php

@@ -5,7 +5,8 @@
     require_once(dirname(__FILE__) . "/../../config.php");
     require_once($CFG->libdir.'/adminlib.php');
 
-    admin_externalpage_setup('mnetenrol');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('mnetenrol', $adminroot);
     $CFG->pagepath = 'admin/mnet';
 
 
@@ -17,45 +18,43 @@
 
     /// get language strings
 
-    admin_externalpage_print_header();
+    admin_externalpage_print_header($adminroot);
 
     print_box(get_string("remoteenrolhosts_desc", "mnet"));
 
-    echo '<hr />';
+    echo "<hr />";
 
     if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
         print_box(get_string('mnetdisabled','mnet'));
     }
 
-    echo '<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->'
-           . '<table cellspacing="0" cellpadding="5" id="hosts" class="generaltable generalbox" >'
+    print ('<table align="center" cellspacing="0" cellpadding="5"  width="500" id="hosts" class="generaltable generalbox" >'
            . '<tr>'
            . '<th class="header c0"> '.get_string('host', 'mnet').' </th>'
            . '<th class="header c1"> '.get_string('enrolments', 'mnet').' </th>'
            . '<th class="header c2"> '.get_string('courses', 'mnet').' </th>'
            // . '<th class="header c3"> &nbsp; </th>'
-           . '</tr>';
+           . '</tr>');
     $hosts = $enrolment->list_remote_servers();
     foreach ($hosts as $host) {
-        $coursesurl = "$CFG->wwwroot/$CFG->admin/mnet/enr_courses.php?host={$host->id}&amp;sesskey={$USER->sesskey}";
+        $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>'
+        print ('<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/$CFG->admin/report/log/index.php?course_host={$host->id}">'
+               // . '<td align="center" ><a href="{$CFG->wwwroot}/admin/report/log/index.php?course_host={$host->id}">'
                // . get_string('logs', 'mnet').'</a> </td>'
-               . '</tr>';
+               . '</tr>');
     }
-    echo '</table>'
-       . '</div>';
+    print ('</table>');
 
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/mnet/index.php

@@ -7,7 +7,8 @@
     include_once($CFG->dirroot.'/mnet/lib.php');
 
     require_login();
-    admin_externalpage_setup('net');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('net', $adminroot);
 
     $context = get_context_instance(CONTEXT_SYSTEM);
 
@@ -15,19 +16,19 @@
 
 
     if (!extension_loaded('openssl')) {
-        admin_externalpage_print_header();
+        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();
+        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();
+        admin_externalpage_print_header($adminroot);
         set_config('mnet_dispatcher_mode', 'off');
         print_error('nocurl', 'mnet', '', NULL, true);
     }
@@ -39,7 +40,7 @@
 /// If data submitted, process and store
     if (($form = data_submitted()) && confirm_sesskey()) {
         if (!empty($form->submit) && $form->submit == get_string('savechanges')) {
-            if (in_array($form->mode, array("off", "strict", "dangerous"))) {
+            if (in_array($form->mode, array("off", "strict", "promiscuous"))) {
                 if (set_config('mnet_dispatcher_mode', $form->mode)) {
                     redirect('index.php', get_string('changessaved'));
                 } else {
@@ -89,7 +90,7 @@
     }
     $hosts = get_records_select('mnet_host', " id != '{$CFG->mnet_localhost_id}' AND deleted = '0' ",'wwwroot ASC' );
 
-    admin_externalpage_print_header();
+    admin_externalpage_print_header($adminroot);
 ?>
 <center>
 <form method="post" action="index.php">
@@ -111,8 +112,8 @@
                 <tr valign="top">
                     <td align="right"><?php print_string('net', 'mnet'); ?>:</td>
                     <td><input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-                        <input type="radio" name="mode" value="off" <?php echo ("off" == $CFG->mnet_dispatcher_mode)? 'checked="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="radio" name="mode" value="off" <?php echo ("off" == $CFG->mnet_dispatcher_mode)? 'checked="true"' : '' ?> /> <?php print_string('off', 'mnet'); ?> <br />
+                        <input type="radio" name="mode" value="strict" <?php echo ("strict" == $CFG->mnet_dispatcher_mode)? 'checked="true"' : '' ?> /> <?php print_string('on', 'mnet'); ?><br />
                         <input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" />
                     </td>
                 </tr>
@@ -147,5 +148,5 @@
 </center>
 
 <?php
-admin_externalpage_print_footer();
+admin_externalpage_print_footer($adminroot);
 ?>

admin/mnet/mnet_review.html

@@ -1,20 +1,28 @@
 <?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();
+admin_externalpage_print_header($adminroot);
 
-$currenttab = 'mnetdetails';
-require_once($CFG->dirroot .'/admin/mnet/tabs.php');
+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' ; ?>" />
-<input type="hidden" name="applicationid" value="<?php echo isset($mnet_peer->applicationid)?  $mnet_peer->applicationid : '0' ; ?>" />
-<input type="hidden" name="applicationname" value="<?php echo isset($mnet_peer->application->name)?  $mnet_peer->application->name : '' ; ?>" />
 <table cellpadding="9" cellspacing="0" width="635">
 
 <tr>
@@ -39,7 +47,7 @@ if (empty($mnet_peer->public_key)) $mnet_peer->public_key = '';
 
 
 if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) {
-    $key = mnet_get_public_key($mnet_peer->wwwroot, $mnet_peer->application->xmlrpc_server_url);
+    $key = mnet_get_public_key($mnet_peer->wwwroot);
     $mnet_peer->public_key = clean_param($key, PARAM_PEM);
 }
 ?>
@@ -66,7 +74,7 @@ if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) {
 </tr>
 <?php
 
-if(!empty($currentkey)) {
+if(!empty($currentkey)):
 ?>
     <tr>
         <td align="right" valign="top"></td>
@@ -77,30 +85,30 @@ if(!empty($currentkey)) {
         <td valign="top"><pre style="font-size: 8px;"><?php echo $currentkey;?></pre></td>
     </tr>
 <?php
-}
+endif;
 
-if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
+if (isset($mnet_peer->id) && $mnet_peer->id > 0):
 ?>
     <tr>
         <td align="right" valign="top"><?php print_string('last_connect_time', 'mnet'); ?>:</td>
         <td valign="top"><?php echo ($mnet_peer->last_connect_time == 0)? get_string('never','mnet') : date('H:i:s d/m/Y',$mnet_peer->last_connect_time);?></td>
     </tr>
 <?php
-}
+endif;
 
-if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0){
+if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0):
 ?>
     <tr>
         <td align="right" valign="top"><?php print_string('deleted'); ?>:</td>
         <td valign="top">
-            <input type="radio" name="deleted" value="0" checked="checked" /> <?php print_string('reenableserver','mnet'); ?><br />
+            <input type="radio" name="deleted" value="0" checked="true" /> <?php print_string('reenableserver','mnet'); ?><br />
             <input type="radio" name="deleted" value="1"  /> <?php print_string('yes'); ?><br />
         </td>
     </tr>
 <?php
-}
+endif;
 
-if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address){
+if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address):
 ?>
     <tr>
         <td align="right" valign="top"><?php print_string('ipaddress', 'mnet');
@@ -111,16 +119,15 @@ if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address){
     </tr>
 
 <?php
-}
+endif;
 ?>
 <tr>
     <td></td>
     <td><input type="submit" value="<?php print_string("savechanges"); ?>" /></td>
 </tr>
 </table>
-</div>
 </form>
 <?php
 print_simple_box_end();
-admin_externalpage_print_footer();
+admin_externalpage_print_footer($adminroot);
 ?>

admin/mnet/mnet_review_allhosts.html

@@ -1,8 +1,9 @@
 <?php
-admin_externalpage_print_header();
+admin_externalpage_print_header($adminroot);
 
-$currenttab = 'mnetdetails';
-require_once($CFG->dirroot .'/admin/mnet/tabs.php');
+$tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
+$tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
+print_tabs(array($tabs), 'mnetdetails');
 
 print_simple_box_start("center", "");
 ?>
@@ -12,10 +13,10 @@ print_simple_box_start("center", "");
     <td valign="top"><?php echo $mnet_peer->name; ?></td>
 </tr>
 <tr>
-    <td align="right" valign="top" colspan="2"><?php print_string('allhosts_no_options','mnet'); ?></td>
+    <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();
+admin_externalpage_print_footer($adminroot);
 ?>

admin/mnet/mnet_services.html

@@ -1,31 +1,36 @@
 <?php
-admin_externalpage_print_header();
+admin_externalpage_print_header($adminroot);
 
-$currenttab = 'mnetservices';
-require_once($CFG->dirroot .'/admin/mnet/tabs.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';
 
+$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) {
+    foreach($myservices as $name => $versions):
     $version = current($versions);
-    $langmodule = ($version['parent_type'] == 'mod' ? '' : ($version['parent_type'] . '_')) . $version['parent'];
 ?>
 <tr>
     <td align="left" valign="top" colspan="2">
-    <h3><?php echo get_string($name.'_name', $langmodule , $mnet_peer->name); ?></h3>
-    <?php echo get_string($name.'_description', $langmodule, $mnet_peer->name); ?>
+    <h3><?php echo get_string($name.'_name', $version['parent_type'].'_'.$version['parent'] , $mnet_peer->name); ?></h3>
+    <p><?php echo get_string($name.'_description', $version['parent_type'].'_'.$version['parent'], $mnet_peer->name); ?></p>
 <?php
         $breakstring = '';
-        foreach($versions as $version){
+        foreach($versions as $version):
             if (count($versions) > 1) {
                 $versionstring = '('.get_string('version','mnet') .' '.$version['apiversion'].')';
             } else {
@@ -35,37 +40,16 @@ print_simple_box_start("center", "");
             echo $breakstring;
 ?>
     <input type="hidden" name="exists[<?php echo  $version['serviceid']; ?>]" value="1" />
-    <input type="checkbox" name="publish[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_publish']))? 'checked="checked" ': '' ; ?>/>
-<?php 
-            print_string('publish','mnet');
-            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 />';  
+    <input type="checkbox" name="publish[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_publish']))? 'checked="checked" ': '' ; ?>/><?php print_string('publish','mnet'); ?><?php echo $versionstring; if (!empty($version['hostsubscribes'])) echo '<a href="#" title="'.get_string('issubscribed','mnet', $mnet_peer->name).'">&radic;</a> '; if (!empty($version['allhosts_publish'])) print_string("enabled_for_all",'mnet',!empty($version['I_publish']));  ?><br />
+    <input type="checkbox" name="subscribe[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_subscribe']))? 'checked="checked" ': '' ; ?>/><?php print_string('subscribe','mnet'); ?><?php echo $versionstring; if (!empty($version['hostpublishes'])) echo '<a href="#" title="'.get_string('ispublished','mnet', $mnet_peer->name).'">&radic;</a> '; if (!empty($version['allhosts_subscribe'])) print_string("enabled_for_all",'mnet',!empty($version['I_subscribe'])); ?><br />
+<?php
             $breakstring = '. . . . . . . . . . . . . . . . . . . . . . . . <br>';
-        } // end foreach
+        endforeach;
 ?>
     </td>
 </tr>
 <?php
-    } // end foreach
+    endforeach;
 ?>
 <tr>
     <td align="left" valign="top" colspan="2">
@@ -86,9 +70,8 @@ print_simple_box_start("center", "");
     </td>
 </tr>
 </table>
-</div>
 </form>
 <?php
 print_simple_box_end();
-admin_externalpage_print_footer();
+admin_externalpage_print_footer($adminroot);
 ?>

admin/mnet/mnet_services.php

@@ -6,7 +6,8 @@
     include_once($CFG->dirroot.'/mnet/lib.php');
 
     require_login();
-    admin_externalpage_setup('mnetpeers');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('mnetpeers', $adminroot);
 
     $context = get_context_instance(CONTEXT_SYSTEM);
 
@@ -24,10 +25,6 @@
     // force   Go ahead with something we've been warned is strange
     $step   = optional_param('step', NULL, PARAM_ALPHA);
     $hostid = optional_param('hostid', NULL, PARAM_INT);
-    $publishes  = optional_param('publish', null, PARAM_BOOL); // optional_param cleans arrays too
-    $subscribes = optional_param('subscribe', null, PARAM_BOOL); // optional_param cleans arrays too
-    $exists     = optional_param('exists', null, PARAM_BOOL); // optional_param cleans arrays too
-
     $nocertstring = '';
     $nocertmatch  = '';
     $badcert = '';
@@ -37,7 +34,6 @@
     $strconfiguration    = get_string('configuration');
     $strmnetsettings     = get_string('mnetsettings', 'mnet');
     $strmnetservices     = get_string('mnetservices', 'mnet');
-    $strmnetthemes       = get_string('mnetthemes', 'mnet');
     $strmnetlog          = get_string('mnetlog', 'mnet');
     $strmnetedithost     = get_string('reviewhostdetails', 'mnet');
     $strmneteditservices = get_string('reviewhostservices', 'mnet');
@@ -47,21 +43,14 @@
     if (($form = data_submitted()) && confirm_sesskey()) {
         $mnet_peer->set_id($hostid);
         $treevals = array();
-        foreach($exists as $key => $value) {
-            $host2service   = get_record('mnet_host2service', 'hostid', $hostid, 'serviceid', $key);
-            $publish        = array_key_exists($key, $publishes) ? $publishes[$key] : 0;
-            $subscribe      = array_key_exists($key, $subscribes) ? $subscribes[$key] : 0;
+        foreach($_POST['exists'] as $key => $value) {
+            $host2service   = get_record('mnet_host2service', 'hostid', $_POST['hostid'], 'serviceid', $key);
+            $publish        = (isset($_POST['publish'][$key]) && $_POST['publish'][$key] == 'on')? 1 : 0;
+            $subscribe      = (isset($_POST['subscribe'][$key]) && $_POST['subscribe'][$key] == 'on')? 1 : 0;
 
-            if ($publish != 1 && $subscribe != 1) {
-                if (false == $host2service) {
-                    // We don't have or need a record - do nothing!
-                } else {
-                    // We don't need the record - delete it
-                    delete_records('mnet_host2service', 'hostid', $hostid, 'serviceid', $key);
-                }
-            } elseif (false == $host2service && ($publish == 1 || $subscribe == 1)) {
+            if (false == $host2service && ($publish == 1 || $subscribe == 1)) {
                 $host2service = new stdClass();
-                $host2service->hostid = $hostid;
+                $host2service->hostid = $_POST['hostid'];
                 $host2service->serviceid = $key;
                 
                 $host2service->publish = $publish;
@@ -85,7 +74,7 @@
             $id_list .= ', '.$CFG->mnet_all_hosts_id;
         }
 
-        $concat = sql_concat('COALESCE(h2s.id,0) ', ' \'-\' ', ' svc.id', '\'-\'', 'r.parent_type', '\'-\'', 'r.parent');
+        $concat = sql_concat('COALESCE(h2s.id,0) ', ' \'-\' ', ' svc.id');
 
         $query = "
             SELECT DISTINCT

admin/mnet/mnet_themes.html

@@ -1,116 +0,0 @@
-<?php
-admin_externalpage_print_header();
-print_heading(get_string('themes'));
-$original_theme = fullclone($THEME);
-
-    $currenttab = 'mnetthemes';
-    require_once($CFG->dirroot .'/admin/mnet/tabs.php');
-
-    $themes = get_list_of_plugins("theme");
-    $sesskey = !empty($USER->id) ? $USER->sesskey : '';
-
-    echo "<table style=\"margin-left:auto;margin-right:auto;\" cellpadding=\"7\" cellspacing=\"5\">";
-
-    if (count($report)) {
-        echo '<tr>';
-        echo '<td align="center" colspan="2">';
-        echo '<span class="'.$report[1].'">'.$report[0].'</span>';
-        echo '</td>';
-        echo '</tr>';
-    }
-
-    if (!$USER->screenreader) {
-        echo "<tr class=\"generaltableheader\"><th scope=\"col\">$strtheme</th>";
-        echo "<th scope=\"col\">$strinfo</th></tr>";
-    }
-
-    echo "<tr>";
-    echo '<td align="center"><span class="informationbox">Choose this option to use your site\'s default theme: <strong>'.$CFG->theme.'</strong>.</span></td>';
-    if ($mnet_peer->theme == '') {
-        echo '<td valign="top" style="border-style:solid; border-width:1px; border-color=#555555">';
-    } else {
-        echo '<td valign="top">';
-    }
-    echo '<p style="font-size:1.5em;font-style:bold;">Site Theme</p>';
-    $options = null;
-    $options['choose'] = $unlikely_name;// Something unlikely to ever be a theme name... initially $unlikely_name = 'ZoqZoqZ';
-    $options['sesskey'] = $sesskey;
-    $options['hostid'] = $mnet_peer->id;
-    print_single_button('mnet_themes.php', $options, $strchoose);
-    echo '</td>';
-    echo "</tr>";
-
-    foreach ($themes as $theme) {
-
-        unset($THEME);
-
-        if (!file_exists($CFG->themedir.'/'.$theme.'/config.php')) {   // bad folder
-            continue;
-        }
-
-        include($CFG->themedir.'/'.$theme.'/config.php');
-
-        $readme = '';
-        $screenshot = '';
-        $screenshotpath = '';
-
-        if (file_exists($CFG->themedir.'/'.$theme.'/README.html')) {
-            $readme =  '<li>'.
-            link_to_popup_window($CFG->themewww .'/'. $theme .'/README.html', $theme, $strinfo, 400, 500, '', 'none', true).'</li>';
-        } else if (file_exists($CFG->themedir.'/'.$theme.'/README.txt')) {
-            $readme =  '<li>'.
-            link_to_popup_window($CFG->themewww .'/'. $theme .'/README.txt', $theme, $strinfo, 400, 500, '', 'none', true).'</li>';
-        }
-        if (file_exists("$theme/screenshot.png")) {
-            $screenshotpath = "$theme/screenshot.png";
-        } else if (file_exists("$theme/screenshot.jpg")) {
-            $screenshotpath = "$theme/screenshot.jpg";
-        }
-
-        echo "<tr>";
-             
-        // no point showing this if user is using screen reader
-        if (!$USER->screenreader) {
-            echo "<td align=\"center\">";
-            if ($screenshotpath) {
-                $screenshot = '<li><a href='.$CFG->wwwroot .'/theme/'. $theme.'/screenshot.jpg">'.$strscreenshot.'</a></li>';
-                echo "<object type=\"text/html\" data=\"$screenshotpath\" height=\"200\" width=\"400\">$theme</object></td>";
-            } else {
-                echo '<object type="text/html" data="'.$CFG->wwwroot.'/theme/preview.php?preview='.$theme.'" height="200" width="400">'.$theme.'</object></td>';
-            }
-        }
-
-        if ($mnet_peer->theme == $theme) {
-            echo '<td valign="top" style="border-style:solid; border-width:1px; border-color=#555555">';
-        } else {
-            echo '<td valign="top">';
-        }
-
-        if (isset($THEME->sheets)) {
-            echo '<p style="font-size:1.5em;font-style:bold;">'.$theme.'</p>';
-        } else {
-            echo '<p style="font-size:1.5em;font-style:bold;color:red;">'.$theme.' (Moodle 1.4)</p>';
-        }
-          
-        if ($screenshot or $readme) {
-            echo '<ul>';      
-            if (!$USER->screenreader) {
-                echo '<li><a href="'.$CFG->wwwroot.'/theme/preview.php?preview='.$theme.'">'.$strpreview.'</a></li>';
-            }
-            echo $screenshot.$readme;
-            echo '</ul>';
-        }
-
-        $options = null;
-        $options['choose'] = $theme;
-        $options['sesskey'] = $sesskey;
-        $options['hostid'] = $mnet_peer->id;
-        print_single_button('mnet_themes.php', $options, $strchoose);
-        echo '</td>';
-        echo "</tr>";
-    }
-    echo "</table>";
-
-$THEME = $original_theme;
-admin_externalpage_print_footer();
-?>

admin/mnet/mnet_themes.php

@@ -1,81 +0,0 @@
-<?php
-    // Allows the admin to configure services for remote hosts
-
-    require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    include_once($CFG->dirroot.'/mnet/lib.php');
-    require_login();
-    admin_externalpage_setup('mnetpeers');
-
-    $context = get_context_instance(CONTEXT_SYSTEM);
-
-    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
-
-    if (!$site = get_site()) {
-        print_error('nosite', '', '', NULL, true);
-    }
-
-/// Initialize variables.
-
-    $hostid = required_param('hostid', PARAM_INT);
-
-    $stradministration   = get_string('administration');
-    $strconfiguration    = get_string('configuration');
-
-    $strmnetedithost   = get_string('reviewhostdetails', 'mnet');
-    $strmnetsettings     = get_string('mnetsettings', 'mnet');
-    $strmnetservices     = get_string('mnetservices', 'mnet');
-    $strmnetthemes       = get_string('mnetthemes', 'mnet');
-    $strmnetlog          = get_string('mnetlog', 'mnet');
-
-
-    $mnet_peer = new mnet_peer();
-    if (is_int($hostid)) {
-        $mnet_peer->set_id($hostid);
-    }
-
-    $choose = optional_param("choose",'',PARAM_FILE);   // set this theme as default
-    $stradministration = get_string("administration");
-    $strconfiguration = get_string("configuration");
-    $strthemes = get_string("themes");
-    $strpreview = get_string("preview");
-    $strchoose = get_string("choose");
-    $strinfo = get_string("info");
-    $strtheme = get_string("theme");
-    $strthemesaved = get_string("themesaved");
-    $strscreenshot = get_string("screenshot");
-    $stroldtheme = get_string("oldtheme");
-    $report = array();
-    $unlikely_name = 'ZoqZoqZ'; // Something unlikely to ever be a theme name
-
-    if ($choose) {
-        if (confirm_sesskey()) {
-            if ($choose == $unlikely_name) {
-                $mnet_peer->force_theme = 1;
-                $mnet_peer->updateparams->force_theme = 1;
-                $mnet_peer->theme = '';
-                $mnet_peer->updateparams->theme = '';
-                if ($mnet_peer->commit()) {
-                    $report = array(get_string('themesaved'), 'informationbox');
-                } else {
-                    $report = array(get_string('themesavederror', 'mnet'), 'errorbox');
-                }
-            } elseif (!is_dir($CFG->themedir .'/'. $choose) || !file_exists($CFG->themedir .'/'. $choose .'/config.php')) {
-                        echo 'CHOOSE -'.$choose.' '. $CFG->themedir .'/'. $choose .'/config.php' ;
-                $report = array('This theme is not installed!'.'3', 'errorbox');
-            } else {
-                $mnet_peer->force_theme = 1;
-                $mnet_peer->theme = $choose;
-                $mnet_peer->updateparams->theme = addslashes($choose);
-                if ($mnet_peer->commit()) {
-                    $report = array(get_string('themesaved').'1', 'informationbox');
-                } else {
-                    $report = array(get_string('themesavederror', 'mnet').'2', 'errorbox');
-                }
-            }
-        }
-    }
-
-    $adminroot = admin_get_root();
-    require('./mnet_themes.html');
-?>

admin/mnet/peers.html

@@ -1,42 +1,40 @@
 <?php
-admin_externalpage_print_header();
+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>
+<center>
+<form  method="post" action="peers.php">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+<input type="hidden" name="updateregisterall" value="1" />
+<table cellspacing="0" cellpadding="5"  width="500" id="hosts" class="generaltable generalbox" >
+    <tr>
+        <th class="header c0" nowrap="nowrap" colspan="2"><?php print_string('registerallhosts', 'mnet'); ?></th>
+    </tr>
+    <tr>
+        <td class="cell c1" colspan="2"><?php print_string('registerallhostsexplain', 'mnet'); ?></td>
+    </tr>
+    <tr>
+        <td class="cell c1"><input type="checkbox" name="registerallhosts" <?php if (!empty($CFG->mnet_register_allhosts)) echo 'checked="checked" '; ?>/></td>
+        <td class="cell c1"> <?php print_string('registerallhosts', 'mnet'); ?> </td>
+    </tr>
+    <tr>
+        <td align="right" colspan="2"><input type="submit" name="submit" value="<?php print_string('savechanges'); ?>" /></td>
+    </tr>
+</table>
+</form>
+<table cellspacing="0" cellpadding="5" id="hosts" class="generaltable generalbox" >
+    <tr>
+        <th class="header c0" nowrap="nowrap"><?php print_string('site'); ?></th>
+        <th class="header c1" nowrap="nowrap"><?php print_string('system','mnet'); ?></th>
+        <th class="header c2" nowrap="nowrap"><?php print_string('last_connect_time', 'mnet'); ?></th>
+        <th class="header c3" nowrap="nowrap"></th>
+    </tr>
 <?php
 
-    foreach($hosts as $host) {
+    foreach($hosts as $host):
 
         if ($host->last_connect_time == 0) {
             $last_connect = get_string('never');
@@ -48,55 +46,43 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict'
     <tr>
         <td class="cell c0"><a href="peers.php?step=update&amp;hostid=<?php echo $host->id; ?>"><?php echo $host->name; ?></a></td>
         <td class="cell c1"><a href="peers.php?step=update&amp;hostid=<?php echo $host->id; ?>"><?php echo $host->wwwroot; ?></a></td>
-        <td class="cell c2"><?php if ($host->id != $CFG->mnet_all_hosts_id) echo $last_connect; ?></td>
+        <td class="cell c2" nowrap="nowrap"><?php if ($host->id != $CFG->mnet_all_hosts_id) echo $last_connect; ?></td>
         <td class="cell c3">
-<?php   if ($host->id != $CFG->mnet_all_hosts_id){ ?>
+<?php   if ($host->id != $CFG->mnet_all_hosts_id): ?>
             <form method="post" action="delete.php">
-                <div>
                 <input type="hidden" name="hostid" value="<?php echo $host->id; ?>" />
                 <input type="hidden" name="step" value="verify" />
-                <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
                 <input type="submit" name="submit" value="<?php print_string('delete'); ?>"/>
-                </div>
             </form>
-<?php   } ?>
+<?php   endif; ?>
         </td>
     </tr>
 <?php
-    }
+    endforeach;
 ?>
-    </table>
+    <tr>
+        <td class="cell c4" colspan="4">&nbsp;</td>
+    </tr>
     <form method="post" action="peers.php">
-        <table cellspacing="0" cellpadding="5" class="generaltable generalbox standard" >
-            
-            <tr>
-                <th class="header c4" colspan="4">
-                    <?php print_string('addnewhost', 'mnet'); ?>
-                    <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
-                    <input type="hidden" name="step" value="input" />
-                </th>
-            </tr>
-            <tr>
-                <td class="cell c0">wwwroot:</td>
-                <td class="cell c1"><input type="text" name="wwwroot" value="" /></td>
-                <td class="cell c2">
-                    <select name="applicationid">
-<?php
-                foreach($applications as $application) {
-                    echo '                <option value="'.$application->id.'">'.$application->display_name."</option>\n";
-                }
-?>
-                    </select>
-                </td>
-                <td class="cell c3"></td>
-            </tr>
-            <tr>
-                <td class="cell c4" align="right" colspan="4"><input type="submit" value="<?php print_string('addhost','mnet'); ?>" /></td>
-            </tr>
-        
-        </table>
+    <tr>
+        <th class="header c4" nowrap="nowrap" colspan="4">
+            <?php print_string('addnewhost', 'mnet'); ?>
+            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+            <input type="hidden" name="step" value="input" />
+        </th>
+    </tr>
+    <tr>
+        <td class="cell c0"></td>
+        <td class="cell c1"><input type="text" name="wwwroot" value="" /></td>
+        <td class="cell c2"></td>
+        <td class="cell c3"></td>
+    </tr>
+    <tr>
+        <td class="cell c4" align="right" colspan="4"><input type="submit" value="<?php print_string('addhost','mnet'); ?>" /></td>
+    </tr>
     </form>
-</div>
+</table>
+</center>
 <?php
-admin_externalpage_print_footer();
-?>
+admin_externalpage_print_footer($adminroot);
+?>

admin/mnet/peers.php

@@ -7,25 +7,26 @@ require_once($CFG->libdir.'/adminlib.php');
 include_once($CFG->dirroot.'/mnet/lib.php');
 
 require_login();
-admin_externalpage_setup('mnetpeers');
+$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();
-    print_error('requiresopenssl', 'mnet');
+    admin_externalpage_print_header($adminroot);
+    print_error('requiresopenssl', 'mnet', '', NULL, true);
 }
 
 if (!$site = get_site()) {
-    admin_externalpage_print_header();
-    print_error('nosite', '');
+    admin_externalpage_print_header($adminroot);
+    print_error('nosite', '', '', NULL, true);
 }
 
 if (!function_exists('curl_init') ) {
-    admin_externalpage_print_header();
-    print_error('nocurl', 'mnet');
+    admin_externalpage_print_header($adminroot);
+    print_error('nocurl', 'mnet', '', NULL, true);
 }
 
 /// Initialize variables.
@@ -40,7 +41,6 @@ $hostid = optional_param('hostid', NULL, PARAM_INT);
 $strmnetservices   = get_string('mnetservices', 'mnet');
 $strmnetlog        = get_string('mnetlog', 'mnet');
 $strmnetedithost   = get_string('reviewhostdetails', 'mnet');
-$strmnetthemes     = get_string('mnetthemes', 'mnet');
 
 if (!isset($CFG->mnet_dispatcher_mode)) set_config('mnet_dispatcher_mode', 'off');
 
@@ -50,16 +50,11 @@ if (($form = data_submitted()) && confirm_sesskey()) {
     if (!empty($form->wwwroot)) {
         // ensure we remove trailing slashes
         $form->wwwroot = preg_replace(':/$:', '', $form->wwwroot);
-
-        // ensure the wwwroot starts with a http or https prefix
-        if (strtolower(substr($form->wwwroot, 0, 4)) != 'http') {
-            $form->wwwroot = 'http://'.$form->wwwroot;
-        }
     }
 
     if(!function_exists('xmlrpc_encode_request')) {
         trigger_error("You must have xml-rpc enabled in your PHP build to use this feature.");
-        print_error('xmlrpc-missing', 'mnet','peers.php');
+        error(get_string('xmlrpc-missing', 'mnet'),'peers.php');
         exit;
     }
 
@@ -82,43 +77,38 @@ if (($form = data_submitted()) && confirm_sesskey()) {
             $temp_wwwroot = clean_param($form->wwwroot, PARAM_URL);
             if ($temp_wwwroot !== $form->wwwroot) {
                 trigger_error("We now parse the wwwroot with PARAM_URL. Your URL will need to have a valid TLD, etc.");
-                print_error("invalidurl", 'mnet','peers.php');
+                error(get_string("invalidurl", 'mnet'),'peers.php');
                 exit;
             }
             unset($temp_wwwroot);
-            $mnet_peer->set_applicationid($form->applicationid);
-            $application = get_field('mnet_application', 'name', 'id', $form->applicationid);
-            $mnet_peer->bootstrap($form->wwwroot, null, $application);
+            $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->updateparams->deleted = $form->deleted;
             $mnet_peer->deleted = $form->deleted;
         }
     
         if (isset($form->public_key)) {
             $form->public_key = clean_param($form->public_key, PARAM_PEM);
             if (empty($form->public_key)) {
-                print_error("invalidpubkey", 'mnet', 'peers.php?step=update&hostid='.$mnet_peer->id);
+                error(get_string("invalidpubkey", 'mnet'),'peers.php?step=update&hostid='.$mnet_peer->id);
                 exit;
             } else {
                 $oldkey = $mnet_peer->public_key;
                 $mnet_peer->public_key = $form->public_key;
-                $mnet_peer->updateparams->public_key = addslashes($form->public_key);
-                $mnet_peer->public_key_expires = $mnet_peer->check_common_name($form->public_key);
-                $mnet_peer->updateparams->public_key_expires = $mnet_peer->check_common_name($form->public_key);
+                $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);
-                    //print_error("invalidpubkey", 'mnet', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $errmsg);
                     exit;
                 }
             }
@@ -127,7 +117,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
         // PREVENT DUPLICATE RECORDS ///////////////////////////////////////////
         if ('input' == $form->step) {
             if ( isset($mnet_peer->id) && $mnet_peer->id > 0 ) {
-                print_error("hostexists", 'mnet', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $mnet_peer->id);
+                error(get_string("hostexists", 'mnet', $mnet_peer->id),'peers.php?step=update&amp;hostid='.$mnet_peer->id);
             }
         }
 
@@ -145,7 +135,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
 } elseif (is_int($hostid)) {
     $mnet_peer = new mnet_peer();
     $mnet_peer->set_id($hostid);
-    $currentkey = mnet_get_public_key($mnet_peer->wwwroot, $mnet_peer->application);
+    $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) {
@@ -154,31 +144,8 @@ if (($form = data_submitted()) && confirm_sesskey()) {
         include('./mnet_review_allhosts.html');
     }
 } else {
-    $hosts = get_records_sql('  SELECT 
-                                    h.id, 
-                                    h.wwwroot, 
-                                    h.ip_address, 
-                                    h.name, 
-                                    h.public_key, 
-                                    h.public_key_expires, 
-                                    h.transport, 
-                                    h.portno, 
-                                    h.last_connect_time, 
-                                    h.last_log_id, 
-                                    h.applicationid, 
-                                    a.name as app_name, 
-                                    a.display_name as app_display_name, 
-                                    a.xmlrpc_server_url
-                                FROM  
-                                    '.$CFG->prefix.'mnet_host h,  
-                                    '.$CFG->prefix.'mnet_application a  
-                                WHERE 
-                                    h.id != \''.$CFG->mnet_localhost_id.'\' AND  
-                                    h.deleted = \'0\' AND  
-                                    h.applicationid=a.id');
-
+    $hosts = get_records_select('mnet_host', " id != '{$CFG->mnet_localhost_id}' AND deleted = '0' ",'wwwroot ASC' );
     if (empty($hosts)) $hosts = array();
-    $applications = get_records('mnet_application');
     include('./peers.html');
 }
 ?>

admin/mnet/tabs.php

@@ -1,31 +0,0 @@
-<?php
-/**
- * Handles tabs for the mnet pages.
- * We assume that $currenttab is defined
- *
- */
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.'); // It must be included from a Moodle page
-}
-$strmnetservices   = get_string('mnetservices', 'mnet');
-$strmnetlog        = get_string('mnetlog', 'mnet');
-$strmnetedithost   = get_string('reviewhostdetails', 'mnet');
-$strmnetthemes     = get_string('mnetthemes', 'mnet');
-
-$logurl = $CFG->wwwroot.
-          '/course/report/log/index.php?chooselog=1&amp;showusers=1&amp;showcourses=1&amp;host_course='.$mnet_peer->id.
-          '%2F1&amp;user='.'0'.
-          '&amp;date=0'.
-          '&amp;modid=&amp;modaction=0&amp;logformat=showashtml';
-$tabs = array();
-if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
-    $tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
-    $tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
-    $tabs[] = new tabobject('mnetthemes', 'mnet_themes.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetthemes, $strmnetthemes, false);
-    if ($mnet_peer->application->name == 'moodle' && $mnet_peer->id != $CFG->mnet_all_hosts_id) {
-        $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
-    }
-} else {
-    $tabs[] = new tabobject('mnetdetails', '#', $strmnetedithost, $strmnetedithost, false);
-}
-print_tabs(array($tabs), $currenttab);

admin/mnet/trustedhosts.html

@@ -1,39 +1,36 @@
 <?php
-admin_externalpage_print_header();
+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" >
+<center>
+<table cellspacing="0" cellpadding="5"  width="500" id="hosts" class="generaltable generalbox" >
     <tr>
-        <th class="header c0" colspan="2"><?php print_string('trustedhosts', 'mnet'); ?></th>
+        <th class="header c0" nowrap="nowrap" 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>
+        <td class="cell c1" colspan="2"><form  method="post" action="trustedhosts.php">
+            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+            <textarea name="hostlist" cols="40" rows="20"><?php echo $trusted_hosts; ?></textarea><br />
+            <input type="submit" value="<?php print_string('savechanges'); ?>" />
             </form>
         </td>
     </tr>
 </table>
-<table cellspacing="0" cellpadding="5" class="generaltable generalbox" >
+<table cellspacing="0" cellpadding="5"  width="500" id="hosts" class="generaltable generalbox" >
     <tr>
-        <th class="header c0" colspan="2"><?php print_string('testtrustedhosts', 'mnet'); ?></th>
+        <th class="header c0" nowrap="nowrap" colspan="2"><?php print_string('testtrustedhosts', 'mnet'); ?></th>
     </tr>
 <?php 
-    if (!empty($test_ip_address)){
+    if (!empty($test_ip_address)):
 ?>
     <tr>
         <td class="cell c1" colspan="2">
             <?php
                 if ($in_range) {
                     print_string('is_in_range',  'mnet', $test_ip_address);
-                    echo '<br />';
+                    echo '<br>';
                     print_string('validated_by', 'mnet', $validated_by);
                 } else {
                     print_string('not_in_range',  'mnet', $test_ip_address);
@@ -42,27 +39,24 @@ admin_externalpage_print_header();
         </td>
     </tr>
 <?php
-   } else {
+    else:
 ?>
     <tr>
         <td class="cell c1" colspan="2"><?php print_string('testtrustedhostsexplain', 'mnet'); ?></td>
     </tr>
 <?php
-   } 
+    endif;
 ?>
     <tr>
-        <td class="cell c1" colspan="2">
-            <form  method="get" action="trustedhosts.php">
-            <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>
+        <td class="cell c1" colspan="2"><form  method="get" action="trustedhosts.php">
+            <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />
+            <input type="text" name="testipaddress" value="<?php echo $test_ip_address; ?>" />
+            <input type="submit" value="<?php print_string('go'); ?>" />
             </form>
         </td>
     </tr>
 </table>
-</div>
+</center>
 <?php
-admin_externalpage_print_footer();
-?>
+admin_externalpage_print_footer($adminroot);
+?>

admin/mnet/trustedhosts.php

@@ -6,19 +6,20 @@
     include_once($CFG->dirroot.'/mnet/lib.php');
 
     require_login();
-    admin_externalpage_setup('trustedhosts');
+    $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();
+        admin_externalpage_print_header($adminroot);
         print_error('requiresopenssl', 'mnet', '', NULL, true);
     }
     
     if (!$site = get_site()) {
-        admin_externalpage_print_header();
+        admin_externalpage_print_header($adminroot);
         print_error('nosite', '', '', NULL, true);
     }
 
@@ -48,6 +49,7 @@
 
     /// If data submitted, process and store
     if (($form = data_submitted()) && confirm_sesskey()) {
+        echo 'a';
         $hostlist = preg_split("/[\s,]+/", $form->hostlist);
         foreach($hostlist as $host) {
             list($address, $mask) = explode('/', $host.'/');

admin/module.php

@@ -3,6 +3,8 @@
 
     require_once('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('managemodules', $adminroot);
 
 /// If data submitted, then process and store.
 
@@ -10,12 +12,11 @@
         $module = optional_param('module', '', PARAM_SAFEDIR);
 
         if (!confirm_sesskey()) {
-            print_error('confirmsesskeybad', 'error');
+            error(get_string('confirmsesskeybad', 'error'));
         }
 
         if ($module != '') {
-            include_once("$CFG->dirroot/mod/$module/lib.php");
-            admin_externalpage_setup('modsetting'.$module);
+            require_once("$CFG->dirroot/mod/$module/lib.php");
             // if the config.html contains a hidden form field giving
             // the module name then the form does not have to prefix all
             // its variable names, we will do it here.
@@ -27,8 +28,6 @@
                 $moduleconfig($config);
             }
         } else {
-            admin_externalpage_setup('managemodules');
-
             $moduleprefix = '';
         }
 
@@ -44,8 +43,7 @@
 
 /// Otherwise print the form.
     $module = required_param('module', PARAM_SAFEDIR);
-    include_once("$CFG->dirroot/mod/$module/lib.php");
-    admin_externalpage_setup('modsetting'.$module);
+    require_once("$CFG->dirroot/mod/$module/lib.php");
 
     $strmodulename = get_string("modulename", $module);
 
@@ -53,17 +51,17 @@
     // of the page. It is also used to generate the link to the Moodle Docs for this view.
     $CFG->pagepath = 'mod/' . $module . '/config';
 
-    admin_externalpage_print_header();
+    admin_externalpage_print_header($adminroot);
 
     print_heading($strmodulename);
 
-    print_simple_box(get_string("configwarning", 'admin'), "center", "60%");
+    print_simple_box("<center>".get_string("configwarning", 'admin')."</center>", "center", "60%");
     echo "<br />";
 
     print_simple_box_start("center", "");
     include("$CFG->dirroot/mod/$module/config.html");
     print_simple_box_end();
 
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/modules.php

@@ -5,12 +5,12 @@
     require_once('../course/lib.php');
     require_once($CFG->libdir.'/adminlib.php');
     require_once($CFG->libdir.'/tablelib.php');
-    require_once($CFG->libdir.'/ddllib.php');
 
     // defines
     define('MODULE_TABLE','module_administration_table');
 
-    admin_externalpage_setup('managemodules');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('managemodules', $adminroot);
 
     $show    = optional_param('show', '', PARAM_SAFEDIR);
     $hide    = optional_param('hide', '', PARAM_SAFEDIR);
@@ -30,52 +30,36 @@
     $stractivitymodule = get_string("activitymodule");
     $strshowmodulecourse = get_string('showmodulecourse');
 
+    admin_externalpage_print_header($adminroot);
+
+    print_heading($stractivities);
+
+    $coursesaffected = false;
+
+
 /// If data submitted, then process and store.
 
     if (!empty($hide) and confirm_sesskey()) {
         if (!$module = get_record("modules", "name", $hide)) {
             error("Module doesn't exist!");
         }
-        set_field("modules", "visible", "0", "id", $module->id); // Hide main module
-        // Remember the visibility status in visibleold
-        // and hide...
-        $sql = "UPDATE {$CFG->prefix}course_modules
-                SET visibleold=visible,
-                    visible=0
-                WHERE  module={$module->id}";
-        execute_sql($sql, false);
-        // clear the course modinfo cache for courses
-        // where we just deleted something
-        $sql = "UPDATE {$CFG->prefix}course
-                SET modinfo=''
-                WHERE id IN (SELECT DISTINCT course
-                             FROM {$CFG->prefix}course_modules
-                             WHERE visibleold=1 AND module={$module->id})";
-        execute_sql($sql, false);
-        admin_get_root(true, false);  // settings not required - only pages
+        set_field("modules", "visible", "0", "id", $module->id);                               // Hide main module
+        set_field('course_modules', 'visibleold', '1', 'visible' ,'1', 'module', $module->id); // Remember the previous visible state so we can toggle this back if the module is unhidden.
+        set_field('course_modules', 'visibleold', '0', 'visible' ,'0', 'module', $module->id);
+        set_field("course_modules", "visible", "0", "module", $module->id);                    // Hide all related activity modules
+        $coursesaffected = true;
     }
 
     if (!empty($show) and confirm_sesskey()) {
         if (!$module = get_record("modules", "name", $show)) {
             error("Module doesn't exist!");
         }
-        set_field("modules", "visible", "1", "id", $module->id); // Show main module
-        set_field('course_modules', 'visible', '1', 'visibleold',
-                  '1', 'module', $module->id); // Get the previous saved visible state for the course module.
-        // clear the course modinfo cache for courses
-        // where we just made something visible
-        $sql = "UPDATE {$CFG->prefix}course
-                SET modinfo=''
-                WHERE id IN (SELECT DISTINCT course
-                             FROM {$CFG->prefix}course_modules
-                             WHERE visible=1 AND module={$module->id})";
-        execute_sql($sql, false);
-        admin_get_root(true, false);  // settings not required - only pages
+        set_field("modules", "visible", "1", "id", $module->id);                               // Show main module
+        set_field('course_modules', 'visible', '1', 'visibleold', '1', 'module', $module->id); // Get the previous saved visible state for the course module.
+        $coursesaffected = true;
     }
 
     if (!empty($delete) and confirm_sesskey()) {
-        admin_externalpage_print_header();
-        print_heading($stractivities);
 
         $strmodulename = get_string("modulename", "$delete");
 
@@ -83,7 +67,7 @@
             notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename),
                          "modules.php?delete=$delete&confirm=1&sesskey=$USER->sesskey",
                          "modules.php");
-            admin_externalpage_print_footer();
+            admin_externalpage_print_footer($adminroot);
             exit;
 
         } else {  // Delete everything!!
@@ -105,31 +89,10 @@
                 }
             }
 
-            // delete calendar events
-            if (!delete_records("event", "modulename", $delete)) {
-                notify("Error occurred while deleting all $strmodulename records in calendar event table");
-            }
-
-            // clear course.modinfo for courses
-            // that used this module...
-            $sql = "UPDATE {$CFG->prefix}course
-                    SET modinfo=''
-                    WHERE id IN (SELECT DISTINCT course
-                                 FROM {$CFG->prefix}course_modules
-                                 WHERE module={$module->id})";
-            execute_sql($sql, false);
-
             // Now delete all the course module records
             if (!delete_records("course_modules", "module", $module->id)) {
                 notify("Error occurred while deleting all $strmodulename records in course_modules table");
             }
-            if ($coursemods) {
-                foreach ($coursemods as $coursemod) {
-                    if (!delete_context(CONTEXT_MODULE, $coursemod->id)) {
-                        notify("Could not delete the context for $strmodulename with id = $coursemod->id");
-                    }
-                }
-            }
 
             // Then delete all the logs
             if (!delete_records("log", "module", $module->name)) {
@@ -146,34 +109,23 @@
                 notify("Error occurred while deleting the $strmodulename record from modules table");
             }
 
-            // And the module configuration records
-            if (!execute_sql("DELETE FROM {$CFG->prefix}config WHERE name LIKE '{$module->name}_%'")) {
-                notify("Error occurred while deleting the $strmodulename records from the config table");
-            }
-
-            // cleanup the gradebook
-            require_once($CFG->libdir.'/gradelib.php');
-            grade_uninstalled_module($module->name);
-
             // Then the tables themselves
-            drop_plugin_tables($module->name, "$CFG->dirroot/mod/$module->name/db/install.xml", false);
 
-            // Delete the capabilities that were defined by this module
-            capabilities_cleanup('mod/'.$module->name);
-
-            // remove entent handlers and dequeue pending events
-            events_uninstall('mod/'.$module->name);
-
-            // Perform any custom uninstall tasks
-            if (file_exists($CFG->dirroot . '/mod/' . $module->name . '/lib.php')) {
-                require_once($CFG->dirroot . '/mod/' . $module->name . '/lib.php');
-                $uninstallfunction = $module->name . '_uninstall';
-                if (function_exists($uninstallfunction)) {
-                    if (! $uninstallfunction() ) {
-                        notify('Encountered a problem running uninstall function for '. $module->name.'!');
+            if ($tables = $db->Metatables()) {
+                $prefix = $CFG->prefix.$module->name;
+                foreach ($tables as $table) {
+                    if (strpos($table, $prefix) === 0) {
+                        if (!execute_sql("DROP TABLE $table", false)) {
+                            notify("ERROR: while trying to drop table $table");
+                        }
                     }
                 }
             }
+            // Delete the capabilities that were defined by this module
+            capabilities_cleanup('mod/'.$module->name);
+
+            // rebuild_course_cache();  // Because things have changed
+            $coursesaffected = true;
 
             $a->module = $strmodulename;
             $a->directory = "$CFG->dirroot/mod/$delete";
@@ -181,8 +133,10 @@
         }
     }
 
-    admin_externalpage_print_header();
-    print_heading($stractivities);
+    if ($coursesaffected) {
+        rebuild_course_cache();  // Because things have changed
+    }
+
 
 /// Get and sort the existing modules
 
@@ -198,7 +152,7 @@
         }
         $modulebyname[$strmodulename] = $module;
     }
-    ksort($modulebyname, SORT_LOCALE_STRING);
+    ksort($modulebyname);
 
 /// Print the table of all modules
     // construct the flexible table ready to display
@@ -217,9 +171,7 @@
 
         $delete = "<a href=\"modules.php?delete=$module->name&amp;sesskey=$USER->sesskey\">$strdelete</a>";
 
-        if (file_exists("$CFG->dirroot/mod/$module->name/settings.php")) {
-            $settings = "<a href=\"settings.php?section=modsetting$module->name\">$strsettings</a>";
-        } else if (file_exists("$CFG->dirroot/mod/$module->name/config.html")) {
+        if (file_exists("$CFG->dirroot/mod/$module->name/config.html")) {
             $settings = "<a href=\"module.php?module=$module->name\">$strsettings</a>";
         } else {
             $settings = "";
@@ -249,23 +201,18 @@
             $class = "";
         }
 
-        $extra = '';
-        if (!file_exists("$CFG->dirroot/mod/$module->name/lib.php")) {
-            $extra = ' <span class="notifyproblem">('.get_string('missingfromdisk').')</span>';
-        }
-
         $table->add_data(array(
-            '<span'.$class.'>'.$icon.' '.$modulename.$extra.'</span>',
-            $countlink,
-            '<span'.$class.'>'.$module->version.'</span>',
-            $visible,
-            $delete,
+            '<span'.$class.'>'.$icon.' '.$modulename.'</span>', 
+            $countlink, 
+            '<span'.$class.'>'.$module->version.'</span>', 
+            $visible, 
+            $delete, 
             $settings
         ));
     }
 
     $table->print_html();
 
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/multilangupgrade.php

@@ -4,13 +4,17 @@
 require_once('../config.php');
 require_once($CFG->dirroot.'/course/lib.php');
 require_once($CFG->libdir.'/adminlib.php');
-
-admin_externalpage_setup('multilangupgrade');
+$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();
+admin_externalpage_print_header($adminroot);
 
 print_heading(get_string('multilangupgrade', 'admin'));
 
@@ -19,7 +23,7 @@ $strmultilangupgrade = get_String('multilangupgradeinfo', 'admin');
 if (!$go or !data_submitted() or !confirm_sesskey()) {   /// Print a form
     $optionsyes = array('go'=>1, 'sesskey'=>sesskey());
     notice_yesno($strmultilangupgrade, 'multilangupgrade.php', 'index.php', $optionsyes, null, 'post', 'get');
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
     die;
 }
 
@@ -38,7 +42,7 @@ while(@ob_end_flush());
 
 echo '<strong>Progress:</strong>';
 $i = 0;
-$skiptables = array($CFG->prefix.'config', $CFG->prefix.'user_students', $CFG->prefix.'user_teachers');//, $CFG->prefix.'sessions2');
+$skiptables = array($CFG->prefix.'config');//, $CFG->prefix.'sessions2');
 
 foreach ($tables as $table) {
     if (($CFG->prefix && strpos($table, $CFG->prefix) !== 0)
@@ -56,11 +60,15 @@ foreach ($tables as $table) {
             if (in_array($data->type, array('text','mediumtext','longtext','varchar'))) {  // Text stuff only
                 // first find candidate records
                 $rs = get_recordset_sql("SELECT id, $column FROM $table WHERE $column LIKE '%</lang>%' OR $column LIKE '%<span lang=%'");
-                if ($rs) {
+                if ($rs and $rs->RecordCount() > 0) {
                     while (!$rs->EOF) {
                         $text = $rs->fields[$column];
-                        $id   = $rs->fields['id'];
-
+                        $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 />';
                         }
@@ -69,24 +77,7 @@ foreach ($tables as $table) {
                         }
                         $i++;
                         $rs->MoveNext();
-
-                        if (empty($text) or is_numeric($text)) {
-                            continue; // nothing to do
-                        }
-
-                        $search = '/(<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)(\s*<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)+/is';
-                        $newtext = preg_replace_callback($search, 'multilangupgrade_impl', $text);
-
-                        if (is_null($newtext)) {
-                            continue; // regex error
-                        }
-
-                        if ($newtext != $text) {
-                            $newtext = addslashes($newtext);
-                            execute_sql("UPDATE $table SET $column='$newtext' WHERE id=$id", false);
-                        }
                     }
-                    rs_close($rs);
                 }
             }
         }
@@ -105,7 +96,7 @@ notify('...finished', 'notifysuccess');
 
 print_continue('index.php');
 
-admin_externalpage_print_footer();
+admin_externalpage_print_footer($adminroot);
 die;
 
 

admin/oacleanup.php

@@ -4,12 +4,16 @@ if (!isset($CFG)) {
 
     require('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('oacleanup', $adminroot);
 
-    admin_externalpage_setup('oacleanup');
+    require_login();
 
-    admin_externalpage_print_header();
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+    admin_externalpage_print_header($adminroot);
     online_assignment_cleanup(true);
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 }
 

admin/pagelib.php

@@ -15,63 +15,68 @@ 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 $section;
+    var $pathtosection;
     var $visiblepathtosection;
-    var $extraurlparams = array();
-    var $extrabutton = '';
-    var $url = '';
 
     // hack alert!
     // this function works around the inability to store the section name
     // in default block, maybe we should "improve" the blocks a bit?
-    function init_extra($section) {
+    function init_extra($section) { 
         global $CFG;
 
         if($this->full_init_done) {
             return;
         }
 
-        $adminroot =& admin_get_root(false, false); //settings not required - only pages
+        $adminroot = admin_get_root();
 
         // fetch the path parameter
         $this->section = $section;
-        $current =& $adminroot->locate($section, true);
-        $this->visiblepathtosection = array_reverse($current->visiblepath);
+
+        $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));
+    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() {
+    function user_is_editing() { 
         global $USER;
         return $USER->adminediting;
     }
 
-    function url_get_path() {
+    function url_get_path() { 
         global $CFG;
-        if (!empty($this->url)) {
-            return $this->url;
-        }
 
-        $adminroot =& admin_get_root(false, false); //settings not required - only pages
+        $adminroot = admin_get_root();
 
-        $root =& $adminroot->locate($this->section);
+        $root = $adminroot->locate($this->section);
         if (is_a($root, 'admin_externalpage')) {
             return $root->url;
         } else {
@@ -79,36 +84,15 @@ class page_admin extends page_base {
         }
     }
 
-    /**
-     * Use this to pass extra HTML that is added after the turn blocks editing on/off button.
-     *
-     * @param string $extrabutton HTML code.
-     */
-    function set_extra_button($extrabutton) {
-        $this->extrabutton = $extrabutton;
-    }
-
-    /**
-     * Use this to pass extra URL parameters that, for example, the blocks editing controls need to reload the current page accurately.
-     *
-     * @param array $extraurlparams paramname => value array.
-     */
-    function set_extra_url_params($extraurlparams, $actualurl = '') {
-        $this->extraurlparams = $extraurlparams;
-        if (!empty($actualurl)) {
-            $this->url = $actualurl;
-        }
-    }
-
     function url_get_parameters() {  // only handles parameters relevant to the admin pagetype
-        return array_merge($this->extraurlparams, array('section' => $this->section));
+        return array('section' => (isset($this->section) ? $this->section : ''));
     }
 
-    function blocks_get_positions() {
+    function blocks_get_positions() { 
         return array(BLOCK_POS_LEFT, BLOCK_POS_RIGHT);
     }
 
-    function blocks_default_position() {
+    function blocks_default_position() { 
         return BLOCK_POS_LEFT;
     }
 
@@ -126,35 +110,24 @@ class page_admin extends page_base {
         parent::init_quick($data);
     }
 
-    function print_header($section = '', $focus='') {
+    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
+	// The search page currently doesn't handle block editing 
         if ($this->section != 'search' and $this->user_allowed_editing()) {
-            $options = $this->url_get_parameters();
-            if ($this->user_is_editing()) {
-                $caption = get_string('blockseditoff');
-                $options['adminedit'] = 'off';
-            } else {
-                $caption = get_string('blocksediton');
-                $options['adminedit'] = 'on';
-            }
-            $buttons = print_single_button($this->url_get_path(), $options, $caption, 'get', '', true);
+            $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;';
         }
-        $buttons .= $this->extrabutton;
-
-        $navlinks = array();
-        foreach ($this->visiblepathtosection as $element) {
-            $navlinks[] = array('name' => $element, 'link' => null, 'type' => 'misc');
-        }
-        $navigation = build_navigation($navlinks);
-
-        print_header("$SITE->shortname: " . implode(": ",$this->visiblepathtosection), $SITE->fullname, $navigation, $focus, '', true, $buttons, '');
+        
+        print_header("$SITE->shortname: " . implode(": ",$this->visiblepathtosection), $SITE->fullname, 
+                       implode(" -> ",$this->visiblepathtosection),'', '', true, $buttons, '');
     }
 
     function get_type() {

admin/phpinfo.php

@@ -4,9 +4,14 @@
     require_once("../config.php");
     require_once($CFG->libdir.'/adminlib.php');
 
-    admin_externalpage_setup('phpinfo');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('phpinfo', $adminroot);
 
-    admin_externalpage_print_header();
+    require_login();
+
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+    admin_externalpage_print_header($adminroot);
 
     echo '<div class="phpinfo">';
 
@@ -28,6 +33,6 @@
 
     echo '</div>';
 
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/process_email.php

@@ -54,7 +54,7 @@ if ($modid == '0') { // special
 }
 else {
     $modname = get_field("modules","name","id",$modid);
-    include_once('mod/'.$modname.'/lib.php');
+    require_once('mod/'.$modname.'/lib.php');
 }
 $function = $modname.'_process_email';
 
@@ -72,7 +72,7 @@ while(!feof($fd)) {
 
 $function($modargs,$body); 
 
-fclose($fd);
+fclose($handle);
 
 
 

admin/register.php

@@ -5,14 +5,14 @@
 
     require_login();
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
     if (!$site = get_site()) {
         redirect("index.php");
     }
 
     if (!confirm_sesskey()) {
-        print_error('confirmsesskeybad', 'error');
+        error(get_string('confirmsesskeybad', 'error'));
     }
 
     if (!$admin = get_admin()) {
@@ -23,15 +23,19 @@
         $admin->country = $CFG->country;
     }
 
+    if (empty($CFG->siteidentifier)) {    // Unique site identification code
+        set_config('siteidentifier', random_string(32).$_SERVER['HTTP_HOST']);
+    }
+
+
 /// Print headings
+
     $stradministration = get_string("administration");
     $strregistration = get_string("registration");
     $strregistrationinfo = get_string("registrationinfo");
-    $navlinks = array();
-    $navlinks[] = array('name' => $stradministration, 'link' => "../$CFG->admin/index.php", 'type' => 'misc');
-    $navlinks[] = array('name' => $strregistration, 'link' => null, 'type' => 'misc');
-    $navigation = build_navigation($navlinks);
-    print_header("$site->shortname: $strregistration", $site->fullname, $navigation);
+
+    print_header("$site->shortname: $strregistration", $site->fullname, 
+                 "<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> $strregistration");
 
     print_heading($strregistration);
 
@@ -42,13 +46,13 @@
 
     echo "<form id=\"mform1\" class=\"mform\" action=\"http://moodle.org/register/\" method=\"post\">\n";
     echo '<fieldset id="registration">';
-    echo '<legend>'.get_string("registrationinfotitle").'</legend>';
+    echo '<legend>Registration Information</legend>';
 
     echo "<!-- The following hidden variables are to help prevent fake entries being sent. -->\n";
     echo "<!-- Together they form a key.  If any of these change between updates then the entry  -->\n";
     echo "<!-- is flagged as a new entry and will be manually checked by the list maintainer -->\n";
     echo "<input type=\"hidden\" name=\"url\" value=\"$CFG->wwwroot\" />\n";
-    echo "<input type=\"hidden\" name=\"secret\" value=\"" . get_site_identifier() . "\" />\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";
 
@@ -59,12 +63,12 @@
     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">';
@@ -99,7 +103,7 @@
     unset($options);
     echo '</div>';
     echo '</div>';
-
+            
     echo '<div class="fitem">';
     echo '<div class="fitemtitle"><label>'.get_string("statistics")."<br />(".get_string("notpublic").')'.'</label></div>';
     echo '<div class="felement ftext">';
@@ -115,7 +119,7 @@
     echo '<br />';
 
     // total number of role assignments
-    $count = count_records('role_assignments');
+    $count = count_records('role_assignments'); 
     echo get_string('roleassignments', 'role').": ".$count;
     echo "<input type=\"hidden\" name=\"roleassignments\" value=\"$count\" />\n";
     echo '<br />';
@@ -123,13 +127,13 @@
     // first find all distinct roles with mod/course:update
     // please change the name and strings to something appropriate to reflect the new data collected
     $sql = "SELECT COUNT(DISTINCT u.id)
-            FROM {$CFG->prefix}role_capabilities rc,
+            FROM {$CFG->prefix}role_capabilities rc, 
                  {$CFG->prefix}role_assignments ra,
                  {$CFG->prefix}user u
             WHERE (rc.capability = 'moodle/course:update' or rc.capability='moodle/site:doanything')
                    AND rc.roleid = ra.roleid
                    AND u.id = ra.userid";
-
+    
     $count = count_records_sql($sql);
     echo get_string("teachers").": ".$count;
     echo "<input type=\"hidden\" name=\"courseupdaters\" value=\"$count\" />\n";
@@ -150,7 +154,7 @@
     echo "<input type=\"hidden\" name=\"resources\" value=\"$count\" />\n";
     echo '</div>';
     echo '</div>';
-
+            
     echo '<div class="fitem">';
     echo '<div class="fitemtitle"><label for="adminname">'.get_string("administrator").'</label></div>';
     echo '<div class="felement ftext">';

admin/replace.php

@@ -4,19 +4,18 @@
 require_once('../config.php');
 require_once($CFG->dirroot.'/course/lib.php');
 require_once($CFG->libdir.'/adminlib.php');
-
-// workaround for problems with compression
-if (ini_get('zlib.output_compression')) {
-    @ini_set('zlib.output_compression', 'Off');
-}
-
-admin_externalpage_setup('replace');
+$adminroot = admin_get_root();
+admin_externalpage_setup('replace', $adminroot);
 
 $search  = optional_param('search', '', PARAM_RAW);
 $replace = optional_param('replace', '', PARAM_RAW);
 
+require_login();
+
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
 ###################################################################
-admin_externalpage_print_header();
+admin_externalpage_print_header($adminroot);
 
 print_heading('Search and replace text throughout the whole database');
 
@@ -24,7 +23,7 @@ print_heading('Search and replace text throughout the whole database');
 if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Print a form
 
     print_simple_box_start('center');
-    echo '<div class="mdl-align">';
+    echo '<div align="center">';
     echo '<form action="replace.php" method="post">';
     echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
     echo 'Search whole database for: <input type="text" name="search" /><br />';
@@ -33,32 +32,40 @@ if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Pr
     echo '</form>';
     echo '</div>';
     print_simple_box_end();
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
     die;
 }
 
+
+if (!$tables = $db->Metatables() ) {    // No tables yet at all.
+    error("no tables");
+}
+
 print_simple_box_start('center');
 
-if (!db_replace($search, $replace)) {
-    error('An error has occured during this process'); 
+/// Turn off time limits, sometimes upgrades can be slow.
+
+@set_time_limit(0);
+@ob_implicit_flush(true);
+while(@ob_end_flush());
+
+foreach ($tables as $table) {
+    if (in_array($table, array($CFG->prefix.'config'))) {      // Don't process these
+        continue;
+    }
+    if ($columns = $db->MetaColumns($table, false)) {
+        foreach ($columns as $column => $data) {
+            if (in_array($data->type, array('text','mediumtext','longtext','varchar'))) {  // Text stuff only
+                $db->debug = true;
+                execute_sql("UPDATE $table SET $column = REPLACE($column, '$search', '$replace');");
+                $db->debug = false;
+            }
+        }
+    }
 }
 
 print_simple_box_end();
 
-/// Try to replace some well-known serialised contents (html blocks)
-notify('Replacing in html blocks...');
-$sql = "SELECT bi.*
-          FROM {$CFG->prefix}block_instance bi
-          JOIN {$CFG->prefix}block b ON b.id = bi.blockid
-         WHERE b.name = 'html'";
-if ($instances = get_records_sql($sql)) {
-    foreach ($instances as $instance) {
-        $blockobject = block_instance('html', $instance);
-        $blockobject->config->text = str_replace($search, $replace, $blockobject->config->text);
-        $blockobject->instance_config_commit($blockobject->pinned);
-    }
-}
-
 /// Rebuild course cache which might be incorrect now
 notify('Rebuilding course cache...');
 rebuild_course_cache();
@@ -66,6 +73,6 @@ notify('...finished');
 
 print_continue('index.php');
 
-admin_externalpage_print_footer();
+admin_externalpage_print_footer($adminroot);
 
 ?>

admin/report/backups/index.php

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

admin/report/backups/settings.php

@@ -1,3 +0,0 @@
-<?php  // $Id$
-$ADMIN->add('reports', new admin_externalpage('reportbackups', get_string('backups', 'admin'), "$CFG->wwwroot/$CFG->admin/report/backups/index.php",'moodle/site:backup'));
-?>

admin/report/courseoverview/db/access.php

@@ -1,42 +0,0 @@
-<?php  // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$report_courseoverview_capabilities = array(
-
-    'report/courseoverview:view' => array(
-        'riskbitmask' => RISK_PERSONAL,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_SYSTEM,
-        'legacy' => array(
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        ),
-
-        'clonepermissionsfrom' => 'moodle/site:viewreports',
-    )
-);
-
-?>

admin/report/courseoverview/index.php

@@ -4,21 +4,23 @@
     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);
 
-    admin_externalpage_setup('reportcourseoverview');
-    admin_externalpage_print_header();
+    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));  // needed?
 
     if (empty($CFG->enablestats)) {
-        if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
-            redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3);
-        } else {
-            error("Stats is not enabled.");
-        }
+        redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3, $adminroot);
     }
 
+
     $course = get_site();
     stats_check_uptodate($course->id);
 
@@ -44,11 +46,11 @@
     $timeoptions = stats_get_time_options($now,$lastweekend,$lastmonthend,$earliestday,$earliestweek,$earliestmonth);
 
     if (empty($timeoptions)) {
-        print_error('nostatstodisplay', "", $CFG->wwwroot.'/course/view.php?id='.$course->id);
+        error(get_string('nostatstodisplay'), $CFG->wwwroot.'/course/view.php?id='.$course->id, $adminroot);
     }
 
     echo '<form action="index.php" method="post">'."\n";
-    echo '<div>';
+    echo '<fieldset class="invisiblefieldset">';
 
     $table->width = '*';
     $table->align = array('left','left','left','left','left','left');
@@ -58,35 +60,33 @@
                            '<input type="submit" value="'.get_string('view').'" />') ;
 
     print_table($table);
-    echo '</div>';
+    echo '</fieldset>';
     echo '</form>';
 
-    print_heading($reportoptions[$report]);
-
-
     if (!empty($report) && !empty($time)) {
         $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
+
         if (!empty($param->sql)) {
             $sql = $param->sql;
         } else {
             $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
-                ." WHERE timeend >= $param->timeafter AND stattype = 'activity' AND roleid = 0"
+                ." 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)) {
-            notify(get_string('statsnodata'));
-            echo '</td></tr></table>';
+            notify(get_string('statsnodata'));echo '</td></tr></table>';echo '<p>after notify</p>';
 
         } else {
             if (empty($CFG->gdversion)) {
-                echo '<div class="graph">(' . get_string("gdneed") .')</div>';
+                echo '<div class="boxaligncenter">(' . get_string("gdneed") .')</div>';
             } else {
-                echo '<div class="graph"><img alt="'.get_string('courseoverviewgraph').'" src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></div>';
+                echo '<div class="boxaligncenter"><img alt="'.get_string('courseoverviewgraph').'" src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></div>';
             }
 
             $table = new StdClass;
@@ -115,6 +115,6 @@
             print_table($table);
         }
     }
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 ?>

admin/report/courseoverview/reportsgraph.php

@@ -10,9 +10,9 @@
 
     require_login();
 
-    require_capability('report/courseoverview:view', get_context_instance(CONTEXT_SYSTEM));
+    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
-    stats_check_uptodate();
+    stats_check_uptodate($course->id);
 
     $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
 
@@ -20,7 +20,7 @@
         $sql = $param->sql;
     } else {
         $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
-            ." WHERE timeend >= $param->timeafter AND stattype = 'activity' AND roleid = 0"
+            ." WHERE timeend >= ".$param->timeafter.' AND stattype = \'activity\''
             ." GROUP BY courseid "
             .$param->extras
             ." ORDER BY ".$param->orderby;
@@ -29,7 +29,7 @@
     $courses = get_records_sql($sql, 0, $numcourses);
 
     if (empty($courses)) {
-        print_error('statsnodata', "", $CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/index.php');
+        error(get_string('statsnodata'),$CFG->wwwroot.'/'.$CFG->admin.'/report/course/index.php');
     }
 
 

admin/report/courseoverview/settings.php

@@ -1,3 +0,0 @@
-<?php  // $Id$
-$ADMIN->add('reports', new admin_externalpage('reportcourseoverview', get_string('courseoverview', 'admin'), "$CFG->wwwroot/$CFG->admin/report/courseoverview/index.php",'report/courseoverview:view'));
-?>

admin/report/courseoverview/version.php

@@ -1,29 +0,0 @@
-<?PHP // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$plugin->version  = 2007101503;
-$plugin->requires = 2007101532;
-
-?>

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

@@ -1,5 +0,0 @@
-<?php  // $Id$
-// just a link to course report
-$ADMIN->add('reports', new admin_externalpage('reportlog', get_string('log', 'admin'), "$CFG->wwwroot/course/report/log/index.php?id=".SITEID, 'coursereport/log:view'));
-$ADMIN->add('reports', new admin_externalpage('reportloglive', get_string('loglive', 'coursereport_log'), "$CFG->wwwroot/course/report/log/indexlive.php?id=".SITEID, 'coursereport/log:viewlive'));
-?>

admin/report/question/index.php

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

admin/report/question/settings.php

@@ -1,3 +0,0 @@
-<?php  // $Id$
-$ADMIN->add('reports', new admin_externalpage('reportquestion', get_string('question', 'admin'), "$CFG->wwwroot/$CFG->admin/report/question/index.php", 'moodle/site:config'));
-?>

admin/report/security/db/access.php

@@ -1,36 +0,0 @@
-<?php  // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$report_security_capabilities = array(
-
-    'report/security:view' => array(
-        'riskbitmask' => RISK_CONFIG,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_SYSTEM,
-        'legacy' => array(
-            'admin' => CAP_ALLOW
-        ),
-    )
-);

admin/report/security/index.php

@@ -1,127 +0,0 @@
-<?php  //$Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas  http://dougiamas.com     //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once('../../../config.php');
-require_once($CFG->dirroot.'/'.$CFG->admin.'/report/security/lib.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-require_login();
-
-$issue = optional_param('issue', '', PARAM_FILE); // show detailed info about one issue only
-
-$issues = report_security_get_issue_list();
-
-// test if issue valid string
-if (array_search($issue, $issues, true) === false) {
-    $issue = '';
-}
-
-// we may need a bit more memory and this may take a long time to process
-@raise_memory_limit('128M');
-@set_time_limit(0);
-
-// Print the header.
-admin_externalpage_setup('reportsecurity');
-admin_externalpage_print_header();
-
-print_heading(get_string('reportsecurity', 'report_security'));
-
-echo '<div id="timewarning">'.get_string('timewarning', 'report_security').'</div>';
-while(@ob_end_flush());
-@flush();
-
-$strok       = '<span class="statusok">'.get_string('statusok', 'report_security').'</span>';
-$strinfo     = '<span class="statusinfo">'.get_string('statusinfo', 'report_security').'</span>';
-$strwarning  = '<span class="statuswarning">'.get_string('statuswarning', 'report_security').'</span>';
-$strserious  = '<span class="statusserious">'.get_string('statusserious', 'report_security').'</span>';
-$strcritical = '<span class="statuscritical">'.get_string('statuscritical', 'report_security').'</span>';
-
-$strissue    = get_string('issue', 'report_security');
-$strstatus   = get_string('status', 'report_security');
-$strdesc     = get_string('description', 'report_security');
-$strconfig   = get_string('configuration', 'report_security');
-
-$statusarr = array(REPORT_SECURITY_OK       => $strok,
-                   REPORT_SECURITY_INFO     => $strinfo,
-                   REPORT_SECURITY_WARNING  => $strwarning,
-                   REPORT_SECURITY_SERIOUS  => $strserious,
-                   REPORT_SECURITY_CRITICAL => $strcritical);
-
-$url = "$CFG->wwwroot/$CFG->admin/report/security/index.php";
-
-if ($issue and ($result = $issue(true))) {
-    report_security_hide_timearning();
-
-    $table = new object();
-    $table->head  = array($strissue, $strstatus, $strdesc, $strconfig);
-    $table->size  = array('30%', '10%', '50%', '10%' );
-    $table->align = array('left', 'left', 'left', 'left');
-    $table->width = '90%';
-    $table->data  = array();
-
-    // print detail of one issue only
-    $row = array();
-    $row[0] = report_security_doc_link($issue, $result->name);
-    $row[1] = $statusarr[$result->status];
-    $row[2] = $result->info;
-    $row[3] = is_null($result->link) ? '&nbsp;' : $result->link;
-
-    $CFG->pagepath = "report/security/$issue"; // help link in footer
-
-    $table->data[] = $row;
-
-    print_table($table);
-
-    print_box($result->details, 'generalbox boxwidthnormal boxaligncenter'); // TODO: add proper css
-
-    print_continue($url);
-
-} else {
-    report_security_hide_timearning();
-
-    $table = new object();
-    $table->head  = array($strissue, $strstatus, $strdesc);
-    $table->size  = array('30%', '10%', '60%' );
-    $table->align = array('left', 'left', 'left');
-    $table->width = '90%';
-    $table->data  = array();
-
-    foreach ($issues as $issue) {
-        $result = $issue(false);
-        if (!$result) {
-            // ignore this test
-            continue;
-        }
-        $row = array();
-        $row[0] = "<a href='$url?issue=$result->issue'>$result->name</a>";
-        $row[1] = $statusarr[$result->status];
-        $row[2] = $result->info;
-
-        $table->data[] = $row;
-    }
-    print_table($table);
-}
-
-print_footer();

admin/report/security/settings.php

@@ -1,3 +0,0 @@
-<?php  //$Id$
-
-$ADMIN->add('reports', new admin_externalpage('reportsecurity', get_string('reportsecurity', 'report_security'), "$CFG->wwwroot/$CFG->admin/report/security/index.php",'report/security:view'));

admin/report/security/version.php

@@ -1,29 +0,0 @@
-<?PHP // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$plugin->version  = 2007101500;
-$plugin->requires = 2007101533;
-
-?>

admin/report/simpletest/ex_reporter.php

@@ -9,10 +9,9 @@
  * @package SimpleTestEx
  */
 
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
-
+/** */
+require_once(dirname(__FILE__) . '/../../../config.php');
+require_once($CFG->libdir . '/moodlelib.php');
 require_once($CFG->libdir . '/simpletestlib/reporter.php');
 
 /**
@@ -46,7 +45,8 @@ class ExHtmlReporter extends HtmlReporter {
 
         $this->strrunonlyfolder = $this->get_string('runonlyfolder');
         $this->strrunonlyfile = $this->get_string('runonlyfile');
-        $this->strseparator = get_separator();
+        check_theme_arrows();
+        $this->strseparator = ' <span class="sep">'.$THEME->rarrow.'</span> ';
     }
 
     /**
@@ -66,39 +66,22 @@ class ExHtmlReporter extends HtmlReporter {
     function paintFail($message) {
         // Explicitly call grandparent, not parent::paintFail.
         SimpleScorer::paintFail($message);
-        $this->_paintPassFail('fail', $message, debug_backtrace());
+        $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::paintError.
+        // Explicitly call grandparent, not parent::paintFail.
         SimpleScorer::paintError($message);
         $this->_paintPassFail('exception', $message);
     }
 
     /**
-     * Called when a caught exception needs to be output.
+     * Private method. Used by printPass/Fail/Error.
      */
-    function paintException($exception) {
-        // Explicitly call grandparent, not parent::paintException.
-        SimpleScorer::paintException($exception);
-        $message = 'Unexpected exception of type [' . get_class($exception) .
-                '] with message ['. $exception->getMessage() .
-                '] in ['. $exception->getFile() .
-                ' line ' . $exception->getLine() . ']';
-        $stacktrace = null;
-        if (method_exists($exception, 'getTrace')) {
-            $stacktrace = $exception->getTrace();
-        }
-        $this->_paintPassFail('exception', $message, $stacktrace);
-    }
-
-    /**
-     * Private method. Used by printPass/Fail/Error/Exception.
-     */
-    function _paintPassFail($passorfail, $message, $stacktrace = null) {
+    function _paintPassFail($passorfail, $message) {
         global $FULLME, $CFG;
 
         print_simple_box_start('', '100%', '', 5, $passorfail . ' generalbox');
@@ -117,25 +100,6 @@ class ExHtmlReporter extends HtmlReporter {
         echo "<a href=\"{$url}path=$folder$file\" title=\"$this->strrunonlyfile\">$file</a>";
         echo $this->strseparator, implode($this->strseparator, $breadcrumb);
         echo $this->strseparator, '<br />', $this->_htmlEntities($message), "\n\n";
-        if ($stacktrace) {
-            $dotsadded = false;
-            $interestinglines = 0;
-            $filteredstacktrace = array();
-            foreach ($stacktrace as $frame) {
-                if (empty($frame['file']) || (strpos($frame['file'], 'simpletestlib') === false
-                        && strpos($frame['file'], 'report/unittest') === false)) {
-                    $filteredstacktrace[] = $frame;
-                    $interestinglines += 1;
-                    $dotsadded = false;
-                } else if (!$dotsadded) {
-                    $filteredstacktrace[] = array('line' => '...', 'file' => '...');
-                    $dotsadded = true;
-                }
-            }
-            if ($interestinglines > 1 || $passorfail == 'exception') {
-                echo '<div class="notifytiny">' . format_backtrace($filteredstacktrace) . "</div>\n\n";
-            }
-        }
         print_simple_box_end();
         flush();
     }
@@ -183,9 +147,9 @@ class ExHtmlReporter extends HtmlReporter {
         $summarydata->exceptions = $this->getExceptionCount();
 
         if ($summarydata->fails == 0 && $summarydata->exceptions == 0) {
-            $status = "passed";
+            $status = "pass";
         } else {
-            $status = "failed";
+            $status = "fail";
         }
         echo '<div class="unittestsummary ', $status, '">';
         echo $this->get_string('summary', $summarydata);
@@ -229,45 +193,4 @@ class ExHtmlReporter extends HtmlReporter {
         return get_string($identifier, 'simpletest', $a);
     }
 }
-
-/**
- * Formats a backtrace ready for output.
- *
- * @param array $callers backtrace array, as returned by debug_backtrace().
- * @param boolean $plaintext if false, generates HTML, if true generates plain text.
- * @return string formatted backtrace, ready for output.
- */
-function format_backtrace($callers, $plaintext = false) {
-    // do not use $CFG->dirroot because it might not be available in destructors
-    $dirroot = dirname(dirname(__FILE__));
-
-    if (empty($callers)) {
-        return '';
-    }
-
-    $from = $plaintext ? '' : '<ul style="text-align: left">';
-    foreach ($callers as $caller) {
-        if (!isset($caller['line'])) {
-            $caller['line'] = '?'; // probably call_user_func()
-        }
-        if (!isset($caller['file'])) {
-            $caller['file'] = 'unknownfile'; // probably call_user_func()
-        }
-        $from .= $plaintext ? '* ' : '<li>';
-        $from .= 'line ' . $caller['line'] . ' of ' . str_replace($dirroot, '', $caller['file']);
-        if (isset($caller['function'])) {
-            $from .= ': call to ';
-            if (isset($caller['class'])) {
-                $from .= $caller['class'] . $caller['type'];
-            }
-            $from .= $caller['function'] . '()';
-        } else if (isset($caller['exception'])) {
-            $from .= ': '.$caller['exception'].' thrown';
-        }
-        $from .= $plaintext ? "\n" : '</li>';
-    }
-    $from .= $plaintext ? '' : '</ul>';
-
-    return $from;
-}
 ?>

admin/report/simpletest/ex_simple_test.php

@@ -10,10 +10,8 @@
  * @package SimpleTestEx
  */
 
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
-
+/** */
+require_once(dirname(__FILE__) . '/../../../config.php');
 require_once($CFG->libdir . '/simpletestlib/test_case.php');
 
 /**
@@ -22,13 +20,13 @@ require_once($CFG->libdir . '/simpletestlib/test_case.php');
  * them into a group test.
  * @package SimpleTestEx
  */
-class AutoGroupTest extends TestSuite {
+class AutoGroupTest extends GroupTest {
 
     var $thorough;
     var $showsearch;
 
     function AutoGroupTest($showsearch, $thorough, $test_name = null) {
-        $this->TestSuite($test_name);
+        $this->GroupTest($test_name);
         $this->showsearch = $showsearch;
         $this->thorough = $thorough;
     }
@@ -56,7 +54,7 @@ class AutoGroupTest extends TestSuite {
             }
             $file_path = $path . '/' . $file;
             if (is_dir($file_path)) {
-                if ($file != 'CVS' && $file != '.git' && !in_array($file_path, $this->ignorefolders)) {
+                if ($file != 'CVS' && !in_array($file_path, $this->ignorefolders)) {
                     $this->_recurseFolders($file_path);
                 }
             } elseif (preg_match('/simpletest(\/|\\\\)test.*\.php$/', $file_path) ||

admin/report/simpletest/index.php

@@ -10,12 +10,20 @@
  */
 
 /** */
-require_once(dirname(__FILE__).'/../../../config.php');
+require_once(dirname(__FILE__) . '/../../../config.php');
+require_once($CFG->libdir . '/moodlelib.php');
 require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/simpletestlib.php');
 require_once('ex_simple_test.php');
 require_once('ex_reporter.php');
 
+require_login();
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+
+/* The UNITTEST constant can be checked elsewhere if you need to know
+ * when your code is being run as part of a unit test. */
+define('UNITTEST', true);
+$langfile = 'simpletest';
+
 // CGI arguments
 $path = optional_param('path', null, PARAM_PATH);
 $showpasses = optional_param('showpasses', false, PARAM_BOOL);
@@ -23,16 +31,10 @@ $showsearch = optional_param('showsearch', false, PARAM_BOOL);
 $thorough = optional_param('thorough', false, PARAM_BOOL);
 
 // Print the header.
-admin_externalpage_setup('reportunittest', '', array('showpasses' => $showpasses,
-        'showsearch' => $showsearch, 'thorough' => $thorough));
-admin_externalpage_print_header();
-
-/* The UNITTEST constant can be checked elsewhere if you need to know
- * when your code is being run as part of a unit test. */
-define('UNITTEST', true);
-$langfile = 'simpletest';
-
+$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.
@@ -104,6 +106,6 @@ echo '</form>';
 print_simple_box_end();
 
 // Footer.
-admin_externalpage_print_footer();
+admin_externalpage_print_footer($adminroot);
 
 ?>

admin/report/spamcleaner/index.php

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

admin/report/spamcleaner/settings.php

@@ -1,5 +0,0 @@
-<?php
-
-// spam cleaner
-$ADMIN->add('reports', new admin_externalpage('reportspamcleaner', get_string('spamcleaner','report_spamcleaner'), "$CFG->wwwroot/$CFG->admin/report/spamcleaner/index.php", 'moodle/site:config'));
-

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/report/stats/settings.php

@@ -1,4 +0,0 @@
-<?php  // $Id$
-// just a link to course report
-$ADMIN->add('reports', new admin_externalpage('reportstats', get_string('stats', 'admin'), "$CFG->wwwroot/course/report/stats/index.php", 'coursereport/stats:view'));
-?>

admin/report/unittest/db/access.php

@@ -1,40 +0,0 @@
-<?php  // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$report_unittest_capabilities = array(
-
-    'report/unittest:view' => array(
-        'riskbitmask' => RISK_DATALOSS,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_SYSTEM,
-        'legacy' => array(
-            'admin' => CAP_ALLOW
-        ),
-
-        'clonepermissionsfrom' => 'moodle/site:config',
-    )
-);
-
-?>

admin/report/unittest/settings.php

@@ -1,3 +0,0 @@
-<?php  //$Id$
-$ADMIN->add('reports', new admin_externalpage('reportunittest', get_string('simpletest', 'admin'), "$CFG->wwwroot/$CFG->admin/report/unittest/index.php", 'report/unittest:view'));
-?>

admin/report/unittest/version.php

@@ -1,29 +0,0 @@
-<?PHP // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$plugin->version  = 2007101501;
-$plugin->requires = 2007101532;
-
-?>

admin/roles/allowassign.php

@@ -8,11 +8,14 @@
  * then he can modify the roles_allow_assign table via this interface.
  */
     require_once('../../config.php');
+/// check capabilities here
+
     require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('defineroles', $adminroot);
 
-    admin_externalpage_setup('defineroles', '', array(), $CFG->wwwroot . '/' . $CFG->admin . '/roles/allowassign.php');
 
-    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
     require_capability('moodle/role:manage', $sitecontext);
 
 /// form processiong here
@@ -21,10 +24,10 @@
 
     $roles = get_all_roles();
 
-    if ($grant = data_submitted() and confirm_sesskey()) {
+    if ($grant = data_submitted()) {
 
         foreach ($grant as $grole => $val) {
-            if ($grole == 'dummy' or !strpos($grole, '_')) {
+            if ($grole == 'dummy') {
                 continue;
             }
 
@@ -44,12 +47,10 @@
                 }
             }
         }
-        // updated allowassigns sitewide...
-        mark_context_dirty($sitecontext->path);
     }
 /// displaying form here
 
-    admin_externalpage_print_header();
+    admin_externalpage_print_header($adminroot);
 
     $currenttab='allowassign';
     require_once('managetabs.php');
@@ -79,12 +80,11 @@
 
     echo '<form action="allowassign.php" method="post">';
     print_table($table);
-    echo '<div class="buttons"><input type="submit" value="'.get_string('savechanges').'"/>';
+    echo '<div class="buttons"><input type="submit" value="'.get_string('savechanges').'"/></div>';
     echo '<input type="hidden" name="dummy" value="1" />'; // this is needed otherwise we do not know a form has been submitted
-    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
-    echo '</div></form>';
+    echo '</form>';
 
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 
 

admin/roles/allowoverride.php

@@ -6,11 +6,14 @@
  * and be in the roles_allow_override table.
  */
     require_once('../../config.php');
+/// check capabilities here
+
     require_once($CFG->libdir.'/adminlib.php');
+    $adminroot = admin_get_root();
+    admin_externalpage_setup('defineroles', $adminroot);
 
-    admin_externalpage_setup('defineroles', '', array(), $CFG->wwwroot . '/' . $CFG->admin . '/roles/allowoverride.php');
 
-    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
     require_capability('moodle/role:manage', $sitecontext);
 
 /// form processiong here
@@ -19,10 +22,10 @@
 
     $roles = get_all_roles();
 
-    if ($grant = data_submitted() and confirm_sesskey()) {
+    if ($grant = data_submitted()) {
 
         foreach ($grant as $grole => $val) {
-            if ($grole == 'dummy' or !strpos($grole, '_')) {
+            if ($grole == 'dummy') {
                 continue;
             }
 
@@ -42,12 +45,10 @@
                 }
             }
         }
-        // updated allowoverride sitewide...
-        mark_context_dirty($sitecontext->path);
     }
 /// displaying form here
 
-    admin_externalpage_print_header();
+    admin_externalpage_print_header($adminroot);
 
     $currenttab='allowoverride';
     require_once('managetabs.php');
@@ -73,16 +74,15 @@
         $table->data[] = array_merge(array(format_string($role->name)), $beta);
     }
 
-    print_simple_box(get_string('configallowoverride2', 'admin'), 'center');
+    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 '<div class="buttons"><input type="submit" value="'.get_string('savechanges').'"/></div>';
     echo '<input type="hidden" name="dummy" value="1" />'; // this is needed otherwise we do not know a form has been submitted
-    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
-    echo '</div></form>';
+    echo '</form>';
 
-    admin_externalpage_print_footer();
+    admin_externalpage_print_footer($adminroot);
 
 // returns array
 function get_box_list($roleid, $arraylist){

admin/roles/assign.html

@@ -1,8 +1,5 @@
 <form id="assignform" method="post" action="">
-<div style="text-align:center;">
-<label for="extendperiod"><?php print_string('enrolperiod') ?></label> <?php choose_from_menu($periodmenu, "extendperiod", $defaultperiod, $unlimitedperiod); ?>
-<label for="extendbase"><?php print_string('startingfrom') ?></label> <?php choose_from_menu($basemenu, "extendbase", 3, ""); ?>
-
+<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) ?>" />
@@ -41,13 +38,15 @@
         <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')); ?>
+            <img src="<?php echo $CFG->pixpath; ?>/t/hide.gif" alt="<?php print_string('hiddenassign') ?>" class="hide-show-image" />            <? 
+            helpbutton ('hiddenassign', get_string('hiddenassign'));
+            ?>
         </label>
         <?php check_theme_arrows(); ?>
         <p class="arrow_button">
-            <input name="add" id="add" type="submit" value="<?php echo $THEME->larrow.'&nbsp;'.get_string('add'); ?>" title="<?php print_string('add'); ?>" /><br />
-            <input name="remove" id="remove" type="submit" value="<?php echo get_string('remove').'&nbsp;'.$THEME->rarrow; ?>" title="<?php print_string('remove'); ?>" />
+            <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">
@@ -60,11 +59,13 @@
           <?php
             $i=0;
             if (!empty($searchtext)) {
-                echo "<optgroup label=\"$strsearchresults (" . $usercount . ")\">\n";
+                echo "<optgroup label=\"$strsearchresults (" . $availableusers->_numOfRows . ")\">\n";
                 while ($user = rs_fetch_next_record($availableusers)) {
-                    $fullname = fullname($user, true);
-                    echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
-                    $i++;
+                    if (!isset($contextusers[$user->id])) {
+                        $fullname = fullname($user, true);
+                        echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                        $i++;
+                    }
                 }
                 echo "</optgroup>\n";
 
@@ -74,9 +75,11 @@
                           .'<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";
-                        $i++;
+                        if (!isset($contextusers[$user->id])) {
+                            $fullname = fullname($user, true);
+                            echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                            $i++;
+                        }
                     }
                 }
             }

admin/roles/assign.php

@@ -6,7 +6,6 @@
     require_once($CFG->libdir.'/adminlib.php');
 
     define("MAX_USERS_PER_PAGE", 5000);
-    define("MAX_USERS_TO_LIST_PER_ROLE", 10);
 
     $contextid      = required_param('contextid',PARAM_INT); // context id
     $roleid         = optional_param('roleid', 0, PARAM_INT); // required role id
@@ -16,8 +15,8 @@
     $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
-    $extendperiod   = optional_param('extendperiod', 0, PARAM_INT);
-    $extendbase     = optional_param('extendbase', 0, PARAM_INT);
+    $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
 
@@ -45,12 +44,10 @@
         } 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);
@@ -58,55 +55,37 @@
 
     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, 'name', ROLENAME_BOTH);
-    $assignableroles  = get_assignable_roles($context, 'name', ROLENAME_BOTH);
+    $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('showallusers');
+    $strshowall = get_string('showall');
     $strparticipants = get_string('participants');
     $strsearchresults = get_string('searchresults');
 
-    $unlimitedperiod = get_string('unlimited');
-    $defaultperiod = $course->enrolperiod;
-    for ($i=1; $i<=365; $i++) {
-        $seconds = $i * 86400;
-        $periodmenu[$seconds] = get_string('numdays', '', $i);
-    }
 
-    $timeformat = get_string('strftimedate');
-    $today = time();
-    $today = make_timestamp(date('Y', $today), date('m', $today), date('d', $today), 0, 0, 0);
-
-    // MDL-12420, preventing course start date showing up as an option at system context and front page roles.
-    if ($course->startdate > 0) {
-        $basemenu[0] = get_string('startdate') . ' (' . userdate($course->startdate, $timeformat) . ')';
-    }
-    if ($course->enrollable != 2 || ($course->enrolstartdate == 0 || $course->enrolstartdate <= $today) && ($course->enrolenddate == 0 || $course->enrolenddate > $today)) {
-        $basemenu[3] = get_string('today') . ' (' . userdate($today, $timeformat) . ')' ;
-    }
-    if($course->enrollable == 2) {
-        if($course->enrolstartdate > 0) {
-            $basemenu[4] = get_string('courseenrolstartdate') . ' (' . userdate($course->enrolstartdate, $timeformat) . ')';
-        }
-        if($course->enrolenddate > 0) {
-            $basemenu[5] = get_string('courseenrolenddate') . ' (' . userdate($course->enrolenddate, $timeformat) . ')';
-        }
-    }
 
 /// Make sure this user can assign that role
 
     if ($roleid) {
-        if (!isset($assignableroles[$roleid])) {
+        if (!user_can_assign($context, $roleid)) {
             error ('you can not override this role in this context');
         }
     }
@@ -121,49 +100,46 @@
 
     if ($context->contextlevel == CONTEXT_USER) {
         /// course header
-        $navlinks = array();
         if ($courseid != SITEID) {
-            if (has_capability('moodle/course:viewparticipants', get_context_instance(CONTEXT_COURSE, $course->id))) {
-                $navlinks[] = array('name' => $strparticipants, 'link' => "$CFG->wwwroot/user/index.php?id=$course->id", 'type' => 'misc');
-            }
-            $navlinks[] = array('name' => $fullname, 'link' => "$CFG->wwwroot/user/view.php?id=$userid&amp;course=$courseid", 'type' => 'misc');
-            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
-            $navigation = build_navigation($navlinks);
-
-            print_header("$fullname", "$fullname", $navigation, "", "", true, "&nbsp;", navmenu($course));
+            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 {
-            $navlinks[] = array('name' => $fullname, 'link' => "$CFG->wwwroot/user/view.php?id=$userid&amp;course=$courseid", 'type' => 'misc');
-            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
-            $navigation = build_navigation($navlinks);
-            print_header("$course->fullname: $fullname", $course->fullname, $navigation, "", "", true, "&nbsp;", navmenu($course));
+            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) {
-        admin_externalpage_setup('assignroles', '', array('contextid' => $contextid, 'roleid' => $roleid));
-        admin_externalpage_print_header('');
+        $adminroot = admin_get_root();
+        admin_externalpage_setup('assignroles', $adminroot);
+        admin_externalpage_print_header($adminroot);
     } else if ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID) {
-        admin_externalpage_setup('frontpageroles', '', array('contextid' => $contextid, 'roleid' => $roleid));
-        admin_externalpage_print_header('');
-        $currenttab = 'assign';
+        $adminroot = admin_get_root();
+        admin_externalpage_setup('frontpageroles', $adminroot);
+        admin_externalpage_print_header($adminroot);
+        $currenttab = '';
+        $tabsmode = 'assign';
         include_once('tabs.php');
     } else {
-        $currenttab = 'assign';
+        $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;
@@ -182,34 +158,12 @@
                     }
                 }
                 if ($allow) {
-                    switch($extendbase) {
-                        case 0:
-                            $timestart = $course->startdate;
-                            break;
-                        case 3:
-                            $timestart = $today;
-                            break;
-                        case 4:
-                            $timestart = $course->enrolstartdate;
-                            break;
-                        case 5:
-                            $timestart = $course->enrolenddate;
-                            break;
-                    }
-
-                    if($extendperiod > 0) {
-                        $timeend = $timestart + $extendperiod;
-                    } else {
-                        $timeend = 0;
-                    }
                     if (! role_assign($roleid, $adduser, 0, $context->id, $timestart, $timeend, $hidden)) {
                         $errors[] = "Could not add user with id $adduser to this role!";
                     }
                 }
             }
-            
-            $rolename = get_field('role', 'name', 'id', $roleid);
-            add_to_log($course->id, 'role', 'assign', 'admin/roles/assign.php?contextid='.$context->id.'&roleid='.$roleid, $rolename, '', $USER->id);
+
         } else if ($remove and !empty($frm->removeselect) and confirm_sesskey()) {
 
             $sitecontext = get_context_instance(CONTEXT_SYSTEM);
@@ -243,34 +197,29 @@
                     }
                 }
             }
-            
-            $rolename = get_field('role', 'name', 'id', $roleid);
-            add_to_log($course->id, 'role', 'unassign', 'admin/roles/assign.php?contextid='.$context->id.'&roleid='.$roleid, $rolename, '', $USER->id);
+
         } else if ($showall) {
             $searchtext = '';
             $previoussearch = 0;
         }
-        
-        
-    
     }
 
     if ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID) {
         print_heading_with_help(get_string('frontpageroles', 'admin'), 'assignroles');
     } else {
-        print_heading_with_help(get_string('assignrolesin', 'role', print_context_name($context)), 'assignroles');
+        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, ra.hidden')) {
+        if (!$contextusers = get_role_users($roleid, $context, false, 'u.id, u.firstname, u.lastname, u.email, r.hidden')) {
             $contextusers = array();
         }
 
@@ -284,98 +233,17 @@
             $LIKE      = sql_ilike();
             $FULLNAME  = sql_fullname();
 
-            $selectsql = " AND ($FULLNAME $LIKE '%$searchtext%' OR email $LIKE '%$searchtext%') ";
-            $select  .= $selectsql;
-        } else {
-            $selectsql = "";
+            $select  .= " AND ($FULLNAME $LIKE '%$searchtext%' OR email $LIKE '%$searchtext%') ";
         }
 
-        if ($context->contextlevel > CONTEXT_COURSE && !is_inside_frontpage($context)) { // mod or block (or group?)
+        $availableusers = get_recordset_sql('SELECT id, firstname, lastname, email
+                                               FROM '.$CFG->prefix.'user
+                                              WHERE '.$select.'
+                                            ORDER BY lastname ASC, firstname ASC');
 
-            /************************************************************************
-             *                                                                      *
-             * context level is above or equal course context level                 *
-             * in this case we pull out all users matching search criteria (if any) *
-             *                                                                      *
-             * MDL-11324                                                            *
-             * a mini get_users_by_capability() call here, this is done instead of  *
-             * get_users_by_capability() because                                    *
-             * 1) get_users_by_capability() does not deal with searching by name    *
-             * 2) exceptions array can be potentially large for large courses       *
-             * 3) get_recordset_sql() is more efficient                             *
-             *                                                                      *
-             ************************************************************************/
+        /// In the .html file below we loop through these results and exclude any in $contextusers
 
-            if ($possibleroles = get_roles_with_capability('moodle/course:view', CAP_ALLOW, $context)) {
-
-                $doanythingroles = get_roles_with_capability('moodle/site:doanything', CAP_ALLOW, get_context_instance(CONTEXT_SYSTEM));
-
-                $validroleids = array();
-                foreach ($possibleroles as $possiblerole) {
-                    if (isset($doanythingroles[$possiblerole->id])) {  // We don't want these included
-                            continue;
-                    }
-                    if ($caps = role_context_capabilities($possiblerole->id, $context, 'moodle/course:view')) { // resolved list
-                        if (isset($caps['moodle/course:view']) && $caps['moodle/course:view'] > 0) { // resolved capability > 0
-                            $validroleids[] = $possiblerole->id;
-                        }
-                    }
-                }
-
-                if ($validroleids) {
-                    $roleids =  '('.implode(',', $validroleids).')';
-
-                    $select = " SELECT DISTINCT u.id, u.firstname, u.lastname, u.email";
-                    $countselect = "SELECT COUNT(u.id)";
-                    $from   = " FROM {$CFG->prefix}user u
-                                INNER JOIN {$CFG->prefix}role_assignments ra ON ra.userid = u.id
-                                INNER JOIN {$CFG->prefix}role r ON r.id = ra.roleid";
-                    $where  = " WHERE ra.contextid ".get_related_contexts_string($context)."
-                                AND u.deleted = 0
-                                AND ra.roleid in $roleids";
-                    $excsql = " AND u.id NOT IN (
-                                    SELECT u.id
-                                    FROM {$CFG->prefix}role_assignments r,
-                                    {$CFG->prefix}user u
-                                    WHERE r.contextid = $contextid
-                                    AND u.id = r.userid
-                                    AND r.roleid = $roleid
-                                    $selectsql)";
-
-                    $availableusers = get_recordset_sql($select . $from . $where . $selectsql . $excsql);
-                }
-
-                $usercount =  $availableusers->_numOfRows;
-            }
-
-        } else {
-
-            /************************************************************************
-             *                                                                      *
-             * context level is above or equal course context level                 *
-             * in this case we pull out all users matching search criteria (if any) *
-             *                                                                      *
-             ************************************************************************/
-
-            /// MDL-11111 do not include user already assigned this role in this context as available users
-            /// so that the number of available users is right and we save time looping later
-            $availableusers = get_recordset_sql('SELECT id, firstname, lastname, email
-                                                FROM '.$CFG->prefix.'user
-                                                WHERE '.$select.'
-                                                AND id NOT IN (
-                                                    SELECT u.id
-                                                    FROM '.$CFG->prefix.'role_assignments r,
-                                                    '.$CFG->prefix.'user u
-                                                    WHERE r.contextid = '.$contextid.'
-                                                    AND u.id = r.userid
-                                                    AND r.roleid = '.$roleid.'
-                                                    '.$selectsql.')
-                                                ORDER BY lastname ASC, firstname ASC');
-
-            $usercount = $availableusers->_numOfRows;         
-        }
-
-        echo '<div class="selector">';
+        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);
@@ -395,12 +263,6 @@
             notify($msg);
             print_simple_box_end();
         }
-		
-		//Back to Assign Roles button
-		echo "<br/>";
-		echo "<div class='continuebutton'>";
-		print_single_button('assign.php', array('contextid' => $contextid), get_string('assignrolesin', 'role', print_context_name($context)));
-		echo "</div>";
 
     } else {   // Print overview table
 
@@ -409,35 +271,6 @@
             sync_metacourse($course);
         }
 
-        // Get the names of role holders for roles with between 1 and MAX_USERS_TO_LIST_PER_ROLE users,
-        // and so determine whether to show the extra column. 
-        $rolehodlercount = array();
-        $rolehodlernames = array();
-        $strmorethanten = get_string('morethan', 'role', MAX_USERS_TO_LIST_PER_ROLE);
-        $showroleholders = false;
-        foreach ($assignableroles as $roleid => $rolename) {
-            $countusers = count_role_users($roleid, $context);
-            $rolehodlercount[$roleid] = $countusers;
-            $roleusers = '';
-            if (0 < $countusers && $countusers <= MAX_USERS_TO_LIST_PER_ROLE) {
-                $roleusers = get_role_users($roleid, $context, false, 'u.id, u.lastname, u.firstname');
-                if (!empty($roleusers)) {
-                    $strroleusers = array();
-                    foreach ($roleusers as $user) {
-                        $strroleusers[] = '<a href="' . $CFG->wwwroot . '/user/view.php?id=' . $user->id . '" >' . fullname($user) . '</a>';
-                    }
-                    $rolehodlernames[$roleid] = implode('<br />', $strroleusers);
-                    $showroleholders = true;
-                }
-            } else if ($countusers > MAX_USERS_TO_LIST_PER_ROLE) {
-                $rolehodlernames[$roleid] = '<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$strmorethanten.'</a>';
-            } else {
-                $rolehodlernames[$roleid] = '';
-            }
-        }
-		
-		
-        // Print overview table
         $table->tablealign = 'center';
         $table->cellpadding = 5;
         $table->cellspacing = 0;
@@ -445,28 +278,20 @@
         $table->head = array(get_string('roles', 'role'), get_string('description'), get_string('users'));
         $table->wrap = array('nowrap', '', 'nowrap');
         $table->align = array('right', 'left', 'center');
-        if ($showroleholders) {
-            $table->head[] = '';
-            $table->wrap[] = 'nowrap';
-            $table->align[] = 'left';
-        }
 
         foreach ($assignableroles as $roleid => $rolename) {
+            $countusers = count_role_users($roleid, $context);
             $description = format_string(get_field('role', 'description', 'id', $roleid));
-            $row = array('<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$rolename.'</a>',$description, $rolehodlercount[$roleid]);
-            if ($showroleholders) {
-                $row[] = $rolehodlernames[$roleid];
-            }
-            $table->data[] = $row;
+            $table->data[] = array('<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$rolename.'</a>',$description, $countusers);
         }
+
         print_table($table);
-		
-	   //Continue to Course Button
-	   echo "<br/>";
-	   echo "<div class='continuebutton'>";
-	   print_single_button($CFG->wwwroot.'/course/view.php', array('id' => $courseid), get_string('continuetocourse'));
-	   echo "</div>";
     }
-	
-    print_footer($course);
+
+    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

@@ -24,7 +24,7 @@
 <?php if ($action == 'view') { ?>
     <tr valign="top">
         <td align="right"><?php print_string('name') ?>:</td>
-        <td><?php p(format_string($role->name)); ?></td>
+        <td><?php p($role->name); ?></td>
     </tr>
     <tr valign="top">
         <td align="right"><?php print_string('shortname') ?>:</td>
@@ -32,11 +32,11 @@
     </tr>
     <tr valign="top">
         <td align="right"><?php print_string('description') ?>:</td>
-        <td><?php p(format_text($role->description, FORMAT_HTML)); $usehtmleditor = false; ?></td>
+        <td><?php p($role->description); $usehtmleditor = false; ?></td>
     </tr>
     <tr valign="top">
         <td align="right"><?php print_string('legacytype', 'role') ?>:</td>
-        <td><?php
+        <td><?php 
                 $usehtmleditor = false;
                 if (empty($role->legacytype)) {
                     print_string('none');
@@ -58,7 +58,7 @@
     <tr valign="top">
         <td align="right"><label for="shortname"><?php print_string('shortname') ?></label></td>
         <td><?php
-            echo '<input type="text" id="shortname" name="shortname" maxlength="100" size="15" value="'.s($role->shortname).'" />';
+            echo '<input type="text" id="shortname" name="shortname" maxlength="20" size="15" value="'.s($role->shortname).'" />';
             if (isset($errors["shortname"])) formerr($errors["shortname"]);
             ?>
         </td>
@@ -89,7 +89,7 @@
 <?php
     print_heading_with_help(get_string('permissions','role'), 'permissions');
 
-    $strinherit = get_string('notset','role');
+    $strinherit = get_string('inherit','role');
     $strallow = get_string('allow','role');
     $strprevent = get_string('prevent','role');
     $strprohibit = get_string('prohibit','role');
@@ -113,8 +113,7 @@ $contextlevel = 0;
 $component = '';
 
 $strrisks = s(get_string('risks', 'role'));
-// MDL-11687
-$strcapabilities = 'Capabilities';//s(get_string('capabilities', 'role'));
+$strcapabilities = s(get_string('capabilities', 'role'));
 
 // prepare legacy defaults
 if (!empty($role->legacytype)) {
@@ -131,8 +130,7 @@ foreach ($capabilities as $capability) {
     }
 
     // prints a breaker if component or name or context level
-    if (component_level_changed($capability, $component, $contextlevel)) {
-    //if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
+    if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
         echo ('<tr class="rolecapheading header"><td colspan="10" class="header"><strong>'.
                get_component_string($capability->component, $capability->contextlevel).'</strong></td></tr>');
     }

admin/roles/manage.php

@@ -3,6 +3,9 @@
     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
@@ -12,8 +15,6 @@
     $confirm     = optional_param('confirm', 0, PARAM_BOOL);
     $cancel      = optional_param('cancel', 0, PARAM_BOOL);
 
-    admin_externalpage_setup('defineroles', '', array('roleid' => $roleid));
-
     $sitecontext = get_context_instance(CONTEXT_SYSTEM);
 
     require_capability('moodle/role:manage', $sitecontext);
@@ -117,16 +118,10 @@
                     }
                 }
 
-                // added a role sitewide...
-                mark_context_dirty($sitecontext->path);
-
                 if (empty($errors)) {
-                    $rolename = get_field('role', 'name', 'id', $newroleid);
-                    add_to_log(SITEID, 'role', 'add', 'admin/roles/manage.php?action=add', $rolename, '', $USER->id);
                     redirect('manage.php');
                 }
             }
-            
             break;
 
         case 'edit':
@@ -234,17 +229,9 @@
                         } 
                     }                    
 
-                    // edited a role sitewide...
-                    mark_context_dirty($sitecontext->path);
-                    add_to_log(SITEID, 'role', 'edit', 'admin/roles/manage.php?action=edit&roleid='.$role->id, $role->name, '', $USER->id);
-
                     redirect('manage.php');
                 }
-
-                // edited a role sitewide - with errors, but still...
-                mark_context_dirty($sitecontext->path);
             }
-
             break;
 
         case 'delete':
@@ -253,18 +240,12 @@
             }
             if ($confirm and data_submitted() and confirm_sesskey()) {
                 if (!delete_role($roleid)) {
-
-                    // partially deleted a role sitewide...?
-                    mark_context_dirty($sitecontext->path);
-
                     error('Could not delete role with ID '.$roleid);
                 }
-                // deleted a role sitewide...
-                mark_context_dirty($sitecontext->path);
 
             } else if (confirm_sesskey()){
                 // show confirmation
-                admin_externalpage_print_header();
+                admin_externalpage_print_header($adminroot);
                 $optionsyes = array('action'=>'delete', 'roleid'=>$roleid, 'sesskey'=>sesskey(), 'confirm'=>1);
                 $a = new object();
                 $a->id = $roleid;
@@ -272,7 +253,7 @@
                 $a->shortname = $roles[$roleid]->shortname;
                 $a->count = (int)count_records('role_assignments', 'roleid', $roleid);
                 notice_yesno(get_string('deleterolesure', 'role', $a), 'manage.php', 'manage.php', $optionsyes, NULL, 'post', 'get');
-                admin_externalpage_print_footer();
+                admin_externalpage_print_footer($adminroot);
                 die;
             }
 
@@ -318,7 +299,7 @@
                 //ok - lets duplicate!
             } else {
                 // show confirmation
-                admin_externalpage_print_header();
+                admin_externalpage_print_header($adminroot);
                 $optionsyes = array('action'=>'duplicate', 'roleid'=>$roleid, 'sesskey'=>sesskey(), 'confirm'=>1);
                 $optionsno  = array('action'=>'view', 'roleid'=>$roleid);
                 $a = new object();
@@ -326,7 +307,7 @@
                 $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();
+                admin_externalpage_print_footer($adminroot);
                 die;
             }
 
@@ -349,8 +330,8 @@
                     $suffixshort = "";
                 }
                 $currentfullname = $fullname.$suffixfull;
-                // Limit the size of shortname - database column accepts <= 100 chars
-                $currentshortname = substr($shortname, 0, 100 - strlen($suffixshort)).$suffixshort;
+                // 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++;
@@ -360,13 +341,7 @@
             if ($newrole = create_role($currentfullname, $currentshortname, $description)) {
                 // dupilcate all the capabilities
                 role_cap_duplicate($sourcerole, $newrole);
-
-                // dup'ed a role sitewide...
-                mark_context_dirty($sitecontext->path);
-
             }
-            $rolename = get_field('role', 'name', 'id', $newrole);
-            add_to_log(SITEID, 'role', 'duplicate', 'admin/roles/manage.php?roleid='.$newrole.'&action=duplicate', $rolename, '', $USER->id);
             redirect('manage.php');
             break;
 
@@ -377,18 +352,11 @@
 
             if ($confirm and data_submitted() and confirm_sesskey()) {
                 reset_role_capabilities($roleid);
-
-                // reset a role sitewide...
-                mark_context_dirty($sitecontext->path);
-
-                $rolename = get_field('role', 'name', 'id', $roleid);
-                add_to_log(SITEID, 'role', 'reset', 'admin/roles/manage.php?roleid='.$roleid.'&action=reset', $rolename, '', $USER->id);
-
                 redirect('manage.php?action=view&amp;roleid='.$roleid);
 
             } else {
                 // show confirmation
-                admin_externalpage_print_header();
+                admin_externalpage_print_header($adminroot);
                 $optionsyes = array('action'=>'reset', 'roleid'=>$roleid, 'sesskey'=>sesskey(), 'confirm'=>1);
                 $optionsno  = array('action'=>'view', 'roleid'=>$roleid);
                 $a = new object();
@@ -402,7 +370,7 @@
                     $warning = get_string('resetrolesure', 'role', $a);
                 }
                 notice_yesno($warning, 'manage.php', 'manage.php', $optionsyes, $optionsno, 'post', 'get');
-                admin_externalpage_print_footer();
+                admin_externalpage_print_footer($adminroot);
                 die;
             }
 
@@ -414,7 +382,7 @@
 
 /// print UI now
 
-    admin_externalpage_print_header('');
+    admin_externalpage_print_header($adminroot);
 
     $currenttab = 'manage';
     include_once('managetabs.php');
@@ -567,9 +535,58 @@
         echo '</div>';
     }
 
-    admin_externalpage_print_footer();
+    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

@@ -7,7 +7,7 @@
 
     $toprow = array();
 
-    $toprow[] = new tabobject('manage', $CFG->wwwroot.'/'.$CFG->admin.'/roles/manage.php', get_string('manageroles', 'role'));
+    $toprow[] = new tabobject('manage', $CFG->wwwroot.'/'.$CFG->admin.'/roles/manage.php', get_string('manageroles', 'role'),'', true);
 
     $toprow[] = new tabobject('allowassign', $CFG->wwwroot.'/'.$CFG->admin.'/roles/allowassign.php', get_string('allowassign', 'role'));
 

admin/roles/override.html

@@ -3,7 +3,6 @@
     $strallow = get_string('allow','role');
     $strprevent = get_string('prevent','role');
     $strprohibit = get_string('prohibit','role');
-    $strsafewarning = get_string('safeoverridenotice', 'role');
 ?>
 
 <form id="overrideform" action="override.php" method="post">
@@ -31,8 +30,7 @@
         $component = '';
 
         $strrisks = s(get_string('risks', 'role'));
-        // MDL-11687
-        $strcapabilities = 'Capabilities';//s(get_string('capabilities', 'role'));
+        $strcapabilities = s(get_string('capabilities', 'role'));
 
         foreach ($capabilities as $capability) {
 
@@ -42,8 +40,7 @@
             }
 
         // prints a breaker if component or name or context level
-            //if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
-            if (component_level_changed($capability, $component, $contextlevel)) {
+            if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
                 echo ('<tr class="rolecapheading header"><td colspan="10" class="header"><strong>'.get_component_string($capability->component, $capability->contextlevel).'</strong></td></tr>');
             }
 
@@ -68,7 +65,7 @@
                 $isprohibit = 0;
             }
 
-            $isdisabled = $isprohibit || $capability->locked;
+            $isdisabled = $isprohibit;
 
             $riskinfo = '<td class="risk managetrust">';
             $rowclasses = '';
@@ -139,17 +136,10 @@
             <?php echo $riskinfo; ?>
         </tr>
 
-        <?php }  ?>
+        <?php } ?>
     </table>
     <div class="submit buttons">
         <input type="submit" value="<?php print_string('savechanges') ?>" />
         <input type="submit" name="cancel" value="<?php print_string('cancel') ?>" />
     </div>
-
-    <?php
-    if ($safeoverridenotice) {
-        echo '<div class="sefeoverridenotice">'.$strsafewarning.'</div>';
-    }
-    ?> 
-
 </form>

admin/roles/override.php

@@ -20,9 +20,7 @@
         error('Can not override base role capabilities');
     }
 
-    $canoverride = has_capability('moodle/role:override', $context);
-
-    if (!$canoverride and !has_capability('moodle/role:safeoverride', $context)) {
+    if (!has_capability('moodle/role:override', $context)) {
         error('You do not have permission to change overrides in this context!');
     }
 
@@ -50,20 +48,22 @@
     }
 
 /// needed for tabs.php
-    $overridableroles = get_overridable_roles($context, 'name', ROLENAME_BOTH);
-    $assignableroles  = get_assignable_roles($context, 'name', ROLENAME_BOTH);
+    $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 (!isset($overridableroles[$roleid])) {
+        if (!user_can_override($context, $roleid)) {
             error ('you can not override this role in this context');
         }
     }
@@ -74,30 +74,7 @@
     }
 
 /// get all cababilities
-    $safeoverridenotice = false;
-    if ($roleid) {
-        if ($capabilities = fetch_context_capabilities($context)) {
-            // find out if we need to lock some capabilities
-            foreach ($capabilities as $capname=>$capability) {
-                $capabilities[$capname]->locked = false;
-                if ($canoverride) {
-                    //ok no locking at all
-                    continue;
-                }
-                //only limited safe overrides - spam only allowed
-                if ((RISK_DATALOSS & (int)$capability->riskbitmask)
-                 or (RISK_MANAGETRUST & (int)$capability->riskbitmask)
-                 or (RISK_CONFIG & (int)$capability->riskbitmask)
-                 or (RISK_XSS & (int)$capability->riskbitmask)
-                 or (RISK_PERSONAL & (int)$capability->riskbitmask)) {
-                    $capabilities[$capname]->locked = true;
-                    $safeoverridenotice = true;
-                }
-            }
-        }
-    } else {
-        $capabilities = null;
-    }
+    $capabilities = fetch_context_capabilities($context);
 
 /// Process incoming role override
     if ($data = data_submitted() and $roleid and confirm_sesskey()) {
@@ -107,10 +84,6 @@
                                              '', 'capability, permission, id');
 
         foreach ($capabilities as $cap) {
-            if ($cap->locked) {
-                //user not allowed to change this cap
-                continue;
-            }
 
             if (!isset($data->{$cap->name})) {
                 //cap not specified in form
@@ -127,20 +100,36 @@
                  continue;
             }
 
-            if (isset($localoverrides[$capname])) {
-                // Something exists, so update it
-                assign_capability($capname, $value, $roleid, $context->id, true);
+            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
-                    assign_capability($capname, $value, $roleid, $context->id);
+                    $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!');
+                    }
                 }
             }
         }
-
-        // force accessinfo refresh for users visiting this context...
-        mark_context_dirty($context->path);
-        $rolename = get_field('role', 'name', 'id', $roleid);
-        add_to_log($course->id, 'role', 'override', 'admin/roles/override.php?contextid='.$context->id.'&roleid='.$roleid, $rolename, '', $USER->id);
         redirect($baseurl);
     }
 
@@ -148,43 +137,42 @@
 /// Print the header and tabs
 
     if ($context->contextlevel == CONTEXT_USER) {
-        $navlinks = array();
+
         /// course header
         if ($course->id != SITEID) {
-            if (has_capability('moodle/course:viewparticipants', get_context_instance(CONTEXT_COURSE, $course->id))) {
-                $navlinks[] = array('name' => $strparticipants, 'link' => "$CFG->wwwroot/user/index.php?id=$course->id", 'type' => 'misc');
-            }
-            $navlinks[] = array('name' => $fullname, 'link' => "$CFG->wwwroot/user/view.php?id=$userid&course=$courseid", 'type' => 'misc');
-            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
-            $navigation = build_navigation($navlinks);
-            print_header("$fullname", "$fullname", $navigation, "", "", true, " ", navmenu($course));
+            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 {
-            $navlinks[] = array('name' => $fullname, 'link' => "$CFG->wwwroot/user/view.php?id=$userid&amp;course=$courseid", 'type' => 'misc');
-            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
-            $navigation = build_navigation($navlinks);
-            print_header("$course->fullname: $fullname", $course->fullname, $navigation, "", "", true, "&nbsp;", navmenu($course));
+            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');
-        admin_externalpage_setup('frontpageroles', '', array('contextid' => $contextid, 'roleid' => $roleid), $CFG->wwwroot . '/' . $CFG->admin . '/roles/override.php');
-        admin_externalpage_print_header();
-        $currenttab = 'override';
+        $adminroot = admin_get_root();
+        admin_externalpage_setup('frontpageroles', $adminroot);
+        admin_externalpage_print_header($adminroot);
+        $currenttab = '';
+        $tabsmode = 'override';
         include_once('tabs.php');
     } else {
-        $currenttab = 'override';
+        $currenttab = '';
+        $tabsmode = 'override';
         include_once('tabs.php');
     }
 
-    print_heading_with_help(get_string('overridepermissionsin', 'role', print_context_name($context)), 'overrides');
+    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);
@@ -208,7 +196,7 @@
         if (!empty($capabilities)) {
             // Print the capabilities overrideable in this context
             print_simple_box_start('center');
-            include('override.html');
+            include_once('override.html');
             print_simple_box_end();
 
         } else {
@@ -236,6 +224,10 @@
         print_table($table);
     }
 
-    print_footer($course);
+    if ($context->contextlevel == CONTEXT_SYSTEM or ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID)) {
+        admin_externalpage_print_footer($adminroot);
+    } else {
+        print_footer($course);
+    }
 
 ?>

admin/roles/tabs.php

@@ -7,16 +7,15 @@ if (!defined('MOODLE_INTERNAL')) {
     die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
 }
 
-$navlinks = array();
 if ($currenttab != 'update') {
     switch ($context->contextlevel) {
 
         case CONTEXT_SYSTEM:
             $stradministration = get_string('administration');
-            $navlinks[] = array('name' => $stradministration, 'link' => '../index.php', 'type' => 'misc');
-            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
-            $navigation = build_navigation($navlinks);
-            print_header($SITE->fullname, "$SITE->fullname", $navigation);
+            print_header($SITE->fullname, "$SITE->fullname","<a href=\"../index.php\">$stradministration</a> -> $straction");
+            break;
+
+        case CONTEXT_PERSONAL:
             break;
 
         case CONTEXT_USER:
@@ -28,19 +27,8 @@ if ($currenttab != 'update') {
             $strcategories = get_string("categories");
             $strcategory = get_string("category");
             $strcourses = get_string("courses");
-
-            $navlinks[] = array('name' => $strcategories,
-                                'link' => "$CFG->wwwroot/course/index.php",
-                                'type' => 'misc');
-            $navlinks[] = array('name' => $category->name,
-                                'link' => "$CFG->wwwroot/course/category.php?id=$category->id",
-                                'type' => 'misc');
-            $navlinks[] = array('name' => get_string("roles"),
-                                'link' => null,
-                                'type' => 'misc');
-            $navigation = build_navigation($navlinks);
-
-            print_header("$SITE->shortname: $category->name", "$SITE->fullname: $strcourses", $navigation, "", "", true);
+            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:
@@ -50,14 +38,15 @@ if ($currenttab != 'update') {
                 $course = get_record('course', 'id', $context->instanceid);
 
                 require_login($course);
-                $navlinks[] = array('name' => get_string('roles'),
-                                    'link' => "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=$context->id",
-                                    'type' => 'misc');
-                $navigation = build_navigation($navlinks);
-                print_header($streditcoursesettings, $course->fullname, $navigation);
+
+                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)) {
@@ -75,8 +64,9 @@ if ($currenttab != 'update') {
 
             require_login($course);
 
-            $fullmodulename      = get_string("modulename", $module->name);
-            $streditinga         = get_string("editinga", "moodle", $fullmodulename);
+            $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") {
@@ -85,21 +75,9 @@ if ($currenttab != 'update') {
                 $focuscursor = "form.name";
             }
 
-            $navlinks[] = array('name' => $strmodulenameplural,
-                                'link' => "$CFG->wwwroot/mod/$module->name/index.php?id=$course->id",
-                                'type' => 'misc');
-
-            $navlinks[] = array('name' => $instance->name,
-                                'link' => "$CFG->wwwroot/mod/$module->name/view.php?id=$cm->id",
-                                'type' => 'misc');
-
-            $navlinks[] = array('name' => $streditinga,
-                                'link' => "$CFG->wwwroot/course/mod.php?update=$cm->id&amp;sesskey=".sesskey(),
-                                'type' => 'misc');
-
-            $navigation = build_navigation($navlinks);
-
-            print_header_simple($streditinga, '', $navigation, $focuscursor, "", false);
+            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;
 
@@ -107,7 +85,7 @@ if ($currenttab != 'update') {
             if ($blockinstance = get_record('block_instance', 'id', $context->instanceid)) {
                 if ($block = get_record('block', 'id', $blockinstance->blockid)) {
                     $blockname = print_context_name($context);
-
+                    $navigation = $blockname. ' -> '.$straction;
 
                     switch ($blockinstance->pagetype) {
                         case 'course-view':
@@ -115,39 +93,21 @@ if ($currenttab != 'update') {
 
                                 require_login($course);
 
-                                $navlinks[] = array('name' => $blockname, 'link' => null, 'type' => 'misc');
-                                $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
-                                $navigation = build_navigation($navlinks);
+                                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');
-                            $navlinks[] = array('name' => $strblogs,
-                                                 'link' => $CFG->wwwroot.'/blog/index.php',
-                                                 'type' => 'misc');
-                            $navlinks[] = array('name' => $blockname, 'link' => null, 'type' => 'misc');
-                            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
-                            $navigation = build_navigation($navlinks);
+                            $navigation = '<a href="'.$CFG->wwwroot.'/blog/index.php">'.
+                                $strblogs.'</a> -> '.$navigation;
                             print_header("$straction: $strblogs", $SITE->fullname, $navigation);
                             break;
 
-                        case 'tag-index':
-                            $strtags = get_string('tags');
-                            $navlinks[] = array('name' => $strtags,
-                                                 'link' => $CFG->wwwroot.'/tag/index.php',
-                                                 'type' => 'misc');
-                            $navlinks[] = array('name' => $blockname, 'link' => null, 'type' => 'misc');
-                            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
-                            $navigation = build_navigation($navlinks);
-                            print_header("$straction: $strtags", $SITE->fullname, $navigation);
-                            break;
-
                         default:
-                            $navlinks[] = array('name' => $blockname, 'link' => null, 'type' => 'misc');
-                            $navlinks[] = array('name' => $straction, 'link' => null, 'type' => 'misc');
-                            $navigation = build_navigation($navlinks);
                             print_header("$straction: $blockname", $SITE->fullname, $navigation);
                             break;
                     }
@@ -163,67 +123,52 @@ if ($currenttab != 'update') {
 }
 
 
-$toprow = array();
-$inactive = array();
-$activetwo = array();
-
-
 if ($context->contextlevel != CONTEXT_SYSTEM) {    // Print tabs for anything except SYSTEM context
 
-    if ($context->contextlevel == CONTEXT_MODULE) {  // Only show update button if module
+    if ($context->contextlevel == CONTEXT_MODULE) { // only show update button if module?
 
         $toprow[] = new tabobject('update', $CFG->wwwroot.'/course/mod.php?update='.
-                        $context->instanceid.'&amp;return=true&amp;sesskey='.sesskey(), get_string('settings'));
+                       $context->instanceid.'&amp;return=true&amp;sesskey='.sesskey(), get_string('update'));
 
     }
 
-    if (!empty($assignableroles)) {
-        $toprow[] = new tabobject('assign',
-                        $CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$context->id,
-                        get_string('localroles', 'role'),
-                        get_string('showallroles', 'role'),
-                        true);
-    }
+    $toprow[] = new tabobject('roles', $CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.
+                               $context->id, get_string('roles'));
 
-    if (!empty($overridableroles)) {
-        $toprow[] = new tabobject('override',
-                        $CFG->wwwroot.'/'.$CFG->admin.'/roles/override.php?contextid='.$context->id,
-                        get_string('overridepermissions', 'role'),
-                        get_string('showallroles', 'role'),
-                        true);
-    }
+    if (!empty($tabsmode)) {
 
-}
-
-/// Here other core tabs should go (always calling tabs.php files)
-/// All the logic to decide what to show must be self-contained in the tabs file
-/// eg:
-/// include_once($CFG->dirroot . '/grades/tabs.php');
-
-/// Finally, we support adding some 'on-the-fly' tabs here
-/// All the logic to decide what to show must be self-cointained in the tabs file
-    if (isset($CFG->extratabs) && !empty($CFG->extratabs)) {
-        if ($extratabs = explode(',', $CFG->extratabs)) {
-            asort($extratabs);
-            foreach($extratabs as $extratab) {
-            /// Each extra tab must be one $CFG->dirroot relative file
-                if (file_exists($CFG->dirroot . '/' . $extratab)) {
-                    include_once($CFG->dirroot . '/' . $extratab);
-                }
-            }
+        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();
     }
 
-    $inactive[] = $currenttab;
-
-    $tabs = array($toprow);
-
-/// If there are any secondrow defined, let's introduce it
-    if (isset($secondrow) && is_array($secondrow) && !empty($secondrow)) {
-        $tabs[] = $secondrow;
+    if (!empty($secondrow)) {
+        $tabs = array($toprow, $secondrow);
+    } else {
+        $tabs = array($toprow);
     }
 
     print_tabs($tabs, $currenttab, $inactive, $activetwo);
-
+}
 
 ?>

admin/search.php

@@ -5,58 +5,153 @@
 require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 
-$query = trim(stripslashes(optional_param('query', '', PARAM_NOTAGS)));  // Search string
+$query = trim(stripslashes_safe(required_param('query', PARAM_NOTAGS)));  // Search string
 
-$adminroot =& admin_get_root(); // need all settings here
-$adminroot->search = $query; // So we can reference it in search boxes later in this invocation
-$statusmsg = '';
-$errormsg  = '';
-$focus = '';
+$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
 
-admin_externalpage_setup('search'); // now hidden page
 
 // now we'll deal with the case that the admin has submitted the form with changed settings
-if ($data = data_submitted() and confirm_sesskey()) {
-    if (admin_write_settings($data)) {
-        $statusmsg = get_string('changessaved');
-    }
-    $adminroot =& admin_get_root(true); //reload tree
 
-    if (!empty($adminroot->errors)) {
-        $errormsg = get_string('errorwithsettings', 'admin');
-        $firsterror = reset($adminroot->errors);
-        $focus = $firsterror->id;
+$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($focus);
+admin_externalpage_print_header($adminroot);
 
-if ($errormsg !== '') {
-    notify ($errormsg);
-
-} else if ($statusmsg !== '') {
-    notify ($statusmsg, 'notifysuccess');
+if ($statusmsg != '') {
+    notify ($statusmsg);
 }
 
-$resultshtml = admin_search_settings_html($query); // case insensitive search only
+$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 '<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>';
 
-print_footer();
+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

@@ -5,56 +5,21 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/blocklib.php');
 require_once($CFG->dirroot.'/'.$CFG->admin.'/pagelib.php');
 
-$section      = required_param('section', PARAM_SAFEDIR);
-$return       = optional_param('return','', PARAM_ALPHA);
-$adminediting = optional_param('adminedit', -1, PARAM_BOOL);
-
-/// no guest autologin
-require_login(0, false);
-
-$adminroot =& admin_get_root(); // need all settings
-$page      =& $adminroot->locate($section);
-
-if (empty($page) or !is_a($page, 'admin_settingpage')) {
-    print_error('sectionerror', 'admin', "$CFG->wwwroot/$CFG->admin/");
-    die;
+if ($site = get_site()) {
+    require_login();
 }
 
-if (!($page->check_access())) {
-    print_error('accessdenied', 'admin');
-    die;
-}
 
-/// WRITING SUBMITTED DATA (IF ANY) -------------------------------------------------------------------------------
-
-$statusmsg = '';
-$errormsg  = '';
-$focus = '';
-
-if ($data = data_submitted() and confirm_sesskey()) {
-    if (admin_write_settings($data)) {
-        $statusmsg = get_string('changessaved');
-    }
-
-    if (empty($adminroot->errors)) {
-        switch ($return) {
-            case 'site':  redirect("$CFG->wwwroot/");
-            case 'admin': redirect("$CFG->wwwroot/$CFG->admin/");
-        }
-    } else {
-        $errormsg = get_string('errorwithsettings', 'admin');
-        $firsterror = reset($adminroot->errors);
-        $focus = $firsterror->id;
-    }
-    $adminroot =& admin_get_root(true); //reload tree
-    $page      =& $adminroot->locate($section);
-}
-
-/// very hacky page setup
 page_map_class(PAGE_ADMIN, 'page_admin');
+
 $PAGE = page_create_object(PAGE_ADMIN, 0); // there must be any constant id number
-$PAGE->init_extra($section);
-$CFG->pagepath = 'admin/setting/'.$section;
+
+$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;
@@ -68,36 +33,87 @@ if ($PAGE->user_allowed_editing()) {
     }
 }
 
+$adminroot = admin_get_root();
+
+$root = $adminroot->locate($PAGE->section);
+
+if (!is_a($root, 'admin_settingpage')) {
+    error(get_string('sectionerror', 'admin'));
+    die;
+}
+
+if (!($root->check_access())) {
+    error(get_string('accessdenied', 'admin'));
+    die;
+}
+
+$CFG->pagepath = 'admin/setting/'.$section;
+
+
+
+/// WRITING SUBMITTED DATA (IF ANY) -------------------------------------------------------------------------------
+
+$statusmsg = '';
+
+if ($data = data_submitted()) {
+    if (confirm_sesskey()) {
+        $olddbsessions = !empty($CFG->dbsessions);
+        $unslashed = (array)stripslashes_recursive($data);
+        $errors = $root->write_settings($unslashed);
+        //force logout if dbsession setting changes
+        if ($olddbsessions != !empty($CFG->dbsessions)) {
+            require_logout();
+        }
+        if (empty($errors)) {
+            switch ($return) {
+                case 'site':
+                    redirect("$CFG->wwwroot/");
+                case 'admin':
+                    redirect("$CFG->wwwroot/$CFG->admin/");
+                default:
+                    $statusmsg = get_string('changessaved');
+            }
+        } else {
+            $statusmsg = get_string('errorwithsettings', 'admin') . ' <br />' . $errors;
+        }
+    } else {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
+    // now update $SITE - it might have been changed
+    $SITE = get_record('course', 'id', $SITE->id);
+    $COURSE = clone($SITE);
+}
+
 
 /// print header stuff ------------------------------------------------------------
+// header must be printed after the redirects and require_logout
 
 if (empty($SITE->fullname)) {
-    print_header($page->visiblename, $page->visiblename, '', $focus);
+    print_header();
     print_simple_box(get_string('configintrosite', 'admin'), 'center', '50%');
 
-    if ($errormsg !== '') {
-        notify ($errormsg);
-
-    } else if ($statusmsg !== '') {
-        notify ($statusmsg, 'notifysuccess');
+    if ($statusmsg != '') {
+        notify ($statusmsg);
     }
 
     // ---------------------------------------------------------------------------------------------------------------
 
     echo '<form action="settings.php" method="post" id="adminsettings">';
-    echo '<div class="settingsform clearfix">';
-    echo '<input type="hidden" name="section" value="'.$PAGE->section.'" />';
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
-    echo '<input type="hidden" name="return" value="'.$return.'" />';
+    echo '<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 $page->output_html();
+    echo $root->output_html();
 
-    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="'.get_string('savechanges','admin').'" /></div>';
+    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="' . get_string('savechanges','admin') . '" /></div>';
 
     echo '</div>';
     echo '</form>';
+}
 
-} else {
+if (!empty($SITE->fullname)) {
     $pageblocks = blocks_setup($PAGE);
 
     $preferred_width_left  = bounded_number(BLOCK_L_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
@@ -105,56 +121,71 @@ if (empty($SITE->fullname)) {
     $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]),
                                             BLOCK_R_MAX_WIDTH);
 
-    $PAGE->print_header('', $focus);
+    $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">';
-    print_container_start();
+    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);
-    print_container_end();
+    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">';
-    print_container_start();
+    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 ($errormsg !== '') {
-        notify ($errormsg);
-
-    } else if ($statusmsg !== '') {
-        notify ($statusmsg, 'notifysuccess');
+    if ($statusmsg != '') {
+        notify ($statusmsg);
     }
 
     // ---------------------------------------------------------------------------------------------------------------
 
     echo '<form action="settings.php" method="post" id="adminsettings">';
-    echo '<div class="settingsform clearfix">';
-    echo '<input type="hidden" name="section" value="'.$PAGE->section.'" />';
-    echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
-    echo '<input type="hidden" name="return" value="'.$return.'" />';
-    print_heading($page->visiblename);
+    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 $page->output_html();
+    echo $root->output_html();
 
-    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="'.get_string('savechanges','admin').'" /></div>';
+    echo '<div class="form-buttons"><input class="form-submit" type="submit" value="' . get_string('savechanges','admin') . '" /></div>';
 
     echo '</div>';
     echo '</form>';
 
-    print_container_end();
+    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">';
-        print_container_start();
+        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);
-        print_container_end();
+        if (!empty($THEME->roundcorners)) {
+            echo '</div></div></div>';
+            echo '<div class="bb"><div></div></div>';
+        }
         echo '</td>';
     }
             break;

admin/settings/appearance.php

@@ -2,97 +2,113 @@
 
 // This file defines settingpages and externalpages under the "appearance" category
 
-if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
+$ADMIN->add('appearance', new admin_category('themes', get_string('themes')));
+// "themesettings" settingpage
+$temp = new admin_settingpage('themesettings', get_string('themesettings', 'admin'));
+$temp->add(new admin_setting_configtext('themelist', get_string('themelist', 'admin'), get_string('configthemelist','admin'), '', PARAM_NOTAGS));
+$temp->add(new admin_setting_configcheckbox('allowuserthemes', get_string('allowuserthemes', 'admin'), get_string('configallowuserthemes', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('allowcoursethemes', get_string('allowcoursethemes', 'admin'), get_string('configallowcoursethemes', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('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'));
 
-    $ADMIN->add('appearance', new admin_category('themes', get_string('themes')));
-    // "themesettings" settingpage
-    $temp = new admin_settingpage('themesettings', get_string('themesettings', 'admin'));
-    $temp->add(new admin_setting_configtext('themelist', get_string('themelist', 'admin'), get_string('configthemelist','admin'), '', PARAM_NOTAGS));
-    $temp->add(new admin_setting_configcheckbox('allowuserthemes', get_string('allowuserthemes', 'admin'), get_string('configallowuserthemes', 'admin'), 0));
-    $temp->add(new admin_setting_configcheckbox('allowcoursethemes', get_string('allowcoursethemes', 'admin'), get_string('configallowcoursethemes', 'admin'), 0));
-    $temp->add(new admin_setting_configcheckbox('allowcategorythemes',  get_string('allowcategorythemes', 'admin'), get_string('configallowcategorythemes', 'admin'), 0));
-    $temp->add(new admin_setting_configcheckbox('allowuserblockhiding', get_string('allowuserblockhiding', 'admin'), get_string('configallowuserblockhiding', 'admin'), 1));
-    $temp->add(new admin_setting_configcheckbox('showblocksonmodpages', get_string('showblocksonmodpages', 'admin'), get_string('configshowblocksonmodpages', 'admin'), 0));
-    $temp->add(new admin_setting_configselect('hideactivitytypenavlink', get_string('hideactivitytypenavlink', 'admin'), get_string('confighideactivitytypenavlink', 'admin'), 0,
-    array(
-            0 => get_string('hidefromnone', 'admin'),
-            1 => get_string('hidefromstudents', 'admin'),
-            2 => get_string('hidefromall', 'admin')
-        )));
-    $ADMIN->add('themes', $temp);
-    $ADMIN->add('themes', new admin_externalpage('themeselector', get_string('themeselector','admin'), $CFG->wwwroot . '/theme/index.php'));
+# 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());
-    //this is hacky because we do not want to include the stuff from calendar/lib.php
-    $temp->add(new admin_setting_configselect('calendar_site_timeformat', get_string('pref_timeformat', 'calendar'),
-                                              get_string('explain_site_timeformat', 'calendar'), '0',
-                                              array('0'        => get_string('default', 'calendar'),
-                                                    '%I:%M %p' => get_string('timeformat_12', 'calendar'),
-                                                    '%H:%M'    => get_string('timeformat_24', 'calendar'))));
-    $temp->add(new admin_setting_configselect('calendar_startwday', get_string('configstartwday', 'admin'), get_string('helpstartofweek', 'admin'), 0,
-    array(
-            0 => get_string('sunday', 'calendar'),
-            1 => get_string('monday', 'calendar'),
-            2 => get_string('tuesday', 'calendar'),
-            3 => get_string('wednesday', 'calendar'),
-            4 => get_string('thursday', 'calendar'),
-            5 => get_string('friday', 'calendar'),
-            6 => get_string('saturday', 'calendar')
-        )));
-    $temp->add(new admin_setting_special_calendar_weekend());
-    $temp->add(new admin_setting_configtext('calendar_lookahead',get_string('configlookahead','admin'),get_string('helpupcominglookahead', 'admin'),21,PARAM_INT));
-    $temp->add(new admin_setting_configtext('calendar_maxevents',get_string('configmaxevents','admin'),get_string('helpupcomingmaxevents', 'admin'),10,PARAM_INT));
-    $temp->add(new admin_setting_configcheckbox('enablecalendarexport', get_string('enablecalendarexport', 'admin'), get_string('configenablecalendarexport','admin'), 1));
-    $temp->add(new admin_setting_configtext('calendar_exportsalt', get_string('calendarexportsalt','admin'), get_string('configcalendarexportsalt', 'admin'), random_string(60)));
-    $ADMIN->add('appearance', $temp);
+// 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);
 
-    // "htmleditor" settingpage
-    $temp = new admin_settingpage('htmleditor', get_string('htmleditor', 'admin'));
-    $temp->add(new admin_setting_configcheckbox('htmleditor', get_string('usehtmleditor', 'admin'), get_string('confightmleditor','admin'), 1));
-    $temp->add(new admin_setting_configtext('editorbackgroundcolor', get_string('editorbackgroundcolor', 'admin'), get_string('edhelpbgcolor'), '#ffffff', PARAM_NOTAGS));
-    $temp->add(new admin_setting_configtext('editorfontfamily', get_string('editorfontfamily', 'admin'), get_string('edhelpfontfamily'), 'Trebuchet MS,Verdana,Arial,Helvetica,sans-serif', PARAM_NOTAGS));
-    $temp->add(new admin_setting_configtext('editorfontsize', get_string('editorfontsize', 'admin'), get_string('edhelpfontsize'), '', PARAM_NOTAGS));
-    $temp->add(new admin_setting_special_editorfontlist());
-    $temp->add(new admin_setting_configcheckbox('editorkillword', get_string('editorkillword', 'admin'), get_string('edhelpcleanword'), 1));
-    if (!empty($CFG->aspellpath)) { // make aspell settings disappear if path isn't set
-      $temp->add(new admin_setting_configcheckbox('editorspelling', get_string('editorspelling', 'admin'), get_string('editorspellinghelp', 'admin'), 0));
-      $temp->add(new admin_setting_special_editordictionary());
-    }
-    $temp->add(new admin_setting_special_editorhidebuttons());
-    $temp->add(new admin_setting_emoticons());
-    $ADMIN->add('appearance', $temp);
+// "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);
 
-    // "htmlsettings" settingpage
-    $temp = new admin_settingpage('htmlsettings', get_string('htmlsettings', 'admin'));
-    $temp->add(new admin_setting_configcheckbox('formatstringstriptags', get_string('stripalltitletags', 'admin'), get_string('configstripalltitletags', 'admin'), 1));
-    $ADMIN->add('appearance', $temp);
 
-    // "documentation" settingpage
-    $temp = new admin_settingpage('documentation', get_string('moodledocs'));
-    $temp->add(new admin_setting_configtext('docroot', get_string('docroot', 'admin'), get_string('configdocroot', 'admin'), 'http://docs.moodle.org', PARAM_URL));
-    $temp->add(new admin_setting_configcheckbox('doctonewwindow', get_string('doctonewwindow', 'admin'), get_string('configdoctonewwindow', 'admin'), 0));
-    $ADMIN->add('appearance', $temp);
 
-    $temp = new admin_settingpage('mymoodle', get_string('mymoodle', 'admin'));
-    $temp->add(new admin_setting_configcheckbox('mymoodleredirect', get_string('mymoodleredirect', 'admin'), get_string('configmymoodleredirect', 'admin'), 0));
-    $temp->add(new admin_setting_configtext('mycoursesperpage', get_string('mycoursesperpage', 'admin'), get_string('configmycoursesperpage', 'admin'), 21, PARAM_INT));
-    $ADMIN->add('appearance', $temp);
 
-    // new CFG variable for coursemanager (what roles to display)
-    $temp = new admin_settingpage('coursemanager', get_string('coursemanager', 'admin'));
-    $temp->add(new admin_setting_special_coursemanager());
-    $ADMIN->add('appearance', $temp);
 
-    $temp = new admin_settingpage('ajax', get_string('ajaxuse'));
-    $temp->add(new admin_setting_configcheckbox('enableajax', get_string('enableajax', 'admin'), get_string('configenableajax', 'admin'), 1));
-    $temp->add(new admin_setting_configcheckbox('disablecourseajax', get_string('disablecourseajax', 'admin'), get_string('configdisablecourseajax', 'admin'),
-                                                isset($CFG->disablecourseajax) ? 1 : empty($CFG->enableajax)));
-    $ADMIN->add('appearance', $temp);
+// "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);
 
-    // link to tag management interface
-    $ADMIN->add('appearance', new admin_externalpage('managetags', get_string('managetags', 'tag'), "$CFG->wwwroot/tag/manage.php"));
+// "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"));
 
-} // end of speedup
 ?>

admin/settings/courses.php

@@ -2,109 +2,49 @@
 
 // This file defines settingpages and externalpages under the "courses" category
 
-if ($hassiteconfig
- or has_capability('moodle/site:backup', $systemcontext)
- or has_capability('moodle/category:manage', $systemcontext)
- or has_capability('moodle/course:create', $systemcontext)
- or has_capability('moodle/site:approvecourse', $systemcontext)) { // speedup for non-admins, add all caps used on this page
 
-    $ADMIN->add('courses', new admin_externalpage('coursemgmt', get_string('coursemgmt', 'admin'), $CFG->wwwroot . '/course/index.php?categoryedit=on',
-            array('moodle/category:manage', 'moodle/course:create')));
+$ADMIN->add('courses', new admin_externalpage('coursemgmt', get_string('coursemgmt', 'admin'), $CFG->wwwroot . '/course/index.php?categoryedit=on'));
 
-    $ADMIN->add('courses', new admin_enrolment_page());
+$ADMIN->add('courses', new admin_externalpage('enrolment', get_string('enrolments'), $CFG->wwwroot . '/'.$CFG->admin.'/enrol.php'));
 
-/// Course Default Settings Page
-/// NOTE: these settings must be applied after all other settings because they depend on them
-/// NOTE: these are a subset of the complete defaults available in 2.0
-    ///general course settings
-    $temp = new admin_settingpage('coursesettings', get_string('coursesettings'));
-    $courseformats = get_list_of_plugins('course/format');
-    $formcourseformats = array();
-    foreach ($courseformats as $courseformat) {
-        $formcourseformats["$courseformat"] = get_string("format$courseformat","format_$courseformat");
-        if ($formcourseformats["$courseformat"]=="[[format$courseformat]]") {
-            $formcourseformats["$courseformat"] = get_string("format$courseformat");
-        }
-    }
-    $temp->add(new admin_setting_configselect('moodlecourse/format', get_string('format'), get_string('coursehelpformat'), 'weeks',$formcourseformats));
-    for ($i=1; $i<=52; $i++) {
-        $sectionmenu[$i] = "$i";
-    }
-    $temp->add(new admin_setting_configselect('moodlecourse/numsections', get_string('numberweeks'), get_string('coursehelpnumberweeks'), 10, $sectionmenu));
-    $choices = array();
-    $choices['0'] = get_string('hiddensectionscollapsed');
-    $choices['1'] = get_string('hiddensectionsinvisible');
-    $temp->add(new admin_setting_configselect('moodlecourse/hiddensections', get_string('hiddensections'), get_string('coursehelphiddensections'), 0,$choices));
-    $options = range(0, 10);
-    $temp->add(new admin_setting_configselect('moodlecourse/newsitems', get_string('newsitemsnumber'), get_string('coursehelpnewsitemsnumber'), 5,$options));
-    $temp->add(new admin_setting_configselect('moodlecourse/showgrades', get_string('showgrades'), get_string('coursehelpshowgrades'), 1,array(0 => get_string('no'), 1 => get_string('yes'))));
-    $temp->add(new admin_setting_configselect('moodlecourse/showreports', get_string('showreports'), '', 0,array(0 => get_string('no'), 1 => get_string('yes'))));
-    if (isset($CFG->maxbytes)) {
-        $choices = get_max_upload_sizes($CFG->maxbytes);
-    } else {
-        $choices = get_max_upload_sizes();
-    }
-    $temp->add(new admin_setting_configselect('moodlecourse/maxbytes', get_string('maximumupload'), get_string('coursehelpmaximumupload'), key($choices), $choices));
-    $temp->add(new admin_setting_configselect('moodlecourse/metacourse', get_string('metacourse'), get_string('coursehelpmetacourse'), 0,array(0 => get_string('no'), 1 => get_string('yes'))));
+// "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);
 
-    $ADMIN->add('courses', $temp);
 
-    // "courserequests" settingpage
-    $temp = new admin_settingpage('courserequest', get_string('courserequest'));
-    $temp->add(new admin_setting_configcheckbox('enablecourserequests', get_string('enablecourserequests', 'admin'), get_string('configenablecourserequests', 'admin'), 0));
-    $temp->add(new admin_settings_coursecat_select('defaultrequestcategory', get_string('defaultrequestcategory', 'admin'), get_string('configdefaultrequestcategory', 'admin'), 1));
-    $temp->add(new admin_setting_users_with_capability('courserequestnotify', get_string('courserequestnotify', 'admin'), get_string('configcourserequestnotify2', 'admin'), array(), 'moodle/site:approvecourse'));
-    $ADMIN->add('courses', $temp);
 
-    // Pending course requests.
-    if (!empty($CFG->enablecourserequests)) {
-        $ADMIN->add('courses', new admin_externalpage('coursespending', get_string('pendingrequests'),
-                $CFG->wwwroot . '/course/pending.php', array('moodle/site:approvecourse')));
-    }
-
-    // "backups" settingpage
-    if (!empty($CFG->backup_version)) {
-        $bi = array();
-        $bi[] = new admin_setting_configcheckbox('backup_sche_modules', get_string('includemodules'), get_string('backupincludemoduleshelp'), 0);
-        $bi[] = new admin_setting_configcheckbox('backup_sche_withuserdata', get_string('includemoduleuserdata'), get_string('backupincludemoduleuserdatahelp'), 0);
-        $bi[] = new admin_setting_configcheckbox('backup_sche_metacourse', get_string('metacourse'), get_string('backupmetacoursehelp'), 0);
-        $bi[] = new admin_setting_configselect('backup_sche_users', get_string('users'), get_string('backupusershelp'),
-                                               0, array(0 => get_string('all'), 1 => get_string('course')));
-        $bi[] = new admin_setting_configcheckbox('backup_sche_logs', get_string('logs'), get_string('backuplogshelp'), 0);
-        $bi[] = new admin_setting_configcheckbox('backup_sche_userfiles', get_string('userfiles'), get_string('backupuserfileshelp'), 0);
-        $bi[] = new admin_setting_configcheckbox('backup_sche_coursefiles', get_string('coursefiles'), get_string('backupcoursefileshelp'), 0);
-        $bi[] = new admin_setting_configcheckbox('backup_sche_sitefiles', get_string('sitefiles'), get_string('backupsitefileshelp'), 0);
-        $bi[] = new admin_setting_configcheckbox('backup_sche_gradebook_history', get_string('gradebookhistories', 'grades'), get_string('backupgradebookhistoryhelp'), 0);
-        $bi[] = new admin_setting_configcheckbox('backup_sche_messages', get_string('messages', 'message'), get_string('backupmessageshelp','message'), 0);
-        $bi[] = new admin_setting_configcheckbox('backup_sche_blogs', get_string('blogs', 'blog'), get_string('backupblogshelp','blog'), 0);
-        $bi[] = new admin_setting_configselect('backup_sche_keep', get_string('keep'),
-                                               get_string('backupkeephelp'), 1, array(0 => get_string('all'), 1 => '1',
-                                                                                                              2 => '2',
-                                                                                                              5 => '5',
-                                                                                                              10 => '10',
-                                                                                                              20 => '20',
-                                                                                                              30 => '30',
-                                                                                                              40 => '40',
-                                                                                                              50 => '50',
-                                                                                                              100 => '100',
-                                                                                                              200 => '200',
-                                                                                                              300 => '300',
-                                                                                                              400 => '400',
-                                                                                                              500 => '500'));
-        $bi[] = new admin_setting_configcheckbox('backup_sche_active', get_string('active'), get_string('backupactivehelp'), 0);
-        $bi[] = new admin_setting_special_backupdays();
-        $bi[] = new admin_setting_configtime('backup_sche_hour', 'backup_sche_minute', get_string('executeat'),
-                                             get_string('backupexecuteathelp'), array('h' => 0, 'm' => 0));
-        $bi[] = new admin_setting_configdirectory('backup_sche_destination', get_string('saveto'), get_string('backupsavetohelp'), '');
-
-        $temp = new admin_settingpage('backups', get_string('backups','admin'), 'moodle/site:backup');
-        foreach ($bi as $backupitem) {
-            $backupitem->plugin = 'backup';
-            $temp->add($backupitem);
-        }
-        $ADMIN->add('courses', $temp);
-    }
-
-} // end of speedup
+// "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

@@ -4,80 +4,42 @@
 
 if (get_site()) { //do not use during installation
     $frontpagecontext = get_context_instance(CONTEXT_COURSE, SITEID);
-
-    if ($hassiteconfig or has_any_capability(array(
-            'moodle/course:update',
-            'moodle/role:assign',
-            'moodle/site:restore',
-            'moodle/site:backup',
-            'moodle/course:managefiles',
-            'moodle/question:add',
-            'moodle/question:editmine',
-            'moodle/question:editall',
-            'moodle/question:viewmine',
-            'moodle/question:viewall',
-            'moodle/question:movemine',
-            'moodle/question:moveall'), $frontpagecontext)) {
-
-        // "frontpage" settingpage
-        $temp = new admin_settingpage('frontpagesettings', get_string('frontpagesettings','admin'), 'moodle/course:update', false, $frontpagecontext);
-        $temp->add(new admin_setting_sitesettext('fullname', get_string('fullsitename'), '', NULL)); // no default
-        $temp->add(new admin_setting_sitesettext('shortname', get_string('shortsitename'), '', NULL)); // no default
-        $temp->add(new admin_setting_special_frontpagedesc());
-        $temp->add(new admin_setting_courselist_frontpage(false)); // non-loggedin version of the setting (that's what the parameter is for :) )
-        $temp->add(new admin_setting_courselist_frontpage(true)); // loggedin version of the setting
-        
-        $options = array();
-        $options[] = get_string('unlimited');
-        for ($i=1; $i<100; $i++) {
-            $options[$i] = $i;
-        }
-        $temp->add(new admin_setting_configselect('maxcategorydepth', get_string('configsitemaxcategorydepth','admin'), get_string('configsitemaxcategorydepthhelp','admin'), 0, $options));
-        
-        $temp->add(new admin_setting_sitesetcheckbox('numsections', get_string('sitesection'), get_string('sitesectionhelp','admin'), 1));
-        $temp->add(new admin_setting_sitesetselect('newsitems', get_string('newsitemsnumber'), '', 3,
-             array('0' => '0',
-                   '1' => '1',
-                   '2' => '2',
-                   '3' => '3',
-                   '4' => '4',
-                   '5' => '5',
-                   '6' => '6',
-                   '7' => '7',
-                   '8' => '8',
-                   '9' => '9',
-                   '10' => '10')));
-        $temp->add(new admin_setting_configtext('coursesperpage', get_string('coursesperpage', 'admin'), get_string('configcoursesperpage', 'admin'), 20, PARAM_INT));
-        $temp->add(new admin_setting_configcheckbox('allowvisiblecoursesinhiddencategories', get_string('allowvisiblecoursesinhiddencategories', 'admin'), get_string('configvisiblecourses', 'admin'), 0));
-
-        // front page default role
-        $roleoptions = array(0=>get_string('none')); // roles to choose from
-        if ($roles = get_all_roles()) {
-            foreach ($roles as $role) {
-                $roleoptions[$role->id] = strip_tags(format_string($role->name, true));
-            }
-        }
-        $temp->add(new admin_setting_configselect('defaultfrontpageroleid', get_string('frontpagedefaultrole', 'admin'), '', 0, $roleoptions));
-
-        $ADMIN->add('frontpage', $temp);
-
-        $ADMIN->add('frontpage', new admin_externalpage('frontpageroles', get_string('frontpageroles', 'admin'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=" . $frontpagecontext->id, 'moodle/role:assign', false, $frontpagecontext));
-
-        $ADMIN->add('frontpage', new admin_externalpage('frontpagebackup', get_string('frontpagebackup', 'admin'), $CFG->wwwroot.'/backup/backup.php?id='.SITEID, 'moodle/site:backup', false, $frontpagecontext));
-
-        $ADMIN->add('frontpage', new admin_externalpage('frontpagerestore', get_string('frontpagerestore', 'admin'), $CFG->wwwroot.'/files/index.php?id='.SITEID.'&amp;wdir=/backupdata', 'moodle/site:restore', false, $frontpagecontext));
-
-        $questioncapabilites = array(
-                'moodle/question:add',
-                'moodle/question:editmine',
-                'moodle/question:editall',
-                'moodle/question:viewmine',
-                'moodle/question:viewall',
-                'moodle/question:movemine',
-                'moodle/question:moveall');
-        $ADMIN->add('frontpage', new admin_externalpage('frontpagequestions', get_string('frontpagequestions', 'admin'), $CFG->wwwroot.'/question/edit.php?courseid='.SITEID, $questioncapabilites, false, $frontpagecontext));
-
-        $ADMIN->add('frontpage', new admin_externalpage('sitefiles', get_string('sitefiles'), $CFG->wwwroot . '/files/index.php?id=' . SITEID, 'moodle/course:managefiles', false, $frontpagecontext));
-    }
+    $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/grades.php

@@ -1,217 +0,0 @@
-<?php // $Id$
-
-// This file defines settingpages and externalpages under the "grades" section
-
-if (has_capability('moodle/grade:manage', $systemcontext)
- or has_capability('moodle/grade:manageletters', $systemcontext)) { // speedup for non-admins, add all caps used on this page
-
-    require_once $CFG->libdir.'/grade/constants.php';
-    $display_types = array(GRADE_DISPLAY_TYPE_REAL => get_string('real', 'grades'),
-                           GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
-                           GRADE_DISPLAY_TYPE_LETTER => get_string('letter', 'grades'),
-                           GRADE_DISPLAY_TYPE_REAL_PERCENTAGE => get_string('realpercentage', 'grades'),
-                           GRADE_DISPLAY_TYPE_REAL_LETTER => get_string('realletter', 'grades'),
-                           GRADE_DISPLAY_TYPE_LETTER_REAL => get_string('letterreal', 'grades'),
-                           GRADE_DISPLAY_TYPE_LETTER_PERCENTAGE => get_string('letterpercentage', 'grades'),
-                           GRADE_DISPLAY_TYPE_PERCENTAGE_LETTER => get_string('percentageletter', 'grades'),
-                           GRADE_DISPLAY_TYPE_PERCENTAGE_REAL => get_string('percentagereal', 'grades')
-                           );
-    asort($display_types);
-
-    // General settings
-
-    $temp = new admin_settingpage('gradessettings', get_string('generalsettings', 'grades'), 'moodle/grade:manage');
-    if ($ADMIN->fulltree) {
-
-        // new CFG variable for gradebook (what roles to display)
-        $temp->add(new admin_setting_special_gradebookroles());
-
-        // enable outcomes checkbox
-        $temp->add(new admin_setting_configcheckbox('enableoutcomes', get_string('enableoutcomes', 'grades'), get_string('configenableoutcomes', 'grades'), 0, PARAM_INT));
-
-        $temp->add(new admin_setting_grade_profilereport());
-
-        $temp->add(new admin_setting_configselect('grade_aggregationposition', get_string('aggregationposition', 'grades'),
-                                                  get_string('configaggregationposition', 'grades'), GRADE_REPORT_AGGREGATION_POSITION_LAST,
-                                                  array(GRADE_REPORT_AGGREGATION_POSITION_FIRST => get_string('positionfirst', 'grades'),
-                                                        GRADE_REPORT_AGGREGATION_POSITION_LAST => get_string('positionlast', 'grades'))));
-
-        $temp->add(new admin_setting_regradingcheckbox('grade_includescalesinaggregation', get_string('includescalesinaggregation', 'grades'), get_string('configincludescalesinaggregation', 'grades'), 1));
-
-        $temp->add(new admin_setting_configcheckbox('grade_hiddenasdate', get_string('hiddenasdate', 'grades'), get_string('confighiddenasdate', 'grades'), 0));
-
-        // enable publishing in exports/imports
-        $temp->add(new admin_setting_configcheckbox('gradepublishing', get_string('gradepublishing', 'grades'), get_string('configgradepublishing', 'grades'), 0));
-
-        $temp->add(new admin_setting_configselect('grade_export_displaytype', get_string('gradeexportdisplaytype', 'grades'),
-                                                  get_string('configgradeexportdisplaytype', 'grades'), GRADE_DISPLAY_TYPE_REAL, $display_types));
-
-        $temp->add(new admin_setting_configselect('grade_export_decimalpoints', get_string('gradeexportdecimalpoints', 'grades'),
-                                                  get_string('configexportdecimalpoints', 'grades'), 2,
-                                                  array( '0' => '0',
-                                                         '1' => '1',
-                                                         '2' => '2',
-                                                         '3' => '3',
-                                                         '4' => '4',
-                                                         '5' => '5')));
-        $temp->add(new admin_setting_configselect('grade_navmethod', get_string('navmethod', 'grades'), null, 0,
-                                                  array(GRADE_NAVMETHOD_DROPDOWN => get_string('dropdown', 'grades'),
-                                                        GRADE_NAVMETHOD_TABS => get_string('tabs', 'grades'),
-                                                        GRADE_NAVMETHOD_COMBO => get_string('combo', 'grades'))));
-
-        $temp->add(new admin_setting_special_gradeexport());
-
-        $temp->add(new admin_setting_special_gradelimiting());
-    }
-    $ADMIN->add('grades', $temp);
-
-    /// Grade category settings
-    $temp = new admin_settingpage('gradecategorysettings', get_string('gradecategorysettings', 'grades'), 'moodle/grade:manage');
-    if ($ADMIN->fulltree) {
-        $temp->add(new admin_setting_configcheckbox('grade_hideforcedsettings', get_string('hideforcedsettings', 'grades'), get_string('confighideforcedsettings', 'grades'), '1'));
-
-        $strnoforce = get_string('noforce', 'grades');
-
-        // Aggregation type
-        $options = array(GRADE_AGGREGATE_MEAN            =>get_string('aggregatemean', 'grades'),
-                         GRADE_AGGREGATE_WEIGHTED_MEAN   =>get_string('aggregateweightedmean', 'grades'),
-                         GRADE_AGGREGATE_WEIGHTED_MEAN2  =>get_string('aggregateweightedmean2', 'grades'),
-                         GRADE_AGGREGATE_EXTRACREDIT_MEAN=>get_string('aggregateextracreditmean', 'grades'),
-                         GRADE_AGGREGATE_MEDIAN          =>get_string('aggregatemedian', 'grades'),
-                         GRADE_AGGREGATE_MIN             =>get_string('aggregatemin', 'grades'),
-                         GRADE_AGGREGATE_MAX             =>get_string('aggregatemax', 'grades'),
-                         GRADE_AGGREGATE_MODE            =>get_string('aggregatemode', 'grades'),
-                         GRADE_AGGREGATE_SUM             =>get_string('aggregatesum', 'grades'));
-
-        $defaultvisible = array(GRADE_AGGREGATE_MEAN, GRADE_AGGREGATE_WEIGHTED_MEAN, GRADE_AGGREGATE_WEIGHTED_MEAN2,
-                                GRADE_AGGREGATE_EXTRACREDIT_MEAN, GRADE_AGGREGATE_MEDIAN, GRADE_AGGREGATE_MIN,
-                                GRADE_AGGREGATE_MAX, GRADE_AGGREGATE_MODE, GRADE_AGGREGATE_SUM);
-
-        $defaults = array('value'=>GRADE_AGGREGATE_WEIGHTED_MEAN2, 'forced'=>false, 'adv'=>false);
-        $temp->add(new admin_setting_gradecat_combo('grade_aggregation', get_string('aggregation', 'grades'), get_string('aggregationhelp', 'grades'), $defaults, $options));
-
-        $temp->add(new admin_setting_configmultiselect('grade_aggregations_visible', get_string('aggregationsvisible', 'grades'),
-                                                       get_string('aggregationsvisiblehelp', 'grades'), $defaultvisible, $options));
-
-        $options = array(0 => get_string('no'), 1 => get_string('yes'));
-
-        $defaults = array('value'=>1, 'forced'=>false, 'adv'=>true);
-        $temp->add(new admin_setting_gradecat_combo('grade_aggregateonlygraded', get_string('aggregateonlygraded', 'grades'),
-                    get_string('aggregateonlygradedhelp', 'grades'), $defaults, $options));
-        $defaults = array('value'=>0, 'forced'=>false, 'adv'=>true);
-        $temp->add(new admin_setting_gradecat_combo('grade_aggregateoutcomes', get_string('aggregateoutcomes', 'grades'),
-                    get_string('aggregateoutcomeshelp', 'grades'), $defaults, $options));
-        $temp->add(new admin_setting_gradecat_combo('grade_aggregatesubcats', get_string('aggregatesubcats', 'grades'),
-                    get_string('aggregatesubcatshelp', 'grades'), $defaults, $options));
-
-        $options = array(0 => get_string('none'));
-        for ($i=1; $i<=20; $i++) {
-            $options[$i] = $i;
-        }
-
-        $defaults['value'] = 0;
-        $defaults['forced'] = true;
-        $temp->add(new admin_setting_gradecat_combo('grade_keephigh', get_string('keephigh', 'grades'),
-                    get_string('keephighhelp', 'grades'), $defaults, $options));
-        $defaults['forced'] = false;
-        $temp->add(new admin_setting_gradecat_combo('grade_droplow', get_string('droplow', 'grades'),
-                    get_string('droplowhelp', 'grades'), $defaults, $options));
-    }
-    $ADMIN->add('grades', $temp);
-
-
-    /// Grade item settings
-    $temp = new admin_settingpage('gradeitemsettings', get_string('gradeitemsettings', 'grades'), 'moodle/grade:manage');
-    if ($ADMIN->fulltree) {
-        $temp->add(new admin_setting_configselect('grade_displaytype', get_string('gradedisplaytype', 'grades'),
-                                                  get_string('configgradedisplaytype', 'grades'), GRADE_DISPLAY_TYPE_REAL, $display_types));
-
-        $temp->add(new admin_setting_configselect('grade_decimalpoints', get_string('decimalpoints', 'grades'),
-                                                  get_string('configdecimalpoints', 'grades'), 2,
-                                                  array( '0' => '0',
-                                                         '1' => '1',
-                                                         '2' => '2',
-                                                         '3' => '3',
-                                                         '4' => '4',
-                                                         '5' => '5')));
-
-        $temp->add(new admin_setting_configmultiselect('grade_item_advanced', get_string('gradeitemadvanced', 'grades'), get_string('configgradeitemadvanced', 'grades'),
-                                                       array('iteminfo', 'idnumber', 'gradepass', 'plusfactor', 'multfactor', 'display', 'decimals', 'hiddenuntil', 'locktime'),
-                                                       array('iteminfo' => get_string('iteminfo', 'grades'),
-                                                             'idnumber' => get_string('idnumbermod'),
-                                                             'gradetype' => get_string('gradetype', 'grades'),
-                                                             'scaleid' => get_string('scale'),
-                                                             'grademin' => get_string('grademin', 'grades'),
-                                                             'grademax' => get_string('grademax', 'grades'),
-                                                             'gradepass' => get_string('gradepass', 'grades'),
-                                                             'plusfactor' => get_string('plusfactor', 'grades'),
-                                                             'multfactor' => get_string('multfactor', 'grades'),
-                                                             'display' => get_string('gradedisplaytype', 'grades'),
-                                                             'decimals' => get_string('decimalpoints', 'grades'),
-                                                             'hidden' => get_string('hidden', 'grades'),
-                                                             'hiddenuntil' => get_string('hiddenuntil', 'grades'),
-                                                             'locked' => get_string('locked', 'grades'),
-                                                             'locktime' => get_string('locktime', 'grades'),
-                                                             'aggregationcoef' => get_string('aggregationcoef', 'grades'),
-                                                             'parentcategory' => get_string('parentcategory', 'grades'))));
-    }
-    $ADMIN->add('grades', $temp);
-
-
-    /// Scales and outcomes
-
-    $scales = new admin_externalpage('scales', get_string('scales'), $CFG->wwwroot.'/grade/edit/scale/index.php', 'moodle/grade:manage');
-    $ADMIN->add('grades', $scales);
-    if (!empty($CFG->enableoutcomes)) {
-        $outcomes = new admin_externalpage('outcomes', get_string('outcomes', 'grades'), $CFG->wwwroot.'/grade/edit/outcome/index.php', 'moodle/grade:manage');
-        $ADMIN->add('grades', $outcomes);
-    }
-    $letters = new admin_externalpage('letters', get_string('letters', 'grades'), $CFG->wwwroot.'/grade/edit/letter/edit.php', 'moodle/grade:manageletters');
-    $ADMIN->add('grades', $letters);
-
-    // The plugins must implement a settings.php file that adds their admin settings to the $settings object
-
-    // Reports
-    $ADMIN->add('grades', new admin_category('gradereports', get_string('reportsettings', 'grades')));
-    foreach (get_list_of_plugins('grade/report') as $plugin) {
-     // Include all the settings commands for this plugin if there are any
-        if (file_exists($CFG->dirroot.'/grade/report/'.$plugin.'/settings.php')) {
-            $settings = new admin_settingpage('gradereport'.$plugin, get_string('modulename', 'gradereport_'.$plugin), 'moodle/grade:manage');
-            if ($ADMIN->fulltree) {
-                include($CFG->dirroot.'/grade/report/'.$plugin.'/settings.php');
-            }
-            $ADMIN->add('gradereports', $settings);
-        }
-    }
-
-    // Imports
-    $ADMIN->add('grades', new admin_category('gradeimports', get_string('importsettings', 'grades')));
-    foreach (get_list_of_plugins('grade/import') as $plugin) {
-
-     // Include all the settings commands for this plugin if there are any
-        if (file_exists($CFG->dirroot.'/grade/import/'.$plugin.'/settings.php')) {
-            $settings = new admin_settingpage('gradeimport'.$plugin, get_string('modulename', 'gradeimport_'.$plugin), 'moodle/grade:manage');
-            if ($ADMIN->fulltree) {
-                include($CFG->dirroot.'/grade/import/'.$plugin.'/settings.php');
-            }
-            $ADMIN->add('gradeimports', $settings);
-        }
-    }
-
-
-    // Exports
-    $ADMIN->add('grades', new admin_category('gradeexports', get_string('exportsettings', 'grades')));
-    foreach (get_list_of_plugins('grade/export') as $plugin) {
-     // Include all the settings commands for this plugin if there are any
-        if (file_exists($CFG->dirroot.'/grade/export/'.$plugin.'/settings.php')) {
-            $settings = new admin_settingpage('gradeexport'.$plugin, get_string('modulename', 'gradeexport_'.$plugin), 'moodle/grade:manage');
-            if ($ADMIN->fulltree) {
-                include($CFG->dirroot.'/grade/export/'.$plugin.'/settings.php');
-            }
-            $ADMIN->add('gradeexports', $settings);
-        }
-    }
-
-} // end of speedup
-
-?>

admin/settings/language.php

@@ -2,28 +2,21 @@
 
 // This file defines settingpages and externalpages under the "appearance" category
 
-if ($hassiteconfig
-    or has_capability('moodle/site:langeditmaster', $systemcontext)
-    or has_capability('moodle/site:langeditlocal', $systemcontext)) { // speedup for non-admins, add all caps used on this page
+// "languageandlocation" settingpage
+$temp = new admin_settingpage('langsettings', get_string('languagesettings', 'admin'));
+$temp->add(new admin_setting_configselect('lang', get_string('lang', 'admin'), get_string('configlang', 'admin'), current_language(), get_list_of_languages())); // $CFG->lang might be set in installer already, default en or en_utf8 is in setup.php
+$temp->add(new admin_setting_configcheckbox('langmenu', get_string('langmenu', 'admin'), get_string('configlangmenu', 'admin'), 1));
+$temp->add(new admin_setting_configtext('langlist', get_string('langlist', 'admin'), get_string('configlanglist', 'admin'), '', PARAM_NOTAGS));
+$temp->add(new admin_setting_configcheckbox('langcache', get_string('langcache', 'admin'), get_string('configlangcache', 'admin'), 1));
+$temp->add(new admin_setting_configtext('locale', get_string('localetext', 'admin'), get_string('configlocale', 'admin'), '', PARAM_FILE));
 
-    // "languageandlocation" settingpage
-    $temp = new admin_settingpage('langsettings', get_string('languagesettings', 'admin'));
-    $temp->add(new admin_setting_configcheckbox('autolang', get_string('autolang', 'admin'), get_string('configautolang', 'admin'), 1));
-    $temp->add(new admin_setting_configselect('lang', get_string('lang', 'admin'), get_string('configlang', 'admin'), current_language(), get_list_of_languages())); // $CFG->lang might be set in installer already, default en or en_utf8 is in setup.php
-    $temp->add(new admin_setting_configcheckbox('langmenu', get_string('langmenu', 'admin'), get_string('configlangmenu', 'admin'), 1));
-    $temp->add(new admin_setting_langlist());
-    $temp->add(new admin_setting_configcheckbox('langcache', get_string('langcache', 'admin'), get_string('configlangcache', 'admin'), 1));
-    $temp->add(new admin_setting_configtext('locale', get_string('localetext', 'admin'), get_string('configlocale', 'admin'), '', PARAM_FILE));
-
-    // new CFG variable for excel encoding
-    $temp->add(new admin_setting_configselect('latinexcelexport', get_string('latinexcelexport', 'admin'), get_string('configlatinexcelexport', 'admin'), '0', array('0'=>'Unicode','1'=>'Latin')));
+// new CFG variable for excel encoding
+$temp->add(new admin_setting_configselect('latinexcelexport', get_string('latinexcelexport', 'admin'), get_string('configlatinexcelexport', 'admin'), '0', array('0'=>'Unicode','1'=>'Latin')));
 
 
-    $ADMIN->add('language', $temp);
+$ADMIN->add('language', $temp);
 
-    $ADMIN->add('language', new admin_externalpage('langedit', get_string('langedit', 'admin'), "$CFG->wwwroot/$CFG->admin/lang.php", array('moodle/site:langeditmaster', 'moodle/site:langeditlocal') ));
-    $ADMIN->add('language', new admin_externalpage('langimport', get_string('langpacks', 'admin'), "$CFG->wwwroot/$CFG->admin/langimport.php"));
-
-} // end of speedup
+$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

@@ -1,27 +1,28 @@
 <?php // $Id$
 
-if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
+// "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));
 
-    // "locations" settingpage
-    $temp = new admin_settingpage('locationsettings', get_string('locationsettings', 'admin'));
-    $options = get_list_of_timezones();
-    $options[99] = get_string('serverlocaltime');
-    $temp->add(new admin_setting_configselect('timezone', get_string('timezone','admin'), get_string('configtimezone', 'admin'), 99, $options));
-    $options[99] = get_string('timezonenotforced', 'admin');
-    $temp->add(new admin_setting_configselect('forcetimezone', get_string('forcetimezone', 'admin'), get_string('helpforcetimezone', 'admin'), 99, $options));
-    $options = get_list_of_countries();
-    $options[0] = get_string('choose') .'...';
-    $temp->add(new admin_setting_configselect('country', get_string('country', 'admin'), get_string('configcountry', 'admin'), 0, $options));
+$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));
 
-    $temp->add(new admin_setting_heading('iplookup', get_string('iplookup', 'admin'), get_string('iplookupinfo', 'admin')));
-    $temp->add(new admin_setting_configfile('geoipfile', get_string('geoipfile', 'admin'), get_string('configgeoipfile', 'admin', $CFG->dataroot.'/geoip/'), $CFG->dataroot.'/geoip/GeoLiteCity.dat'));
-    $temp->add(new admin_setting_configtext('googlemapkey', get_string('googlemapkey', 'admin'), get_string('configgooglemapkey', 'admin', $CFG->wwwroot), ''));
-
-    $ADMIN->add('location', $temp);
+$ADMIN->add('location', $temp);
 
 
-    $ADMIN->add('location', new admin_externalpage('timezoneimport', get_string('updatetimezones', 'admin'), "$CFG->wwwroot/$CFG->admin/timezoneimport.php"));
-
-} // end of speedup
+$ADMIN->add('location', new admin_externalpage('timezoneimport', get_string('updatetimezones', 'admin'), "$CFG->wwwroot/$CFG->admin/timezoneimport.php"));
 
 ?>

admin/settings/misc.php

@@ -2,35 +2,21 @@
 
 // * Miscellaneous settings
 
-if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
+// 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);
 
-    // Experimental settings page
-    $temp = new admin_settingpage('experimental', get_string('experimental', 'admin'));
-    $temp->add(new admin_setting_configcheckbox('enableglobalsearch', get_string('enableglobalsearch', 'admin'), get_string('configenableglobalsearch', 'admin'), 0));
-    $temp->add(new admin_setting_configcheckbox('smartpix', get_string('smartpix', 'admin'), get_string('configsmartpix', 'admin'), 0));
-    $item = new admin_setting_configcheckbox('enablehtmlpurifier', get_string('enablehtmlpurifier', 'admin'), get_string('configenablehtmlpurifier', 'admin'), 0); 
-    $item->set_updatedcallback('reset_text_filters_cache');
-    $temp->add($item);
-    $temp->add(new admin_setting_configcheckbox('enablegroupings', get_string('enablegroupings', 'admin'), get_string('configenablegroupings', 'admin'), 0));
-    $rqsetting = new admin_setting_configcheckbox('selectmanual', get_string('selectmanualquestions', 'qtype_random'), get_string('configselectmanualquestions', 'qtype_random'), 0);
-    $rqsetting->plugin = 'qtype_random';
-    $temp->add($rqsetting);
-    $temp->add(new admin_setting_configcheckbox('experimentalsplitrestore', get_string('experimentalsplitrestore', 'admin'), get_string('configexperimentalsplitrestore', 'admin'), 0));
-    $temp->add(new admin_setting_configcheckbox('enableimsccimport', get_string('enable_cc_import', 'imscc'), get_string('enable_cc_import_description', 'imscc'), 0));
-    $temp->add(new admin_setting_configcheckbox('enablesafebrowserintegration', get_string('enablesafebrowserintegration', 'admin'), get_string('configenablesafebrowserintegration', 'admin'), 0));
-
-    $ADMIN->add('misc', $temp);
-
-    // XMLDB editor
-    $ADMIN->add('misc', new admin_externalpage('xmldbeditor', get_string('xmldbeditor'), "$CFG->wwwroot/$CFG->admin/xmldb/"));
+// 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)));
-
-} // end of speedup
+// 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

@@ -2,26 +2,20 @@
 
 // This file defines settingpages and externalpages under the "mnet" category
 
-if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
-
-
-$ADMIN->add('mnet', new admin_externalpage('net', get_string('settings', 'mnet'),
-                                           "$CFG->wwwroot/$CFG->admin/mnet/index.php",
+$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/$CFG->admin/mnet/peers.php",
+$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/$CFG->admin/mnet/access_control.php",
+                                           $CFG->wwwroot . '/admin/mnet/access_control.php', 
                                            'moodle/site:config'));
-$ADMIN->add('mnet', new admin_externalpage('mnetenrol', get_string('mnetenrol', 'mnet'),
-                                           "$CFG->wwwroot/$CFG->admin/mnet/enr_hosts.php",
+$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/$CFG->admin/mnet/trustedhosts.php",
+$ADMIN->add('mnet', new admin_externalpage('trustedhosts', get_string('trustedhosts', 'mnet'), 
+                                           $CFG->wwwroot . '/admin/mnet/trustedhosts.php', 
                                            'moodle/site:config'));
-
-} // end of speedup
-
 ?>