Bump to 1.6.1

get_courses_page() uses get_records_sql() which means that it will actually
break if the first field requested isn't c.id. This in turn means that
the DISTINCT is not needed at all.

So let's go fast again!

admin/admin.html

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

admin/admin.php

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

admin/auth.php

@@ -3,13 +3,21 @@
 
     require_once('../config.php');
 
-    require_once($CFG->libdir.'/adminlib.php');
-
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('userauthentication', $adminroot);
-
     $auth = optional_param('auth', '', PARAM_SAFEDIR);
 
+    require_login();
+
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
+
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
+
+    if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
 
     $focus = '';
 
@@ -17,16 +25,12 @@
 
     if ($config = data_submitted()) {
 
-        if (!confirm_sesskey()) {
-            error(get_string('confirmsesskeybad', 'error'));
-        }
-
         $config = (array)$config;
 
         // extract and sanitize the auth key explicitly
         $modules = get_list_of_plugins("auth");
         if (in_array($config['auth'], $modules)) {
-            $auth = $config['auth'];
+            $auth = $config['auth'];            
         } else {
             notify("Error defining the authentication method");
         }
@@ -44,10 +48,10 @@
                 if (preg_match('/^pluginconfig_(.+?)$/', $name, $matches)) {
                     $plugin = "auth/$auth";
                     $name   = $matches[1];
-                    if (! set_config($name, $value, $plugin)) {
+                    if (! set_config($name, $value, $plugin)) {                        
                         notify("Problem saving config $name as $value for plugin $plugin");
                     }
-                } else { // normal handling for
+                } else { // normal handling for 
                     if (! set_config($name, $value)) {
                         notify("Problem saving config $name as $value");
                     }
@@ -116,23 +120,23 @@
     $createoptions[0] = get_string("no");
     $createoptions[1] = get_string("yes");
 
+    $stradministration        = get_string("administration");
     $strauthentication        = get_string("authentication");
     $strauthenticationoptions = get_string("authenticationoptions","auth");
     $strsettings = get_string("settings");
     $strusers = get_string("users");
 
-    admin_externalpage_print_header($adminroot);
+    print_header("$site->shortname: $strauthenticationoptions", "$site->fullname",
+                  "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> -> $strauthenticationoptions", "$focus");
 
     echo "<center><b>";
     echo "<form target=\"{$CFG->framename}\" name=\"authmenu\" method=\"post\" action=\"auth.php\">";
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />";
     print_string("chooseauthmethod","auth");
 
-    echo '&nbsp;&nbsp;';
-
     choose_from_menu ($options, "auth", $auth, "","document.location='auth.php?sesskey=$USER->sesskey&auth='+document.authmenu.auth.options[document.authmenu.auth.selectedIndex].value", "");
 
-    echo "</b></center><br />";
+    echo "</b></center>";
 
     print_simple_box_start("center", "100%");
     print_heading($options[$auth]);
@@ -149,7 +153,7 @@
 
     require_once("$CFG->dirroot/auth/$auth/config.html");
     $CFG->pagepath = 'auth/' . $auth;
-
+    
     echo '<tr><td colspan="3">';
     print_heading(get_string('auth_common_settings', 'auth'));
     echo '<td/></tr>';
@@ -231,7 +235,7 @@
 
     print_simple_box_end();
 
-    admin_externalpage_print_footer($adminroot);
+    print_footer();
     exit;
 
 /// Functions /////////////////////////////////////////////////////////////////
@@ -240,7 +244,7 @@
 // Good enough for most auth plugins
 // but some may want a custom one if they are offering
 // other options
-// Note: pluginconfig_ fields have special handling.
+// Note: pluginconfig_ fields have special handling. 
 function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts, $updateopts) {
 
     echo '<tr><td colspan="3">';
@@ -258,9 +262,9 @@ function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts,
                                 'onlogin'   => get_string('update_onlogin', 'auth'));
     $updateextoptions = array('0'  => get_string('update_never', 'auth'),
                               '1'   => get_string('update_onupdate', 'auth'));
-
+    
     $pluginconfig = get_config("auth/$auth");
-
+    
     // helptext is on a field with rowspan
     if (empty($helptext)) {
                 $helptext = '&nbsp;';
@@ -274,7 +278,7 @@ function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts,
         }
         if(empty($pluginconfig->{"field_updatelocal_$field"})) {
             $pluginconfig->{"field_updatelocal_$field"} = '';
-        }
+        }  
         if (empty($pluginconfig->{"field_updateremote_$field"})) {
             $pluginconfig->{"field_updateremote_$field"} = '';
         }

admin/backup.php

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

admin/block.php

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

admin/blocks.php

@@ -3,13 +3,8 @@
     // Allows the admin to configure blocks (hide/show, delete and configure)
 
     require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
     require_once($CFG->libdir.'/blocklib.php');
     require_once($CFG->libdir.'/tablelib.php');
-    require_once($CFG->libdir.'/ddllib.php');
-
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('manageblocks', $adminroot);
 
     $confirm  = optional_param('confirm', 0, PARAM_BOOL);
     $hide     = optional_param('hide', 0, PARAM_INT);
@@ -17,9 +12,21 @@
     $delete   = optional_param('delete', 0, PARAM_INT);
     $multiple = optional_param('multiple', 0, PARAM_INT);
 
+    require_login();
+
+    if (!isadmin()) {
+        error("Only administrators can use this page!");
+    }
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
+
 
 /// Print headings
 
+    $stradministration = get_string('administration');
+    $strconfiguration = get_string('configuration');
     $strmanageblocks = get_string('manageblocks');
     $strdelete = get_string('delete');
     $strversion = get_string('version');
@@ -30,7 +37,9 @@
     $strname = get_string('name');
     $strmultiple = get_string('blockmultiple', 'admin');
 
-    admin_externalpage_print_header($adminroot);
+    print_header("$site->shortname: $strmanageblocks", "$site->fullname",
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $strmanageblocks");
 
     print_heading($strmanageblocks);
 
@@ -76,51 +85,34 @@
             notice_yesno(get_string('blockdeleteconfirm', '', $strblockname),
                          'blocks.php?delete='.$block->id.'&amp;confirm=1&amp;sesskey='.$USER->sesskey,
                          'blocks.php');
-            admin_externalpage_print_footer($adminroot);
+            print_footer();
             exit;
 
         } else {
-            // Inform block it's about to be deleted
-            $blockobject = block_instance($block->name);
-            if ($blockobject) {
-                $blockobject->before_delete();  //only if we can create instance, block might have been already removed
-            }
-
-            // First delete instances and then block
-            $instances = get_records('block_instance', 'blockid', $block->id);
-            if(!empty($instances)) {
-                foreach($instances as $instance) {
-                    blocks_delete_instance($instance);
-                    blocks_delete_instance($instance, true);
-                }
-            }
-
             // Delete block
             if (!delete_records('block', 'id', $block->id)) {
                 notify("Error occurred while deleting the $strblockname record from blocks table");
             }
 
+            $instances = get_records('block_instance', 'blockid', $block->id);
+            if(!empty($instances)) {
+                foreach($instances as $instance) {
+                    blocks_delete_instance($instance);
+                }
+            }
+
             // Then the tables themselves
+
             if ($tables = $db->Metatables()) {
                 $prefix = $CFG->prefix.$block->name;
-                $prefix2 = $CFG->prefix.'block_'.$block->name;
                 foreach ($tables as $table) {
-                    if (strpos($table, $prefix) === 0 || 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)) {
+                    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 block
-            capabilities_cleanup('block/'.$block->name);
 
             $a->block = $strblockname;
             $a->directory = $CFG->dirroot.'/blocks/'.$block->name;
@@ -140,7 +132,7 @@
 
     foreach ($blocks as $block) {
         if(!block_is_compatible($block->name)) {
-            notify('Block '. $block->name .' is not compatible with the current version of Moodle and needs to be updated by a programmer.');
+            notify('Block '. $block->name .' is not compatible with the current version of Mooodle and needs to be updated by a programmer.');
             $incompatible[] = $block;
             continue;
         }
@@ -223,15 +215,15 @@
         print_heading(get_string('incompatibleblocks', 'admin'));
 
         $table = new flexible_table('admin-blocks-incompatible');
-
+        
         $table->define_columns(array('block', 'delete'));
         $table->define_headers(array($strname, $strdelete));
         $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
-
+    
         $table->set_attribute('cellspacing', '0');
         $table->set_attribute('id', 'incompatible');
         $table->set_attribute('class', 'generaltable generalbox');
-
+    
         $table->setup();
 
         foreach ($incompatible as $block) {
@@ -243,6 +235,6 @@
         $table->print_html();
     }
 
-    admin_externalpage_print_footer($adminroot);
+    print_footer();
 
 ?>

admin/calendar.html

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

admin/calendar.php

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

admin/config.php

@@ -7,7 +7,9 @@
 
     if ($site = get_site()) {   // If false then this is a new installation
         require_login();
-        require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+        if (!isadmin()) {
+            error('Only the admin can use this page');
+        }
     }
 
 /// This is to overcome the "insecure forms paradox"
@@ -21,7 +23,7 @@
 
     if ($config = data_submitted($match)) {  
 
-        if (!empty($USER->id)) {            // Additional identity check
+        if (!empty($USER->id)) {             // Additional identity check
             if (!confirm_sesskey()) {
                 error(get_string('confirmsesskeybad', 'error'));
             }
@@ -44,24 +46,21 @@
                         $value = implode(',',$value);
                     }
                 }
-                if ($name == "locale") {
-                    $value = trim($value);
-                }
-                $conf = new object();
+                unset($conf);
                 $conf->name  = $name;
                 $conf->value = $value;
                 if ($current = get_record('config', 'name', $name)) {
                     $conf->id = $current->id;
                     if (! update_record('config', $conf)) {
-                        error("Error: Could not update $name to $value");
+                        notify("Could not update $name to $value");
                     }
                 } else {
                     if (! insert_record('config', $conf)) {
-                        error("Error: could not add new variable $name !");
+                        notify("Error: could not add new variable $name !");
                     }
                 }
             }
-            redirect('index.php');
+            redirect('index.php', get_string('changessaved'), 1);
             exit;
 
         } else {
@@ -75,6 +74,9 @@
 
     if (empty($config)) {
         $config = $CFG;
+        if (!$config->locale = get_field('config', 'value', 'name', 'locale')) {
+            $config->locale = $CFG->lang;
+        }
     }
 
     $sesskey = !empty($USER->id) ? $USER->sesskey : '';

admin/configure.php

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

admin/configvars.php

@@ -69,7 +69,7 @@ class configvar {
 
 /// debug
     unset($options);
-    $options[5]  = $strno;
+    $options[7]  = $strno;
     $options[15] = $stryes;
 
     $misc['debug'] = new configvar (get_string('configdebug', 'admin'),
@@ -225,9 +225,6 @@ class configvarrss extends configvar {
     $permissions['allowobjectembed'] = new configvar (get_string('configallowobjectembed', 'admin'),
         choose_from_menu ($noyesoptions, 'allowobjectembed', $config->allowobjectembed, '', '', '', true) );
 
-/// enabletrusttext
-    $permissions['enabletrusttext'] = new configvar (get_string('configenabletrusttext', 'admin'),
-        choose_from_menu ($noyesoptions, 'enabletrusttext', $config->enabletrusttext, '', '', '', true) );
 
     unset($options);
     $options['none'] = 'No courses';
@@ -315,10 +312,10 @@ class configvarrss extends configvar {
 /// language menu
     $interface['langcache'] = new configvar ( get_string('configlangcache', 'admin'),
         choose_from_menu($noyesoptions, 'langcache', $config->langcache, '', '', '', true) );
-
+        
 /// locale
     $interface['locale'] = new configvar ( get_string('configlocale', 'admin'),
-        '<input name="locale" type="text" size="15" value="'.s($config->locale).'" alt="locale" />' );
+        '<input name="locale" type="text" size="10" value="'.s($config->locale).'" alt="locale" />' );
 
 /// docroot
     $interface['docroot'] = new configvar ( get_string('configdocroot', 'admin'),
@@ -594,7 +591,6 @@ class configvarrss extends configvar {
     }
     
 /// enable stats
-if (empty($CFG->disablestatsprocessing)) {
     $stats['enablestats'] = new configvar (get_string('configenablestats','admin'),
         choose_from_menu($noyesoptions, 'enablestats', $config->enablestats, '', '', '', true) );
 
@@ -640,7 +636,7 @@ if (empty($CFG->disablestatsprocessing)) {
 
     $stats['statsuserthreshold'] = new configvar (get_string('configstatsuserthreshold','admin'),
       '<input type="text" name="statsuserthreshold" size="4" value="'.$config->statsuserthreshold.'" />');
-}                                        
+                                              
 
 ////////////////////////////////////////////////////////////////////
 
@@ -653,8 +649,6 @@ if (empty($CFG->disablestatsprocessing)) {
     $configvars['permissions']     = $permissions;
     $configvars['requestedcourse'] = $reqcourse;
     $configvars['misc']            = $misc;
-if (empty($CFG->disablestatsprocessing)) {
     $configvars['stats']           = $stats;
-}
 
 ?>

admin/courses.php

@@ -0,0 +1,42 @@
+<?php // $Id$
+
+    require_once('../config.php');
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only admins can access this page");
+    }
+
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
+
+    $stradministration = get_string("administration");
+    $strcourses        = get_string("courses");
+
+    print_header("$site->shortname: $stradministration: $strcourses", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> $strcourses");
+
+    print_heading($strcourses);
+
+    $table->align = array ("right", "left");
+
+    $table->data[] = array('<b><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.get_string("managecourses")."</a></b>",
+                           get_string("adminhelpcourses"));
+    $table->data[] = array("<b><a href=\"enrol.php?sesskey=$USER->sesskey\">".get_string("enrolmentplugins")."</a></b>",
+                           get_string("adminhelpenrolments"));
+    $table->data[] = array("<b><a href=\"../course/index.php?edit=off&amp;sesskey=$USER->sesskey\">".get_string("assignstudents")."</a></b>",
+                           get_string("adminhelpassignstudents"));
+    $table->data[] = array("<b><a href=\"../course/index.php?edit=on&amp;sesskey=$USER->sesskey\">".get_string("assignteachers")."</a></b>",
+                           get_string("adminhelpassignteachers")." <img src=\"../pix/t/user.gif\" height=\"11\" width=\"11\" alt=\"\" />");
+    $table->data[] = array("<b><a href=\"creators.php?sesskey=$USER->sesskey\">".get_string("assigncreators")."</a></b>",
+                           get_string("adminhelpassigncreators"));
+    $table->data[] = array("<b><a href=\"admin.php?sesskey=$USER->sesskey\">".get_string("assignadmins")."</a></b>",
+                           get_string("adminhelpassignadmins"));
+
+    print_table($table);
+
+    print_footer($site);
+
+?>

admin/creators.html

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

admin/creators.php

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

admin/cron.php

@@ -27,9 +27,9 @@
     }
 
     require_once(dirname(__FILE__) . '/../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
+    require_once($CFG->dirroot.'/lib/adminlib.php');
 
-    if (!$alreadyadmin = has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    if (!$alreadyadmin = isadmin()) {
         unset($_SESSION['USER']);
         unset($USER);
         unset($_SESSION['SESSION']);
@@ -43,9 +43,9 @@
     setcookie('MoodleSessionTest'.$CFG->sessioncookie, '', time() - 3600, '/');
 
 /// switch to site language and locale
-    if (!empty($CFG->courselang)) {
+	if (!empty($CFG->courselang)) {
         unset ($CFG->courselang);
-    }
+	}
     if (!empty($SESSION->lang)) {
         unset ($SESSION->lang);
     }
@@ -53,17 +53,7 @@
     moodle_setlocale();
 
 /// send mime type and encoding
-    if (check_browser_version('MSIE')) {
-        //ugly IE hack to work around downloading instead of viewing
-        @header('Content-Type: text/html; charset='.current_charset());
-        echo "<xmp>"; //<pre> is not good enough for us here
-    } else {
-        //send proper plaintext header
-        @header('Content-Type: text/plain; charset='.current_charset());
-    }
-
-/// increase memory limit (PHP 5.2 does different calculation, we need more memory now)
-    @raise_memory_limit('128M');
+    @header('Content-Type: text/plain; charset='.current_charset());
 
 /// Start output log
 
@@ -117,27 +107,13 @@
 
         }
     }
-    mtrace('Finished blocks');
+    mtrace("Finished blocks");
 
     if (!empty($CFG->langcache)) {
         mtrace('Updating languages cache');
         get_list_of_languages();
     }
 
-    mtrace('Removing expired enrolments ...', '');     // See MDL-8785
-    $timenow = time();
-    if ($oldenrolments = get_records_select('role_assignments', "timeend > 0 AND timeend < '$timenow'")) {
-        mtrace(count($oldenrolments).' to delete');
-        foreach ($oldenrolments as $oldenrolment) {
-            if (role_unassign($oldenrolment->roleid, $oldenrolment->userid, 0, $oldenrolment->contextid)) {
-                mtrace("Deleted expired role assignment $oldenrolment->roleid for user $oldenrolment->userid from context $oldenrolment->contextid");
-            }
-        }
-        mtrace('Done');
-    } else {
-        mtrace('none found');
-    }
-
 
 /// 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 
@@ -153,12 +129,10 @@
 
         if ($CFG->longtimenosee) { // value in days
             $longtime = $timenow - ($CFG->longtimenosee * 3600 * 24);
-            if ($assigns = get_users_longtimenosee($longtime)) {
-                foreach ($assigns as $assign) {
-                    if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
-                        if (role_unassign(0, $assign->id, 0, $context->id)) {
-                            mtrace("Deleted student enrolment for user $assign->id from course $assign->courseid");
-                        }
+            if ($students = get_users_longtimenosee($longtime)) {
+                foreach ($students as $student) {
+                    if (unenrol_student($student->userid, $student->course)) {
+                        mtrace("Deleted student enrolment for user $student->userid from course $student->course");
                     }
                 }
             }
@@ -167,13 +141,11 @@
     
         /// Delete users who haven't confirmed within required period
 
-        if (!empty($CFG->deleteunconfirmed)) {
-            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
-            if ($users = get_users_unconfirmed($oneweek)) {
-                foreach ($users as $user) {
-                    if (delete_records('user', 'id', $user->id)) {
-                        mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
-                    }
+        $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)");
                 }
             }
         }
@@ -183,13 +155,11 @@
 
         /// Delete users who haven't completed profile within required period
 
-        if (!empty($CFG->deleteunconfirmed)) {
-            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
-            if ($users = get_users_not_fully_set_up($oneweek)) {
-                foreach ($users as $user) {
-                    if (delete_records('user', 'id', $user->id)) {
-                        mtrace("Deleted not fully setup user $user->username ($user->id)");
-                    }
+        $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)");
                 }
             }
         }
@@ -248,11 +218,11 @@
     } // End of occasional clean-up tasks
 
 
-    if (empty($CFG->disablescheduledbackups)) {   // Defined in config.php
+    if (!isset($CFG->disablescheduledbackups)) {   // Defined in config.php
         //Execute backup's cron
         //Perhaps a long time and memory could help in large sites
         @set_time_limit(0);
-        @raise_memory_limit("192M");
+        @raise_memory_limit("128M");
         if (function_exists('apache_child_terminate')) {
             // if we are running from Apache, give httpd a hint that 
             // it can recycle the process after it's done. Apache's 
@@ -304,7 +274,7 @@
         unset($enrol);
     }
 
-    if (!empty($CFG->enablestats) and empty($CFG->disablestatsprocessing)) {
+    if (!empty($CFG->enablestats)) {
 
         // check we're not before our runtime
         $timetocheck = strtotime("$CFG->statsruntimestarthour:$CFG->statsruntimestartminute today");
@@ -315,7 +285,7 @@
             if (!empty($CFG->statsmaxruntime)) {
                 $time = $CFG->statsmaxruntime+(60*30); // add on half an hour just to make sure (it could take that long to break out of the loop)
             }
-            if (!get_field_sql('SELECT id FROM '.$CFG->prefix.'stats_daily')) {
+            if (!get_field_sql('SELECT id FROM '.$CFG->prefix.'stats_daily LIMIT 1')) {
                 // 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;
@@ -358,9 +328,4 @@
     $difftime = microtime_diff($starttime, microtime());
     mtrace("Execution took ".$difftime." seconds"); 
 
-/// finishe the IE hack
-    if (check_browser_version('MSIE')) {
-        echo "</xmp>";
-    }
-
 ?>

admin/dbperformance.php

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

admin/delete.php

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

admin/editor.html

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

admin/editor.php

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

admin/enrol.php

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

admin/enrol_config.php

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

admin/environment.php

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

admin/environment.xml

@@ -35,11 +35,6 @@
     </PHP_EXTENSIONS>
   </MOODLE>
   <MOODLE version="1.7">
-    <UNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="unicoderecommended" />
-      </FEEDBACK>
-    </UNICODE>
     <DATABASE level="required">
       <VENDOR name="mysql" version="4.1.16">
         <FEEDBACK>
@@ -48,49 +43,10 @@
         <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
       </VENDOR>
       <VENDOR name="postgres" version="7.4" />
-      <VENDOR name="mssql" version="9.0" />
-      <VENDOR name="odbc_mssql" version="9.0" />
-      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="mssql" version="8.0" />
       <VENDOR name="oracle" version="9.0" />
     </DATABASE>
-    <PHP version="4.3.0" level="required">
-      <RESTRICT function="restrict_php50_version" message="php50restricted" />
-    </PHP>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="iconvrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-    </PHP_EXTENSIONS>
-  </MOODLE>
-  <MOODLE version="1.8">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mysql" version="4.1.16">
-        <FEEDBACK>
-          <ON_ERROR message="mysql416required" />
-        </FEEDBACK>
-        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
-      </VENDOR>
-      <VENDOR name="postgres" version="7.4" />
-      <VENDOR name="mssql" version="9.0" />
-      <VENDOR name="odbc_mssql" version="9.0" />
-      <VENDOR name="mssql_n" version="9.0" />
-      <VENDOR name="oracle" version="9.0" />
-    </DATABASE>
-    <PHP version="4.3.0" level="required">
-      <RESTRICT function="restrict_php50_version" message="php50restricted" />
-    </PHP>
+    <PHP version="4.3.0" level="required" />
     <PHP_EXTENSIONS>
       <PHP_EXTENSION name="iconv" level="optional">
         <FEEDBACK>

admin/filter.php

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

admin/filters.php

@@ -3,14 +3,20 @@
     // Edit list of available text filters
 
     require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
     require_once($CFG->libdir.'/tablelib.php');
 
     // defines
     define('FILTER_TABLE','filter_administration_table');
 
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('managefilters', $adminroot);
+    // check for allowed access
+    require_login();
+
+    if (!isadmin()) {
+        error('Only administrators can use the filters administration page');
+    }
+    if (!$site = get_site()) {
+        error('Site is not defined in filters administration page');
+    }
 
     // get values from page
     $params = new object();
@@ -268,15 +274,61 @@
     // Display logic
     //==============================
 
-    admin_externalpage_print_header($adminroot);
+    print_header("$site->shortname: $txt->managefilters", "$site->fullname",
+        "<a href=\"index.php\">$txt->administration</a> -> <a href=\"configure.php\">$txt->configuration</a> " .
+        "-> $txt->managefilters");
 
     print_heading_with_help($txt->managefilters, 'filters');
 
     // print the table of all the filters
     $table->print_html();
 
-    // cache control table has been removed
+    // print the table for the cache controls
+    print_heading($txt->cachecontrols);
+    print_simple_box_start('center');
+    ?>
 
-    admin_externalpage_print_footer($adminroot);
+    <form name="options" id="options" method="post" action="<?php echo $url; ?>" >
+        <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
+        <input type="hidden" name="action" value="config" />
+        <table cellpadding="20">
+            <tr valign="top">
+                <td nowrap="nowrap" align="right"><?php echo $txt->cachetext; ?></td>
+                <td><?php choose_from_menu($options, "cachetext", $CFG->cachetext, "", "", ""); ?></td>
+                <td><?php echo $txt->configcachetext; ?></td>
+            </tr>
+            <tr valign="top">
+                <td nowrap="nowrap" align="right"><?php echo $txt->filteruploadedfiles; ?></td>
+                <td><?php choose_from_menu(array($txt->none,$txt->allfiles,$txt->htmlfilesonly),
+                    "filteruploadedfiles", $CFG->filteruploadedfiles,"","",""); ?></td>
+                <td><?php echo $txt->configfilteruploadedfiles; ?></td>
+            </tr>
+            <tr valign="top">
+                <td nowrap="nowrap" align="right"><?php echo $txt->filtermatchoneperpage; ?></td>
+                <td><?php choose_from_menu(array($txt->no,$txt->yes), "filtermatchoneperpage", $CFG->filtermatchoneperpage,"","",""); ?></td>
+                <td><?php echo $txt->configfiltermatchoneperpage; ?></td>
+        <tr valign="top">
+        <td nowrap="nowrap" align="right"><?php echo $txt->filtermatchonepertext; ?></td>
+        <td><?php choose_from_menu(array($txt->no,$txt->yes), "filtermatchonepertext", $CFG->filtermatchonepertext,"","",""); ?></td>
+        <td><?php echo $txt->configfiltermatchonepertext; ?></td>
+        </tr>
+            </tr>
+            <tr valign="top">
+                <td nowrap="nowrap" align="right"><?php echo $txt->filterall; ?></td>
+                <td><?php choose_from_menu(array($txt->no,$txt->yes), "filterall", $CFG->filterall,"","",""); ?></td>
+                <td><?php echo $txt->configfilterall; ?></td>
+            </tr>
+            <tr valign="top">
+                <td>&nbsp;</td>
+                <td><input type="submit" value="<?php print_string('savechanges'); ?>" /></td>
+                <td>&nbsp;</td>
+            </tr>
+        </table>
+    </form>
+
+    <?php
+    print_simple_box_end();
+
+    print_footer();
 
 ?>

admin/health.php

@@ -3,19 +3,15 @@
     ob_start(); //for whitespace test
     require_once('../config.php');
 
-    // extra whitespace test - intentionally breaks cookieless mode
-    $extraws = '';
+	// extra whitespace test - intentionally breaks cookieless mode
+	$extraws = '';
     while (true) {
         $extraws .= ob_get_contents();
-        if (!@ob_end_clean()) {
+        if (!@ob_end_clean()) { //
             break;
         }
     }
 
-    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('healthcenter', $adminroot);
-
     define('SEVERITY_NOTICE',      'notice');
     define('SEVERITY_ANNOYANCE',   'annoyance');
     define('SEVERITY_SIGNIFICANT', 'significant');
@@ -24,11 +20,18 @@
     $solution = optional_param('solution', 0, PARAM_SAFEDIR); //in fact it is class name alhanumeric and _
 
     require_login();
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    if (!isadmin()) {
+        error('Only the admin can use this page');
+    }
 
     $site = get_site();
+    $stradmin         = get_string('administration');
+    $strhealthcenter  = get_string('healthcenter');
+    $strmisc          = get_string('miscellaneous');
 
-    admin_externalpage_print_header($adminroot);
+    print_header($site->shortname.': '.$strhealthcenter, $site->fullname,
+                  '<a href="index.php">'.$stradmin.'</a> -> <a href="misc.php">'.$strmisc.'</a> ->'.
+                  $strhealthcenter);
 
 echo <<<STYLES
 <style type="text/css">
@@ -100,7 +103,7 @@ STYLES;
     }
 
 
-    admin_externalpage_print_footer($adminroot);
+    print_footer();
 
 
 function health_find_problems() {
@@ -418,7 +421,7 @@ class problem_000010 extends problem_base {
     }
     function exists() {
         if (!$this->is_enabled()) {
-            return true;
+            return true;   
         }
         if ($this->status() < 1) {
             return true;
@@ -428,7 +431,7 @@ class problem_000010 extends problem_base {
     function severity() {
         if ($this->is_enabled() and $this->status() == 0) {
             return SEVERITY_SIGNIFICANT;
-        } else {
+        } else { 
             return SEVERITY_ANNOYANCE;
         }
     }
@@ -436,9 +439,9 @@ class problem_000010 extends problem_base {
         global $CFG;
         $desc = 'Slasharguments are needed for relative linking in uploaded resources:<ul>';
         if (!$this->is_enabled()) {
-            $desc .= '<li>slasharguments are <strong>disabled</strong> in Moodle configuration</li>';
+            $desc .= '<li>slasharguments are <strong>disabled</strong> in Moodle configuration</li>';   
         } else {
-            $desc .= '<li>slasharguments are enabled in Moodle configuration</li>';
+            $desc .= '<li>slasharguments are enabled in Moodle configuration</li>';   
         }
         if ($this->status() == -1) {
             $desc .= '<li>can not run automatic test, you can verify it <a href="'.$CFG->wwwroot.'/file.php/testslasharguments" target="_blank">here</a> manually</li>';
@@ -469,9 +472,9 @@ class problem_000010 extends problem_base {
             $solution .= 'Congratulations - everything seems OK now :-D';
         }
         if ($status < 1) {
-            $solution .= '<p>IIS:<ul><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li><li>do NOT enable AllowPathInfoForScriptMappings !!!</li><li>slasharguments may not work when using ISAPI and PHP 4.3.10 and older</li></ul></p>';
-            $solution .= '<p>Apache 1:<ul><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li></ul></p>';
-            $solution .= '<p>Apache 2:<ul><li>you must add <code>AcceptPathInfo on</code> to php.ini or .htaccess</li><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li></ul></p>';
+            $solution .= '<p>IIS:<ul><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li><li>do NOT enable AllowPathInfoForScriptMappings !!!</li><li>slasharguments may not work when using ISAPI and PHP 4.3.10 and older</li></ul></p>'; 
+            $solution .= '<p>Apache 1:<ul><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li></ul></p>'; 
+            $solution .= '<p>Apache 2:<ul><li>you must add <code>AcceptPathInfo on</code> to php.ini or .htaccess</li><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li></ul></p>'; 
         }
         return $solution;
     }

admin/index.php

@@ -22,24 +22,16 @@
 
 
     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
+    include_once($CFG->dirroot.'/lib/adminlib.php');  // Contains various admin-only functions
 
     $id             = optional_param('id', '', PARAM_ALPHANUM);
     $confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
-    $confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL);
     $agreelicence = optional_param('agreelicence',0, PARAM_BOOL);
-    $ignoreupgradewarning = optional_param('ignoreupgradewarning', 0, PARAM_BOOL);
 
-/// check upgrade status first
-    if ($ignoreupgradewarning and !empty($_SESSION['upgraderunning'])) {
-        $_SESSION['upgraderunning'] = 0;
-    }
-    upgrade_check_running("Upgrade already running in this session, please wait!<br />Click on the exclamation marks to ignore this warning (<a href=\"index.php?ignoreupgradewarning=1\">!!!</a>).", 10);
 
 /// Check some PHP server settings
 
-    $documentationlink = '<a href="http://docs.moodle.org/en/Installation">Installation docs</a>';
+    $documentationlink = "please read the <a href=\"../doc/?frame=install.html&amp;sub=webserver\">install documentation</a>";
 
     if (ini_get_bool('session.auto_start')) {
         error("The PHP server variable 'session.auto_start' should be Off - $documentationlink");
@@ -53,13 +45,6 @@
         error("The PHP server variable 'file_uploads' is not turned On - $documentationlink");
     }
 
-    if (empty($CFG->prefix) && $CFG->dbtype != 'mysql') {  //Enforce prefixes for everybody but mysql
-        error('$CFG->prefix can\'t be empty for your target DB (' . $CFG->dbtype . ')');
-    }
-
-    if ($CFG->dbtype == 'oci8po' && strlen($CFG->prefix) > 2) { //Max prefix length for Oracle is 2cc
-        error('$CFG->prefix maximum allowed length for Oracle DBs is 2cc.');
-    }
 
 /// Check that config.php has been edited
 
@@ -100,7 +85,7 @@
         $maintables = true;
         $mtables = array("config", "course", "course_categories", "course_modules",
                          "course_sections", "log", "log_display", "modules",
-                         "user");
+                         "user", "user_admins", "user_students", "user_teachers");
         foreach ($mtables as $mtable) {
             if (!in_array($CFG->prefix.$mtable, $tables)) {
                 $maintables = false;
@@ -109,12 +94,7 @@
         }
     }
 
-    $linktoscrolltoerrors = '<script type="text/javascript" src="' . $CFG->wwwroot . '/lib/scroll_to_errors.js"></script>';
     if (! $maintables) {
-    /// hide errors from headers in case debug enabled in config.php
-        $origdebug = $CFG->debug;
-        $CFG->debug = DEBUG_MINIMAL;
-        error_reporting($CFG->debug);
         if (empty($agreelicence)) {
             $strlicense = get_string("license");
             print_header($strlicense, $strlicense, $strlicense, "", "", false, "&nbsp;", "&nbsp;");
@@ -131,58 +111,20 @@
 
         $strdatabasesetup    = get_string("databasesetup");
         $strdatabasesuccess  = get_string("databasesuccess");
-        print_header($strdatabasesetup, $strdatabasesetup, $strdatabasesetup,
-                        "", $linktoscrolltoerrors, false, "&nbsp;", "&nbsp;");
-    /// return to original debugging level
-        $CFG->debug = $origdebug;
-        error_reporting($CFG->debug);
-        upgrade_log_start();
-        $db->debug = true;
-
-    /// Both old .sql files and new install.xml are supported
-    /// But we prioritise install.xml (XMLDB) if present
-    
-        change_db_encoding(); // first try to change db encoding to utf8
-        $status = false;
-        if (file_exists("$CFG->libdir/db/install.xml")) {
-            $status = install_from_xmldb_file("$CFG->libdir/db/install.xml"); //New method
-        } else if (file_exists("$CFG->libdir/db/$CFG->dbtype.sql")) {
-            $status = modify_database("$CFG->libdir/db/$CFG->dbtype.sql"); //Old method
+        print_header($strdatabasesetup, $strdatabasesetup, $strdatabasesetup, "", "", false, "&nbsp;", "&nbsp;");
+        if (file_exists("$CFG->libdir/db/$CFG->dbtype.sql")) {
+            $db->debug = true;
+            if (modify_database("$CFG->libdir/db/$CFG->dbtype.sql")) {
+                $db->debug = false;
+                notify($strdatabasesuccess, "green");
+            } else {
+                $db->debug = false;
+                error("Error: Main databases NOT set up successfully");
+            }
         } else {
-            error("Error: Your database ($CFG->dbtype) is not yet fully supported by Moodle or install.xml is not present.  See the lib/db directory.");
+            error("Error: Your database ($CFG->dbtype) is not yet fully supported by Moodle.  See the lib/db directory.");
         }
-
-    /// Continue with the instalation
-        $db->debug = false;
-        if ($status) {
-            // Install the roles system.
-            moodle_install_roles();
-            set_config('statsrolesupgraded',time());
-
-            // Write default settings unconditionally (i.e. even if a setting is already set, overwrite it)
-            // (this should only have any effect during initial install).
-            $adminroot = admin_get_root();
-            $adminroot->prune('backups'); // backup settings table not created yet
-            apply_default_settings($adminroot);
-
-            /// This is used to handle any settings that must exist in $CFG but which do not exist in
-            /// admin_get_root()/$ADMIN as admin_setting objects (there are some exceptions).
-            apply_default_exception_settings(array('alternateloginurl' => '',
-                                                   'auth' => 'email',
-                                                   'auth_pop3mailbox' => 'INBOX',
-                                                   'changepassword' => '',
-                                                   'enrol' => 'manual',
-                                                   'enrol_plugins_enabled' => 'manual',
-                                                   'guestloginbutton' => 1,
-                                                   'style' => 'default',
-                                                   'template' => 'default',
-                                                   'theme' => 'standardwhite'));
-
-            notify($strdatabasesuccess, "green");
-        } else {
-            error("Error: Main databases NOT set up successfully");
-        }
-        print_continue('index.php');
+        print_continue("index.php");
         die;
     }
 
@@ -190,19 +132,8 @@
 /// Check version of Moodle code on disk compared with database
 /// and upgrade if possible.
 
-    if ( is_readable("$CFG->dirroot/version.php")) {
-        include_once("$CFG->dirroot/version.php");              # defines $version
-    }
-    if (!$version) {
-        error('Main version.php was not readable or specified');# without version, stop
-    }
-
-    if (file_exists("$CFG->dirroot/lib/db/$CFG->dbtype.php")) {
-        include_once("$CFG->dirroot/lib/db/$CFG->dbtype.php");  # defines old upgrades
-    }
-    if (file_exists("$CFG->dirroot/lib/db/upgrade.php")) {
-        include_once("$CFG->dirroot/lib/db/upgrade.php");  # defines new upgrades
-    }
+    include_once("$CFG->dirroot/version.php");              # defines $version
+    include_once("$CFG->dirroot/lib/db/$CFG->dbtype.php");  # defines upgrades
 
     $stradministration = get_string("administration");
 
@@ -213,213 +144,121 @@
             $a->newversion = "$release ($version)";
             $strdatabasechecking = get_string("databasechecking", "", $a);
 
-            // hide errors from headers in case debug is enabled
-            $origdebug = $CFG->debug;
-            $CFG->debug = DEBUG_MINIMAL;
-            error_reporting($CFG->debug);
-
-            // logout in case we are upgrading from pre 1.7 version - prevention of weird session problems
-            if ($CFG->version < 2006050600) {
-                require_logout();
-            }
-
             if (empty($confirmupgrade)) {
-
                 print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
                         "", "", false, "&nbsp;", "&nbsp;");
-
                 notice_yesno(get_string('upgradesure', 'admin', $a->newversion), 'index.php?confirmupgrade=yes', 'index.php');
                 exit;
 
-            } else if (empty($confirmrelease)) {
-                $strcurrentrelease = get_string("currentrelease");
-                print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
-                print_heading("Moodle $release");
-                print_simple_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'), 'center');
-
-                require_once($CFG->libdir.'/environmentlib.php');
-                print_heading(get_string('environment', 'admin'));
-                if (check_moodle_environment($release, $environment_results, true)) {
-                    notice_yesno(get_string('environmenterrorupgrade', 'admin'), 
-                                 'index.php?confirmupgrade=1&confirmrelease=1', 'index.php');
-                } else {
-                    notify(get_string('environmentok', 'admin'), 'notifysuccess');
-
-                    echo '<form action="index.php">';
-                    echo '<input type="hidden" name="confirmupgrade" value="1" />';
-                    echo '<input type="hidden" name="confirmrelease" value="1" />';
-                    echo '<div class="continuebutton"><input type="submit" value="'.get_string('continue').'" /></div>';
-                    echo '</form>';
-                }
-
-                print_footer('none');
-                exit;
-
             } else {
                 $strdatabasesuccess  = get_string("databasesuccess");
                 print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
-                        "", $linktoscrolltoerrors, false, "&nbsp;", "&nbsp;");
-
-            /// return to original debugging level
-                $CFG->debug = $origdebug;
-                error_reporting($CFG->debug);
-                upgrade_log_start();
-
-            /// Upgrade current language pack if we can
-                upgrade_language_pack();   
-
+                        "", "", false, "&nbsp;", "&nbsp;");
                 print_heading($strdatabasechecking);
                 $db->debug=true;
-            /// Launch the old main upgrade (if exists)
-                $status = true;
-                if (function_exists('main_upgrade')) {
-                    $status = main_upgrade($CFG->version);
-                }
-            /// If succesful and exists launch the new main upgrade (XMLDB), called xmldb_main_upgrade
-                if ($status && function_exists('xmldb_main_upgrade')) {
-                    $status = xmldb_main_upgrade($CFG->version);
-                }
-                $db->debug=false;
-            /// If successful, continue upgrading roles and setting everything properly
-                if ($status) {
-                    if (empty($CFG->rolesactive)) {
-                        // Upgrade to the roles system.
-                        moodle_install_roles();
-                        set_config('rolesactive', 1);
-                    } else if (!update_capabilities()) {
-                        error('Had trouble upgrading the core capabilities for the Roles System');
-                    }
-                    require_once($CFG->libdir.'/statslib.php');
-                    if (!stats_upgrade_for_roles_wrapper()) {
-                        notify('Couldn\'t upgrade the stats tables to use the new roles system');
-                    }
+                if (main_upgrade($CFG->version)) {
+                    $db->debug=false;
                     if (set_config("version", $version)) {
                         remove_dir($CFG->dataroot . '/cache', true); // flush cache
                         notify($strdatabasesuccess, "green");
-                        print_continue("upgradesettings.php");
+                        print_continue("index.php");
                         exit;
                     } else {
                         notify("Upgrade failed!  (Could not update version in config table)");
                     }
-            /// Main upgrade not success
                 } else {
+                    $db->debug=false;
                     notify("Upgrade failed!  See /version.php");
                 }
-                upgrade_log_finish();
             }
         } else if ($version < $CFG->version) {
-            upgrade_log_start();
             notify("WARNING!!!  The code you are using is OLDER than the version that made these databases!");
-            upgrade_log_finish();
         }
+
     } else {
+        $strcurrentversion = get_string("currentversion");
+        print_header($strcurrentversion, $stradministration, $strcurrentversion,
+                     "", "", false, "&nbsp;", "&nbsp;");
+
         if (!set_config("version", $version)) {
-            error("A problem occurred inserting current version into databases");
+            $db->debug=true;
+            if (main_upgrade(0)) {
+                print_continue("index.php");
+            } else {
+                error("A problem occurred inserting current version into databases");
+            }
+            $db->debug=false;
         }
     }
 
 /// Updated human-readable release version if necessary
 
     if ($release <> $CFG->release) {  // Update the release version
+        $strcurrentrelease = get_string("currentrelease");
+        print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
+        print_heading("Moodle $release");
         if (!set_config("release", $release)) {
-            error("ERROR: Could not update release version in database!!");
+            notify("ERROR: Could not update release version in database!!");
+        }
+        notice(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'), 'index.php');
+        exit;
+    }
+
+/// Insert default values for any important configuration variables
+
+    include_once("$CFG->dirroot/lib/defaults.php");
+
+    foreach ($defaults as $name => $value) {
+        if (!isset($CFG->$name)) {
+            $CFG->$name = $value;
+            set_config($name, $value);
+            $configchange = true;
         }
     }
 
+/// Send $CFG->unicodedb to DB to have it available for next requests
+    set_config('unicodedb', $CFG->unicodedb);
+
+/// If any new configurations were found then send to the config page to check
+
+    if (!empty($configchange)) {
+        redirect("config.php");
+    }
+
 /// Find and check all main modules and load them up or upgrade them if necessary
-/// first old *.php update and then the new upgrade.php script
     upgrade_activity_modules("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Check all questiontype plugins and upgrade if necessary
-/// first old *.php update and then the new upgrade.php script
-/// It is important that this is done AFTER the quiz module has been upgraded
+    // It is important that this is done AFTER the quiz module has been upgraded
     upgrade_plugins('qtype', 'question/type', "$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Upgrade backup/restore system if necessary
-/// first old *.php update and then the new upgrade.php script
     require_once("$CFG->dirroot/backup/lib.php");
     upgrade_backup_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Upgrade blocks system if necessary
-/// first old *.php update and then the new upgrade.php script
     require_once("$CFG->dirroot/lib/blocklib.php");
     upgrade_blocks_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Check all blocks and load (or upgrade them if necessary)
-/// first old *.php update and then the new upgrade.php script
     upgrade_blocks_plugins("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Check all enrolment plugins and upgrade if necessary
-/// first old *.php update and then the new upgrade.php script
     upgrade_plugins('enrol', 'enrol', "$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
 /// Check for local database customisations
-/// first old *.php update and then the new upgrade.php script
     require_once("$CFG->dirroot/lib/locallib.php");
     upgrade_local_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
 
-/// just make sure upgrade logging is properly terminated
-    upgrade_log_finish();
 
-/// Set up the blank site - to be customized later at the end of install.
+/// Set up the overall site name etc.
     if (! $site = get_site()) {
-        // We are about to create the site "course"
-        require_once($CFG->libdir.'/blocklib.php');
-
-        $newsite = new Object();
-        $newsite->fullname = "";
-        $newsite->shortname = "";
-        $newsite->summary = "";
-        $newsite->newsitems = 3;
-        $newsite->numsections = 0;
-        $newsite->category = 0;
-        $newsite->format = 'site';  // Only for this course
-        $newsite->teacher = get_string("defaultcourseteacher");
-        $newsite->teachers = get_string("defaultcourseteachers");
-        $newsite->student = get_string("defaultcoursestudent");
-        $newsite->students = get_string("defaultcoursestudents");
-        $newsite->timemodified = time();
-
-        if ($newid = insert_record('course', $newsite)) {
-            // Site created, add blocks for it
-            $page = page_create_object(PAGE_COURSE_VIEW, $newid);
-            blocks_repopulate_page($page); // Return value not checked because you can always edit later
-
-            $cat = new Object();
-            $cat->name = get_string('miscellaneous');
-            if (insert_record('course_categories', $cat)) {
-                  redirect('index.php');
-            } else {
-                 error("Serious Error! Could not set up a default course category!");
-            }
-        } else {
-            error("Serious Error! Could not set up the site!");
-        }
-    }
-
-    // initialise default blocks on admin and site page if needed
-    if (empty($CFG->adminblocks_initialised)) {
-        require_once("$CFG->dirroot/$CFG->admin/pagelib.php");
-        require_once($CFG->libdir.'/blocklib.php');
-        page_map_class(PAGE_ADMIN, 'page_admin');
-        $page = page_create_object(PAGE_ADMIN, 0); // there must be some id number
-        blocks_repopulate_page($page);
-
-        //add admin_tree block to site if not already present
-        if ($admintree = get_record('block', 'name', 'admin_tree')) {
-            $page = page_create_object(PAGE_COURSE_VIEW, SITEID);
-            blocks_execute_action($page, blocks_get_by_page($page), 'add', (int)$admintree->id, false, false);
-            if ($admintreeinstance = get_record('block_instance', 'pagetype', $page->type, 'pageid', SITEID, 'blockid', $admintree->id)) {
-                blocks_execute_action($page, blocks_get_by_page($page), 'moveleft', $admintreeinstance, false, false);
-            }
-        }
-
-        set_config('adminblocks_initialised', 1);
+        redirect("site.php");
     }
 
 /// 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']);
+        set_config('siteidentifier', random_string(32));
     }
 
 /// Check if the guest user exists.  If not, create one.
@@ -440,22 +279,16 @@
         }
     }
 
-
 /// Set up the admin user
-    if (empty($CFG->rolesactive)) {
-        redirect('user.php');
+    if (! record_exists("user_admins")) {   // No admin user yet
+        redirect("user.php");
     }
 
 /// Check for valid admin user
     require_login();
 
-    $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
-
-    require_capability('moodle/site:config', $context);
-
-/// check that site is properly customized
-    if (empty($site->shortname) or empty($site->shortname)) {
-        redirect('settings.php?section=frontpage&amp;return=site');
+    if (!isadmin()) {
+        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
     }
 
 /// Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders
@@ -466,13 +299,12 @@
         }
     }
 
-/// Everything should now be set up, and the user is an admin
+/// At this point everything is set up and the user is an admin, so print menu
 
-/// Print default admin page with notifications.
-
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('adminnotifications', $adminroot);
-    admin_externalpage_print_header($adminroot);
+    $stradministration = get_string("administration");
+    print_header("$site->shortname: $stradministration","$site->fullname", "$stradministration");
+    print_simple_box_start('center', '100%', '', 20);
+    print_heading($stradministration);
 
 /// Deprecated database! Warning!!
     if (!empty($CFG->migrated_to_new_db)) {
@@ -481,8 +313,7 @@
         print_simple_box_end();
     }
 
-/// Check for any special upgrades that might need to be run
-    if (!empty($CFG->upgrade)) {
+    if (!empty($CFG->upgrade)) {  // Print notice about extra upgrading that needs to be done
         print_simple_box(get_string("upgrade$CFG->upgrade", "admin",
                                     "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"), "center", '60%');
         print_spacer(10,10);
@@ -492,9 +323,6 @@
         print_simple_box(get_string('globalsquoteswarning', 'admin'), 'center', '60%');
     }
 
-    if (is_dataroot_insecure()) {
-        print_simple_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'center', '60%');
-    }
 
 /// If no recently cron run
     $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
@@ -509,13 +337,13 @@
         print_simple_box(get_string('sitemaintenancewarning', 'admin') , 'center', '60%');
     }
 
-/// Alert to display the utf-8 migration button (if !unicode yet and DB is MySQL or PG)
-    if (empty($CFG->unicodedb) && in_array($CFG->dbtype, array('mysql', 'postgres7'))) {
+/// Alert if we are currently in maintenance mode
+    if (empty($CFG->unicodedb)) {
         print_simple_box(get_string('unicodeupgradenotice', 'admin') , 'center', '60%');
     }
 
 /// Print slightly annoying registration button every six months   ;-)
-/// You can set the "registered" variable to something far in the future
+/// You can set the "registered" variable to something far in the future 
 /// if you really want to prevent this.   eg  9999999999
     if (!isset($CFG->registered) || $CFG->registered < (time() - 3600*24*30*6)) {
         $options = array();
@@ -526,30 +354,136 @@
         print_single_button('register.php', $options, get_string('registration'));
         echo '</div>';
         print_simple_box_end();
-        $registrationbuttonshown = true;
     }
 
+    $table->tablealign = "center";
+    $table->align = array ("right", "left");
+    $table->wrap = array ("nowrap", "nowrap");
+    $table->cellpadding = 5;
+    $table->cellspacing = 0;
+    $table->width = '40%';
+
+    $configdata  = '<div class="adminlink"><a href="config.php">'.get_string('configvariables', 'admin').
+                   '</a> - <span class="explanation">'.get_string('adminhelpconfigvariables').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="site.php">'.get_string('sitesettings').
+                   '</a> - <span class="explanation">'.get_string('adminhelpsitesettings').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="../theme/index.php">'.get_string('themes').
+                   '</a> - <span class="explanation">'.get_string('adminhelpthemes').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="lang.php">'.get_string('language').
+                   '</a> - <span class="explanation">'.get_string('adminhelplanguage').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="modules.php">'.get_string('managemodules').
+                   '</a> - <span class="explanation">'.get_string('adminhelpmanagemodules').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="blocks.php">'.get_string('manageblocks').
+                   '</a> - <span class="explanation">'.get_string('adminhelpmanageblocks').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="filters.php">'.get_string('managefilters').
+                   '</a> - <span class="explanation">'.get_string('adminhelpmanagefilters').'</span></div>';
+    if (!isset($CFG->disablescheduledbackups)) {
+        $configdata .= '<div class="adminlink"><a href="backup.php">'.get_string('backup').
+                       '</a> - <span class="explanation">'.get_string('adminhelpbackup').'</span></div>';
+    }
+    $configdata .= '<div class="adminlink"><a href="editor.php">'.get_string('editorsettings').
+                   '</a> - <span class="explanation">'.get_string('adminhelpeditorsettings').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="calendar.php">'.get_string('calendarsettings', 'admin').
+                   '</a> - <span class="explanation">'.get_string('helpcalendarsettings', 'admin').'</span></div>';
+    $configdata .= '<div class="adminlink"><a href="maintenance.php">'.get_string('sitemaintenancemode', 'admin').
+                   '</a> - <span class="explanation">'.get_string('helpsitemaintenance', 'admin').'</span></div>';
+
+    $table->data[] = array('<strong><a href="configure.php">'.get_string('configuration').'</a></strong>', $configdata);
+
+
+    $userdata =  '<div class="adminlink"><a href="auth.php?sesskey='.$USER->sesskey.'">'.get_string("authentication").
+                 '</a> - <span class="explanation">'.get_string('adminhelpauthentication').'</span></div>';
+    $userdata .= '<div class="adminlink"><a href="user.php">'.get_string('edituser').
+                 '</a> - <span class="explanation">'.get_string('adminhelpedituser').'</span></div>';
+    $userdata .= '<div class="adminlink"><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/user.php?newuser=true&amp;sesskey='.$USER->sesskey.'">'.
+                 get_string('addnewuser').'</a> - <span class="explanation">'.get_string('adminhelpaddnewuser').'</span></div>';
+    $userdata .= '<div class="adminlink"><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/uploaduser.php?sesskey='.$USER->sesskey.'">'.
+                 get_string('uploadusers').'</a> - <span class="explanation">'.get_string('adminhelpuploadusers').'</span></div>';
+
+    $table->data[] = array('<strong><a href="users.php">'.get_string('users').'</a></strong>', $userdata);
+
+    $coursedata = '<div class="adminlink"><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.get_string('managecourses').
+                 '</a> - <span class="explanation">'.get_string('adminhelpcourses').'</span></div>';
+    $coursedata .= '<div class="adminlink"><a href="enrol.php?sesskey='.$USER->sesskey.'">'.get_string('enrolmentplugins').
+                 '</a> - <span class="explanation">'.get_string('adminhelpenrolments').'</span></div>';
+    $coursedata .= '<div class="adminlink"><a href="../course/index.php?edit=off&amp;sesskey='.$USER->sesskey.'">'.
+                 get_string('assignstudents').'</a> - <span class="explanation">'.get_string('adminhelpassignstudents').'</span></div>';
+    $coursedata .= '<div class="adminlink"><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.
+                 get_string('assignteachers').'</a> - <span class="explanation">'.get_string('adminhelpassignteachers').
+                 ' <img src="../pix/t/user.gif" height="11" width="11" alt="" /></span></div>';
+    $coursedata .= '<div class="adminlink"><a href="creators.php?sesskey='.$USER->sesskey.'">'.get_string('assigncreators').
+                 '</a> - <span class="explanation">'.get_string('adminhelpassigncreators').'</span></div>';
+    $coursedata .= '<div class="adminlink"><a href="admin.php?sesskey='.$USER->sesskey.'">'.get_string('assignadmins').
+                 '</a> - <span class="explanation">'.get_string('adminhelpassignadmins').'</span></div>';
+
+    $table->data[] = array('<strong><a href="courses.php">'.get_string('courses').'</a></strong>', $coursedata);
+
+    $miscdata = '<div class="adminlink"><a href="../files/index.php?id='.$site->id.'">'.get_string('sitefiles').
+                 '</a> - <span class="explanation">'.get_string('adminhelpsitefiles').'</span></div>';
+    $miscdata .= '<div class="adminlink"><a href="stickyblocks.php">'.get_string('stickyblocks','admin').
+                 '</a> - <span class="explanation">'.get_string('adminhelpstickyblocks').'</span></div>';
+    $miscdata .= '<div class="adminlink"><a href="report.php">'.get_string('reports').
+                 '</a> - <span class="explanation">'.get_string('adminhelpreports').'</span></div>';
+//to be enabled later
+/*    $miscdata .= '<div class="adminlink"><a href="health.php">'.get_string('healthcenter').
+                 '</a> - <span class="explanation">'.get_string('adminhelphealthcenter').'</span></div>';*/
+    $miscdata .= '<div class="adminlink"><a href="environment.php">'.get_string('environment', 'admin').
+                 '</a> - <span class="explanation">'.get_string('adminhelpenvironment').'</span></div>';
+/// Optional stuff
+    if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
+        $miscdata .= '<div class="adminlink"><a href="'.$CFG->dbtype.'/frame.php">'.get_string('managedatabase').
+        			 '</a> - <span class="explanation">'.get_string('adminhelpmanagedatabase').'</span></div>';
+    }
+
+    $table->data[] = array('<strong><a href="misc.php">'.get_string('miscellaneous').'</a></strong>', $miscdata);
+
+
+/// Hooks for Matt Oquists contrib code for repositories and portfolio.  
+/// The eventual official versions may not look like this
+    if (isset($CFG->portfolio) && file_exists("$CFG->dirroot/$CFG->portfolio")) {
+                $table->data[] = array("<strong><a href=\"../portfolio/\">".get_string('portfolio','portfolio').'</a></
+trong>',
+                            '<div class="explanation">'.get_string('adminhelpportfolio','portfolio').'</div>');
+    }
+
+    if (isset($CFG->repo) && file_exists("$CFG->dirroot/$CFG->repo")) {
+            $table->data[] = array("<strong><a href=\"../repository/?repoid=1&action=list\">".get_string('repository','
+epository').'</a></strong>',
+                            '<div class="explanation">'.get_string('adminhelprepository','repository').'</div>');
+    }
+
+
+
+    print_table($table);
+
     //////////////////////////////////////////////////////////////////////////////////////////////////
-    ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
+    ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO REMOVE OR MODIFY THE COPYRIGHT NOTICE BELOW ////
     $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
                      '<a href="http://docs.moodle.org/en/Release">'.$CFG->release.'</a> ('.$CFG->version.')<br />'.
                      'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
-                     'and <a href="http://docs.moodle.org/en/Credits">many other contributors</a>.<br />'.
                      '<a href="http://docs.moodle.org/en/License">GNU Public License</a>';
     echo '<p class="copyright">'.$copyrighttext.'</p>';
     //////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-    if (empty($registrationbuttonshown)) {
-        echo '<div align="center">';
-        $options = array();
-        $options['sesskey'] = $USER->sesskey;
-        print_single_button('register.php', $options, get_string('registration'));
-        echo '</div>';
+    echo '<div align="center">';
+    $options = array();
+    $options['sesskey'] = $USER->sesskey;
+    print_single_button('register.php', $options, get_string('registration'));
+    echo '</div>';
+
+
+    print_simple_box_end();
+
+    
+    if (optional_param('dbmigrate')) {               // ??? Is this actually used?
+        print_simple_box_start('center','60%');
+        require_once($CFG->dirroot.'/admin/utfdbmigrate.php');
+        db_migrate2utf8();
+        print_simple_box_end();
     }
 
-    admin_externalpage_print_footer($adminroot);
-
 
+    print_footer($site);
 
 ?>

admin/innodb.php

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

admin/lang.php

@@ -4,9 +4,6 @@
     *
     * CHANGES
     *
-    * 2006/11/07 mudrd8mz
-    * Fixed bug MDL-7361. Thanks to Dan Poltawski for the patch proposal.
-    *
     * 2006/06/08 mudrd8mz
     * 1) Fixed bug 5745 reported by Harry Smith so now can edit en_utf8_local pack
     * 2) More notification messages included
@@ -36,9 +33,6 @@
     */
 
     require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('langedit', $adminroot);    
 
     define('LANG_SUBMIT_REPEAT', 1);            // repeat displaying submit button?
     define('LANG_SUBMIT_REPEAT_EVERY', 20);     // if so, after how many lines?
@@ -61,6 +55,18 @@
         $SESSION->langtranslateintolocal = $uselocal;
     }
 
+    require_login();
+
+    if (!isadmin()) {
+        error("You need to be admin to edit this page");
+    }     
+
+    if (! $site = get_site()) {
+        error("Site not defined!");
+    }
+
+    $stradministration = get_string("administration");
+    $strconfiguration = get_string("configuration");
     $strlanguage = get_string("language");
     $strcurrentlanguage = get_string("currentlanguage");
     $strmissingstrings = get_string("missingstrings");
@@ -112,38 +118,49 @@
     }
 
 
-    admin_externalpage_print_header($adminroot);
+    print_header("$site->shortname: $title", "$site->fullname",
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $navigation",
+                 '', '', true, $button);
 
     if (!$mode) {
         print_simple_box_start('center','80%');
-        echo '<div align="center">';
+        echo '<table summary="" align="center" width="100%"><tr><td width="50%" align="center">';
+        print_string('managelang','admin');
+        echo '</td><td align="center" width="50%">';
         print_string('editlang','admin');
-        echo '<br />';
+        echo '</td></tr><tr><td>';
+        print_string('lang16notify','admin');
+        echo '<p /><a href="langimport.php">'.get_string('langimport','admin').'</a>';
+        echo '</td><td>';
         $currlang = current_language();
         $langs = get_list_of_languages();
+        echo "<table summary=\"\" align=\"center\"><tr><td align=\"right\">";
         echo "<b>$strcurrentlanguage:</b>";
-        echo '<br />';
+        echo "</td><td>";
         echo popup_form ("$CFG->wwwroot/$CFG->admin/lang.php?lang=", $langs, "chooselang", $currlang, "", "", "", true);
+        echo '</td></tr><tr><td colspan="2">';
         $options["lang"] = $currentlang;
+        //print_single_button("http://moodle.org/download/lang/", $options, get_string("latestlanguagepack"));
+        echo "</td></tr></table>";
         print_heading("<a href=\"lang.php?mode=missing\">$strmissingstrings</a>");
         print_heading("<a href=\"lang.php?mode=compare\">$streditstrings</a>");
         print_heading("<a href=\"langdoc.php\">$stredithelpdocs</a>");
-        echo '</div>';
+        echo '</td></tr></table>';
         print_simple_box_end();
-        admin_externalpage_print_footer($adminroot);
+        print_footer();
         exit;
     }
 
     // Get a list of all the root files in the English directory
 
-    $langbase = $CFG->dataroot . '/lang';
     $enlangdir = "$CFG->dirroot/lang/en_utf8";
     if ($currentlang == 'en_utf8') {
         $langdir = $enlangdir;
     } else {
-        $langdir = "$langbase/$currentlang";
+        $langdir = "$CFG->dataroot/lang/$currentlang";
     }
-    $locallangdir = "$langbase/{$currentlang}_local";
+    $locallangdir = "$CFG->dataroot/lang/{$currentlang}_local";
 
     if (! $stringfiles = get_directory_list($enlangdir, "", false)) {
         error("Could not find English language pack!");
@@ -260,14 +277,6 @@
 
     } else if ($mode == "compare") {
    
-        if (!file_exists($langbase) ){
-            if (!lang_make_directory($langbase) ){
-                error('ERROR: Could not create base lang directory ' . $langbase);
-            } else {
-                echo '<div class="notifysuccess" align="center">Created directory '.
-                                                     $langbase .'</div>'."<br />\n";
-            }
-        } 
         if (!$uselocal && !file_exists($langdir)) {
             if (!lang_make_directory($langdir)) {
                 error('ERROR: Could not create directory '.$langdir);
@@ -510,7 +519,7 @@
         }
     }
 
-    admin_externalpage_print_footer($adminroot);
+    print_footer();
 
 //////////////////////////////////////////////////////////////////////
 
@@ -585,7 +594,7 @@ function lang_fix_value_from_file($value='') {
  * Try and create a new language directory.
  *
  * @uses $CFG
- * @param string $directory full path to the directory under $langbase
+ * @param string $directory  directory name under $CFG->dataroot/lang eg cs_utf8_local
  * @return string|false Returns full path to directory if successful, false if not
  */
 function lang_make_directory($dir, $shownotices=true) {

admin/langdoc.php

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

admin/langimport.php

@@ -5,9 +5,6 @@
 ///This helps to avoid confusion.
 
     require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('langimport', $adminroot);
 
     $mode          = optional_param('mode', 0, PARAM_INT);     //phase
     $pack          = optional_param('pack', '', PARAM_FILE);   //pack to install
@@ -20,15 +17,32 @@
     define('CHANGE_SITE_LANG', 3);
     define('DELETION_OF_SELECTED_LANG', 4);
     define('UPDATE_ALL_LANG', 5);
+
+    require_login();
+
+    if (!isadmin()) {
+        error('You must be an admin');
+    }
+    
+    if (!$site = get_site()) {
+        error("Site not defined!");
+    }
     
     $strlang = get_string('langimport','admin');
     
+    $stradministration = get_string("administration");
+    $strconfiguration = get_string("configuration");
     $strlanguage = get_string("language");
     $strthislanguage = get_string("thislanguage");
     $title = $strlang;
-        
-    admin_externalpage_print_header($adminroot);
     
+    print_header("$site->shortname: $title", "$site->fullname",
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> ".
+                 "<a href=\"lang.php\">$strlanguage</a> -> $strlang",
+                 '', '', true, '');
+    
+    print_heading('');
 
     switch ($mode){
     
@@ -270,25 +284,23 @@
             echo '<p />';
             
             /// Display option to change site language
- 
- /// Erm... this doesn't seem to work. Plus it's redundant. -vinkmar
             
-//            print_string('changesitelang','admin');
-//            $sitelanguage = get_record('config','name','lang');
-//            echo '<form name="changelangform" action="langimport.php?mode=3" method="POST">';
-//            echo '<select name="sitelangconfig">';
-//            
-//            foreach ($installedlangs as $clang =>$ilang) {
-//                if ($clang == $sitelanguage->value){
-//                    echo '<option value="'.$clang.'" selected="selected">'.$ilang.'</option>';
-//                } else {
-//                    echo '<option value="'.$clang.'">'.$ilang.'</option>';
-//                }
-//            }
-//            echo '</select>';
-//            echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
-//            echo '<input type="submit" value="'.get_string('change','admin').'" />';
-//            echo '</form>';
+            print_string('changesitelang','admin');
+            $sitelanguage = get_record('config','name','lang');
+            echo '<form name="changelangform" action="langimport.php?mode=3" method="POST">';
+            echo '<select name="sitelangconfig">';
+            
+            foreach ($installedlangs as $clang =>$ilang) {
+                if ($clang == $sitelanguage->value){
+                    echo '<option value="'.$clang.'" selected="selected">'.$ilang.'</option>';
+                } else {
+                    echo '<option value="'.$clang.'">'.$ilang.'</option>';
+                }
+            }
+            echo '</select>';
+            echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
+            echo '<input type="submit" value="'.get_string('change','admin').'" />';
+            echo '</form>';
 
             /// display to be installed langs here
 
@@ -342,7 +354,7 @@
 
     }    //close of main switch
 
-    admin_externalpage_print_footer($adminroot);
+    print_footer();
     
     /* returns a list of available language packs from a
      * local copy shipped with standard moodle distro

admin/maintenance.php

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

admin/misc.php

@@ -0,0 +1,47 @@
+<?php // $Id$
+
+    require_once('../config.php');
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only admins can access this page");
+    }
+
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
+
+    $stradministration = get_string("administration");
+    $strmisc           = get_string("miscellaneous");
+
+    print_header("$site->shortname: $stradministration: $strmisc", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> $strmisc");
+
+    print_heading($strmisc);
+
+    $table->align = array ("right", "left");
+
+    $table->data[] = array('<b><a href="../files/index.php?id='.$site->id.'">'.get_string('sitefiles').'</a></b>',
+                           get_string("adminhelpsitefiles"));
+    $table->data[] = array('<b><a href="stickyblocks.php">'.get_string('stickyblocks','admin')."</a></b>",
+                           get_string('adminhelpstickyblocks'));
+    $table->data[] = array('<b><a href="report.php">'.get_string('reports')."</a></b>",
+                           get_string('adminhelpreports'));
+// to be enabled later
+/*    $table->data[] = array('<b><a href="health.php">'.get_string('healthcenter')."</a></b>",
+                           get_string('adminhelphealthcenter'));*/
+    $table->data[] = array('<b><a href="environment.php">'.get_string('environment', 'admin')."</a></b>",
+                           get_string('adminhelpenvironment'));
+    if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
+        $table->data[] = array('<b><a href="'.$CFG->dbtype.'/frame.php">'.get_string('managedatabase')."</a></b>",
+                           get_string('adminhelpmanagedatabase'));
+    }
+
+    print_table($table);
+
+    print_footer($site);
+
+?>
+
+

admin/module.php

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

admin/modules.php

@@ -2,9 +2,6 @@
       // Allows the admin to manage activity modules
 
     require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('managemodules', $adminroot);
     require_once('../course/lib.php');
 
     $show    = optional_param('show', '', PARAM_SAFEDIR);
@@ -12,10 +9,22 @@
     $delete  = optional_param('delete', '', PARAM_SAFEDIR);
     $confirm = optional_param('confirm', '', PARAM_BOOL);
 
+    require_login();
+
+    if (!isadmin()) {
+        error("Only administrators can use this page!");
+    }
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
+
 
 /// Print headings
 
-    $stractivities = get_string("activities");
+    $stradministration = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strmanagemodules = get_string("managemodules");
     $strdelete = get_string("delete");
     $strversion = get_string("version");
     $strhide = get_string("hide");
@@ -24,12 +33,14 @@
     $stractivities = get_string("activities");
     $stractivitymodule = get_string("activitymodule");
 
-    admin_externalpage_print_header($adminroot);
-
-    print_heading($stractivities);
+    print_header("$site->shortname: $strmanagemodules", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $strmanagemodules");
 
+    print_heading($strmanagemodules);
+   
     $coursesaffected = false;
-
+    
 
 /// If data submitted, then process and store.
 
@@ -54,14 +65,14 @@
     }
 
     if (!empty($delete) and confirm_sesskey()) {
-
+      
         $strmodulename = get_string("modulename", "$delete");
 
         if (!$confirm) {
-            notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename),
-                         "modules.php?delete=$delete&amp;confirm=1&amp;sesskey=$USER->sesskey",
+            notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename), 
+                         "modules.php?delete=$delete&amp;confirm=1&amp;sesskey=$USER->sesskey", 
                          "modules.php");
-            admin_externalpage_print_footer($adminroot);
+            print_footer();
             exit;
 
         } else {  // Delete everything!!
@@ -88,7 +99,7 @@
                 notify("Error occurred while deleting all $strmodulename records in course_modules table");
             }
 
-            // Then delete all the logs
+            // Then delete all the logs 
             if (!delete_records("log", "module", $module->name)) {
                 notify("Error occurred while deleting all $strmodulename records in log table");
             }
@@ -114,11 +125,9 @@
                         }
                     }
                 }
-            }
-            // Delete the capabilities that were defined by this module
-            capabilities_cleanup('mod/'.$module->name);
+            }  
 
-            // rebuild_course_cache();  // Because things have changed
+            //rebuild_course_cache();  // Because things have changed
             $coursesaffected = true;
 
             $a->module = $strmodulename;
@@ -126,11 +135,11 @@
             notice(get_string("moduledeletefiles", "", $a), "modules.php");
         }
     }
-
+    
     if ($coursesaffected) {
         rebuild_course_cache();  // Because things have changed
     }
-
+    
 
 /// Get and sort the existing modules
 
@@ -168,7 +177,7 @@
             $settings = "";
         }
 
-        $count = count_records_select("$module->name",'course<>0');
+        $count = count_records("$module->name");
 
         if ($module->visible) {
             $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=$USER->sesskey\" title=\"$strhide\">".
@@ -190,6 +199,6 @@
 
     echo "<br /><br />";
 
-    admin_externalpage_print_footer($adminroot);
+    print_footer();
 
 ?>

admin/oacleanup.php

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

admin/pagelib.php

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

admin/phpinfo.php

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

admin/questiontypes.php

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

admin/register.php

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

admin/replace.php

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

admin/report.php

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

admin/report/courseoverview/index.php

@@ -2,24 +2,20 @@
 
     require_once('../../../config.php');
     require_once($CFG->dirroot.'/lib/statslib.php');
-    require_once($CFG->libdir.'/adminlib.php');
-
-    $adminroot = admin_get_root();
-
-    admin_externalpage_setup('reportcourseoverview', $adminroot);
-
-    admin_externalpage_print_header($adminroot);
 
     $report     = optional_param('report', STATS_REPORT_ACTIVE_COURSES, PARAM_INT);
     $time       = optional_param('time', 0, PARAM_INT);
     $numcourses = optional_param('numcourses', 20, PARAM_INT);
 
-    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));  // needed?
-
     if (empty($CFG->enablestats)) {
-        redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'));
+        error("Stats is not enabled.");
     }
 
+    require_login();
+
+    if (!isadmin()) {
+        error("This page is for admins only");
+    }
 
     $course = get_site();
     stats_check_uptodate($course->id);
@@ -27,14 +23,16 @@
     $strreports = get_string('reports');
     $strcourseoverview = get_string('courseoverview');
 
+    $strnav = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/index.php">'.get_string('administration').'</a> -> <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/report.php">'.$strreports.'</a> -> '.$strcourseoverview;
+    
     $reportoptions = stats_get_report_options($course->id,STATS_MODE_RANKED);
 
     $tableprefix = $CFG->prefix.'stats_';
 
-    $earliestday = get_field_sql('SELECT timeend FROM '.$tableprefix.'daily ORDER BY timeend');
-    $earliestweek = get_field_sql('SELECT timeend FROM '.$tableprefix.'weekly ORDER BY timeend');
-    $earliestmonth = get_field_sql('SELECT timeend FROM '.$tableprefix.'monthly ORDER BY timeend');
-
+    $earliestday = get_field_sql('SELECT timeend FROM '.$tableprefix.'daily ORDER BY timeend LIMIT 1');
+    $earliestweek = get_field_sql('SELECT timeend FROM '.$tableprefix.'weekly ORDER BY timeend LIMIT 1');
+    $earliestmonth = get_field_sql('SELECT timeend FROM '.$tableprefix.'monthly ORDER BY timeend LIMIT 1');
+    
     if (empty($earliestday)) $earliestday = time();
     if (empty($earliestweek)) $earliestweek = time();
     if (empty($earliestmonth)) $earliestmonth = time();
@@ -49,6 +47,8 @@
         error(get_string('nostatstodisplay'), $CFG->wwwroot.'/course/view.php?id='.$course->id);
     }
 
+    print_header($strcourseoverview, $strcourseoverview, $strnav,'','',true,'&nbsp');
+
     echo '<form action="index.php" method="post">'."\n";
 
     $table->width = '*';
@@ -64,57 +64,48 @@
 
     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\''
-                ." GROUP BY courseid "
-                .$param->extras
-                ." ORDER BY ".$param->orderby;
-        }
-        error_log($sql);
-
-        $courses = get_records_sql($sql, 0, $numcourses);
+        
+        $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
+            ." WHERE timeend >= ".$param->timeafter
+            ." GROUP BY courseid "
+            .$param->extras
+            ." ORDER BY ".$param->orderby
+            ." LIMIT ".$numcourses;
+        
+        $courses = get_records_sql($sql);
 
         if (empty($courses)) {
-            notify(get_string('statsnodata'));
-
-        } else {
-            if (empty($CFG->gdversion)) {
-                echo '<div align="center">(' . get_string("gdneed") .')</div>';
-            } else {
-                echo '<div align="center"><img src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></div>';
-            }
-
-            $table = new StdClass;
-            $table->align = array('left','center','center','center');
-            $table->head = array(get_string('course'),$param->line1);
-            if (!empty($param->line2)) {
-                $table->head[] = $param->line2;
-            }
-            if (!empty($param->line3)) {
-                $table->head[] = $param->line3;
-            }
-
-            foreach  ($courses as $c) {
-                $a = array();
-                $a[] = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$c->courseid.'">'.get_field('course','shortname','id',$c->courseid).'</a>';
-
-                $a[] = $c->line1;
-                if (isset($c->line2)) {
-                    $a[] = $c->line2;
-                }
-                if (isset($c->line3)) {
-                    $a[] = round($c->line3,2);
-                }
-                $table->data[] = $a;
-            }
-            print_table($table);
+            error(get_string('statsnodata'),$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/index.php');
         }
-    }
 
-    admin_externalpage_print_footer($adminroot);
+        echo '<center><img src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></center>';
+        
+        $table = new object();
+        $table->align = array('left','center','center','center');
+        $table->head = array(get_string('course'),$param->line1);
+        if (!empty($param->line2)) {
+            $table->head[] = $param->line2; 
+        }
+        if (!empty($param->line3)) {
+            $table->head[] = $param->line3;
+        }
+        
+        foreach  ($courses as $c) {
+            $a = array();
+            $a[] = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$c->courseid.'">'.get_field('course','shortname','id',$c->courseid).'</a>';
+
+            $a[] = $c->line1;
+            if (isset($c->line2)) {
+                $a[] = $c->line2;
+            }
+            if (isset($c->line3)) {
+                $a[] = $c->line3;
+            }
+            $table->data[] = $a;
+        }
+        print_table($table);
+    }
+    
+    print_footer();
 
 ?>

admin/report/courseoverview/mod.php

@@ -0,0 +1,57 @@
+<?php
+
+    if (!defined('MOODLE_INTERNAL')) {
+        die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+    }
+
+    if (!empty($CFG->enablestats)) {
+   
+        $strreports = get_string('reports');
+        $strcourseoverview = get_string('courseoverview');
+
+        print_heading("$strcourseoverview:");
+
+        require_once($CFG->dirroot.'/lib/statslib.php');
+
+        $report     = optional_param('report', STATS_REPORT_ACTIVE_COURSES, PARAM_INT);
+        $time       = optional_param('time', 0, PARAM_INT);
+        $numcourses = optional_param('numcourses', 20, PARAM_INT);
+
+        $course = get_site();
+        $statsstatus = stats_check_uptodate($course->id);
+
+        $reportoptions = stats_get_report_options($course->id,STATS_MODE_RANKED);
+
+        $tableprefix = $CFG->prefix.'stats_';
+
+        $earliestday = get_field_sql('SELECT timeend FROM '.$tableprefix.'daily ORDER BY timeend LIMIT 1');
+        $earliestweek = get_field_sql('SELECT timeend FROM '.$tableprefix.'weekly ORDER BY timeend LIMIT 1');
+        $earliestmonth = get_field_sql('SELECT timeend FROM '.$tableprefix.'monthly ORDER BY timeend LIMIT 1');
+
+        if (empty($earliestday)) $earliestday = time();
+        if (empty($earliestweek)) $earliestweek = time();
+        if (empty($earliestmonth)) $earliestmonth = time();
+
+        $now = stats_get_base_daily();
+        $lastweekend = stats_get_base_weekly();
+        $lastmonthend = stats_get_base_monthly();
+
+        $timeoptions = stats_get_time_options($now,$lastweekend,$lastmonthend,$earliestday,$earliestweek,$earliestmonth);
+
+        $table->width = '*';
+        $table->align = array('left','left','left','left','left','left');
+        $table->data[] = array(get_string('statsreporttype'),choose_from_menu($reportoptions,'report',$report,'','','',true),
+                get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
+                '<input type="text" name="numcourses" size="3" maxlength="2" value="'.$numcourses.'" />',
+                '<input type="submit" value="'.get_string('view').'" />') ;
+
+        echo '<form action="report/courseoverview/index.php" method="post">'."\n";
+        print_table($table);
+        echo '</form>';
+        if ($statsstatus !== NULL) {
+            notify ($statsstatus);
+        }
+
+    }
+?>
+

admin/report/courseoverview/reportsgraph.php

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

admin/report/log/mod.php

@@ -1,22 +1,17 @@
-<?php // $Id$
+<?php
+
+    if (!defined('MOODLE_INTERNAL')) {
+        die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+    }
 
-    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_log_selector_form($course);
+    print_log_selector_form($course); 
 
     echo '<br />';
     print_heading(get_string('chooselivelogs') .':');
@@ -25,7 +20,4 @@
     link_to_popup_window('/course/report/log/live.php?id='. $course->id,'livelog', get_string('livelogs'), 500, 800);
     echo '</h3></center>';
 
-
-    admin_externalpage_print_footer($adminroot);
-
 ?>

admin/report/simpletest/ex_reporter.php

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

admin/report/simpletest/ex_simple_test.php

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

admin/report/simpletest/index.php

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

admin/report/stats/index.php

@@ -4,33 +4,22 @@
     require_once($CFG->dirroot.'/lib/statslib.php');
     require_once($CFG->dirroot.'/course/report/stats/lib.php');
 
-    require_once($CFG->libdir.'/adminlib.php');
+    if (empty($CFG->enablestats)) {
+        error("Stats is not enabled.");
+    }
 
-    $adminroot = admin_get_root();
-
-    admin_externalpage_setup('reportstats', $adminroot);
-
-    admin_externalpage_print_header($adminroot);
-
-
-    $courseid = optional_param('course', SITEID, PARAM_INT);
+    $courseid = required_param('course', 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);
+        redirect($CFG->wwwroot.'/'.$CFG->admin.'/report.php?time='.$time);
     }
 
     if (!$course = get_record("course","id",$courseid)) {
@@ -44,34 +33,31 @@
     }
 
     require_login();
-
-    if (empty($CFG->enablestats)) {
-        redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'));
+    if (!isteacher($course->id)) {
+        error("You need to be a teacher to use this page");
     }
 
-    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);
+    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);
 
 
-//    $strreports = get_string("reports");
-//    $strstats = get_string('stats');
-//
-//    $menu = report_stats_mode_menu($course, $mode, $time);
-//
-//
-//    $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);
-
+    $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');
+    
+    print_footer();
 
-    admin_externalpage_print_footer($adminroot);
-
-?>
+?>

admin/report/stats/mod.php

@@ -0,0 +1,16 @@
+<?php  //$Id$
+
+    if (!defined('MOODLE_INTERNAL')) {
+        die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+    }
+    
+    if (!empty($CFG->enablestats)) {
+        echo '<p style="text-align:center;">';
+        echo '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/stats/index.php?course='.$course->id.'">'.get_string('stats').'</a>';
+        echo '</p>';
+        $statsstatus = stats_check_uptodate($course->id);
+        if ($statsstatus !== NULL) {
+            notify ($statsstatus);
+        }
+    }
+?>

admin/roles/allowassign.php

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

admin/roles/allowoverride.php

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

admin/roles/assign.html

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

admin/roles/assign.php

@@ -1,289 +0,0 @@
-<?php // $Id$
-      // Script to assign users to contexts
-
-    require_once('../../config.php');
-    require_once($CFG->dirroot.'/mod/forum/lib.php');
-    require_once($CFG->libdir.'/adminlib.php');
-
-    define("MAX_USERS_PER_PAGE", 5000);
-
-    $contextid      = required_param('contextid',PARAM_INT); // context id
-    $roleid         = optional_param('roleid', 0, PARAM_INT); // required role id
-    $add            = optional_param('add', 0, PARAM_BOOL);
-    $remove         = optional_param('remove', 0, PARAM_BOOL);
-    $showall        = optional_param('showall', 0, PARAM_BOOL);
-    $searchtext     = optional_param('searchtext', '', PARAM_RAW); // search string
-    $previoussearch = optional_param('previoussearch', 0, PARAM_BOOL);
-    $hidden         = optional_param('hidden', 0, PARAM_BOOL); // whether this assignment is hidden
-    $timestart      = optional_param('timestart', 0, PARAM_INT);
-    $timeend        = optional_param('timened', 0, PARAM_INT);
-    $userid         = optional_param('userid', 0, PARAM_INT); // needed for user tabs
-    $courseid       = optional_param('courseid', 0, PARAM_INT); // needed for user tabs
-
-    $errors = array();
-
-    $previoussearch = ($searchtext != '') or ($previoussearch) ? 1:0;
-
-    $baseurl = 'assign.php?contextid='.$contextid;
-    if (!empty($userid)) {
-        $baseurl .= '&amp;userid='.$userid;
-    }
-    if (!empty($courseid)) {
-        $baseurl .= '&amp;courseid='.$courseid;
-    }
-
-    if (! $context = get_context_instance_by_id($contextid)) {
-        error("Context ID was incorrect (can't find it)");
-    }
-
-
-    $inmeta = 0;
-    if ($context->contextlevel == CONTEXT_COURSE) {
-        $courseid = $context->instanceid;
-        if ($course = get_record('course', 'id', $courseid)) {
-            $inmeta = $course->metacourse;
-        } else {
-            error('Invalid course id');
-        }
-    } else if (!empty($courseid)){ // we need this for user tabs in user context
-        if (!$course = get_record('course', 'id', $courseid)) {
-            error('Invalid course id');
-        }
-    } else {
-        $courseid = SITEID;
-        $course = get_site();
-    }
-
-    if ($context->contextlevel == CONTEXT_COURSE) {
-        require_login($context->instanceid);
-    } else {
-        require_login();
-    }
-
-    require_capability('moodle/role:assign', $context);
-
-    $assignableroles = get_assignable_roles($context);
-
-/// Get some language strings
-
-    $strassignusers = get_string('assignusers', 'role');
-    $strpotentialusers = get_string('potentialusers', 'role');
-    $strexistingusers = get_string('existingusers', 'role');
-    $straction = get_string('assignroles', 'role');
-    $strroletoassign = get_string('roletoassign', 'role');
-    $strcurrentcontext = get_string('currentcontext', 'role');
-    $strsearch = get_string('search');
-    $strshowall = get_string('showall');
-    $strparticipants = get_string('participants');
-    $strsearchresults = get_string('searchresults');
-
-
-
-/// Make sure this user can assign that role
-
-    if ($roleid) {
-        if (!user_can_assign($context, $roleid)) {
-            error ('you can not override this role in this context');
-        }
-    }
-
-    if ($userid) {
-        $user = get_record('user', 'id', $userid);
-        $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
-    }
-
-
-/// Print the header and tabs
-
-    if ($context->contextlevel == CONTEXT_USER) {
-        /// course header
-        if ($courseid != SITEID) {
-            print_header("$fullname", "$fullname",
-                     "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->
-                      <a href=\"$CFG->wwwroot/user/index.php?id=$course->id\">$strparticipants</a> -> <a href=\"$CFG->wwwroot/user/view.php?id=$userid&course=$courseid\">$fullname</a> ->".$straction,
-                      "", "", true, "&nbsp;", navmenu($course));
-
-        /// site header
-        } else {
-            print_header("$course->fullname: $fullname", "$course->fullname",
-                        "<a href=\"$CFG->wwwroot/user/view.php?id=$userid&course=$courseid\">$fullname</a> -> $straction", "", "", true, "&nbsp;", navmenu($course));
-        }
-
-        $showroles = 1;
-        $currenttab = 'assign';
-        include_once($CFG->dirroot.'/user/tabs.php');
-    } else if ($context->contextlevel == CONTEXT_SYSTEM) {
-        $adminroot = admin_get_root();
-        admin_externalpage_setup('assignroles', $adminroot);
-        admin_externalpage_print_header($adminroot);
-    } else {
-        $currenttab = '';
-        $tabsmode = 'assign';
-        include_once('tabs.php');
-    }
-
-
-/// Process incoming role assignment
-
-    if ($frm = data_submitted()) {
-
-        if ($add and !empty($frm->addselect) and confirm_sesskey()) {
-
-            $timemodified = time();
-
-            foreach ($frm->addselect as $adduser) {
-                if (!$adduser = clean_param($adduser, PARAM_INT)) {
-                    continue;
-                }
-                $allow = true;
-                if ($inmeta) {
-                    if (has_capability('moodle/course:managemetacourse', $context, $adduser)) {
-                        //ok
-                    } else {
-                        $managerroles = get_roles_with_capability('moodle/course:managemetacourse', CAP_ALLOW, $context);
-                        if (!empty($managerroles) and !array_key_exists($roleid, $managerroles)) {
-                            $erruser = get_record('user', 'id', $adduser, '','','','', 'id, firstname, lastname');
-                            $errors[] = get_string('metaassignerror', 'role', fullname($erruser));
-                            $allow = false;
-                        }
-                    }
-                }
-                if ($allow) {
-                    if (! role_assign($roleid, $adduser, 0, $context->id, $timestart, $timeend, $hidden)) {
-                        $errors[] = "Could not add user with id $adduser to this role!";
-                    }
-                }
-            }
-
-        } else if ($remove and !empty($frm->removeselect) and confirm_sesskey()) {
-
-            $sitecontext = get_context_instance(CONTEXT_SYSTEM);
-            $topleveladmin = false;
-   
-            // we only worry about this if the role has doanything capability at site level
-            if ($context->id == $sitecontext->id && $adminroles = get_roles_with_capability('moodle/site:doanything', CAP_ALLOW, $sitecontext)) {
-                foreach ($adminroles as $adminrole) {
-                    if ($adminrole->id == $roleid) {
-                        $topleveladmin = true;
-                    }
-                }
-            }
- 
-            foreach ($frm->removeselect as $removeuser) {
-                $removeuser = clean_param($removeuser, PARAM_INT);
-
-                if ($topleveladmin && ($removeuser == $USER->id)) {   // Prevent unassigning oneself from being admin
-                    continue;
-                }
-
-                if (! role_unassign($roleid, $removeuser, 0, $context->id)) {
-                    $errors[] = "Could not remove user with id $removeuser from this role!";
-                } else if ($inmeta) {
-                    sync_metacourse($courseid);
-                    $newroles = get_user_roles($context, $removeuser, false);
-                    if (!empty($newroles) and !array_key_exists($roleid, $newroles)) {
-                        $erruser = get_record('user', 'id', $removeuser, '','','','', 'id, firstname, lastname');
-                        $errors[] = get_string('metaunassignerror', 'role', fullname($erruser));
-                        $allow = false;
-                    }
-                }
-            }
-
-        } else if ($showall) {
-            $searchtext = '';
-            $previoussearch = 0;
-        }
-    }
-
-
-    print_heading_with_help(get_string('assignroles', 'role'), 'assignroles');
-
-    if ($context->contextlevel==CONTEXT_SYSTEM) {
-        print_simple_box(get_string('globalroleswarning', 'role'));
-    }
-
-    if ($roleid) {        /// prints a form to swap roles
-
-    /// Get all existing participants in this context.
-        // Why is this not done with get_users???
-
-        if (!$contextusers = get_role_users($roleid, $context, false, 'u.id, u.firstname, u.lastname, u.email, r.hidden')) {
-            $contextusers = array();
-        }
-
-        $select  = "username <> 'guest' AND username <> 'changeme' AND deleted = 0 AND confirmed = 1";
-    
-        $usercount = count_records_select('user', $select) - count($contextusers);
-
-        $searchtext = trim($searchtext);
-
-        if ($searchtext !== '') {   // Search for a subset of remaining users
-            $LIKE      = sql_ilike();
-            $FULLNAME  = sql_fullname();
-
-            $select  .= " AND ($FULLNAME $LIKE '%$searchtext%' OR email $LIKE '%$searchtext%') ";
-        }
-
-        $availableusers = get_recordset_sql('SELECT id, firstname, lastname, email 
-                                               FROM '.$CFG->prefix.'user 
-                                              WHERE '.$select.'
-                                            ORDER BY lastname ASC, firstname ASC');
-
-        /// In the .html file below we loop through these results and exclude any in $contextusers
-    
-        echo '<form name="rolesform" action="assign.php" method="post">';
-        echo '<div align="center">'.$strcurrentcontext.': '.print_context_name($context).'<br/>';
-        if ($userid) {
-            echo '<input type="hidden" name="userid" value="'.$userid.'" />';
-        }
-        echo '<input type="hidden" name="courseid" value="'.$courseid.'" />';
-        echo '<input type="hidden" name="contextid" value="'.$context->id.'" />'.$strroletoassign.': ';
-        choose_from_menu ($assignableroles, 'roleid', $roleid, get_string('listallroles', 'role').'...', $script='rolesform.submit()');
-        echo '</div></form>';
-
-        print_simple_box_start('center');
-        include('assign.html');
-        print_simple_box_end();
-
-        if (!empty($errors)) {
-            $msg = '<p>';
-            foreach ($errors as $e) {
-                $msg .= $e.'<br />';
-            }
-            $msg .= '</p>';
-            print_simple_box_start('center');
-            notify($msg);
-            print_simple_box_end();
-        }
-
-    } else {   // Print overview table
-
-        // sync metacourse enrolments if needed
-        if ($inmeta) {
-            sync_metacourse($course);
-        }
-
-        $table->tablealign = 'center';
-        $table->cellpadding = 5;
-        $table->cellspacing = 0;
-        $table->width = '60%';
-        $table->head = array(get_string('roles', 'role'), get_string('description'), get_string('users'));
-        $table->wrap = array('nowrap', '', 'nowrap');
-        $table->align = array('right', 'left', 'center');
-
-        foreach ($assignableroles as $roleid => $rolename) {
-            $countusers = count_role_users($roleid, $context);
-            $description = format_string(get_field('role', 'description', 'id', $roleid));
-            $table->data[] = array('<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$rolename.'</a>',$description, $countusers);
-        }
-
-        print_table($table);
-    }
-
-    if ($context->contextlevel == CONTEXT_SYSTEM) {
-        admin_externalpage_print_footer($adminroot);
-    } else {
-        print_footer($course);
-    }
-
-?>

admin/roles/manage.html

@@ -1,157 +0,0 @@
-<?php  //$Id$
-
-    switch ($action) {
-        case 'add':
-            $submitlabel = get_string('addrole', 'role');
-            break;
-        case 'view':
-            $submitlabel = get_string('listallroles', 'role');
-            break;
-        case 'edit':
-        default:
-            $submitlabel = get_string('savechanges');
-    }
-?>
-
-
-<form name="rolesform" action="manage.php" method="post">
-<input type="hidden" name="roleid" value="<?php p($roleid) ?>" />
-<input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
-<input type="hidden" name="action" value="<?php if ($action != 'view') { echo p($action); } ?>" />
-
-<table cellpadding="9" cellspacing="0" align="center">
-<tr valign="top">
-    <td align="right"><?php print_string('name') ?>:</td>
-    <td><?php
-    if ($action == 'view') {
-        p($role->name);
-    } else {
-        echo '<input type="text" name="name" maxlength="254" size="50" value="'.s($role->name).'" />';
-        if (isset($errors["name"])) formerr($errors["name"]);
-    } ?></td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string('shortname') ?>:</td>
-    <td><?php
-    if ($action == 'view') {
-        p($role->shortname);
-    } else {
-        echo '<input type="text" name="shortname" maxlength="20" size="15" value="'.s($role->shortname).'" />';
-        if (isset($errors["shortname"])) formerr($errors["shortname"]);
-    } ?></td>
-</tr>
-<tr valign="top">
-    <td align="right"><?php print_string('description') ?>:</td>
-    <td><?php
-    if ($action == 'view') {
-        p($role->description);
-        $usehtmleditor = false;
-    } else {
-        print_textarea($usehtmleditor, 10, 50, 50, 10, 'description', $role->description);
-    } ?></td>
-</tr>
-</table>
-
-<?php
-    print_heading_with_help(get_string('permissions','role'), 'permissions');
-
-    $strinherit = get_string('inherit','role');
-    $strallow = get_string('allow','role');
-    $strprevent = get_string('prevent','role');
-    $strprohibit = get_string('prohibit','role');
-?>
-
-<table class="rolecap" align="center">
-
-<tr>
-<th class="name" align="left"><?php print_string('capability','role') ?></th>
-<th class="inherit"><?php p($strinherit); ?></th>
-<th class="allow"><?php p($strallow); ?></th>
-<th class="prevent"><?php p($strprevent); ?></th>
-<th class="prohibit"><?php p($strprohibit); ?></th>
-<th class="risk" colspan="5"><?php print_string('risks','role') ?></th>
-</tr>
-
-<?php
-
-// init these 2
-$contextlevel = 0;
-$component = '';
-
-$strrisks = s(get_string('risks', 'role'));
-$strcapabilities = s(get_string('capabilities', 'role'));
-
-foreach ($capabilities as $capability) {
-    // prints a breaker if component or name or context level
-    if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
-        echo ('<tr class="rolecapheading header"><td colspan="10" class="header"><strong>'.
-               get_component_string($capability->component, $capability->contextlevel).'</strong></td></tr>');
-    }
-
-    // these 2 are used to see to group same mod/core capabilities together
-    $contextlevel = $capability->contextlevel;
-    $component = $capability->component;
-
-    if (empty($errors)) {
-       // check the capability override for this cap, this role in this context
-        $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
-        $localoverride = get_local_override($roleid, $sitecontext->id, $capability->name);
-    } else {
-        $localoverride = new object();
-        $localoverride->permission = $role->{$capability->name};
-    }
-
-    $disabled = ($action != 'edit' and $action != 'add') ? ' disabled="disabled" ' : '';
-
-    $riskinfo = '<td class="risk managetrust">';
-    $rowclasses = '';
-    if (RISK_MANAGETRUST & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">T</a>';
-        $rowclasses .= ' riskmanagetrust';
-    }
-    $riskinfo .= '</td><td class="risk config">';
-    if (RISK_CONFIG & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">C</a>';
-        $rowclasses .= ' riskconfig';
-    }
-    $riskinfo .= '</td><td class="risk xss">';
-    if (RISK_XSS & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">X</a>';
-        $rowclasses .= ' riskxss';
-    }
-    $riskinfo .= '</td><td class="risk personal">';
-    if (RISK_PERSONAL & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">P</a>';
-        $rowclasses .= ' riskpersonal';
-    }
-    $riskinfo .= '</td><td class="risk spam">';
-    if (RISK_SPAM & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a target="docspopup" title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">S</a>';
-        $rowclasses .= ' riskspam';
-    }
-    $riskinfo .= '</td>';
-
-    ?>
-
-        <tr class="rolecap <?php echo $rowclasses; ?>">
-        <td class="name"><span class="cap-desc"><a target="docspopup" href="<?php echo $CFG->docroot.'/'.$lang.'/'.$strcapabilities.'/'.$capability->name ?>"><?php echo get_capability_string($capability->name); ?></a><span class="cap-name"><?php echo $capability->name ?></span></label></td>
-        <td class="inherit"><input type="radio" title="<?php p($strinherit); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_INHERIT ?>" <?php if (!isset($localoverride->permission) || $localoverride->permission==CAP_INHERIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="allow"><input type="radio" title="<?php p($strallow); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_ALLOW ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_ALLOW){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="prevent" ><input type="radio" title="<?php p($strprevent); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PREVENT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PREVENT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="prohibit" ><input type="radio" title="<?php p($strprohibit); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PROHIBIT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PROHIBIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-
-        <?php echo $riskinfo; ?>
-
-        </tr>
-
-<?php } ?>
-</table>
-
-<div class="submit" align="center">
-<input type="submit" value="<?php p($submitlabel) ?>" />
-<?php if ($action != 'view') { ?>
-<input type="submit" name="cancel" value="<?php print_string('cancel') ?>" />
-<?php } ?>
-</div>
-
-</form>

admin/roles/manage.php

@@ -1,421 +0,0 @@
-<?php //$Id$
-
-    require_once('../../config.php');
-
-    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-
-    admin_externalpage_setup('defineroles', $adminroot);
-
-    $roleid      = optional_param('roleid', 0, PARAM_INT);             // if set, we are editing a role
-    $name        = optional_param('name', '', PARAM_MULTILANG);        // new role name
-    $shortname   = optional_param('shortname', '', PARAM_RAW);         // new role shortname, special cleaning before storage
-    $description = optional_param('description', '', PARAM_CLEAN);     // new role desc
-    $action      = optional_param('action', '', PARAM_ALPHA);
-    $confirm     = optional_param('confirm', 0, PARAM_BOOL);
-    $cancel      = optional_param('cancel', 0, PARAM_BOOL);
-
-    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
-    require_capability('moodle/role:manage', $sitecontext);
-
-    if ($cancel) {
-        redirect('manage.php');
-    }
-
-    $errors = array();
-    $newrole = false;
-
-    $roles = get_all_roles();
-    $rolescount = count($roles);
-
-/// fix sort order if needed
-    $rolesort = array();
-    $i = 0;
-    foreach ($roles as $rolex) {
-        $rolesort[$i] = $rolex->id;
-        if ($rolex->sortorder != $i) {
-            $r = new object();
-            $r->id = $rolex->id;
-            $r->sortorder = $i;
-            update_record('role', $r);
-            $roles[$rolex->id]->sortorder = $i;
-        }
-        $i++;
-    }
-
-
-/// form processing, editing a role, adding a role, deleting a role etc.
-    switch ($action) {
-        case 'add':
-            if ($data = data_submitted() and confirm_sesskey()) {
-
-                $shortname = moodle_strtolower(clean_param(clean_filename($shortname), PARAM_SAFEDIR)); // only lowercase safe ASCII characters
-
-                if (empty($name)) {
-                    $errors['name'] = get_string('errorbadrolename', 'role');
-                } else if (count_records('role', 'name', $name)) {
-                    $errors['name'] = get_string('errorexistsrolename', 'role');
-                }
-
-                if (empty($shortname)) {
-                    $errors['shortname'] = get_string('errorbadroleshortname', 'role');
-                } else if (count_records('role', 'shortname', $shortname)) {
-                    $errors['shortname'] = get_string('errorexistsroleshortname', 'role');
-                }
-
-                if (empty($errors)) {
-                    $newrole = create_role($name, $shortname, $description);
-                } else {
-                    $newrole = new object();
-                    $newrole->name = $name;
-                    $newrole->shortname = $shortname;
-                    $newrole->description = $description;
-                }
-
-                $allowed_values = array(CAP_INHERIT, CAP_ALLOW, CAP_PREVENT, CAP_PROHIBIT);
-                $capabilities = fetch_context_capabilities($sitecontext); // capabilities applicable in this context
-
-                foreach ($capabilities as $cap) {
-                    if (!isset($data->{$cap->name})) {
-                        continue;
-                    }
-                    $capname = $cap->name;
-                    $value = clean_param($data->{$cap->name}, PARAM_INT);
-                    if (!in_array($value, $allowed_values)) {
-                        continue;
-                    }
-
-                    if (empty($errors)) {
-                        assign_capability($capname, $value, $newrole, $sitecontext->id);
-                    } else {
-                        $newrole->$capname = $value;
-                    }
-                }
-                if (empty($errors)) {
-                    redirect('manage.php');
-                }
-            }
-            break;
-
-        case 'edit':
-            if ($data = data_submitted() and confirm_sesskey()) {
-
-                $shortname = moodle_strtolower(clean_param(clean_filename($shortname), PARAM_SAFEDIR)); // only lowercase safe ASCII characters
-
-                if (empty($name)) {
-                    $errors['name'] = get_string('errorbadrolename', 'role');
-                } else if ($rs = get_records('role', 'name', $name)) {
-                    unset($rs[$roleid]);
-                    if (!empty($rs)) {
-                        $errors['name'] = get_string('errorexistsrolename', 'role');
-                    }
-                }
-
-                if (empty($shortname)) {
-                    $errors['shortname'] = get_string('errorbadroleshortname', 'role');
-                } else if ($rs = get_records('role', 'shortname', $shortname)) {
-                    unset($rs[$roleid]);
-                    if (!empty($rs)) {
-                        $errors['shortname'] = get_string('errorexistsroleshortname', 'role');
-                    }
-                }
-                if (!empty($errors)) {
-                    $newrole = new object();
-                    $newrole->name = $name;
-                    $newrole->shortname = $shortname;
-                    $newrole->description = $description;
-                }
-
-                $allowed_values = array(CAP_INHERIT, CAP_ALLOW, CAP_PREVENT, CAP_PROHIBIT);
-                $capabilities = fetch_context_capabilities($sitecontext); // capabilities applicable in this context
-
-                foreach ($capabilities as $cap) {
-                    if (!isset($data->{$cap->name})) {
-                        continue;
-                    }
-                    $capname = $cap->name;
-                    $value = clean_param($data->{$cap->name}, PARAM_INT);
-                    if (!in_array($value, $allowed_values)) {
-                        continue;
-                    }
-
-                    if (!empty($errors)) {
-                        $newrole->$capname = $value;
-                        continue;
-                    }
-
-                    // edit default caps
-                    $SQL = "SELECT * FROM {$CFG->prefix}role_capabilities
-                            WHERE roleid = $roleid AND capability = '$capname'
-                              AND contextid = $sitecontext->id";
-
-                    $localoverride = get_record_sql($SQL);
-
-                    if ($localoverride) { // update current overrides
-                        if ($value == CAP_INHERIT) { // inherit = delete
-                            unassign_capability($capname, $roleid, $sitecontext->id);
-
-                        } else {
-                            $localoverride->permission = $value;
-                            $localoverride->timemodified = time();
-                            $localoverride->modifierid = $USER->id;
-                            update_record('role_capabilities', $localoverride);
-                        }
-                    } else { // insert a record
-                        if ($value != CAP_INHERIT) {
-                            assign_capability($capname, $value, $roleid, $sitecontext->id);
-                        }
-                    }
-                }
-
-                if (empty($errors)) {
-                    // update normal role settings
-                    $role->id = $roleid;
-                    $role->name = $name;
-                    $role->shortname = $shortname;
-                    $role->description = $description;
-
-                    if (!update_record('role', $role)) {
-                        error('Could not update role!');
-                    }
-                    redirect('manage.php');
-                }
-            }
-            break;
-
-        case 'delete':
-            if ($confirm and data_submitted() and confirm_sesskey()) {
-                if (!delete_role($roleid)) {
-                    error('Could not delete role with ID '.$roleid);
-                }
-
-            } else if (confirm_sesskey()){
-                // show confirmation
-                admin_externalpage_print_header($adminroot);
-                $optionsyes = array('action'=>'delete', 'roleid'=>$roleid, 'sesskey'=>sesskey(), 'confirm'=>1);
-                $a = new object();
-                $a->id = $roleid;
-                $a->name = $roles[$roleid]->name;
-                $a->shortname = $roles[$roleid]->shortname;
-                $a->count = (int)count_records('role_assignments', 'roleid', $roleid);
-                notice_yesno(get_string('deleterolesure', 'role', $a), 'manage.php', 'manage.php', $optionsyes, NULL, 'post', 'get');
-                admin_externalpage_print_footer($adminroot);
-                die;
-            }
-
-            redirect('manage.php');
-            break;
-
-        case 'moveup':
-            if (array_key_exists($roleid, $roles) and confirm_sesskey()) {
-                $role = $roles[$roleid];
-                if ($role->sortorder > 0) {
-                    $above = $roles[$rolesort[$role->sortorder - 1]];
-
-                    if (!switch_roles($role, $above)) {
-                        error("Cannot move role with ID $roleid");
-                    }
-                }
-            }
-
-            redirect('manage.php');
-            break;
-
-        case 'movedown':
-            if (array_key_exists($roleid, $roles) and confirm_sesskey()) {
-                $role = $roles[$roleid];
-                if ($role->sortorder + 1 < $rolescount) {
-                    $below = $roles[$rolesort[$role->sortorder + 1]];
-
-                    if (!switch_roles($role, $below)) {
-                        error("Cannot move role with ID $roleid");
-                    }
-                }
-            }
-
-            redirect('manage.php');
-            break;
-
-        default:
-            break;
-
-    }
-
-/// print UI now
-
-    admin_externalpage_print_header($adminroot);
-
-    $currenttab = 'manage';
-    include_once('managetabs.php');
-
-    if (($roleid and ($action == 'view' or $action == 'edit')) or $action == 'add') { // view or edit role details
-
-        if ($action == 'add') {
-            $roleid = 0;
-            if (empty($errors) or empty($newrole)) {
-                $role = new object();
-                $role->name='';
-                $role->shortname='';
-                $role->description='';
-            } else {
-                $role = stripslashes_safe($newrole);
-            }
-        } else if ($action == 'edit' and !empty($errors) and !empty($newrole)) {
-                $role = stripslashes_safe($newrole);
-        } else {
-            if(!$role = get_record('role', 'id', $roleid)) {
-                error('Incorrect role ID!');
-            }
-        }
-
-        foreach ($roles as $rolex) {
-            $roleoptions[$rolex->id] = strip_tags(format_string($rolex->name));
-        }
-
-        // this is the array holding capabilities of this role sorted till this context
-        $r_caps = role_context_capabilities($roleid, $sitecontext);
-
-        // this is the available capabilities assignable in this context
-        $capabilities = fetch_context_capabilities($sitecontext);
-
-        $usehtmleditor = can_use_html_editor();
-
-        switch ($action) {
-            case 'add':
-                print_heading_with_help(get_string('addrole', 'role'), 'roles');
-                break;
-            case 'view':
-                print_heading_with_help(get_string('viewrole', 'role'), 'roles');
-                break;
-            case 'edit':
-                print_heading_with_help(get_string('editrole', 'role'), 'roles');
-                break;
-        }
-
-        echo '<div align="center" class="selector">';
-        if ($action == 'view') {
-            echo get_string('selectrole', 'role').': ';
-            echo '<form style="display:inline;" name="switchrole" action="manage.php" method="get">';
-            echo '<input type="hidden" name="action" value="view" />';
-            choose_from_menu ($roleoptions, 'roleid', $roleid, get_string('listallroles', 'role').'...', $script='switchrole.submit()');
-            echo '</form>';
-            echo '<form style="display:inline;" name="editrole" action="manage.php" method="get">';
-            echo '<input type="hidden" name="roleid" value="'.$roleid.'" />';
-            echo '<input type="hidden" name="action" value="edit" />';
-            echo '<input type="submit" value="'.get_string('edit').'" />';
-            echo '</form>';
-        }
-        echo '</div>';
-
-        $lang = str_replace('_utf8', '', current_language());
-
-        print_simple_box_start('center');
-        include_once('manage.html');
-        print_simple_box_end();
-
-        if ($usehtmleditor) {
-            use_html_editor('description');
-        }
-
-    } else {
-
-        print_heading_with_help(get_string('roles', 'role'), 'roles');
-
-        $table = new object;
-
-        $table->tablealign = 'center';
-        $table->align = array('right', 'left', 'left', 'left');
-        $table->wrap = array('nowrap', '', 'nowrap','nowrap');
-        $table->cellpadding = 5;
-        $table->cellspacing = 0;
-        $table->width = '90%';
-        $table->data = array();
-
-        $table->head = array(get_string('name'),
-                             get_string('description'),
-                             get_string('shortname'),
-                             get_string('edit'));
-
-        /*************************
-         * List all current roles *
-         **************************/
-
-        foreach ($roles as $role) {
-
-            $stredit     = get_string('edit');
-            $strdelete   = get_string('delete');
-            $strmoveup   = get_string('moveup');
-            $strmovedown = get_string('movedown');
-
-            $row = array();
-            $row[0] = '<a href="manage.php?roleid='.$role->id.'&amp;action=view">'.format_string($role->name).'</a>';
-            $row[1] = format_text($role->description, FORMAT_HTML);
-            $row[2] = s($role->shortname);
-            $row[3] = '<a title="'.$stredit.'" href="manage.php?action=edit&roleid='.$role->id.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="'.$stredit.'" /></a> ';
-            $row[3] .= '<a title="'.$strdelete.'" href="manage.php?action=delete&roleid='.$role->id.'&sesskey='.sesskey().'">'.
-                         '<img src="'.$CFG->pixpath.'/t/delete.gif" height="11" width="11" border="0" alt="'.$strdelete.'" /></a> ';
-            if ($role->sortorder != 0) {
-                $row[3] .= '<a title="'.$strmoveup.'" href="manage.php?action=moveup&roleid='.$role->id.'&sesskey='.sesskey().'">'.
-                     '<img src="'.$CFG->pixpath.'/t/up.gif" height="11" width="11" border="0" alt="'.$strmoveup.'" /></a> ';
-            } else {
-                $row[3] .= '<img src="'.$CFG->wwwroot.'/pix/spacer.gif" height="11" width="11" border="0" alt="" /> ';
-            }
-            if ($role->sortorder+1 < $rolescount) {
-                $row[3] .= '<a title="'.$strmovedown.'" href="manage.php?action=movedown&roleid='.$role->id.'&sesskey='.sesskey().'">'.
-                     '<img src="'.$CFG->pixpath.'/t/down.gif" height="11" width="11" border="0" alt="'.$strmovedown.'" /></a> ';
-            } else {
-                $row[3] .= '<img src="'.$CFG->wwwroot.'/pix/spacer.gif" height="11" width="11" border="0" alt="" /> ';
-            }
-
-            $table->data[] = $row;
-
-        }
-        print_table($table);
-
-        $options = new object();
-        $options->action = 'add';
-        print_single_button('manage.php', $options, get_string('addrole', 'role'), 'get');
-    }
-
-    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;
-}
-
-?>

admin/roles/managetabs.php

@@ -1,14 +0,0 @@
-<?php
-// this page deals with the 2 tabs for manage.php and grant.php
-
-    $toprow[] = new tabobject('manage', $CFG->wwwroot.'/'.$CFG->admin.'/roles/manage.php', get_string('manageroles', 'role'),'', true);
-
-    $toprow[] = new tabobject('allowassign', $CFG->wwwroot.'/'.$CFG->admin.'/roles/allowassign.php', get_string('allowassign', 'role'));
-
-    $toprow[] = new tabobject('allowoverride', $CFG->wwwroot.'/'.$CFG->admin.'/roles/allowoverride.php', get_string('allowoverride', 'role'));
-
-    $tabs = array($toprow);
-
-    print_tabs($tabs, $currenttab);
-
-?>

admin/roles/override.html

@@ -1,133 +0,0 @@
-<?php
-    $strinherit = get_string('inherit','role');
-    $strallow = get_string('allow','role');
-    $strprevent = get_string('prevent','role');
-    $strprohibit = get_string('prohibit','role');
-?>
-
-<form name="overrideform" action="override.php" method="post">
-    <input type="hidden" name="contextid" value="<?php p($contextid) ?>">
-    <input type="hidden" name="roleid" value="<?php p($roleid) ?>">
-    <input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" />
-    <input type="hidden" name="userid" value="<?php p($userid) ?>" />
-    <input type="hidden" name="courseid" value="<?php p($courseid) ?>" />
-
-    <table class="rolecap">
-        <tr>
-            <th class="name" align="left"><?php print_string('capability','role') ?></th>
-            <th class="inherit"><?php p($strinherit); ?></th>
-            <th class="allow"><?php p($strallow); ?></th>
-            <th class="prevent"><?php p($strprevent); ?></th>
-            <th class="prohibit"><?php p($strprohibit); ?></th>
-            <th class="risk" colspan="5"><?php print_string('risks','role') ?></th>
-        </tr>
-        <?php
-
-        // init these 2
-        $contextlevel = 0;
-        $component = '';
-
-        $strrisks = s(get_string('risks', 'role'));
-        $strcapabilities = s(get_string('capabilities', 'role'));
-
-        foreach ($capabilities as $capability) {
-        // prints a breaker if component or name or context level
-            if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
-                echo ('<tr class="rolecapheading header"><td colspan="10" class="header"><strong>'.get_component_string($capability->component, $capability->contextlevel).'</strong></td></tr>');
-            }
-
-            // these 2 are used to see to group same mod/core capabilities together
-            $contextlevel = $capability->contextlevel;
-            $component = $capability->component;
-
-            // check the capability override for this cap, this role in this context
-            if (isset($localoverrides[$capability->name])) {
-                $localpermission = $localoverrides[$capability->name]->permission;
-            } else {
-                $localpermission = 0;  // Just inherit
-            }
-
-            if (isset($r_caps[$capability->name])) {
-                $isallow = $r_caps[$capability->name] > 0;
-                $isprevent = $r_caps[$capability->name] < 0 && $r_caps[$capability->name] > -500;
-                $isprohibit = $r_caps[$capability->name] <= -500;
-            } else {
-                $isallow = 0;
-                $isprevent = 0;
-                $isprohibit = 0;
-            }
-
-            $isdisabled = $isprohibit || islegacy($capability->name);
-
-            $riskinfo = '<td class="risk managetrust">';
-            $rowclasses = '';
-            if (RISK_MANAGETRUST & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">T</a>';
-                $rowclasses .= ' riskmanagetrust';
-            }
-            $riskinfo .= '</td><td class="risk config">';
-            if (RISK_CONFIG & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">C</a>';
-                $rowclasses .= ' riskconfig';
-            }
-            $riskinfo .= '</td><td class="risk xss">';
-            if (RISK_XSS & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">X</a>';
-                $rowclasses .= ' riskxss';
-            }
-            $riskinfo .= '</td><td class="risk personal">';
-            if (RISK_PERSONAL & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">P</a>';
-                $rowclasses .= ' riskpersonal';
-            }
-            $riskinfo .= '</td><td class="risk spam">';
-            if (RISK_SPAM & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a target="docspopup" title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">S</a>';
-                $rowclasses .= ' riskspam';
-            }
-            $riskinfo .= '</td>';
-
-
-        ?>
-
-        <tr class="rolecap <?php echo $rowclasses; ?>">
-          <td class="name"><span class="cap-desc"><a target="docspopup" href="<?php echo $CFG->docroot.'/'.$lang.'/'.$strcapabilities.'/'.$capability->name ?>"><?php echo get_capability_string($capability->name); ?></a><span class="cap-name"><?php echo $capability->name ?></span></label></td>
-
-             <td class="inherit">
-             <input type="radio" title="<?php p($strinherit); ?>" name="<?php echo $capability->name; ?>" value="0"
-                <?php
-                    if ($localpermission == CAP_INHERIT) {echo 'checked="checked"';}
-                    if ($isdisabled)           {echo 'disabled="disabled"';}?> />
-             </td>
-
-             <td class="allow <?php if ($isallow) {echo ' capcurrent';} ?>">
-             <input type="radio" title="<?php p($strallow); ?>" name="<?php echo $capability->name; ?>"
-                <?php echo ' value="'.CAP_ALLOW.'"';
-                   if ($localpermission == CAP_ALLOW) {echo ' checked="checked"';}
-                   if ($isdisabled)                   {echo ' disabled="disabled"';}?> />
-             </td>
-
-             <td class="prevent <?php if ($isprevent) {echo ' capcurrent';} ?>">
-             <input type="radio" title="<?php p($strprevent); ?>" name="<?php echo $capability->name; ?>"
-                <?php echo ' value="'.CAP_PREVENT.'"';
-                   if ($localpermission == CAP_PREVENT) {echo ' checked="checked"';}
-                   if ($isdisabled)                     {echo ' disabled="disabled"';}?> />
-             </td>
-
-             <td class="prohibit <?php if ($isprohibit) {echo ' capcurrent';} ?>">
-             <input type="radio" title="<?php p($strprohibit); ?>" name="<?php echo $capability->name; ?>"
-                <?php echo ' value="'.CAP_PROHIBIT.'"';
-                   if ($localpermission == CAP_PROHIBIT) {echo ' checked="checked"';}
-                   if ($isdisabled)                      {echo ' disabled="disabled"';}?> />
-             </td>
-            <?php echo $riskinfo; ?>
-        </tr>
-
-        <?php } ?>
-    </table>
-    <br />
-    <div align="center">
-        <input type="submit" value="<?php print_string('savechanges') ?>" />
-        <input type="submit" name="cancel" value="<?php print_string('cancel') ?>" />
-    </div>
-</form>

admin/roles/override.php

@@ -1,209 +0,0 @@
-<?php  //$Id$
-
-    require_once('../../config.php');
-
-    $contextid = required_param('contextid',PARAM_INT);    // context id
-    $roleid    = optional_param('roleid', 0, PARAM_INT);   // requested role id
-    $userid    = optional_param('userid', 0, PARAM_INT);   // needed for user tabs
-    $courseid  = optional_param('courseid', 0, PARAM_INT); // needed for user tabs
-    $cancel    = optional_param('cancel', 0, PARAM_BOOL);
-
-    if (!$context = get_record('context', 'id', $contextid)) {
-        error('Bad context ID');
-    }
-
-    if (!$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID)) {
-        error('No site ID');
-    }
-
-    if ($context->id == $sitecontext->id) {
-        error ('Can not override base role capabilities');
-    }
-
-    require_capability('moodle/role:override', $context);   // Just to make sure
-
-    if ($courseid) {
-        if (!$course = get_record('course', 'id', $courseid)) {
-            error('Bad course ID');
-        }
-    } else {
-        $course = $SITE;
-    }
-
-    $baseurl = 'override.php?contextid='.$context->id;
-    if (!empty($userid)) {
-        $baseurl .= '&amp;userid='.$userid;
-    }
-    if (!empty($courseid)) {
-        $baseurl .= '&amp;courseid='.$courseid;
-    }
-
-    if ($cancel) {
-        redirect($baseurl);
-    }
-
-
-/// Get some language strings
-
-    $strroletooverride = get_string('roletooverride', 'role');
-    $stroverrideusers  = get_string('overrideusers', 'role');
-    $straction         = get_string('overrideroles', 'role');
-    $strcurrentrole    = get_string('currentrole', 'role');
-    $strcurrentcontext = get_string('currentcontext', 'role');
-    $strparticipants   = get_string('participants');
-
-/// Make sure this user can override that role
-    if ($roleid) {
-        if (!user_can_override($context, $roleid)) {
-            error ('you can not override this role in this context');
-        }
-    }
-
-    if ($userid) {
-        $user = get_record('user', 'id', $userid);
-        $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
-    }
-
-/// Process incoming role override
-    if ($data = data_submitted() and $roleid and confirm_sesskey()) {
-        $allowed_values = array(CAP_INHERIT, CAP_ALLOW, CAP_PREVENT, CAP_PROHIBIT);
-        $capabilities = fetch_context_capabilities($context); // capabilities applicable in this context
-
-        $localoverrides = get_records_select('role_capabilities', "roleid = $roleid AND contextid = $context->id",
-                                             '', 'capability, permission, id');
-
-        foreach ($capabilities as $cap) {
-            if (!isset($data->{$cap->name})) {
-                continue;
-            }
-            $capname = $cap->name;
-            $value = clean_param($data->{$cap->name}, PARAM_INT);
-            if (!in_array($value, $allowed_values)) {
-                 continue;
-            }
-
-            if (isset($localoverrides[$capname])) {    // Something exists, so update it
-                if ($value == CAP_INHERIT) {       // inherit = delete
-                    delete_records('role_capabilities', 'roleid', $roleid, 'contextid', $context->id,
-                                                        'capability', $capname);
-                } else {
-                    $localoverride = new object();
-                    $localoverride->id = $localoverrides[$capname]->id;
-                    $localoverride->permission = $value;
-                    $localoverride->timemodified = time();
-                    $localoverride->modifierid = $USER->id;
-                    if (!update_record('role_capabilities', $localoverride)) {
-                        error('Could not update a capability!');
-                    }
-                }
-
-            } else { // insert a record
-                if ($value != CAP_INHERIT) {    // Ignore inherits
-                    $localoverride = new object();
-                    $localoverride->capability = $capname;
-                    $localoverride->contextid = $context->id;
-                    $localoverride->roleid = $roleid;
-                    $localoverride->permission = $value;
-                    $localoverride->timemodified = time();
-                    $localoverride->modifierid = $USER->id;
-                    if (!insert_record('role_capabilities', $localoverride)) {
-                        error('Could not insert a capability!');
-                    }
-                }
-            }
-        }
-        redirect($baseurl);
-    }
-
-
-/// Print the header and tabs
-
-    if ($context->contextlevel == CONTEXT_USER) {
-
-        /// course header
-        if ($course->id != SITEID) {
-            print_header("$fullname", "$fullname",
-                     "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->
-                      <a href=\"$CFG->wwwroot/user/index.php?id=$course->id\">$strparticipants</a> -> <a href=\"$CFG->wwwroot/user/view.php?id=$userid&amp;course=$course->id\">$fullname</a> -> $straction",
-                      "", "", true, "&nbsp;", navmenu($course));
-
-        /// site header
-        } else {
-            print_header("$course->fullname: $fullname", "$course->fullname",
-                        "<a href=\"$CFG->wwwroot/user/view.php?id=$userid&amp;course=$course->id\">$fullname</a> -> $straction", "", "", true, "&nbsp;", navmenu($course));
-        }
-        $showroles = 1;
-        $currenttab = 'override';
-        include_once($CFG->dirroot.'/user/tabs.php');
-    } else {
-        $currenttab = '';
-        $tabsmode = 'override';
-        include_once('tabs.php');
-    }
-
-    print_heading_with_help(get_string('overrides', 'role'), 'overrides');
-
-    $overridableroles = get_overridable_roles($context);
-
-    if ($roleid) {
-    /// prints a form to swap roles
-        echo '<form name="rolesform" action="override.php" method="get">';
-        echo '<div align="center">'.$strcurrentcontext.': '.print_context_name($context).'<br/>';
-        if ($userid) {
-            echo '<input type="hidden" name="userid" value="'.$userid.'" />';
-        }
-        if ($courseid) {
-            echo '<input type="hidden" name="courseid" value="'.$courseid.'" />';
-        }
-        echo '<input type="hidden" name="contextid" value="'.$context->id.'" />'.$strroletooverride.': ';
-        choose_from_menu ($overridableroles, 'roleid', $roleid, get_string('listallroles', 'role').'...', $script='rolesform.submit()');
-        echo '</div></form>';
-
-        $parentcontexts = get_parent_contexts($context);
-        if (!empty($parentcontexts)) {
-            $parentcontext = array_shift($parentcontexts);
-            $parentcontext = get_context_instance_by_id($parentcontext);
-        } else {
-            $parentcontext = $context; // site level in override??
-        }
-
-        $r_caps = role_context_capabilities($roleid, $parentcontext);
-
-        $localoverrides = get_records_select('role_capabilities', "roleid = $roleid AND contextid = $context->id",
-                                             '', 'capability, permission, id');
-
-        $lang = str_replace('_utf8', '', current_language());
-
-        // Get the capabilities overrideable in this context
-        if ($capabilities = fetch_context_capabilities($context)) {
-            print_simple_box_start('center');
-            include_once('override.html');
-            print_simple_box_end();
-        } else {
-            notice(get_string('nocapabilitiesincontext', 'role'),
-                    $CFG->wwwroot.'/'.$CFG->admin.'/roles/'.$baseurl);
-        }
-
-    } else {   // Print overview table
-
-        $table->tablealign = 'center';
-        $table->cellpadding = 5;
-        $table->cellspacing = 0;
-        $table->width = '60%';
-        $table->head = array(get_string('roles', 'role'), get_string('description'), get_string('overrides', 'role'));
-        $table->wrap = array('nowrap', '', 'nowrap');
-        $table->align = array('right', 'left', 'center');
-
-        foreach ($overridableroles as $roleid => $rolename) {
-            $countusers = 0;
-            $overridecount = count_records_select('role_capabilities', "roleid = $roleid AND contextid = $context->id");
-            $description = format_string(get_field('role', 'description', 'id', $roleid));
-            $table->data[] = array('<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$rolename.'</a>', $description, $overridecount);
-        }
-
-        print_table($table);
-    }
-
-    print_footer($course);
-
-?>

admin/roles/tabs.php

@@ -1,169 +0,0 @@
-<?php // $Id$
-
-// Handles headers and tabs for the roles control at any level apart from SYSTEM level
-
-if ($currenttab != 'update') {
-    switch ($context->contextlevel) {
-
-        case CONTEXT_SYSTEM:
-            $stradministration = get_string('administration');
-            print_header($SITE->fullname, "$SITE->fullname","<a href=\"../index.php\">$stradministration</a> -> $straction");
-            break;
-
-        case CONTEXT_PERSONAL:
-            break;
-
-        case CONTEXT_USER:
-            print_header();
-            break;
-
-        case CONTEXT_COURSECAT:
-            $category = get_record('course_categories', 'id', $context->instanceid);
-            $strcategories = get_string("categories");
-            $strcategory = get_string("category");
-            $strcourses = get_string("courses");
-            print_header("$SITE->shortname: $category->name", "$SITE->fullname: $strcourses",
-                    "<a href=\"$CFG->wwwroot/course/index.php\">$strcategories</a> -> <a href=\"$CFG->wwwroot/course/category.php?id=$category->id\">$category->name</a> -> $straction", "", "", true);
-            break;
-
-        case CONTEXT_COURSE:
-            $streditcoursesettings = get_string("editcoursesettings");
-
-            $course = get_record('course', 'id', $context->instanceid);
-            print_header($streditcoursesettings, "$course->fullname",
-                    "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> $straction");
-            break;
-
-        case CONTEXT_GROUP:
-            break;
-
-        case CONTEXT_MODULE:
-            // get module type?
-            if (!$cm = get_record('course_modules','id',$context->instanceid)) {
-                error('Bad course module ID');
-            }
-            if (!$module = get_record('modules','id',$cm->module)) {  //$module->name;
-                error('Bad module ID');
-            }
-            if (!$course = get_record('course','id',$cm->course)) {
-                error('Bad course ID');
-            }
-            if (!$instance = get_record($module->name, 'id', $cm->instance)) {
-                error("The required instance of this module doesn't exist");
-            }
-
-            $strnav = "<a href=\"$CFG->wwwroot/mod/$module->name/view.php?id=$cm->id\">$instance->name</a> ->";
-            $fullmodulename = get_string("modulename", $module->name);
-            $streditinga = get_string("editinga", "moodle", $fullmodulename);
-            $strmodulenameplural = get_string("modulenameplural", $module->name);
-
-            if ($module->name == "label") {
-                $focuscursor = "";
-            } else {
-                $focuscursor = "form.name";
-            }
-
-            $COURSE = $course;
-            print_header_simple($streditinga, '',
-                    "<a href=\"$CFG->wwwroot/mod/$module->name/index.php?id=$course->id\">$strmodulenameplural</a> ->
-                    $strnav <a href=\"$CFG->wwwroot/course/mod.php?update=$cm->id&sesskey=".sesskey()."\">$streditinga</a> -> $straction", $focuscursor, "", false);
-
-            break;
-
-        case CONTEXT_BLOCK:
-            if ($blockinstance = get_record('block_instance', 'id', $context->instanceid)) {
-                if ($block = get_record('block', 'id', $blockinstance->blockid)) {
-                    $blockname = print_context_name($context);
-                    $navigation = $blockname. ' -> '.$straction;
-
-                    switch ($blockinstance->pagetype) {
-                        case 'course-view':
-                            if ($course = get_record('course', 'id', $blockinstance->pageid)) {
-                                if ($course->id != SITEID) {
-                                    $navigation = "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> $navigation";
-                                }
-                                print_header("$straction: $blockname", $course->fullname, $navigation);
-                            }
-                            break;
-
-                        case 'blog-view':
-                            $strblogs = get_string('blogs','blog');
-                            $navigation = '<a href="'.$CFG->wwwroot.'/blog/index.php">'.
-                                $strblogs.'</a> -> '.$navigation;
-                            print_header("$straction: $strblogs", $SITE->fullname, $navigation);
-                            break;
-
-                        default:
-                            print_header("$straction: $blockname", $SITE->fullname, $navigation);
-                            break;
-                    }
-                }
-            }
-            break;
-
-        default:
-            error ('This is an unknown context!');
-            return false;
-
-    }
-}
-
-
-if ($context->contextlevel != CONTEXT_SYSTEM) {    // Print tabs for anything except SYSTEM context
-
-    if ($context->contextlevel == CONTEXT_MODULE) { // only show update button if module?
-
-        $toprow[] = new tabobject('update', $CFG->wwwroot.'/course/mod.php?update='.
-                       $context->instanceid.'&amp;return=true&amp;sesskey='.sesskey(), get_string('update'));
-
-    }
-
-    $toprow[] = new tabobject('roles', $CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.
-                               $context->id, get_string('roles'));
-
-    if (isset($tabsmode)) {
-
-        if (!isset($assignableroles)) {
-            $assignableroles = get_assignable_roles($context);
-        }
-        if (!isset($overridableroles)) {
-            $overridableroles = get_overridable_roles($context);
-        }
-
-        $inactive[] = 'roles';
-        if (!empty($assignableroles)) {
-            $secondrow[] = new tabobject('assign',
-                                         $CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$context->id,
-                                         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);
-        }
-
-        if ($tabsmode == 'override') {
-            $currenttab = 'override';
-        } elseif ($tabsmode == 'assign') {
-            $currenttab = 'assign';
-        }
-
-    } else {
-        $inactive[] = '';
-    }
-
-    if (!empty($secondrow)) {
-        $tabs = array($toprow, $secondrow);
-    } else {
-        $tabs = array($toprow);
-    }
-
-    print_tabs($tabs, $currenttab, $inactive);
-}
-
-?>

admin/search.php

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

admin/settings.php

@@ -1,143 +0,0 @@
-<?php // $Id$
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/blocklib.php');
-require_once($CFG->dirroot.'/'.$CFG->admin.'/pagelib.php');
-
-if ($site = get_site()) {
-    require_login();
-}
-
-
-page_map_class(PAGE_ADMIN, 'page_admin');
-
-$PAGE = page_create_object(PAGE_ADMIN, 0); // there must be any constant id number
-
-$section = optional_param('section', '', PARAM_ALPHAEXT);
-
-$PAGE->init_extra($section); // hack alert!
-
-$adminediting = optional_param('adminedit', -1, PARAM_BOOL);
-$return       = optional_param('return','', PARAM_ALPHA);
-
-if (!isset($USER->adminediting)) {
-    $USER->adminediting = false;
-}
-
-if ($PAGE->user_allowed_editing()) {
-    if ($adminediting == 1) {
-        $USER->adminediting = true;
-    } elseif ($adminediting == 0) {
-        $USER->adminediting = false;
-    }
-}
-
-$adminroot = admin_get_root();
-
-$root = $adminroot->locate($PAGE->section);
-
-if (!is_a($root, 'admin_settingpage')) {
-    error(get_string('sectionerror', 'admin'));
-    die;
-}
-
-if (!($root->check_access())) {
-    error(get_string('accessdenied', 'admin'));
-    die;
-}
-
-$CFG->pagepath = 'admin/setting/'.$section;
-
-
-
-/// WRITING SUBMITTED DATA (IF ANY) -------------------------------------------------------------------------------
-
-$statusmsg = '';
-
-if ($data = data_submitted()) {
-    if (confirm_sesskey()) {
-        $olddbsessions = !empty($CFG->dbsessions);
-        $unslashed = (array)stripslashes_recursive($data);
-        $errors = $root->write_settings($unslashed);
-        //force logout if dbsession setting changes
-        if ($olddbsessions != !empty($CFG->dbsessions)) {
-            require_logout();
-        }
-        if (empty($errors)) {
-            switch ($return) {
-                case 'site':
-                    redirect("$CFG->wwwroot/");
-                case 'admin':
-                    redirect("$CFG->wwwroot/$CFG->admin/");
-                default:
-                    $statusmsg = get_string('changessaved');
-            }
-        } else {
-            $statusmsg = get_string('errorwithsettings', 'admin') . ' <br />' . $errors;
-        }
-    } else {
-        error(get_string('confirmsesskeybad', 'error'));
-    }
-    // now update $SITE - it might have been changed
-    $SITE = get_record('course', 'id', $SITE->id);
-    $COURSE = clone($SITE);
-}
-
-
-/// print header stuff ------------------------------------------------------------
-// header must be printed after the redirects and require_logout
-if (!empty($SITE->fullname)) {
-    $pageblocks = blocks_setup($PAGE);
-
-    $preferred_width_left  = bounded_number(BLOCK_L_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
-                                            BLOCK_L_MAX_WIDTH);
-    $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]),
-                                            BLOCK_R_MAX_WIDTH);
-
-    $PAGE->print_header();
-
-    echo '<table id="layout-table"><tr>';
-    echo '<td style="width: ' . $preferred_width_left . 'px;" id="left-column">';
-    blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
-    echo '</td>';
-    echo '<td id="middle-column">';
-} else {
-
-    print_header();
-    print_simple_box(get_string('configintrosite', 'admin'), 'center', '50%');
-
-}
-
-if ($statusmsg != '') {
-    notify ($statusmsg);
-}
-
-// ---------------------------------------------------------------------------------------------------------------
-
-echo '<form action="settings.php" method="post" name="adminsettings" id="adminsettings">';
-echo '<input type="hidden" name="section" value="' . $PAGE->section . '" />';
-echo '<input type="hidden" name="sesskey" value="' . $USER->sesskey . '" />';
-echo '<input type="hidden" name="return" value="' . $return . '" />';
-print_heading($root->visiblename);
-
-echo $root->output_html();
-
-echo '<div class="form-buttons"><input class="form-submit" type="submit" value="' . get_string('savechanges','admin') . '" /></div>';
-
-echo '</form>';
-
-if (!empty($SITE->fullname)) {
-    echo '</td>';
-    echo '<td style="width: ' . $preferred_width_right . 'px;" id="right-column">';
-    blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
-    echo '</td></tr></table>';
-}
-
-if (!empty($CFG->adminusehtmleditor)) {
-    use_html_editor();
-}
-
-print_footer();
-
-?>

admin/settings/appearance.php

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

admin/settings/courses.php

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

admin/settings/language.php

@@ -1,19 +0,0 @@
-<?php // $Id$
-
-// This file defines settingpages and externalpages under the "appearance" category
-
-// "languageandlocation" settingpage
-$temp = new admin_settingpage('langsettings', get_string('languagesettings', 'admin'));
-$temp->add(new admin_setting_configselect('lang', get_string('lang', 'admin'), get_string('configlang', 'admin'), current_language(), get_list_of_languages())); // $CFG->lang might be set in installer already, default en or en_utf8 is in setup.php
-$temp->add(new admin_setting_configcheckbox('langmenu', get_string('langmenu', 'admin'), get_string('configlangmenu', 'admin'), 1));
-$temp->add(new admin_setting_configtext('langlist', get_string('langlist', 'admin'), get_string('configlanglist', 'admin'), '', PARAM_NOTAGS));
-$temp->add(new admin_setting_configcheckbox('langcache', get_string('langcache', 'admin'), get_string('configlangcache', 'admin'), 1));
-$temp->add(new admin_setting_configtext('locale', get_string('localetext', 'admin'), get_string('configlocale', 'admin'), '', PARAM_FILE));
-$ADMIN->add('language', $temp);
-
-
-
-$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,28 +0,0 @@
-<?php // $Id$
-
-// "locations" settingpage
-$temp = new admin_settingpage('locationsettings', get_string('locationsettings', 'admin'));
-$options = get_list_of_timezones();
-$options[99] = get_string('serverlocaltime');
-$temp->add(new admin_setting_configselect('timezone', get_string('timezone','admin'), get_string('configtimezone', 'admin'), 99, $options));
-$options = get_list_of_timezones();
-$options[99] = get_string('timezonenotforced', 'admin');
-$temp->add(new admin_setting_configselect('forcetimezone', get_string('forcetimezone', 'admin'), get_string('helpforcetimezone', 'admin'), 99, $options));
-$options = get_list_of_countries();
-$options[0] = get_string('choose') .'...';
-$temp->add(new admin_setting_configselect('country', get_string('country', 'admin'), get_string('configcountry', 'admin'), 0, $options));
-
-$iplookups = array();
-if ($plugins = get_list_of_plugins('iplookup')) {
-    foreach ($plugins as $plugin) {
-        $iplookups[$plugin] = $plugin;
-    }
-}
-$temp->add(new admin_setting_configselect('iplookup', get_string('iplookup', 'admin'), get_string('configiplookup', 'admin'), 'hostip', $iplookups));
-
-$ADMIN->add('location', $temp);
-
-
-$ADMIN->add('location', new admin_externalpage('timezoneimport', get_string('updatetimezones', 'admin'), "$CFG->wwwroot/$CFG->admin/timezoneimport.php"));
-
-?>

admin/settings/misc.php

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

admin/settings/security.php

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

admin/settings/server.php

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

admin/settings/top.php

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

admin/settings/unsupported.php

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

admin/settings/users.php

@@ -1,65 +0,0 @@
-<?php // $Id$
-
-// This file defines settingpages and externalpages under the "users" category
-
-
-$ADMIN->add('users', new admin_externalpage('userauthentication', get_string('authentication','admin'), "$CFG->wwwroot/$CFG->admin/auth.php"));
-
-
-// stuff under the "accounts" subcategory
-$ADMIN->add('users', new admin_category('accounts', get_string('accounts', 'admin')));
-$ADMIN->add('accounts', new admin_externalpage('editusers', get_string('userlist','admin'), "$CFG->wwwroot/$CFG->admin/user.php", array('moodle/user:update', 'moodle/user:delete')));
-$ADMIN->add('accounts', new admin_externalpage('addnewuser', get_string('addnewuser'), "$CFG->wwwroot/$CFG->admin/user.php?newuser=true", 'moodle/user:create'));
-$ADMIN->add('accounts', new admin_externalpage('uploadusers', get_string('uploadusers'), "$CFG->wwwroot/$CFG->admin/uploaduser.php", 'moodle/site:uploadusers'));
-
-
-// stuff under the "roles" subcategory
-$ADMIN->add('users', new admin_category('roles', get_string('permissions', 'role')));
-$ADMIN->add('roles', new admin_externalpage('defineroles', get_string('defineroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/manage.php"));
-$sitecontext = get_context_instance(CONTEXT_SYSTEM);
-$ADMIN->add('roles', new admin_externalpage('assignroles', get_string('assignglobalroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=" . $sitecontext->id));
-
-
-// "userpolicies" settingpage
-$temp = new admin_settingpage('userpolicies', get_string('userpolicies', 'admin'));
-
-$context = get_context_instance(CONTEXT_SYSTEM, SITEID);
-if (!$guestrole = get_guest_role()) {
-    $guestrole->id = 0;
-}
-if ($studentroles = get_roles_with_capability('moodle/legacy:student', CAP_ALLOW)) {
-    $studentrole = array_shift($studentroles);   /// Take the first one
-} else {
-    $studentrole->id = 0;
-}
-$assignableroles  = get_assignable_roles($context);
-
-$temp->add(new admin_setting_configselect('notloggedinroleid', get_string('notloggedinroleid', 'admin'),
-              get_string('confignotloggedinroleid', 'admin'), $guestrole->id, $assignableroles ));
-$temp->add(new admin_setting_configselect('defaultuserroleid', get_string('defaultuserroleid', 'admin'),
-              get_string('configdefaultuserroleid', 'admin'), $guestrole->id, $assignableroles));
-$temp->add(new admin_setting_configselect('defaultcourseroleid', get_string('defaultcourseroleid', 'admin'),
-              get_string('configdefaultcourseroleid', 'admin'), $studentrole->id, $assignableroles));
-
-$temp->add(new admin_setting_configcheckbox('autologinguests', get_string('autologinguests', 'admin'), get_string('configautologinguests', 'admin'), 0));
-//$temp->add(new admin_setting_configcheckbox('allusersaresitestudents', get_string('allusersaresitestudents', 'admin'), get_string('configallusersaresitestudents','admin'), 1));
-$temp->add(new admin_setting_configmultiselect('hiddenuserfields', get_string('hiddenuserfields', 'admin'),
-           get_string('confighiddenuserfields', 'admin'), array(),
-               array('none' => get_string('none'),
-                     'description' => get_string('description'),
-                     'city' => get_string('city'),
-                     'country' => get_string('country'),
-                     'webpage' => get_string('webpage'),
-                     'icqnumber' => get_string('icqnumber'),
-                     'skypeid' => get_string('skypeid'),
-                     'yahooid' => get_string('yahooid'),
-                     'aimid' => get_string('aimid'),
-                     'msnid' => get_string('msnid'),
-                     'lastaccess' => get_string('lastaccess'))));
-//$temp->add(new admin_setting_special_adminseesall());
-
-
-$ADMIN->add('roles', $temp);
-
-
-?>

admin/site.html

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

admin/site.php

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

admin/stickyblocks.php

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

admin/timezone.php

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

admin/timezoneimport.php

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

admin/upgradeforumread.php

@@ -2,38 +2,40 @@
 
     require_once('../config.php');
     require_once($CFG->dirroot.'/mod/forum/lib.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('upgradeforumread', $adminroot);
 
     $confirm = optional_param('confirm', 0, PARAM_BOOL);
 
     require_login();
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    if (!isadmin()) {
+        error("You must be an admin to use this script");
+    }
 
     if ($CFG->version < 2005042300) {
         error("This script does not work with this old version of Moodle");
     }
 
     if (!$site = get_site()) {
-        redirect('index.php');
+        redirect("index.php");
     }
 
 
 /// Print header
 
-    $strupgradingdata  = get_string('upgradingdata', 'admin');
+    $stradministration = get_string("administration");
+    $strupgradingdata  = get_string("upgradingdata", "admin");
 
-    admin_externalpage_print_header($adminroot);
-    print_heading($strupgradingdata);
+    print_header("$site->shortname: $stradministration: $strupgradingdata", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> $strupgradingdata");
 
-    if (!data_submitted() or empty($confirm) or !confirm_sesskey()) {
-        $optionsyes = array('confirm'=>'1', 'sesskey'=>sesskey());
-        notice_yesno(get_string('upgradeforumreadinfo', 'admin'),
-                    'upgradeforumread.php', 'index.php', $optionsyes, NULL, 'post', 'get');
-        admin_externalpage_print_footer($adminroot);
+    if (empty($confirm)) {
+        notice_yesno(get_string("upgradeforumreadinfo", "admin"), 
+                     "upgradeforumread.php?confirm=true&sesskey=$USER->sesskey", 
+                     "index.php");
+        print_footer();
         exit;
+    } else if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
     }
 
 
@@ -41,7 +43,7 @@
 
     @set_time_limit(0);
     @ob_implicit_flush(true);
-    while(@ob_end_flush());
+    @ob_end_flush();
 
     execute_sql('TRUNCATE TABLE '.$CFG->prefix.'forum_read;', false);   // Trash all old entries
 
@@ -62,7 +64,7 @@
                       'Please keep this window open until it completes', '', 3);
 
         $groups = array();
-
+    
         $currcourse = 0;
         $users = 0;
         $count = 0;
@@ -80,7 +82,7 @@
             /// If this course has users, and posts more than a day old, mark them for each user.
             if ($users &&
                     ($posts = get_records_select('forum_posts', 'discussion = '.$discussion->id.
-                                                 ' AND '.$dateafter.' < modified AND modified < '.$onedayago,
+                                                 ' AND '.$dateafter.' < modified AND modified < '.$onedayago, 
                                                  '', 'id,discussion,modified'))) {
                 foreach ($users as $user) {
                     /// If its a group discussion, make sure the user is in the group.
@@ -100,7 +102,7 @@
         }
         print_progress($dcount, $dtotal, 0);
     }
-
+    
 
     delete_records('config', 'name', 'upgrade', 'value', 'forumread');
 
@@ -108,6 +110,9 @@
 
     print_continue('index.php');
 
-    admin_externalpage_print_footer($adminroot);
+    print_footer();
+
+    exit;
+
 
 ?>

admin/upgradelogs.php

@@ -1,15 +1,14 @@
 <?PHP  //$Id$
 
     require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    $adminroot = admin_get_root();
-    admin_externalpage_setup('upgradelogs', $adminroot);
 
     $confirm = optional_param('confirm', 0, PARAM_BOOL);
 
     require_login();
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    if (!isadmin()) {
+        error("You must be an admin to use this script");
+    }
 
     if ($CFG->version < 2004013101) {
         error("This script does not work with this old version of Moodle");
@@ -22,29 +21,31 @@
 /// Turn off time limits, sometimes upgrades can be slow.
 
     @set_time_limit(0);
-    @ob_implicit_flush(true);
-    while(@ob_end_flush());
 
 
 /// Print header
 
+    $stradministration = get_string("administration");
     $strupgradinglogs  = get_string("upgradinglogs", "admin");
-    admin_externalpage_print_header($adminroot);
-    print_heading($strupgradinglogs);
 
-    if (!data_submitted() or empty($confirm) or !confirm_sesskey()) {
-        $optionsyes = array('confirm'=>'1', 'sesskey'=>sesskey());
-        notice_yesno(get_string('upgradeforumreadinfo', 'admin'),
-                    'upgradelogs.php', 'index.php', $optionsyes, NULL, 'post', 'get');
-        admin_externalpage_print_footer($adminroot);
+    print_header("$site->shortname: $stradministration: $strupgradinglogs", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> $strupgradinglogs");
+
+    if (empty($confirm)) {
+        notice_yesno(get_string("upgradelogsinfo", "admin"), 
+                     "upgradelogs.php?confirm=true&sesskey=$USER->sesskey", 
+                     "index.php");
+        print_footer();
         exit;
+    } else if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
     }
 
 
 /// Try and extract as many cmids as possible from the existing logs
 
-    if ($coursemodules = get_records_sql("SELECT cm.*, m.name
-                                            FROM {$CFG->prefix}course_modules cm,
+    if ($coursemodules = get_records_sql("SELECT cm.*, m.name 
+                                            FROM {$CFG->prefix}course_modules cm, 
                                                  {$CFG->prefix}modules m
                                             WHERE cm.module = m.id")) {
         $cmcount = count($coursemodules);
@@ -59,52 +60,52 @@
         }
 
         if ($cmcount > 10) {
-            print_simple_box('This process may take a very long time ... please be patient and let it finish.',
+            print_simple_box('This process may take a very long time ... please be patient and let it finish.', 
                              'center', '', '#ffcccc');
             $sleeptime = 1;
         }
         foreach ($coursemodules as $cm) {
 
-            switch ($cm->name) {
+            switch ($cm->name) { 
                 case "forum":
-                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id'
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
                                  WHERE module = '$cm->name' AND url = 'view.php?id=$cm->id'", false);
 
-                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id'
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
                                  WHERE module = '$cm->name' AND url = 'view.php?f=$cm->instance'", false);
-
+    
                     if ($discussions = get_records("forum_discussions", "forum", $cm->instance)) {
                         foreach ($discussions as $discussion) {
-                            execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id'
+                            execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
                                          WHERE module = '$cm->name' AND url $LIKE 'discuss.php?d=$discussion->id%'", false);
                         }
                     }
                     break;
 
-                case "glossary":
-                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id'
+                case "glossary": 
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
                                  WHERE module = '$cm->name' AND url $LIKE 'view.php?id=$cm->id%'", false);
                     break;
 
-                case "quiz":
-                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id'
+                case "quiz": 
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
                                  WHERE module = '$cm->name' AND url = 'view.php?id=$cm->id'", false);
                     break;
 
-                case "assignment":
-                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id'
+                case "assignment": 
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
                                  WHERE module = '$cm->name' AND url = 'view.php?id=$cm->id'", false);
-                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id'
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
                                  WHERE module = '$cm->name' AND url = 'view.php?a=$cm->instance'", false);
-                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id'
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
                                  WHERE module = '$cm->name' AND url = 'submissions.php?id=$cm->instance'", false);
                     break;
-
-                case "journal":
-                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id'
+                    
+                case "journal": 
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
                                  WHERE module = '$cm->name' AND url = 'report.php?id=$cm->id'", false);
 
-                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id'
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
                                  WHERE module = '$cm->name' AND url = 'view.php?id=$cm->id'", false);
                     break;
 
@@ -124,10 +125,9 @@
 
     delete_records("config", "name", "upgrade", "value", "logs");
 
-    notify('Log upgrading was successful!', 'notifysuccess');
+    notify("Log upgrading was successful!");
 
-    print_continue('index.php');
 
-    admin_externalpage_print_footer($adminroot);
+    print_footer();
 
 ?>

admin/upgradesettings.php

@@ -1,145 +0,0 @@
-<?php // $Id$
-
-// detects settings that were added during an upgrade, displays a screen for the admin to
-// modify them, and then processes modifications
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-$adminroot = admin_get_root();
-admin_externalpage_setup('upgradesettings', $adminroot); // now hidden page
-
-// a caveat: we're depending on only having one admin access this page at once. why? the following line
-// (the function call to find_new_settings) must have the EXACT SAME RETURN VALUE both times that this
-// page is loaded (i.e. both when we're displaying the form and then when we process the form's input).
-// if the return values don't match, we could potentially lose changes that the admin is making.
-
-$newsettingshtml = output_new_settings_by_page(admin_get_root());
-
-// first we deal with the case where there are no new settings to be set
-if ($newsettingshtml == '') {
-    redirect($CFG->wwwroot . '/' . $CFG->admin . '/index.php');
-    die;
-}
-
-// now we'll deal with the case that the admin has submitted the form with new settings
-if ($data = data_submitted()) {
-    $unslashed = (array)stripslashes_recursive($data);
-    if (confirm_sesskey()) {
-        $newsettings = find_new_settings(admin_get_root());
-        $errors = '';
-
-        foreach($newsettings as $newsetting) {
-            if (isset($unslashed['s_' . $newsetting->name])) {
-                $errors .= $newsetting->write_setting($unslashed['s_' . $newsetting->name]);
-            } else {
-                $errors .= $newsetting->write_setting($newsetting->defaultsetting);
-            }
-        }
-
-        if (empty($errors)) {
-            // there must be either redirect without message or continue button or else upgrade would be sometimes broken
-            redirect($CFG->wwwroot . '/' . $CFG->admin . '/index.php');
-            die;
-        } else {
-            error(get_string('errorwithsettings', 'admin') . ' <br />' . $errors);
-            die;
-        }
-    } else {
-        error(get_string('confirmsesskeybad', 'error'));
-        die;
-    }
-
-}
-
-// and finally, if we get here, then there are new settings and we have to print a form
-// to modify them
-admin_externalpage_print_header($adminroot);
-
-print_simple_box(get_string('upgradesettingsintro','admin'),'','100%','',5,'generalbox','');
-
-echo '<form action="upgradesettings.php" method="post" name="adminsettings" id="adminsettings">';
-echo '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
-echo '<fieldset>';
-echo '<div class="clearer"><!-- --></div>';
-echo $newsettingshtml;
-echo '<div class="form-buttons"><input class="form-submit" type="submit" value="' . get_string('savechanges','admin') . '" /></div>';
-echo '</form>';
-
-admin_externalpage_print_footer($adminroot);
-
-
-/**
- * Find settings that have not been initialized (e.g. during initial install or an upgrade).
- *
- * Tests each setting's get_setting() method. If the result is NULL, we consider the setting
- * to be uninitialized.
- *
- * @param string &$node The node at which to start searching. Should be $ADMIN for all external calls to this function.
- * @return array An array containing admin_setting objects that haven't yet been initialized
- */
-function find_new_settings(&$node) {
-
-    if (is_a($node, 'admin_category')) {
-        $return = array();
-        $entries = array_keys($node->children);
-        foreach ($entries as $entry) {
-            $return = array_merge($return, find_new_settings($node->children[$entry]));
-        }
-        return $return;
-    }
-
-    if (is_a($node, 'admin_settingpage')) {
-        $return = array();
-        foreach ($node->settings as $setting) {
-            if ($setting->get_setting() === NULL) {
-                $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 output_new_settings_by_page(&$node) {
-
-    if (is_a($node, 'admin_category')) {
-        $entries = array_keys($node->children);
-        $return = '';
-        foreach ($entries as $entry) {
-            $return .= output_new_settings_by_page($node->children[$entry]);
-        }
-        return $return;
-    }
-
-    if (is_a($node, 'admin_settingpage')) {
-        $newsettings = array();
-        foreach ($node->settings as $setting) {
-            if ($setting->get_setting() === NULL) {
-                $newsettings[] =& $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($newsettings) > 0) {
-            $return .= print_heading(get_string('upgradesettings','admin').' - '.$node->visiblename, '', 2, 'main', true);
-            $return .= '<fieldset class="adminsettings">' . "\n";
-            foreach ($newsettings as $newsetting) {
-                $return .= '<div class="clearer"><!-- --></div>' . "\n";
-                $return .= $newsetting->output_html();
-            }
-            $return .= '</fieldset>';
-        }
-        return $return;
-    }
-
-    return '';
-
-}
-
-?>

admin/uploaduser.php

@@ -5,9 +5,6 @@
 
 require_once('../config.php');
 require_once($CFG->libdir.'/uploadlib.php');
-require_once($CFG->libdir.'/adminlib.php');
-$adminroot = admin_get_root();
-admin_externalpage_setup('uploadusers', $adminroot);
 
 $createpassword = optional_param('createpassword', 0, PARAM_BOOL);
 $updateaccounts = optional_param('updateaccounts', 0, PARAM_BOOL);
@@ -15,7 +12,9 @@ $allowrenames   = optional_param('allowrenames', 0, PARAM_BOOL);
 
 require_login();
 
-require_capability('moodle/site:uploadusers', get_context_instance(CONTEXT_SYSTEM, SITEID));
+if (!isadmin()) {
+    error("You must be an administrator to edit users this way.");
+}
 
 if (! $site = get_site()) {
     error("Could not find site-level course");
@@ -25,12 +24,15 @@ if (!$adminuser = get_admin()) {
     error("Could not find site admin");
 }
 
-$strfile = get_string('file');
-$struser = get_string('user');
-$strusersnew = get_string('usersnew');
-$strusersupdated = get_string('usersupdated');
-$struploadusers = get_string('uploadusers');
-$straddnewuser = get_string('importuser');
+$streditmyprofile = get_string("editmyprofile");
+$stradministration = get_string("administration");
+$strfile = get_string("file");
+$struser = get_string("user");
+$strusers = get_string("users");
+$strusersnew = get_string("usersnew");
+$strusersupdated = get_string("usersupdated");
+$struploadusers = get_string("uploadusers");
+$straddnewuser = get_string("importuser");
 
 $csv_encode = '/\&\#44/';
 if (isset($CFG->CSV_DELIMITER)) {
@@ -47,7 +49,9 @@ if (isset($CFG->CSV_DELIMITER)) {
 
 /// Print the header
 
-admin_externalpage_print_header($adminroot);
+print_header("$site->shortname: $struploadusers", $site->fullname,
+        "<a href=\"index.php\">$stradministration</a> ->
+        <a href=\"users.php\">$strusers</a> -> $struploadusers");
 
 
 /// If a file has been uploaded, then process it
@@ -117,11 +121,6 @@ if ($um->preprocess_files() && confirm_sesskey()) {
             "type3" => 1,
             "type4" => 1,
             "type5" => 1,
-            "role1" => 1,
-            "role2" => 1,
-            "role3" => 1,
-            "role4" => 1,
-            "role5" => 1,
             "password" => $createpassword,
             "oldusername" => $allowrenames);
 
@@ -153,7 +152,7 @@ if ($um->preprocess_files() && confirm_sesskey()) {
 
             // Will use this course array a lot
             // so fetch it early and keep it in memory
-            $courses = get_courses('all','c.sortorder','c.id,c.shortname,c.fullname,c.sortorder,c.teacher,c.visible');
+            $courses = get_courses('all','c.sortorder','c.id,c.shortname,c.fullname,c.sortorder,c.teacher');
 
             while (!feof ($fp)) {
                 foreach ($optionalDefaults as $key => $value) {
@@ -194,26 +193,21 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                     $user->timemodified = time();
                     $linenum++;
                     $username = $user->username;
-                    $addcourse[0] = isset($user->course1) ? $user->course1 : NULL;
-                    $addcourse[1] = isset($user->course2) ? $user->course2 : NULL;
-                    $addcourse[2] = isset($user->course3) ? $user->course3 : NULL;
-                    $addcourse[3] = isset($user->course4) ? $user->course4 : NULL;
-                    $addcourse[4] = isset($user->course5) ? $user->course5 : NULL;
-                    $addgroup[0] = isset($user->group1) ? $user->group1 : NULL;
-                    $addgroup[1] = isset($user->group2) ? $user->group2 : NULL;
-                    $addgroup[2] = isset($user->group3) ? $user->group3 : NULL;
-                    $addgroup[3] = isset($user->group4) ? $user->group4 : NULL;
-                    $addgroup[4] = isset($user->group5) ? $user->group5 : NULL;
-                    $addtype[0] = isset($user->type1) ? $user->type1 : NULL;
-                    $addtype[1] = isset($user->type2) ? $user->type2 : NULL;
-                    $addtype[2] = isset($user->type3) ? $user->type3 : NULL;
-                    $addtype[3] = isset($user->type4) ? $user->type4 : NULL;
-                    $addtype[4] = isset($user->type5) ? $user->type5 : NULL;
-                    $addrole[0] = isset($user->role1) ? $user->role1 : NULL;
-                    $addrole[1] = isset($user->role2) ? $user->role2 : NULL;
-                    $addrole[2] = isset($user->role3) ? $user->role3 : NULL;
-                    $addrole[3] = isset($user->role4) ? $user->role4 : NULL;
-                    $addrole[4] = isset($user->role5) ? $user->role5 : NULL;
+                    $addcourse[0] = $user->course1;
+                    $addcourse[1] = $user->course2;
+                    $addcourse[2] = $user->course3;
+                    $addcourse[3] = $user->course4;
+                    $addcourse[4] = $user->course5;
+                    $addgroup[0] = $user->group1;
+                    $addgroup[1] = $user->group2;
+                    $addgroup[2] = $user->group3;
+                    $addgroup[3] = $user->group4;
+                    $addgroup[4] = $user->group5;
+                    $addtype[0] = $user->type1;
+                    $addtype[1] = $user->type2;
+                    $addtype[2] = $user->type3;
+                    $addtype[3] = $user->type4;
+                    $addtype[4] = $user->type5;
 
                     for ($i=0; $i<5; $i++) {
                         $course[$i]=NULL;
@@ -268,7 +262,7 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                             //Record not added - user is already registered
                             //In this case, output userid from previous registration
                             //This can be used to obtain a list of userids for existing users
-                            notify("$olduser->id ".get_string('usernotaddedregistered', 'error', $username));
+                            notify("$user->id ".get_string('usernotaddedregistered', 'error', $username));
                             $userserrors++;
                             continue;
                         }
@@ -314,13 +308,7 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                     }
                     for ($i=0; $i<5; $i++) {   /// Enrol into courses if necessary
                         if ($course[$i]) {
-                            if (isset($addrole[$i])) {
-                                $coursecontext = get_context_instance(CONTEXT_COURSE, $course[$i]->id);
-                                if (!user_can_assign($coursecontext, $addrole[$i])) {
-                                    notify('--> Can not assign role in course'); //TODO: localize
-                                }
-                                $ret = role_assign($addrole[$i], $user->id, 0, $coursecontext->id);
-                            } else if (isset($addtype[$i])) {
+                            if (isset($addtype[$i])) {
                                 switch ($addtype[$i]) {
                                     case 2:   // teacher
                                         $ret = add_teacher($user->id, $course[$i]->id, 1);
@@ -346,8 +334,8 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                     }
                     for ($i=0; $i<5; $i++) {   // Add user to groups if necessary
                         if ($course[$i] && $groupid[$i]) {
-                            $coursecontext = get_context_instance(CONTEXT_COURSE, $course[$i]->id);
-                            if (count(get_user_roles($coursecontext, $user->id))) {
+                            if (record_exists('user_students','userid',$user->id,'course',$course[$i]->id) ||
+                                    record_exists('user_teachers','userid',$user->id,'course',$course[$i]->id)) {
                                 if (add_user_to_group($groupid[$i], $user->id)) {
                                     notify('-->' . get_string('addedtogroup','',$addgroup[$i]));
                                 } else {
@@ -405,7 +393,7 @@ echo '<input type="submit" value="'.$struploadusers.'">';
 echo '</form><br />';
 echo '</center>';
 
-admin_externalpage_print_footer($adminroot);
+print_footer($course);
 
 
 

admin/user.php

@@ -1,7 +1,6 @@
 <?php // $Id$
 
     require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
 
     $newuser      = optional_param('newuser', 0, PARAM_BOOL);
     $delete       = optional_param('delete', 0, PARAM_INT);
@@ -11,63 +10,63 @@
     $dir          = optional_param('dir', 'ASC', PARAM_ALPHA);
     $page         = optional_param('page', 0, PARAM_INT);
     $perpage      = optional_param('perpage', 30, PARAM_INT);        // how many per page
-    $search       = trim(optional_param('search', '', PARAM_RAW));
+    $search       = optional_param('search', '', PARAM_RAW);
     $lastinitial  = optional_param('lastinitial', '', PARAM_CLEAN);  // only show students with this last initial
     $firstinitial = optional_param('firstinitial', '', PARAM_CLEAN); // only show students with this first initial
 
-    if (!$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID)) {  // Should never happen
-        redirect('index.php');
-    }
+    $search = trim($search);
 
-    if (empty($CFG->rolesactive)) {   // No admin user yet.
+    $user    = new object();
+    $admin   = new object();
+    $teacher = new object();
 
-        $user = new object();
-        $user->firstname    = get_string('admin');
-        $user->lastname     = get_string('user');
-        $user->username     = 'admin';
-        $user->password     = hash_internal_user_password('admin');
-        $user->email        = 'root@localhost';
+    if (! record_exists("user_admins")) {   // No admin user yet
+
+        $user->firstname    = get_string("admin");
+        $user->lastname     = get_string("user");
+        $user->username     = "admin";
+        $user->password     = hash_internal_user_password("admin");
+        $user->email        = "root@localhost";
         $user->confirmed    = 1;
         $user->lang         = $CFG->lang;
         $user->maildisplay  = 1;
         $user->timemodified = time();
 
-        if (! $user->id = insert_record('user', $user)) {
+        if (! $user->id = insert_record("user", $user)) {
             error("SERIOUS ERROR: Could not create admin user record !!!");
         }
 
-        if (! $user = get_record('user', 'id', $user->id)) {   // Double check.
+        $admin->userid = $user->id;
+
+        if (! insert_record("user_admins", $admin)) {
+            error("Could not make user $user->id an admin !!!");
+        }
+
+        if (! $user = get_record("user", "id", $user->id)) {     // Double check
             error("User ID was incorrect (can't find it)");
         }
 
-
-        // Assign the default admin role to the new user.
-        if (!$adminroles = get_roles_with_capability('moodle/legacy:admin', CAP_ALLOW)) {
-            error('No admin role could be found');
-        }
-        foreach ($adminroles as $adminrole) {
-            role_assign($adminrole->id, $user->id, 0, $sitecontext->id);
-        }
-        set_config('rolesactive', 1);
-
-
         if (! $site = get_site()) {
             error("Could not find site-level course");
         }
 
-        // Log the user in.
+        $teacher->userid = $user->id;
+        $teacher->course = $site->id;
+        $teacher->authority = 1;
+        if (! insert_record("user_teachers", $teacher)) {
+            error("Could not make user $id a teacher of site-level course !!!");
+        }
+
         $USER = $user;
         $USER->loggedin = true;
         $USER->sessionIP = md5(getremoteaddr());   // Store the current IP in the session
         $USER->site = $CFG->wwwroot;
         $USER->admin = true;
+        $USER->teacher["$site->id"] = true;
         $USER->newadminuser = true;
+        sesskey(); // for added security, used to check script parameters
 
-        sesskey();   // For added security, used to check script parameters
-
-        load_all_capabilities();
-
-        redirect("$CFG->wwwroot/user/edit.php?id=$user->id&amp;course=$site->id");  // Edit thyself
+        redirect("$CFG->wwwroot/user/edit.php?id=$user->id&amp;course=$site->id");
         exit;
 
     } else {
@@ -78,36 +77,24 @@
 
     require_login();
 
-    $adminroot = admin_get_root();
-
-    if ($newuser) {
-        admin_externalpage_setup('addnewuser', $adminroot);
-    } else {
-        admin_externalpage_setup('editusers', $adminroot);
+    if (!isadmin()) {
+        error("You must be an administrator to edit users this way.");
     }
 
+    if ($newuser and confirm_sesskey()) {                 // Create a new user
+        $user->auth         = "manual";
+        $user->firstname    = "";
+        $user->lastname     = "";
+        $user->username     = "changeme";
+        $user->password     = "";
+        $user->email        = "";
+        $user->lang         = $CFG->lang;
+        $user->confirmed    = 1;
+        $user->timemodified = time();
 
-    if ($newuser) {                 // Create a new user
-
-        if (!has_capability('moodle/user:create', $sitecontext)) {
-            error('You do not have the required permission to create new users.');
-        }
-
-        if (!$user = get_record('user', 'username', 'changeme')) {   // half finished user from another time
-
-            $user = new object();
-            $user->auth         = 'manual';
-            $user->firstname    = '';
-            $user->lastname     = '';
-            $user->username     = 'changeme';
-            $user->password     = '';
-            $user->email        = '';
-            $user->lang         = $CFG->lang;
-            $user->confirmed    = 1;
-            $user->timemodified = time();
-
-            if (! $user->id = insert_record('user', $user)) {
-                error('Could not start a new user!');
+        if (! $user->id = insert_record("user", $user)) {
+            if (!$user = get_record("user", "username", "changeme")) {   // half finished user from another time
+                error("Could not start a new user!");
             }
         }
 
@@ -115,20 +102,28 @@
 
     } else {                        // List all users for editing
 
-        if (!has_capability('moodle/user:update', $sitecontext) and !has_capability('moodle/user:delete', $sitecontext)) {
-            error('You do not have the required permission to edit/delete users.');
+        $stredituser = get_string("edituser");
+        $stradministration = get_string("administration");
+        $strusers = get_string("users");
+        $stredit   = get_string("edit");
+        $strdelete = get_string("delete");
+        $strdeletecheck = get_string("deletecheck");
+        $strsearch = get_string("search");
+        $strshowallusers = get_string("showallusers");
+
+        if ($firstinitial or $lastinitial or $search or $page) {
+            print_header("$site->shortname: $stredituser", $site->fullname,
+                         "<a href=\"index.php\">$stradministration</a> -> ".
+                         "<a href=\"users.php\">$strusers</a> -> ".
+                         "<a href=\"user.php\">$stredituser</a>");
+        } else {
+            print_header("$site->shortname: $stredituser", $site->fullname,
+                         "<a href=\"index.php\">$stradministration</a> -> ".
+                         "<a href=\"users.php\">$strusers</a> -> $stredituser");
         }
 
-        $stredit   = get_string('edit');
-        $strdelete = get_string('delete');
-        $strdeletecheck = get_string('deletecheck');
-        $strsearch = get_string('search');
-        $strshowallusers = get_string('showallusers');
-
-        admin_externalpage_print_header($adminroot);
-
         if ($confirmuser and confirm_sesskey()) {
-            if (!$user = get_record('user', 'id', $confirmuser)) {
+            if (!$user = get_record("user", "id", "$confirmuser")) {
                 error("No such user!");
             }
 
@@ -137,19 +132,14 @@
             $confirmeduser->confirmed = 1;
             $confirmeduser->timemodified = time();
 
-            if (update_record('user', $confirmeduser)) {
-                notify(get_string('userconfirmed', '', fullname($user, true)) );
+            if (update_record("user", $confirmeduser)) {
+                notify(get_string("userconfirmed", "", fullname($user, true)) );
             } else {
-                notify(get_string('usernotconfirmed', '', fullname($user, true)));
+                notify(get_string("usernotconfirmed", "", fullname($user, true)));
             }
 
         } else if ($delete and confirm_sesskey()) {              // Delete a selected user, after confirmation
-
-            if (!has_capability('moodle/user:delete', $sitecontext)) {
-                error('You do not have the required permission to delete a user.');
-            }
-
-            if (!$user = get_record('user', 'id', $delete)) {
+            if (!$user = get_record("user", "id", "$delete")) {
                 error("No such user!");
             }
 
@@ -160,26 +150,25 @@
 
             if ($confirm != md5($delete)) {
                 $fullname = fullname($user, true);
-                print_heading(get_string('deleteuser', 'admin'));
-                $optionsyes = array('delete'=>$delete, 'confirm'=>md5($delete), 'sesskey'=>sesskey());
-                notice_yesno(get_string('deletecheckfull', '', "'$fullname'"), 'user.php', 'user.php', $optionsyes, NULL, 'post', 'get');
-                admin_externalpage_print_footer($adminroot);
-                die;
-            } else if (data_submitted() and !$user->deleted) {
+                notice_yesno(get_string("deletecheckfull", "", "'$fullname'"),
+                     "user.php?delete=$delete&amp;confirm=".md5($delete)."&amp;sesskey=$USER->sesskey", "user.php");
+
+                exit;
+            } else if (!$user->deleted) {
                 $updateuser = new object();
                 $updateuser->id = $user->id;
-                $updateuser->deleted = 1;
-                $updateuser->username = addslashes("$user->email.".time());  // Remember it just in case
-                $updateuser->email = '';               // Clear this field to free it up
-                $updateuser->idnumber = '';               // Clear this field to free it up
+                $updateuser->deleted = "1";
+                $updateuser->username = "$user->email.".time();  // Remember it just in case
+                $updateuser->email = "";               // Clear this field to free it up
+                $updateuser->idnumber = "";               // Clear this field to free it up
                 $updateuser->timemodified = time();
-                if (update_record('user', $updateuser)) {
-                    // not sure if this is needed. unenrol_student($user->id);  // From all courses
-                    delete_records('role_assignments', 'userid', $user->id); // unassign all roles
-                    // remove all context assigned on this user?
-                    notify(get_string('deletedactivity', '', fullname($user, true)) );
+                if (update_record("user", $updateuser)) {
+                    unenrol_student($user->id);  // From all courses
+                    remove_teacher($user->id);   // From all courses
+                    remove_admin($user->id);
+                    notify(get_string("deletedactivity", "", fullname($user, true)) );
                 } else {
-                    notify(get_string('deletednot', '', fullname($user, true)));
+                    notify(get_string("deletednot", "", fullname($user, true)));
                 }
             }
         }
@@ -219,14 +208,14 @@
         $usersearchcount = get_users(false, $search, true, "", "", $firstinitial, $lastinitial);
 
         if ($search or $firstinitial or $lastinitial) {
-            print_heading("$usersearchcount / $usercount ".get_string('users'));
+            print_heading("$usersearchcount / $usercount ".get_string("users"));
             $usercount = $usersearchcount;
         } else {
-            print_heading("$usercount ".get_string('users'));
+            print_heading("$usercount ".get_string("users"));
         }
 
         $alphabet = explode(',', get_string('alphabet'));
-        $strall = get_string('all');
+        $strall = get_string("all");
 
 
         /// Bar of first initials
@@ -281,13 +270,13 @@
                $match[] = s($search);
             }
             if ($firstinitial) {
-               $match[] = get_string('firstname').": $firstinitial"."___";
+               $match[] = get_string("firstname").": $firstinitial"."___";
             }
             if ($lastinitial) {
-               $match[] = get_string('lastname').": $lastinitial"."___";
+               $match[] = get_string("lastname").": $lastinitial"."___";
             }
             $matchstring = implode(", ", $match);
-            print_heading(get_string('nousersmatching', '', $matchstring));
+            print_heading(get_string("nousersmatching", "", $matchstring));
 
             $table = NULL;
 
@@ -315,51 +304,30 @@
             $table->align = array ("left", "left", "left", "left", "left", "center", "center", "center");
             $table->width = "95%";
             foreach ($users as $user) {
-                if ($user->username == 'changeme' or $user->username == 'guest') {
-                    continue; // do not dispaly dummy new user and guest here
-                }
-
-                if ($user->id == $USER->id) {
+                if ($user->id == $USER->id or $user->username == "changeme") {
                     $deletebutton = "";
                 } else {
-                    if (has_capability('moodle/user:delete', $sitecontext)) {
-                        $deletebutton = "<a href=\"user.php?delete=$user->id&amp;sesskey=$USER->sesskey\">$strdelete</a>";
-                    } else {
-                        $deletebutton ="";
-                    }
+                    $deletebutton = "<a href=\"user.php?delete=$user->id&amp;sesskey=$USER->sesskey\">$strdelete</a>";
                 }
-
-                if (has_capability('moodle/user:update', $sitecontext)) {
-                    $editbutton = "<a href=\"../user/edit.php?id=$user->id&amp;course=$site->id\">$stredit</a>";
-                    if ($user->confirmed == 0) {
-                        $confirmbutton = "<a href=\"user.php?confirmuser=$user->id&amp;sesskey=$USER->sesskey\">" . get_string('confirm') . "</a>";
-                    } else {
-                        $confirmbutton = "";
-                    }
-                } else {
-                    $editbutton ="";
-                    if ($user->confirmed == 0) {
-                        $confirmbutton = "<span class=\"dimmed_text\">".get_string('confirm')."</span>";
-                    } else {
-                        $confirmbutton = "";
-                    }
-                }
-
                 if ($user->lastaccess) {
                     $strlastaccess = format_time(time() - $user->lastaccess);
                 } else {
-                    $strlastaccess = get_string('never');
+                    $strlastaccess = get_string("never");
+                }
+                if ($user->confirmed == 0) {
+                    $confirmbutton = "<a href=\"user.php?confirmuser=$user->id&amp;sesskey=$USER->sesskey\">" . get_string("confirm") . "</a>";
+                } else {
+                    $confirmbutton = "";
                 }
                 $fullname = fullname($user, true);
-
                 $table->data[] = array ("<a href=\"../user/view.php?id=$user->id&amp;course=$site->id\">$fullname</a>",
-                                    "$user->email",
-                                    "$user->city",
-                                    "$user->country",
-                                    $strlastaccess,
-                                    $editbutton,
-                                    $deletebutton,
-                                    $confirmbutton);
+                                        "$user->email",
+                                        "$user->city",
+                                        "$user->country",
+                                        $strlastaccess,
+                                        "<a href=\"../user/edit.php?id=$user->id&amp;course=$site->id\">$stredit</a>",
+                                        $deletebutton,
+                                        $confirmbutton);
             }
         }
 
@@ -372,22 +340,18 @@
         }
         echo "</form>";
         echo "</td></tr></table>";
+        print_heading("<a href=\"user.php?newuser=true&amp;sesskey=$USER->sesskey\">".get_string("addnewuser")."</a>");
 
-        if (has_capability('moodle/user:create', $sitecontext)) {
-            print_heading("<a href=\"user.php?newuser=true&amp;sesskey=$USER->sesskey\">".get_string('addnewuser')."</a>");
-        }
         if (!empty($table)) {
             print_table($table);
             print_paging_bar($usercount, $page, $perpage,
                              "user.php?sort=$sort&amp;dir=$dir&amp;perpage=$perpage".
                              "&amp;firstinitial=$firstinitial&amp;lastinitial=$lastinitial&amp;search=".urlencode(stripslashes($search))."&amp;");
-            if (has_capability('moodle/user:create', $sitecontext)) {
-                print_heading("<a href=\"user.php?newuser=true&amp;sesskey=$USER->sesskey\">".get_string("addnewuser")."</a>");
-            }
+            print_heading("<a href=\"user.php?newuser=true&amp;sesskey=$USER->sesskey\">".get_string("addnewuser")."</a>");
         }
 
 
-        admin_externalpage_print_footer($adminroot);
+        print_footer();
     }
 
 ?>

admin/users.php

@@ -0,0 +1,40 @@
+<?php // $Id$
+
+    require_once('../config.php');
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only admins can access this page");
+    }
+
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
+
+    $stradministration = get_string("administration");
+    $strusers          = get_string("users");
+
+    print_header("$site->shortname: $stradministration: $strusers", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> $strusers");
+
+    print_heading($strusers);
+
+    $table->align = array ("right", "left");
+
+    $table->data[] = array("<b><a href=\"auth.php?sesskey=$USER->sesskey\">".get_string("authentication")."</a></b>",
+                           get_string("adminhelpauthentication"));
+    $table->data[] = array("<b><a href=\"user.php\">".get_string("edituser")."</a></b>",
+                           get_string("adminhelpedituser"));
+    $table->data[] = array("<b><a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true&amp;sesskey=$USER->sesskey\">".get_string("addnewuser")."</a></b>",
+                               get_string("adminhelpaddnewuser"));
+    $table->data[] = array("<b><a href=\"$CFG->wwwroot/$CFG->admin/uploaduser.php?sesskey=$USER->sesskey\">".get_string("uploadusers")."</a></b>",
+                               get_string("adminhelpuploadusers"));
+
+    print_table($table);
+
+    print_footer($site);
+
+?>
+
+

admin/utfdbmigrate.php

@@ -1,58 +1,57 @@
 <?php //$Id$
 
 ///dummy field names are used to help adding and dropping indexes. There's only 1 case now, in scorm_scoes_track
-//testing
+
     require_once('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
     require_once($CFG->libdir.'/environmentlib.php');
     require_once($CFG->dirroot.'/course/lib.php');
-    require_once($CFG->libdir.'/ddllib.php');      //We are going to need DDL services here
-    require_once($CFG->dirroot.'/backup/lib.php');  //We are going to need BACKUP services here
-    define ('BACKUP_UNIQUE_CODE', '1100110011');    //One code in the past to store UTF8 temp indexes info
     require_login();
 
-    // declare once
-    global $enc;
-    
-    $customlang = array();
-    
-    $enc = array('af' => 'iso-8859-1', 'ar' => 'windows-1256', 'be' => 'windows-1251', 'bg' => 'windows-1251', 'bs' => 'windows-1250', 'ca' => 'iso-8859-1', 'cs' => 'iso-8859-2', 'da' => 'iso-8859-1', 'de' => 'iso-8859-1', 'de_du' => 'iso-8859-1', 'de_utf8' => 'utf-8', 'el' => 'windows-1253', 'en' => 'iso-8859-1', 'en_ja' => 'euc-jp', 'en_us' => 'iso-8859-1', 'en_utf8' => 'utf-8', 'es' => 'iso-8859-1', 'es_ar' => 'iso-8859-1', 'es_es' => 'iso-8859-1', 'es_mx' => 'iso-8859-1', 'et' => 'iso-8859-1', 'eu' => 'iso-8859-1', 'fa' => 'windows-1256', 'fa_utf8' => 'utf-8', 'fi' => 'iso-8859-1', 'fil' => 'iso-8859-15', 'fr' => 'iso-8859-1', 'fr_ca' => 'iso-8859-15', 'ga' => 'iso-8859-1', 'gl' => 'iso-8859-1', 'he' => 'ISO-8859-8-I', 'he_utf8' => 'utf-8', 'hi' => 'iso-8859-1', 'hr' => 'windows-1250', 'hr_utf8' => 'utf-8', 'hu' => 'iso-8859-2', 'id' => 'iso-8859-1', 'is' => 'iso-8859-1', 'it' => 'iso-8859-1', 'ja' => 'EUC-JP', 'ja_utf8' => 'UTF-8', 'ka_utf8' => 'UTF-8', 'km_utf8' => 'UTF-8', 'kn_utf8' => 'utf-8', 'ko' => 'EUC-KR', 'ko_utf8' => 'UTF-8', 'lt' => 'windows-1257', 'lv' => 'ISO-8859-4', 'mi_nt' => 'iso-8859-1', 'mi_tn_utf8' => 'utf-8', 'ms' => 'iso-8859-1', 'nl' => 'iso-8859-1', 'nn' => 'iso-8859-1', 'no' => 'iso-8859-1', 'no_gr' => 'iso-8859-1', 'pl' => 'iso-8859-2', 'pt' => 'iso-8859-1', 'pt_br' => 'iso-8859-1', 'ro' => 'iso-8859-2', 'ru' => 'windows-1251', 'sk' => 'iso-8859-2', 'sl' => 'iso-8859-2', 'sl_utf8' => 'utf-8', 'so' => 'iso-8859-1', 'sq' => 'iso-8859-1', 'sr_utf8' => 'utf-8', 'sv' => 'iso-8859-1', 'th' => 'TIS-620', 'th_utf8' => 'UTF-8', 'tl' => 'iso-8859-15', 'tl_utf8' => 'UTF-8', 'tr' => 'iso-8859-9', 'uk' => 'windows-1251', 'vi_utf8' => 'UTF-8', 'zh_cn' => 'GB18030', 'zh_cn_utf8' => 'UTF-8', 'zh_tw' => 'Big5', 'zh_tw_utf8' => 'UTF-8');
+	// decalre once
+	global $enc;
+	
+	$customlang = array();
+	
+	$enc = array('af' => 'iso-8859-1', 'ar' => 'windows-1256', 'be' => 'windows-1251', 'bg' => 'windows-1251', 'bs' => 'windows-1250', 'ca' => 'iso-8859-1', 'cs' => 'iso-8859-2', 'da' => 'iso-8859-1', 'de' => 'iso-8859-1', 'de_du' => 'iso-8859-1', 'de_utf8' => 'utf-8', 'el' => 'windows-1253', 'en' => 'iso-8859-1', 'en_ja' => 'euc-jp', 'en_us' => 'iso-8859-1', 'en_utf8' => 'utf-8', 'es' => 'iso-8859-1', 'es_ar' => 'iso-8859-1', 'es_es' => 'iso-8859-1', 'es_mx' => 'iso-8859-1', 'et' => 'iso-8859-1', 'eu' => 'iso-8859-1', 'fa' => 'windows-1256', 'fa_utf8' => 'utf-8', 'fi' => 'iso-8859-1', 'fil' => 'iso-8859-15', 'fr' => 'iso-8859-1', 'fr_ca' => 'iso-8859-15', 'ga' => 'iso-8859-1', 'gl' => 'iso-8859-1', 'he' => 'ISO-8859-8-I', 'he_utf8' => 'utf-8', 'hi' => 'iso-8859-1', 'hr' => 'windows-1250', 'hr_utf8' => 'utf-8', 'hu' => 'iso-8859-2', 'id' => 'iso-8859-1', 'it' => 'iso-8859-1', 'ja' => 'EUC-JP', 'ja_utf8' => 'UTF-8', 'ka_utf8' => 'UTF-8', 'km_utf8' => 'UTF-8', 'kn_utf8' => 'utf-8', 'ko' => 'EUC-KR', 'ko_utf8' => 'UTF-8', 'lt' => 'windows-1257', 'lv' => 'ISO-8859-4', 'mi_nt' => 'iso-8859-1', 'mi_tn_utf8' => 'utf-8', 'ms' => 'iso-8859-1', 'nl' => 'iso-8859-1', 'nn' => 'iso-8859-1', 'no' => 'iso-8859-1', 'no_gr' => 'iso-8859-1', 'pl' => 'iso-8859-2', 'pt' => 'iso-8859-1', 'pt_br' => 'iso-8859-1', 'ro' => 'iso-8859-2', 'ru' => 'windows-1251', 'sk' => 'iso-8859-2', 'sl' => 'iso-8859-2', 'sl_utf8' => 'utf-8', 'so' => 'iso-8859-1', 'sq' => 'iso-8859-1', 'sr_utf8' => 'utf-8', 'sv' => 'iso-8859-1', 'th' => 'TIS-620', 'th_utf8' => 'UTF-8', 'tl' => 'iso-8859-15', 'tl_utf8' => 'UTF-8', 'tr' => 'iso-8859-9', 'uk' => 'windows-1251', 'vi_utf8' => 'UTF-8', 'zh_cn' => 'GB18030', 'zh_cn_utf8' => 'UTF-8', 'zh_tw' => 'Big5', 'zh_tw_utf8' => 'UTF-8');
+	
+	/**************************************
+	 * Custom lang pack handling 		  *
+	 **************************************/
+	
+	// scan list of langs, including customs packs
+	$langs = get_list_of_languages();
+	
+	// foreach lang
+	foreach ($langs as $lang => $lang1) {
+	  
+		if (in_array($lang, array_keys($enc))) {
+		  	// if already in array, ignore
+			continue;  
+		}
+		
+		// if this lang has got a charset	
+		
+		if ($result = get_string_from_file('thischarset',$CFG->dirroot.'/lang/'.$lang.'/moodle.php', "\$resultstring")) {
+			eval($result);	
+			$enc[$lang] = $resultstring;		
+		} else if ($result = get_string_from_file('parentlanguage',$CFG->dirroot.'/lang/'.$lang.'/moodle.php',"\$resultstring")) {
+		// else if there's a parent lang we can use
+		    eval($result);
+		  	$enc[$lang] = $enc[$resultstring];  
+		} else {
+		 	notify ('unknown lang pack detected '.$lang); 
+		}
 
-    /**************************************
-     * Custom lang pack handling           *
-     **************************************/
-    
-    // scan list of langs, including customs packs
-    $langs = get_list_of_languages();
-    
-    // foreach lang
-    foreach ($langs as $lang => $lang1) {
-      
-        if (in_array($lang, array_keys($enc))) {
-              // if already in array, ignore
-            continue;  
-        }
-        
-        // if this lang has got a charset    
-        
-        if ($result = get_string_from_file('thischarset',$CFG->dirroot.'/lang/'.$lang.'/moodle.php', "\$resultstring")) {
-            eval($result);    
-            $enc[$lang] = $resultstring;        
-        } else if ($result = get_string_from_file('parentlanguage',$CFG->dirroot.'/lang/'.$lang.'/moodle.php',"\$resultstring")) {
-        // else if there's a parent lang we can use
-            eval($result);
-              $enc[$lang] = $enc[$resultstring];  
-        } else {
-             notify ('unknown lang pack detected '.$lang); 
-        }
+	}	
+	
+	/**************************************
+	 * End custom lang pack handling      *
+	 **************************************/
 
-    }    
-    
-    /**************************************
-     * End custom lang pack handling      *
-     **************************************/
-
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    if (!isadmin()) {
+        error('Only admins can access this page');
+    }
 
     if (!$site = get_site()) {
         redirect('index.php');
@@ -87,11 +86,8 @@
         print_string('importlangreminder','admin');
         print_simple_box_end();
         db_migrate2utf8();
-        print_heading('db unicode migration has been completed!');     
-        if (!get_config('', 'migrate_maintmode')) { // already in maint mode
-            unlink($filename);    //no longer in maintenance mode
-        }
-        unset_config('migrate_maintmode');
+        print_heading('db unicode migration has been completed!');
+        unlink($filename);    //no longer in maintenance mode
         @require_logout();
         print_continue($CFG->wwwroot.'/'.$CFG->admin.'/langimport.php');
     }
@@ -119,22 +115,18 @@
             //put the site in maintenance mode
             check_dir_exists($CFG->dataroot.'/'.SITEID, true);
 
-            if (file_exists($filename)) {
-                set_config('migrate_maintmode', 1); // already in maintenance mode
+            if (touch($filename)) {
+                $file = fopen($filename, 'w');
+                fwrite($file, get_string('maintinprogress','admin'));
+                fclose($file);
             } else {
-                if (touch($filename)) {
-                    $file = fopen($filename, 'w');
-                    fwrite($file, get_string('maintinprogress','admin'));
-                    fclose($file);
-                } else {
-                    notify (get_string('maintfileopenerror','admin'));
-                }
+                notify (get_string('maintfileopenerror','admin'));
             }
             //print second confirmation box
             echo '<form name="migratefrom" action="utfdbmigrate.php" method="POST">';
             echo '<input name="confirm" type="hidden" value="1" />';
             echo '<input name="sesskey" type="hidden" value="'.sesskey().'" />';
-
+        
             $xmls = utf_get_xml();
             $sumrecords = 0;   //this is the sum of all records of relavent tables.
             foreach ($xmls as $xml) {    ///foreach xml file, we must get a list of tables
@@ -216,24 +208,22 @@
   
 function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
                               //pointing to the num of records to process would be
-                              //useful. And it won't break anything, because the
-                              //crash system will continue the next time it was
-                              //executed. Also, the function could return:
-                              //0 = Some sort of error
-                              //1 = Finished completelly!
-                              //2 = Finished limit records
-                              //(using constants, of course ;-))
-                              //Then, all those errors, should be converted to
-                              //mtrace() and return 0. (showing the current 
-                              //table/field/recordid)
+							  //useful. And it won't break anything, because the
+							  //crash system will continue the next time it was
+							  //executed. Also, the function could return:
+							  //0 = Some sort of error
+							  //1 = Finished completelly!
+							  //2 = Finished limit records
+							  //(using constants, of course ;-))
+							  //Then, all those errors, should be converted to
+							  //mtrace() and return 0. (showing the current 
+							  //table/field/recordid)
 
     global $db, $CFG, $dbtablename, $fieldname, $record, $processedrecords;
-    $debug = debugging();
-
-    if ($CFG->dbtype == 'mysql') {
-        check_and_create_backup_dir(BACKUP_UNIQUE_CODE);  //Create the backup temp dir
-    }
+    $debug = ($CFG->debug > 7);
 
+     //echo date("H:i:s");
+    
     ignore_user_abort(false); // see bug report 5352. This should kill this thread as soon as user aborts.
     
     @set_time_limit(0);
@@ -384,31 +374,6 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
                 print_heading("<br><b>Processsing db table ".$dbtablename.'...</b>');
             }
 
-        /*  Insted of relying in the indexes defined for the table in utfmigrate.xml
-            files, we are going to use the MetaIndexes() DB call in order to detect
-            all the table indexes. Once fetched, they are saved in backup tables for
-            safe storage and they are dropped from the table.
-            At the end of the table, we'll fetch them from backup tables and all them
-            will be recreated again.
-            This will ensure that no index in lost in the UTF8 migration process and
-            they will be exactly the same for each server (custom indexes...)
-            Also this will leave free to keep the utfmigrate.xml files in sync for
-            all the existing indexes and we only have to maintain fields in such
-            files
-        */
-
-        /// Calculate all the indexes of the table
-            if ($CFG->dbtype == 'mysql' && $allindexes = $db->MetaIndexes($prefix.$dbtablename)) {
-            /// Send them to backup_ids table for temporal storage if crash
-                backup_putid(BACKUP_UNIQUE_CODE, $prefix.$dbtablename, 1, 1, $allindexes);
-            /// Drop all the indexes
-                $sqlarr = array();
-                foreach ($allindexes as $onekey => $oneindex) {
-                    $sqlarr[] = 'ALTER TABLE '.$prefix.$dbtablename.' DROP INDEX '.$onekey;
-                }
-                execute_sql_arr($sqlarr, true, $debug);
-            }
-
             /**********************************************************
              * This is the by pass structure. It allows us to process *
              * tables on row basis instead of column/field basis      *
@@ -439,7 +404,7 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
                     $addindexarray = array();
                     $adduniqueindexarray = array();
                     $addprimaryarray = array();
-                    
+
                     foreach ($fields as $field){
 
                         //if in crash state, and field name is not the same as crash field name
@@ -475,12 +440,7 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
 
                         if ($CFG->dbtype == 'mysql') {
 
-                            /* Drop the index, because with index on, you can't change it to longblob
-                            
-                               NOTE: We aren't going to drop individual indexes anymore, because we have
-                                     dropped them at the begining of the table iteration, saving them to
-                                     backup temp tables. At the end of the table iteration we are going
-                                     to rebuild them back
+                            /* Drop the index, because with index on, you can't change it to longblob */
 
                             if ($dropindex){    //drop index if index is varchar, text etc type
                                 $SQL = 'ALTER TABLE '.$prefix.$dbtablename.' DROP INDEX '.$dropindex.';';
@@ -488,15 +448,13 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
                                 if ($debug) {
                                     $db->debug=999;
                                 }
-
                                 execute_sql($SQL, false); // see bug 5205
                                 execute_sql($SQL1, false); // see bug 5205
 
                                 if ($debug) {
                                     $db->debug=0;
                                 }
-                            } else */
-                            if ($dropprimary) {    // drop primary key
+                            } else if ($dropprimary) {    // drop primary key
                                 $SQL = 'ALTER TABLE '.$prefix.$dbtablename.' DROP PRIMARY KEY;';
                                 if ($debug) {
                                     $db->debug=999;
@@ -507,31 +465,6 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
                                 }
                             }
 
-                            /* Previously to change the field to LONGBLOB, we are going to
-                               use Meta info to fetch the NULL/NOT NULL status of the field.
-                               Then, when converting back the field to its final UTF8 status
-                               we'll apply such status (and default)
-                               This has been added on 1.7 because we are in the process of
-                               converting some fields to NULL and the assumption of all the 
-                               CHAR/TEXT fields being always NOT NULL isn't valid anymore! 
-                               Note that this code will leave remaining NOT NULL fiels
-                               unmodified at all, folowing the old approach 
-                            */
-                            if(($cols = $db->MetaColumns($prefix.$dbtablename)) && $fieldname != 'dummy') {
-                                $cols = array_change_key_case($cols, CASE_LOWER); ///lowercase col names
-                                $notnull = 'NOT NULL';  ///Old default
-                                if ($col = $cols[strtolower($fieldname)]) {
-                                /// If the column was null before UTF-8 migration, save it
-                                    if (!$col->not_null) {
-                                        $notnull = 'NULL';
-                                    /// And, if the column had an empty string as default, make it NULL now
-                                        if ($default == "''") {
-                                            $default = 'NULL';
-                                        }
-                                    }
-                                }
-                            }
-
                             /* Change to longblob, serves 2 purposes:
                                1. column loses encoding, so when we finally change it to unicode,
                                   mysql does not do a double convertion
@@ -594,8 +527,8 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
                          * converting each record *
                          **************************/
                         while(($counter < $totalrecords) and ($fieldname !='dummy') and ($method!='NO_CONV')) {    //while there is still something
-                            $SQL = 'SELECT * FROM '.$prefix.$dbtablename.' ORDER BY id ASC';
-                            if ($records = get_records_sql($SQL, $counter, $recordsetsize)) {
+                            $SQL = 'SELECT * FROM '.$prefix.$dbtablename.' ORDER BY id ASC '.sql_paging_limit($counter, $recordsetsize);
+                            if ($records = get_records_sql($SQL)) {
                                 foreach ($records as $record) {
 
                                     //if we are up this far, either no crash, or crash with same table, field name.
@@ -723,7 +656,7 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
                             if ($length > 0) {
                                 $SQL.='('.$length.') ';
                             }
-                            $SQL.=' CHARACTER SET utf8 ' . $notnull . ' DEFAULT '. $default . ';';
+                            $SQL.=' CHARACTER SET utf8 NOT NULL DEFAULT '.$default.';';
                             if ($debug) {
                                 $db->debug=999;
                             }
@@ -759,12 +692,7 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
                     $alter = 0;
 
                     if ($CFG->dbtype=='mysql'){
-
                         $SQL = 'ALTER TABLE '.$prefix.$dbtablename;
-                    /*
-                        NOTE: We aren't going to create the indexes back here any more because they
-                              are going to be recreated at the end of the table iteration with
-                              the info saved at the begining of it.
 
                         if (!empty($addindexarray)) {
                             foreach ($addindexarray as $aidx){
@@ -779,7 +707,6 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
                                 $alter++;
                             }
                         }
-                    */
 
                         if (!empty($addprimaryarray)) {
                             foreach ($addprimaryarray as $apm){
@@ -825,28 +752,11 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
                 if ($debug) {
                     $db->debug=0;
                 }
-
             } else {
 
                 ///posgresql code here
                 ///No we don't need to do anything here
             }
-
-        /// Recreate all the indexes previously dropped and sent to backup
-        /// tables. Retrieve information from backup tables
-            if ($backupindexes = backup_getid(BACKUP_UNIQUE_CODE, $prefix.$dbtablename, 1)) {
-            /// Confirm we have indexes
-                if ($allindexes = $backupindexes->info) {
-                /// Recreate all the indexes
-                    $sqlarr = array();
-                    foreach ($allindexes as $onekey => $oneindex) {
-                        $unique = $oneindex['unique']? 'UNIQUE ' : '';
-                        $sqlarr[] = 'ALTER TABLE '.$prefix.$dbtablename.' ADD '.$unique.'INDEX '.$onekey.
-                                    ' ('.implode(', ', $oneindex['columns']).')';
-                    }
-                    execute_sql_arr($sqlarr, true, $debug);
-                }
-            }
         }
     }
 
@@ -866,17 +776,14 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
     
     //These have to go!
     if ($debug) {
-        $db->debug=true;
+        $db->debug=999;
     }
-
     if ($CFG->dbtype == 'postgres7') {
         $backup_db = $GLOBALS['db'];
         $GLOBALS['db'] = &get_postgres_db();
     }
-
     execute_sql('TRUNCATE TABLE '.$CFG->prefix.'cache_text', $debug);
     execute_sql('TRUNCATE TABLE '.$CFG->prefix.'cache_filters', $debug);
-
     if ($CFG->dbtype == 'postgres7') {
         $GLOBALS['db'] = $backup_db;
         unset($backup_db);
@@ -884,7 +791,6 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
     if ($debug) {
         $db->debug=0;
     }
-
     //update site language
     $sitelanguage = get_record('config','name', 'lang');
     if (strstr($sitelanguage->value, 'utf8')===false and $sitelanguage->value) {
@@ -914,12 +820,6 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
     //remove the cache file!
     @unlink($CFG->dataroot.'/cache/languages');
 
-    //remove backup temp storage
-    if ($CFG->dbtype = 'mysql') {
-        $pref->backup_unique_code = BACKUP_UNIQUE_CODE;
-        clean_temp_data($pref);
-    }
-
     // Regenerate some cached data
     
     if ($CFG->dbtype == 'mysql') {
@@ -965,46 +865,20 @@ function get_main_teacher_lang($courseid) {
     global $CFG;
     static $mainteachercache;
     
-    if ($courseid == SITEID || $courseid==0) {
-        $admin = get_admin();
-        $mainteachercache[$courseid] = $admin->lang;
-        return $admin->lang;
-    }
-    
     if (!isset($mainteachercache[$courseid])) {
-        
-        /// this is a worse guess
-        if (!empty($CFG->rolesactive)) {
-            
-            $context = get_context_instance(CONTEXT_COURSE, $courseid);
-            $teachers = get_users_by_capability($context, 'moodle/legacy:editingteacher', 'u.id, u.lang', 'ra.id ASC', 0, 1); // only need first one
-            if (is_array($teachers)) {
-                $teacher = reset($teachers);
-                $mainteachercache[$courseid] = $teacher->lang;
-                return $teacher->lang;
-            }
-        /// this is a better guess
-        } else {
-      
-            $SQL = 'SELECT u.id, u.lang 
-                    FROM '.$CFG->prefix.'user_teachers ut,
-                         '.$CFG->prefix.'course c,
-                         '.$CFG->prefix.'user u 
-                    WHERE c.id = ut.course AND 
-                          ut.course = '.$courseid.' AND 
-                          u.id = ut.userid 
-                    ORDER BY ut.authority ASC';
+        $SQL = 'SELECT u.lang from '.$CFG->prefix.'user_teachers ut,
+               '.$CFG->prefix.'course c,
+               '.$CFG->prefix.'user u WHERE
+               c.id = ut.course AND ut.course = '.$courseid.' AND u.id = ut.userid ORDER BY ut.authority ASC';
 
-            if ($teacher = get_record_sql($SQL, true)) {
-                $mainteachercache[$courseid] = $teacher->lang;
-                return $teacher->lang;
-            }
+        if ($teacher = get_record_sql($SQL, true)) {
+            $mainteachercache[$courseid] = $teacher->lang;
+            return $teacher->lang;
+        } else {
+            $admin = get_admin();
+            $mainteachercache[$courseid] = $admin->lang;
+            return $admin->lang;
         }
-    /// Arriving here we haven't been able to select any teacher lang
-    /// so use the admin lang
-        $admin = get_admin();
-        $mainteachercache[$courseid] = $admin->lang;
-        return $admin->lang;
     } else {
         return $mainteachercache[$courseid];
     }

admin/xmldb/README.txt

@@ -1,78 +0,0 @@
-XMLDB - Base classes and edition interface.
-
-Complete Documentation:
-
-  http://docs.moodle.org/en/XMLDB_Defining_one_XML_structure
-
-Ciao, Eloy Lafuente (stronk7)
-
-========== ========== ========== ========== ==========
-========== ==========   HISTORY  ========== ==========
-========== ========== ========== ========== ==========
-
-2006-08-07 - Editor working on production
-
-The editor has been used succesfully to build
-a bunch of install.xml files and everything
-seems to be working properly.
-
-========== ========== ========== ========== ==========
-
-2006-07-11 - PHP4 compatible release
-
-Now everything seems to be working under PHP 4. What
-a horrible OOP implementation!
-
-Note that write permissions to */db dirs are required.
-
-Now working in the 3 missing forms, to manually edit
-fields, keys and indexes.
-
-Ciao, Eloy Lafuente (stronk7)
-
-========== ========== ========== ========== ==========
-
-2006-07-11 - Important notes
-
-I've just discovered this some seconds ago, in order
-to test properly the XMLDB classes and editor:
-
-1.- PHP 5 required for now. Will change this soon.
-2.- Perms to "apache" user needed in */db
-    dirs in order to allow the XMDBD interface
-    to write files.
-
-Ciao, Eloy Lafuente (stronk7)
-
-========== ========== ========== ========== ==========
-
-2006-07-11 - Initial commit
-
-This directory contains the XMLDB classes to be used
-under Moodle > 1.7 to store all the DB info in a
-neutral form (classes dir). Also it contains one simple
-interface to edit all those structures.
-
-To install and test it, simply copy the whole xmldb directory
-under your moodle/admin dir and point your browser (as admin)
-to http://your.server/moodle/admin/xmldb
-
-The edition interface isn't completed yet (it laks 3 more forms
-to edit fields, keys and indexes) and there isn't any lang file
-(although I hope everything is really clear).
-
-The edition interface includes one reverse-engineering tool that
-provides an easy way to retroffit and to generate any table from
-MySQL to the new XMLDB format.
-
-Once the XMLDB format was approved, we'll be able to build all the
-"generators" needed in order to use it to create Moodle DB structures
-for each RDBMS flavour.
-
-Once the interface was finished (2-3 days from now) related documentation
-will be sent to http://docs.moodle.org/en/XML_database_schema in order
-to comment/modify/approve the final XML format.
-
-All the code is, obviously GPL, with its copyrights and so on...
-
-Ciao, Eloy Lafuente (stronk7) :-)

admin/xmldb/actions/XMLDBAction.class.php

@@ -1,191 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This is the main action class. It implements all the basic
-/// functionalities to be shared by each action.
-
-class XMLDBAction {
-
-    var $does_generate;  //Type of value returned by the invoke method
-                         //ACTION_GENERATE_HTML have contents to show
-                         //set by each specialized invoke
-
-    var $title;          //Title of the Action (class name, by default)
-                         //set by parent init automatically
-
-    var $str;            //Strings used by the action
-                         //set by each specialized init, calling loadStrings
-
-    var $output;         //Output of the action
-                         //set by each specialized invoke, get with getOutput
-
-    var $errormsg;       //Last Error produced. Check when any invoke returns false
-                         //get with getError
-
-    var $postaction;     //Action to execute at the end of the invoke script
-
-    /**
-     * Constructor
-     */
-    function XMLDBAction() {
-        $this->init();
-    }
-
-    /**
-     * Constructor to keep PHP5 happy
-     */
-    function __construct() {
-        $this->XMLDBAction();
-    }
-
-    /**
-     * Init method, every subclass will have its own,
-     * always calling the parent one
-     */
-    function init() {
-        $this->does_generate = ACTION_NONE;
-        $this->title     = strtolower(get_class($this));
-        $this->str       = array();
-        $this->output    = NULL;
-        $this->errormsg  = NULL;
-        $this->subaction = NULL;
-    }
-
-    /**
-     * returns the type of output of the file
-     */
-    function getDoesGenerate() {
-        return $this->does_generate;
-    }
-
-    /**
-     * getError method, returns the last error string.
-     * Used if the invoke() methods returns false
-     */
-    function getError() {
-        return $this->errormsg;
-    }
-
-    /**
-     * getOutput method, returns the output generated by the action.
-     * Used after execution of the invoke() methods if they return true
-     */
-    function getOutput() {
-        return $this->output;
-    }
-
-    /**
-     * getPostAtion method, returns the action to launch after executing
-     * another one
-     */
-    function getPostAction() {
-        return $this->postaction;
-    }
-
-    /**
-     * getTitle method returns the title of the action (that is part
-     * of the $str array attribute
-     */
-    function getTitle() {
-        return $this->str['title'];
-    }
-
-    /**
-     * loadStrings method, loads the required strings specified in the
-     * array parameter
-     */
-    function loadStrings($strings) {
-    /// Load some commonly used strings
-        $this->str['title'] = get_string($this->title, 'xmldb');
-
-    /// Now process the $strings array loading it in the $str atribute
-        if ($strings) {
-            foreach ($strings as $key => $module) {
-                $this->str[$key] = get_string($key, $module);
-            }
-        }
-    }
-
-    /**
-     * main invoke method, it simply sets the postaction attribute
-     * if possible
-     */
-    function invoke() {
-
-        global $SESSION;
-
-    /// If we are used any dir, save it in the lastused session object
-    /// Some actions can use it to perform positioning
-        if ($lastused = optional_param ('dir', NULL, PARAM_PATH)) {
-            $SESSION->lastused = stripslashes_safe($lastused);
-        }
-
-        $this->postaction = optional_param ('postaction', NULL, PARAM_ALPHAEXT);
-    /// Avoid being recursive
-        if ($this->title == $this->postaction) {
-            $this->postaction = NULL;
-        }
-    }
-
-    /**
-     * launch method, used to easily call invoke methods between actions
-     */
-    function launch($action) {
-
-        global $CFG;
-
-    /// Get the action path and invoke it
-        $actionsroot = "$CFG->dirroot/$CFG->admin/xmldb/actions";
-        $actionclass = $action . '.class.php';
-        $actionpath = "$actionsroot/$action/$actionclass";
-
-    /// Load and invoke the proper action
-        $result = false;
-        if (file_exists($actionpath) && is_readable($actionpath)) {
-            require_once($actionpath);
-            if ($xmldb_action = new $action) {
-                $result = $xmldb_action->invoke();
-                if ($result) {
-                    if ($xmldb_action->does_generate != ACTION_NONE &&
-                        $xmldb_action->getOutput()) {
-                        $this->does_generate = $xmldb_action->does_generate;
-                        $this->title = $xmldb_action->title;
-                        $this->str = $xmldb_action->str;
-                        $this->output .= $xmldb_action->getOutput();
-                    }
-                } else {
-                    $this->errormsg = $xmldb_action->getError();
-                }
-            } else {
-                $this->errormsg = "Error: cannot instantiate class (actions/$action/$actionclass)";
-            }
-        } else {
-            $this->errormsg = "Error: wrong action specified ($action)";
-        }
-        return $result;
-    }
-}
-?>

admin/xmldb/actions/create_xml_file/create_xml_file.class.php

@@ -1,108 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will
-
-class create_xml_file extends XMLDBAction {
-
-    /**
-     * Init method, every subclass will have its own
-     */
-    function init() {
-        parent::init();
-    /// Set own core attributes
-        $this->can_subaction = ACTION_NONE;
-        //$this->can_subaction = ACTION_HAVE_SUBACTIONS;
-
-    /// Set own custom attributes
-
-    /// Get needed strings
-        $this->loadStrings(array(
-        /// 'key' => 'module',
-        ));
-    }
-
-    /**
-     * Invoke method, every class will have its own
-     * returns true/false on completion, setting both
-     * errormsg and output as necessary
-     */
-    function invoke() {
-        parent::invoke();
-
-        $result = true;
-
-    /// Set own core attributes
-        $this->does_generate = ACTION_NONE;
-        //$this->does_generate = ACTION_GENERATE_HTML;
-
-    /// These are always here
-        global $CFG, $XMLDB;
-
-    /// Do the job, setting result as needed
-
-    /// Get the dir containing the file
-        $dirpath = required_param('dir', PARAM_PATH);
-        $dirpath = $CFG->dirroot . stripslashes_safe($dirpath);
-        $file = $dirpath . '/install.xml';
-
-    /// Some variables
-        $xmlpath = dirname(str_replace($CFG->dirroot . '/', '', $file));
-        $xmlversion = userdate(time(), '%Y%m%d', 99, false);
-        $xmlcomment = 'XMLDB file for Moodle ' . dirname($xmlpath);
-
-        $xmltable = strtolower(basename(dirname($xmlpath)));
-
-    /// Initial contents
-        $c = '<?xml version="1.0" encoding="UTF-8" ?>' . "\n";
-        $c.= '  <XMLDB PATH="' . $xmlpath . '" VERSION="' . $xmlversion .'" COMMENT="' . $xmlcomment .'">' . "\n";
-        $c.= '    <TABLES>' . "\n";
-        $c.= '      <TABLE NAME="' . $xmltable . '" COMMENT="Default comment for ' . $xmltable .', please edit me">' . "\n";
-        $c.= '        <FIELDS>' . "\n";
-        $c.= '          <FIELD NAME="id" TYPE="int" LENGTH="10" UNSIGNED="true" NOTNULL="true" SEQUENCE="true" COMMENT="id of the table, please edit me" />' . "\n";
-        $c.= '        </FIELDS>' . "\n";
-        $c.= '        <KEYS>' . "\n";
-        $c.= '          <KEY NAME="primary" COMMENT="Primary key for ' . $xmltable . '" TYPE="primary" FIELDS="id" />' . "\n";
-        $c.= '        </KEYS>' . "\n";
-        $c.= '      </TABLE>' . "\n";
-        $c.= '    </TABLES>' . "\n";
-        $c.= '  </XMLDB>';
-
-        if (!file_put_contents($file, $c)) {
-            $errormsg = 'Error creando fichero ' . $file;
-            $result = false;
-        }
-
-    /// Launch postaction if exists
-        if ($this->getPostAction() && $result) {
-            return $this->launch($this->getPostAction());
-        }
-
-    /// Return ok if arrived here
-        return $result;
-    }
-}
-?>

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

@@ -1,140 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will delete completely one field
-
-class delete_field extends XMLDBAction {
-
-    /**
-     * Init method, every subclass will have its own
-     */
-    function init() {
-        parent::init();
-
-    /// Set own custom attributes
-
-    /// Get needed strings
-        $this->loadStrings(array(
-            'confirmdeletefield' => 'xmldb',
-            'yes' => '',
-            'no' => ''
-        ));
-    }
-
-    /**
-     * Invoke method, every class will have its own
-     * returns true/false on completion, setting both
-     * errormsg and output as necessary
-     */
-    function invoke() {
-        parent::invoke();
-
-        $result = true;
-
-    /// Set own core attributes
-        $this->does_generate = ACTION_GENERATE_HTML;
-
-    /// These are always here
-        global $CFG, $XMLDB;
-
-    /// Do the job, setting result as needed
-
-    /// Get the dir containing the file
-        $dirpath = required_param('dir', PARAM_PATH);
-        $dirpath = $CFG->dirroot . stripslashes_safe($dirpath);
-        $tableparam = required_param('table', PARAM_CLEAN);
-        $fieldparam = required_param('field', PARAM_CLEAN);
-
-        $confirmed = optional_param('confirmed', false, PARAM_BOOL);
-
-    /// If  not confirmed, show confirmation box
-        if (!$confirmed) {
-            $o = '<table align="center" width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
-            $o.= '  <tr><td class="generalboxcontent">';
-            $o.= '    <p align="center">' . $this->str['confirmdeletefield'] . '<br /><br />' . $fieldparam . '</p>';
-            $o.= '    <table align="center" cellpadding="20"><tr><td>';
-            $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=delete_field&amp;confirmed=yes&amp;postaction=edit_table&amp;field=' . $fieldparam . '&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></form></div>';
-            $o.= '      </td><td>';
-            $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=edit_table&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></form></div>';
-            $o.= '      </td></tr>';
-            $o.= '    </table>';
-            $o.= '  </td></tr>';
-            $o.= '</table>';
-
-            $this->output = $o;
-        } else {
-        /// Get the edited dir
-            if (!empty($XMLDB->editeddirs)) {
-                if (isset($XMLDB->editeddirs[$dirpath])) {
-                    $dbdir =& $XMLDB->dbdirs[$dirpath];
-                    $editeddir =& $XMLDB->editeddirs[$dirpath];
-                    if ($editeddir) {
-                        $structure =& $editeddir->xml_file->getStructure();
-                    /// Move adjacent fields prev and next attributes
-                        $tables =& $structure->getTables();
-                        $table =& $structure->getTable($tableparam);
-                        $fields =& $table->getFields();
-                        $field =& $table->getField($fieldparam);
-                        if ($field->getPrevious()) {
-                            $prev =& $table->getField($field->getPrevious());
-                            $prev->setNext($field->getNext());
-                        }
-                        if ($field->getNext()) {
-                            $next =& $table->getField($field->getNext());
-                            $next->setPrevious($field->getPrevious());
-                        }
-                    /// Remove the field
-                        $table->deleteField($fieldparam);
-
-                    /// Recalculate the hash
-                        $structure->calculateHash(true);
-
-                    /// If the hash has changed from the original one, change the version
-                    /// and mark the structure as changed
-                        $origstructure =& $dbdir->xml_file->getStructure();
-                        if ($structure->getHash() != $origstructure->getHash()) {
-                            $structure->setVersion(userdate(time(), '%Y%m%d', 99, false));
-                            $structure->setChanged(true);
-                        }
-                    }
-                }
-            }
-        }
-
-    /// Launch postaction if exists (leave this here!)
-        if ($this->getPostAction() && $result) {
-            return $this->launch($this->getPostAction());
-        }
-
-    /// Return ok if arrived here
-        return $result;
-    }
-}
-?>

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

@@ -1,140 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will delete completely one index
-
-class delete_index extends XMLDBAction {
-
-    /**
-     * Init method, every subclass will have its own
-     */
-    function init() {
-        parent::init();
-
-    /// Set own custom attributes
-
-    /// Get needed strings
-        $this->loadStrings(array(
-            'confirmdeleteindex' => 'xmldb',
-            'yes' => '',
-            'no' => ''
-        ));
-    }
-
-    /**
-     * Invoke method, every class will have its own
-     * returns true/false on completion, setting both
-     * errormsg and output as necessary
-     */
-    function invoke() {
-        parent::invoke();
-
-        $result = true;
-
-    /// Set own core attributes
-        $this->does_generate = ACTION_GENERATE_HTML;
-
-    /// These are always here
-        global $CFG, $XMLDB;
-
-    /// Do the job, setting result as needed
-
-    /// Get the dir containing the file
-        $dirpath = required_param('dir', PARAM_PATH);
-        $dirpath = $CFG->dirroot . stripslashes_safe($dirpath);
-        $tableparam = required_param('table', PARAM_PATH);
-        $indexparam = required_param('index', PARAM_PATH);
-
-        $confirmed = optional_param('confirmed', false, PARAM_BOOL);
-
-    /// If  not confirmed, show confirmation box
-        if (!$confirmed) {
-            $o = '<table align="center" width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
-            $o.= '  <tr><td class="generalboxcontent">';
-            $o.= '    <p align="center">' . $this->str['confirmdeleteindex'] . '<br /><br />' . $indexparam . '</p>';
-            $o.= '    <table align="center" cellpadding="20"><tr><td>';
-            $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=delete_index&amp;confirmed=yes&amp;postaction=edit_table&amp;index=' . $indexparam . '&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></form></div>';
-            $o.= '      </td><td>';
-            $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=edit_table&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></form></div>';
-            $o.= '      </td></tr>';
-            $o.= '    </table>';
-            $o.= '  </td></tr>';
-            $o.= '</table>';
-
-            $this->output = $o;
-        } else {
-        /// Get the edited dir
-            if (!empty($XMLDB->editeddirs)) {
-                if (isset($XMLDB->editeddirs[$dirpath])) {
-                    $dbdir =& $XMLDB->dbdirs[$dirpath];
-                    $editeddir =& $XMLDB->editeddirs[$dirpath];
-                    if ($editeddir) {
-                        $structure =& $editeddir->xml_file->getStructure();
-                    /// Move adjacent indexes prev and next attributes
-                        $tables =& $structure->getTables();
-                        $table =& $structure->getTable($tableparam);
-                        $indexes =& $table->getIndexes();
-                        $index =& $table->getIndex($indexparam);
-                        if ($index->getPrevious()) {
-                            $prev =& $table->getIndex($index->getPrevious());
-                            $prev->setNext($index->getNext());
-                        }
-                        if ($index->getNext()) {
-                            $next =& $table->getIndex($index->getNext());
-                            $next->setPrevious($index->getPrevious());
-                        }
-                    /// Remove the index
-                        $table->deleteIndex($indexparam);
-
-                    /// Recalculate the hash
-                        $structure->calculateHash(true);
-
-                    /// If the hash has changed from the original one, change the version
-                    /// and mark the structure as changed
-                        $origstructure =& $dbdir->xml_file->getStructure();
-                        if ($structure->getHash() != $origstructure->getHash()) {
-                            $structure->setVersion(userdate(time(), '%Y%m%d', 99, false));
-                            $structure->setChanged(true);
-                        }
-                    }
-                }
-            }
-        }
-
-    /// Launch postaction if exists (leave this here!)
-        if ($this->getPostAction() && $result) {
-            return $this->launch($this->getPostAction());
-        }
-
-    /// Return ok if arrived here
-        return $result;
-    }
-}
-?>

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

@@ -1,140 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will delete completely one key
-
-class delete_key extends XMLDBAction {
-
-    /**
-     * Init method, every subclass will have its own
-     */
-    function init() {
-        parent::init();
-
-    /// Set own custom attributes
-
-    /// Get needed strings
-        $this->loadStrings(array(
-            'confirmdeletekey' => 'xmldb',
-            'yes' => '',
-            'no' => ''
-        ));
-    }
-
-    /**
-     * Invoke method, every class will have its own
-     * returns true/false on completion, setting both
-     * errormsg and output as necessary
-     */
-    function invoke() {
-        parent::invoke();
-
-        $result = true;
-
-    /// Set own core attributes
-        $this->does_generate = ACTION_GENERATE_HTML;
-
-    /// These are always here
-        global $CFG, $XMLDB;
-
-    /// Do the job, setting result as needed
-
-    /// Get the dir containing the file
-        $dirpath = required_param('dir', PARAM_PATH);
-        $dirpath = $CFG->dirroot . stripslashes_safe($dirpath);
-        $tableparam = required_param('table', PARAM_PATH);
-        $keyparam = required_param('key', PARAM_PATH);
-
-        $confirmed = optional_param('confirmed', false, PARAM_BOOL);
-
-    /// If  not confirmed, show confirmation box
-        if (!$confirmed) {
-            $o = '<table align="center" width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
-            $o.= '  <tr><td class="generalboxcontent">';
-            $o.= '    <p align="center">' . $this->str['confirmdeletekey'] . '<br /><br />' . $keyparam . '</p>';
-            $o.= '    <table align="center" cellpadding="20"><tr><td>';
-            $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=delete_key&amp;confirmed=yes&amp;postaction=edit_table&amp;key=' . $keyparam . '&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></form></div>';
-            $o.= '      </td><td>';
-            $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=edit_table&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></form></div>';
-            $o.= '      </td></tr>';
-            $o.= '    </table>';
-            $o.= '  </td></tr>';
-            $o.= '</table>';
-
-            $this->output = $o;
-        } else {
-        /// Get the edited dir
-            if (!empty($XMLDB->editeddirs)) {
-                if (isset($XMLDB->editeddirs[$dirpath])) {
-                    $dbdir =& $XMLDB->dbdirs[$dirpath];
-                    $editeddir =& $XMLDB->editeddirs[$dirpath];
-                    if ($editeddir) {
-                        $structure =& $editeddir->xml_file->getStructure();
-                    /// Move adjacent keys prev and next attributes
-                        $tables =& $structure->getTables();
-                        $table =& $structure->getTable($tableparam);
-                        $keys =& $table->getKeys();
-                        $key =& $table->getKey($keyparam);
-                        if ($key->getPrevious()) {
-                            $prev =& $table->getKey($key->getPrevious());
-                            $prev->setNext($key->getNext());
-                        }
-                        if ($key->getNext()) {
-                            $next =& $table->getKey($key->getNext());
-                            $next->setPrevious($key->getPrevious());
-                        }
-                    /// Remove the key
-                        $table->deleteKey($keyparam);
-
-                    /// Recalculate the hash
-                        $structure->calculateHash(true);
-
-                    /// If the hash has changed from the original one, change the version
-                    /// and mark the structure as changed
-                        $origstructure =& $dbdir->xml_file->getStructure();
-                        if ($structure->getHash() != $origstructure->getHash()) {
-                            $structure->setVersion(userdate(time(), '%Y%m%d', 99, false));
-                            $structure->setChanged(true);
-                        }
-                    }
-                }
-            }
-        }
-
-    /// Launch postaction if exists (leave this here!)
-        if ($this->getPostAction() && $result) {
-            return $this->launch($this->getPostAction());
-        }
-
-    /// Return ok if arrived here
-        return $result;
-    }
-}
-?>

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

@@ -1,133 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will delete completely one sentence
-
-class delete_sentence extends XMLDBAction {
-
-    /**
-     * Init method, every subclass will have its own
-     */
-    function init() {
-        parent::init();
-
-    /// Set own custom attributes
-
-    /// Get needed strings
-        $this->loadStrings(array(
-            'confirmdeletesentence' => 'xmldb',
-            'yes' => '',
-            'no' => ''
-        ));
-    }
-
-    /**
-     * Invoke method, every class will have its own
-     * returns true/false on completion, setting both
-     * errormsg and output as necessary
-     */
-    function invoke() {
-        parent::invoke();
-
-        $result = true;
-
-    /// Set own core attributes
-        $this->does_generate = ACTION_GENERATE_HTML;
-
-    /// These are always here
-        global $CFG, $XMLDB;
-
-    /// Do the job, setting result as needed
-
-    /// Get the dir containing the file
-        $dirpath = required_param('dir', PARAM_PATH);
-        $dirpath = $CFG->dirroot . stripslashes_safe($dirpath);
-        $statementparam = required_param('statement', PARAM_CLEAN);
-        $sentenceparam = required_param('sentence', PARAM_INT);
-
-        $confirmed = optional_param('confirmed', false, PARAM_BOOL);
-
-    /// If  not confirmed, show confirmation box
-        if (!$confirmed) {
-            $o = '<table align="center" width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
-            $o.= '  <tr><td class="generalboxcontent">';
-            $o.= '    <p align="center">' . $this->str['confirmdeletesentence'] . '</p>';
-            $o.= '    <table align="center" cellpadding="20"><tr><td>';
-            $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=delete_sentence&amp;confirmed=yes&amp;postaction=edit_statement&amp;sentence=' . $sentenceparam . '&amp;statement=' . urlencode($statementparam) . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></form></div>';
-            $o.= '      </td><td>';
-            $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=edit_statement&amp;statement=' . urlencode($statementparam) . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></form></div>';
-            $o.= '      </td></tr>';
-            $o.= '    </table>';
-            $o.= '  </td></tr>';
-            $o.= '</table>';
-
-            $this->output = $o;
-        } else {
-        /// Get the edited dir
-            if (!empty($XMLDB->editeddirs)) {
-                if (isset($XMLDB->editeddirs[$dirpath])) {
-                    $dbdir =& $XMLDB->dbdirs[$dirpath];
-                    $editeddir =& $XMLDB->editeddirs[$dirpath];
-                    if ($editeddir) {
-                        $structure =& $editeddir->xml_file->getStructure();
-                        $statements =& $structure->getStatements();
-                        $statement =& $structure->getStatement($statementparam);
-                        $sentences =& $statement->getSentences();
-                    /// Remove the sentence
-                        unset ($sentences[$sentenceparam]);
-
-                    /// The statement has changed
-                        $statement->setChanged(true);
-
-                    /// Recalculate the hash
-                        $structure->calculateHash(true);
-
-                    /// If the hash has changed from the original one, change the version
-                    /// and mark the structure as changed
-                        $origstructure =& $dbdir->xml_file->getStructure();
-                        if ($structure->getHash() != $origstructure->getHash()) {
-                            $structure->setVersion(userdate(time(), '%Y%m%d', 99, false));
-                            $structure->setChanged(true);
-                        }
-                    }
-                }
-            }
-        }
-
-    /// Launch postaction if exists (leave this here!)
-        if ($this->getPostAction() && $result) {
-            return $this->launch($this->getPostAction());
-        }
-
-    /// Return ok if arrived here
-        return $result;
-    }
-}
-?>

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

@@ -1,115 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will delete completely one statement
-
-class delete_statement extends XMLDBAction {
-
-    /**
-     * Init method, every subclass will have its own
-     */
-    function init() {
-        parent::init();
-
-    /// Set own custom attributes
-
-    /// Get needed strings
-        $this->loadStrings(array(
-            'confirmdeletestatement' => 'xmldb',
-            'yes' => '',
-            'no' => ''
-        ));
-    }
-
-    /**
-     * Invoke method, every class will have its own
-     * returns true/false on completion, setting both
-     * errormsg and output as necessary
-     */
-    function invoke() {
-        parent::invoke();
-
-        $result = true;
-
-    /// Set own core attributes
-        $this->does_generate = ACTION_GENERATE_HTML;
-
-    /// These are always here
-        global $CFG, $XMLDB;
-
-    /// Do the job, setting result as needed
-
-    /// Get the dir containing the file
-        $dirpath = required_param('dir', PARAM_PATH);
-        $dirpath = $CFG->dirroot . stripslashes_safe($dirpath);
-        $statementparam = required_param('statement', PARAM_CLEAN);
-
-        $confirmed = optional_param('confirmed', false, PARAM_BOOL);
-
-    /// If  not confirmed, show confirmation box
-        if (!$confirmed) {
-            $o = '<table align="center" width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
-            $o.= '  <tr><td class="generalboxcontent">';
-            $o.= '    <p align="center">' . $this->str['confirmdeletestatement'] . '<br /><br />' . $statementparam . '</p>';
-            $o.= '    <table align="center" cellpadding="20"><tr><td>';
-            $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=delete_statement&amp;confirmed=yes&amp;postaction=edit_xml_file&amp;statement=' . $statementparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></form></div>';
-            $o.= '      </td><td>';
-            $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=edit_xml_file&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></form></div>';
-            $o.= '      </td></tr>';
-            $o.= '    </table>';
-            $o.= '  </td></tr>';
-            $o.= '</table>';
-
-            $this->output = $o;
-        } else {
-        /// Get the edited dir
-            if (!empty($XMLDB->editeddirs)) {
-                if (isset($XMLDB->editeddirs[$dirpath])) {
-                    $dbdir =& $XMLDB->dbdirs[$dirpath];
-                    $editeddir =& $XMLDB->editeddirs[$dirpath];
-                    if ($editeddir) {
-                        $structure =& $editeddir->xml_file->getStructure();
-                    /// Remove the table
-                        $structure->deleteStatement($statementparam);
-                    }
-                }
-            }
-        }
-
-    /// Launch postaction if exists (leave this here!)
-        if ($this->getPostAction() && $result) {
-            return $this->launch($this->getPostAction());
-        }
-
-    /// Return ok if arrived here
-        return $result;
-    }
-}
-?>

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

@@ -1,115 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will delete completely one table
-
-class delete_table extends XMLDBAction {
-
-    /**
-     * Init method, every subclass will have its own
-     */
-    function init() {
-        parent::init();
-
-    /// Set own custom attributes
-
-    /// Get needed strings
-        $this->loadStrings(array(
-            'confirmdeletetable' => 'xmldb',
-            'yes' => '',
-            'no' => ''
-        ));
-    }
-
-    /**
-     * Invoke method, every class will have its own
-     * returns true/false on completion, setting both
-     * errormsg and output as necessary
-     */
-    function invoke() {
-        parent::invoke();
-
-        $result = true;
-
-    /// Set own core attributes
-        $this->does_generate = ACTION_GENERATE_HTML;
-
-    /// These are always here
-        global $CFG, $XMLDB;
-
-    /// Do the job, setting result as needed
-
-    /// Get the dir containing the file
-        $dirpath = required_param('dir', PARAM_PATH);
-        $dirpath = $CFG->dirroot . stripslashes_safe($dirpath);
-        $tableparam = required_param('table', PARAM_CLEAN);
-
-        $confirmed = optional_param('confirmed', false, PARAM_BOOL);
-
-    /// If  not confirmed, show confirmation box
-        if (!$confirmed) {
-            $o = '<table align="center" width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
-            $o.= '  <tr><td class="generalboxcontent">';
-            $o.= '    <p align="center">' . $this->str['confirmdeletetable'] . '<br /><br />' . $tableparam . '</p>';
-            $o.= '    <table align="center" cellpadding="20"><tr><td>';
-            $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=delete_table&amp;confirmed=yes&amp;postaction=edit_xml_file&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></form></div>';
-            $o.= '      </td><td>';
-            $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=edit_xml_file&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></form></div>';
-            $o.= '      </td></tr>';
-            $o.= '    </table>';
-            $o.= '  </td></tr>';
-            $o.= '</table>';
-
-            $this->output = $o;
-        } else {
-        /// Get the edited dir
-            if (!empty($XMLDB->editeddirs)) {
-                if (isset($XMLDB->editeddirs[$dirpath])) {
-                    $dbdir =& $XMLDB->dbdirs[$dirpath];
-                    $editeddir =& $XMLDB->editeddirs[$dirpath];
-                    if ($editeddir) {
-                        $structure =& $editeddir->xml_file->getStructure();
-                    /// Remove the table
-                        $structure->deleteTable($tableparam);
-                    }
-                }
-            }
-        }
-
-    /// Launch postaction if exists (leave this here!)
-        if ($this->getPostAction() && $result) {
-            return $this->launch($this->getPostAction());
-        }
-
-    /// Return ok if arrived here
-        return $result;
-    }
-}
-?>

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

@@ -1,111 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will delete completely one XML file
-
-class delete_xml_file extends XMLDBAction {
-
-    /**
-     * Init method, every subclass will have its own
-     */
-    function init() {
-        parent::init();
-
-    /// Set own custom attributes
-
-    /// Get needed strings
-        $this->loadStrings(array(
-            'confirmdeletexmlfile' => 'xmldb',
-            'yes' => '',
-            'no' => ''
-        ));
-    }
-
-    /**
-     * Invoke method, every class will have its own
-     * returns true/false on completion, setting both
-     * errormsg and output as necessary
-     */
-    function invoke() {
-        parent::invoke();
-
-        $result = true;
-
-    /// Set own core attributes
-        $this->does_generate = ACTION_GENERATE_HTML;
-
-    /// These are always here
-        global $CFG, $XMLDB;
-
-    /// Do the job, setting result as needed
-
-    /// Get the dir containing the file
-        $dirpath = required_param('dir', PARAM_CLEAN);
-        $dirpath = $CFG->dirroot . stripslashes_safe($dirpath);
-
-        $confirmed = optional_param('confirmed', false, PARAM_BOOL);
-
-    /// If  not confirmed, show confirmation box
-        if (!$confirmed) {
-            $o = '<table align="center" width="60" class="generalbox" border="0" cellpadding="5" cellspacing="0" id="notice">';
-            $o.= '  <tr><td class="generalboxcontent">';
-            $o.= '    <p align="center">' . $this->str['confirmdeletexmlfile'] . '<br /><br />' . $dirpath . '/install.php</p>';
-            $o.= '    <table align="center" cellpadding="20"><tr><td>';
-            $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=delete_xml_file&amp;confirmed=yes&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;postaction=main_view#lastused" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['yes'] .'" /></form></div>';
-            $o.= '      </td><td>';
-            $o.= '      <div class="singlebutton">';
-            $o.= '        <form action="index.php?action=main_view#lastused" method="post">';
-            $o.= '          <input type="submit" value="'. $this->str['no'] .'" /></form></div>';
-            $o.= '      </td></tr>';
-            $o.= '    </table>';
-            $o.= '  </td></tr>';
-            $o.= '</table>';
-
-            $this->output = $o;
-        } else {
-        /// Get the original dir and delete the xml file
-            if (!empty($XMLDB->dbdirs)) {
-                if (isset($XMLDB->dbdirs[$dirpath])) {
-                    $dbdir =& $XMLDB->dbdirs[$dirpath];
-                    if ($dbdir) {
-                        @unlink($dirpath . '/install.xml');
-                    }
-                }
-            }
-        }
-
-    /// Launch postaction if exists (leave this here!)
-        if ($this->getPostAction() && $result) {
-            return $this->launch($this->getPostAction());
-        }
-
-    /// Return ok if arrived here
-        return $result;
-    }
-}
-?>

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

@@ -1,204 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will provide the interface for all the edit field actions
-
-class edit_field extends XMLDBAction {
-
-    /**
-     * Init method, every subclass will have its own
-     */
-    function init() {
-        parent::init();
-
-    /// Set own custom attributes
-
-    /// Get needed strings
-        $this->loadStrings(array(
-            'change' => 'xmldb',
-            'vieworiginal' => 'xmldb',
-            'viewedited' => 'xmldb',
-            'yes' => '',
-            'no' => '',
-            'back' => 'xmldb'
-        ));
-    }
-
-    /**
-     * Invoke method, every class will have its own
-     * returns true/false on completion, setting both
-     * errormsg and output as necessary
-     */
-    function invoke() {
-        parent::invoke();
-
-        $result = true;
-
-    /// Set own core attributes
-        $this->does_generate = ACTION_GENERATE_HTML;
-
-    /// These are always here
-        global $CFG, $XMLDB;
-
-    /// Do the job, setting result as needed
-    /// Get the dir containing the file
-        $dirpath = required_param('dir', PARAM_PATH);
-        $dirpath = $CFG->dirroot . stripslashes_safe($dirpath);
-
-    /// Get the correct dirs
-        if (!empty($XMLDB->dbdirs)) {
-            $dbdir =& $XMLDB->dbdirs[$dirpath];
-        } else {
-            return false;
-        }
-        if (!empty($XMLDB->editeddirs)) {
-            $editeddir =& $XMLDB->editeddirs[$dirpath];
-            $structure =& $editeddir->xml_file->getStructure();
-        }
-
-    /// ADD YOUR CODE HERE
-
-    /// Fetch request data
-        $tableparam = required_param('table', PARAM_CLEAN);
-        if (!$table =& $structure->getTable($tableparam)) {
-            $this->errormsg = 'Wrong table specified: ' . $tableparm;
-            return false;
-        }
-        $fieldparam = required_param('field', PARAM_CLEAN);
-        if (!$field =& $table->getField($fieldparam)) {
-        /// Arriving here from a name change, looking for the new field name
-            $fieldparam = required_param('name', PARAM_CLEAN);
-            $field =& $table->getField($fieldparam);
-        }
-
-        $dbdir =& $XMLDB->dbdirs[$dirpath];
-        $origstructure =& $dbdir->xml_file->getStructure();
-
-    /// Add the main form
-        $o = '<form name="form" id="form" action="index.php" method="post">';
-        $o.= '    <input type="hidden" name ="dir" value="' . str_replace($CFG->dirroot, '', $dirpath) . '" />';
-        $o.= '    <input type="hidden" name ="table" value="' . $tableparam .'" />';
-        $o.= '    <input type="hidden" name ="field" value="' . $fieldparam .'" />';
-        $o.= '    <input type="hidden" name ="action" value="edit_field_save" />';
-        $o.= '    <input type="hidden" name ="postaction" value="edit_table" />';
-        $o.= '    <table id="formelements" align="center">';
-    /// XMLDB field name
-    /// If the field has dependencies, we cannot change its name
-        $disabled = '';
-        if ($structure->getFieldUses($table->getName(), $field->getName())) {
-            $o.= '      <input type="hidden" name ="name" value="' .  s($field->getName()) .'" />';
-            $o.= '      <tr valign="top"><td>Name:</td><td colspan="2">' . s($field->getName()) . '</td></tr>';
-        } else {
-            $o.= '      <tr valign="top"><td><label for="name" accesskey="n">Name:</label></td><td colspan="2"><input name="name" type="text" size="30" maxlength="30" id="name" value="' . s($field->getName()) . '" /></td></tr>';
-        }
-    /// XMLDB field comment
-        $o.= '      <tr valign="top"><td><label for="comment" accesskey="c">Comment:</label></td><td colspan="2"><textarea name="comment" rows="3" cols="80" id="comment">' . s($field->getComment()) . '</textarea></td></tr>';
-    /// XMLDBField Type
-        $typeoptions = array (XMLDB_TYPE_INTEGER => $field->getXMLDBTypeName(XMLDB_TYPE_INTEGER),
-                              XMLDB_TYPE_NUMBER  => $field->getXMLDBTypeName(XMLDB_TYPE_NUMBER),
-                              XMLDB_TYPE_FLOAT   => $field->getXMLDBTypeName(XMLDB_TYPE_FLOAT),
-                              XMLDB_TYPE_DATETIME=> $field->getXMLDBTypeName(XMLDB_TYPE_DATETIME),
-                              XMLDB_TYPE_CHAR    => $field->getXMLDBTypeName(XMLDB_TYPE_CHAR),
-                              XMLDB_TYPE_TEXT    => $field->getXMLDBTypeName(XMLDB_TYPE_TEXT),
-                              XMLDB_TYPE_BINARY  => $field->getXMLDBTypeName(XMLDB_TYPE_BINARY));
-    /// If current field isnt float, delete such column type to avoid its creation from the interface
-    /// Note that float fields are supported completely but it's possible than in a next future
-    /// we delete them completely from Moodle DB, using, exlusively, number(x,y) types
-        if ($field->getType() != XMLDB_TYPE_FLOAT) {
-            unset ($typeoptions[XMLDB_TYPE_FLOAT]);
-        }
-    /// Also we hide datetimes. Only edition of them is allowed (and retrofit) but not new creation
-        if ($field->getType() != XMLDB_TYPE_DATETIME) {
-            unset ($typeoptions[XMLDB_TYPE_DATETIME]);
-        }
-        $o.= '      <tr valign="top"><td><label for="menutype" accesskey="t">Type:</label></td>';
-        $o.= '        <td colspan="2">' . choose_from_menu($typeoptions, 'type', $field->getType(), '', '', '', true) . '</td></tr>';
-    /// XMLDBField Length
-        $o.= '      <tr valign="top"><td><label for="length" accesskey="l">Length:</label></td>';
-        $o.= '        <td colspan="2"><input name="length" type="text" size="6" maxlength="6" id="length" value="' . s($field->getLength()) . '" /><span id="lengthtip"></span></td></tr>';
-    /// XMLDBField Decimals
-        $o.= '      <tr valign="top"><td><label for="decimals" accesskey="d">Decimals:</label></td>';
-        $o.= '        <td colspan="2"><input name="decimals" type="text" size="6" maxlength="6" id="decimals" value="' . s($field->getDecimals()) . '" /><span id="decimalstip"></span></td></tr>';
-    /// XMLDBField Unsigned
-        $unsignedoptions = array (0 => 'signed', 1 => 'unsigned');
-        $o.= '      <tr valign="top"><td><label for="menuunsigned" accesskey="u">Unsigned:</label></td>';
-        $o.= '        <td colspan="2">' . choose_from_menu($unsignedoptions, 'unsigned', $field->getUnsigned(), '', '', '', true) . '</td></tr>';
-    /// XMLDBField NotNull
-        $notnulloptions = array (0 => 'null', 'not null');
-        $o.= '      <tr valign="top"><td><label for="menunotnull" accesskey="n">Not Null:</label></td>';
-        $o.= '        <td colspan="2">' . choose_from_menu($notnulloptions, 'notnull', $field->getNotNull(), '', '', '', true) . '</td></tr>';
-    /// XMLDBField Sequence
-        $sequenceoptions = array (0 => $this->str['no'], 1 => 'auto-numbered');
-        $o.= '      <tr valign="top"><td><label for="menusequence" accesskey="s">Sequence:</label></td>';
-        $o.= '        <td colspan="2">' . choose_from_menu($sequenceoptions, 'sequence', $field->getSequence(), '', '', '', true) . '</td></tr>';
-    /// XMLDBField Enum and enumvalues
-        $enumoptions = array (0 => $this->str['no'], 1 => $this->str['yes']);
-        $o.= '      <tr valign="top"><td><label for="menuenum" accesskey="s">Enum:</label></td>';
-        $o.= '        <td>' . choose_from_menu($enumoptions, 'enum', $field->getEnum(), '', '', '', true) . '</td>';
-        if (is_array($field->getEnumValues())) {
-            $enumvalues = implode(', ', $field->getEnumValues());
-        } else {
-            $enumvalues = '';
-        }
-        $o.= '            <td><textarea name="enumvalues" rows="3" cols="70" id="enumvalues">' . s($enumvalues) . '</textarea></td></tr>';
-    /// XMLDBField Default
-        $o.= '      <tr valign="top"><td><label for="default" accesskey="d">Default:</label></td>';
-        $o.= '        <td colspan="2"><input type="text" name="default" size="30" maxlength="80" id="default" value="' . s($field->getDefault()) . '" /></td></tr>';
-    /// Change button
-        $o.= '      <tr valign="top"><td>&nbsp;</td><td colspan="2"><input type="submit" value="' .$this->str['change'] . '" /></td></tr>';
-        $o.= '    </table>';
-        $o.= '</form>';
-    /// Calculate the buttons
-        $b = ' <p align="center" class="buttons">';
-    /// The view original XML button
-        if ($table->getField($fieldparam)) {
-            $b .= '&nbsp;<a href="index.php?action=view_field_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=original&amp;table=' . $tableparam . '&amp;field=' . $fieldparam . '" target="_blank">[' . $this->str['vieworiginal'] . ']</a>';
-        } else {
-            $b .= '&nbsp;[' . $this->str['vieworiginal'] . ']';
-        }
-    /// The view edited XML button
-        if ($field->hasChanged()) {
-            $b .= '&nbsp;<a href="index.php?action=view_field_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=edited&amp;table=' . $tableparam . '&amp;field=' . $fieldparam . '" target="_blank">[' . $this->str['viewedited'] . ']</a>';
-        } else {
-            $b .= '&nbsp;[' . $this->str['viewedited'] . ']';
-        }
-    /// The back to edit table button
-        $b .= '&nbsp;<a href="index.php?action=edit_table&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '">[' . $this->str['back'] . ']</a>';
-        $b .= '</p>';
-        $o .= $b;
-
-        $this->output = $o;
-
-    /// Launch postaction if exists (leave this here!)
-        if ($this->getPostAction() && $result) {
-            return $this->launch($this->getPostAction());
-        }
-
-    /// Return ok if arrived here
-        return $result;
-    }
-}
-?>

admin/xmldb/actions/edit_field/edit_field.js

@@ -1,187 +0,0 @@
-/// $Id $
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-
-/// Register the needed events
-
-    onload=function() {
-    /// Adjust the form on load
-        transformForm();
-
-    /// Get the required fields
-        var typeField         = document.getElementById('menutype');
-        var sequenceField     = document.getElementById('menusequence');
-        var enumField         = document.getElementById('menuenum');
-
-    /// Register the rest of events
-        if (typeField.addEventListener) {
-        /// Standard
-            typeField.addEventListener('change', transformForm, false);
-            sequenceField.addEventListener('change', transformForm, false);
-            enumField.addEventListener('change', transformForm, false);
-        } else {
-        /// IE 5.5
-            typeField.attachEvent('onchange', transformForm);
-            sequenceField.attachEvent('onchange', transformForm);
-            enumField.attachEvent('onchange', transformForm);
-        }
-    }
-
-/**
- * This function controls all modifications to perform when any field changes
- */
-function transformForm(event) {
-
-/// Initialize all the needed variables
-    var typeField         = document.getElementById('menutype');
-    var lengthField       = document.getElementById('length');
-    var decimalsField     = document.getElementById('decimals');
-    var unsignedField     = document.getElementById('menuunsigned');
-    var notnullField      = document.getElementById('menunotnull');
-    var sequenceField     = document.getElementById('menusequence');
-    var enumField         = document.getElementById('menuenum');
-    var enumvaluesField   = document.getElementById('enumvalues');
-    var defaultField      = document.getElementById('default');
-
-    var lengthTip         = document.getElementById('lengthtip');
-    var decimalsTip       = document.getElementById('decimalstip');
-
-/// Initially, enable everything
-    decimalsField.disabled = false;
-    unsignedField.disabled = false;
-    notnullField.disabled = false;
-    sequenceField.disabled = false;
-    enumField.disabled = false;
-    enumvaluesField.disabled = false;
-    defaultField.disabled = false;
-
-/// Based on enum, disable some items
-    if (enumField.value == '0') {
-        enumvaluesField.disabled = true;
-        enumvaluesField.value = '';
-    };
-
-/// Based on sequence, disable some items
-    if (sequenceField.value == '1') {
-        unsignedField.disabled = true;
-        unsignedField.value = '1';
-        notnullField.disabled = true;
-        notnullField.value = '1';
-        defaultField.disabled = true;
-        defaultField.value = '';
-        enumField.disabled = true;
-        enumField.value = '0';
-        enumvaluesField.disabled = true;
-        enumvaluesField.value = '';
-    }
-
-
-/// Based on type, disable some items
-    switch (typeField.value) {
-        case '1':  // XMLDB_TYPE_INTEGER
-            lengthTip.innerHTML = ' 1...20';
-            decimalsTip.innerHTML = '';
-            decimalsField.disabled = true;
-            decimalsField.value = '';
-            enumField.disabled = true;
-            enumField.value = '0';
-            enumvaluesField.disabled = true;
-            enumvaluesField.value = '';
-            break;
-        case '2':  // XMLDB_TYPE_NUMBER
-            lengthTip.innerHTML = ' 1...20';
-            decimalsTip.innerHTML = ' 0...length or empty';
-            enumField.disabled = true;
-            enumField.value = '0';
-            enumvaluesField.disabled = true;
-            enumvaluesField.value = '';
-            break;
-        case '3':  // XMLDB_TYPE_FLOAT
-            lengthTip.innerHTML = ' 1...20 or empty';
-            decimalsTip.innerHTML = ' 0...length or empty';
-            enumField.disabled = true;
-            enumField.value = '0';
-            enumvaluesField.disabled = true;
-            enumvaluesField.value = '';
-            break;
-        case '4':  // XMLDB_TYPE_CHAR
-            lengthTip.innerHTML = ' 1...255';
-            decimalsTip.innerHTML = '';
-            decimalsField.disabled = true;
-            decimalsField.value = '';
-            unsignedField.disabled = true;
-            unsignedField.value = '0';
-            sequenceField.disabled = true;
-            sequenceField.value = '0';
-            break;
-        case '5':  // XMLDB_TYPE_TEXT
-            lengthTip.innerHTML = ' small, medium, big';
-            decimalsTip.innerHTML = '';
-            decimalsField.disabled = true;
-            decimalsField.value = '';
-            unsignedField.disabled = true;
-            unsignedField.value = '0';
-            sequenceField.disabled = true;
-            sequenceField.value = '0';
-            defaultField.disabled = true;
-            defaultField.value = '';
-            break;
-        case '6':  // XMLDB_TYPE_BINARY
-            lengthTip.innerHTML = ' small, medium, big';
-            decimalsTip.innerHTML = '';
-            decimalsField.disabled = true;
-            decimalsField.value = '';
-            unsignedField.disabled = true;
-            unsignedField.value = '0';
-            sequenceField.disabled = true;
-            sequenceField.value = '0';
-            enumField.disabled = true;
-            enumField.value = '0';
-            enumvaluesField.disabled = true;
-            enumvaluesField.value = '';
-            defaultField.disabled = true;
-            defaultField.value = '';
-            break;
-        case '7':  // XMLDB_TYPE_DATETIME
-            lengthTip.innerHTML = '';
-            lengthField.disabled = true;
-            lengthField.value = '';
-            decimalsTip.innerHTML = '';
-            decimalsField.disabled = true;
-            decimalsField.value = '';
-            unsignedField.disabled = true;
-            unsignedField.value = '0';
-            sequenceField.disabled = true;
-            sequenceField.value = '0';
-            enumField.disabled = true;
-            enumField.value = '0';
-            enumvaluesField.disabled = true;
-            enumvaluesField.value = '';
-            defaultField.disabled = true;
-            defaultField.value = '';
-            break;
-    }
-}

admin/xmldb/actions/edit_field_save/edit_field_save.class.php

@@ -1,350 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will save the changes performed to one field
-
-class edit_field_save extends XMLDBAction {
-
-    /**
-     * Init method, every subclass will have its own
-     */
-    function init() {
-        parent::init();
-
-    /// Set own custom attributes
-
-    /// Get needed strings
-        $this->loadStrings(array(
-            'fieldnameempty' => 'xmldb',
-            'incorrectfieldname' => 'xmldb',
-            'duplicatefieldname' => 'xmldb',
-            'integerincorrectlength' => 'xmldb',
-            'numberincorrectlength' => 'xmldb',
-            'floatincorrectlength' => 'xmldb',
-            'charincorrectlength' => 'xmldb',
-            'textincorrectlength' => 'xmldb',
-            'binaryincorrectlength' => 'xmldb',
-            'numberincorrectdecimals' => 'xmldb',
-            'floatincorrectdecimals' => 'xmldb',
-            'enumvaluesincorrect' => 'xmldb',
-            'wronglengthforenum' => 'xmldb',
-            'defaultincorrect' => 'xmldb',
-            'administration' => ''
-        ));
-    }
-
-    /**
-     * Invoke method, every class will have its own
-     * returns true/false on completion, setting both
-     * errormsg and output as necessary
-     */
-    function invoke() {
-        parent::invoke();
-
-        $result = true;
-
-    /// Set own core attributes
-        $this->does_generate = ACTION_NONE;
-        //$this->does_generate = ACTION_GENERATE_HTML;
-
-    /// These are always here
-        global $CFG, $XMLDB;
-
-    /// Do the job, setting result as needed
-
-        if (!data_submitted('nomatch')) { ///Basic prevention
-            error('Wrong action call');
-        }
-
-    /// Get parameters
-        $dirpath = required_param('dir', PARAM_PATH);
-        $dirpath = $CFG->dirroot . stripslashes_safe($dirpath);
-
-        $tableparam = strtolower(required_param('table', PARAM_PATH));
-        $fieldparam = strtolower(required_param('field', PARAM_PATH));
-        $name = substr(trim(strtolower(optional_param('name', $fieldparam, PARAM_PATH))),0,30);
-
-        $comment = required_param('comment', PARAM_CLEAN);
-        $comment = trim(stripslashes_safe($comment));
-
-        $type       = required_param('type', PARAM_INT);
-        $length     = strtolower(optional_param('length', NULL, PARAM_ALPHANUM));
-        $decimals   = optional_param('decimals', NULL, PARAM_INT);
-        $unsigned   = optional_param('unsigned', false, PARAM_BOOL);
-        $notnull    = optional_param('notnull', false, PARAM_BOOL);
-        $sequence   = optional_param('sequence', false, PARAM_BOOL);
-        $enum       = optional_param('enum', false, PARAM_BOOL);
-        $enumvalues = optional_param('enumvalues', 0, PARAM_CLEAN);
-        $enumvalues = trim(stripslashes_safe($enumvalues));
-        $default    = optional_param('default', NULL, PARAM_PATH);
-        $default    = trim(stripslashes_safe($default));
-
-        $editeddir =& $XMLDB->editeddirs[$dirpath];
-        $structure =& $editeddir->xml_file->getStructure();
-        $table =& $structure->getTable($tableparam);
-        $field =& $table->getField($fieldparam);
-        $oldhash = $field->getHash();
-
-        $errors = array();    /// To store all the errors found
-
-    /// Perform some automatic asumptions
-        if ($sequence) {
-            $unsigned = true;
-            $notnull  = true;
-            $enum     = false;
-            $default  = NULL;
-        }
-        if ($type != XMLDB_TYPE_NUMBER && $type != XMLDB_TYPE_FLOAT) {
-            $decimals = NULL;
-        }
-        if ($type != XMLDB_TYPE_CHAR && $type != XMLDB_TYPE_TEXT) {
-            $enum = false;
-        }
-        if ($type == XMLDB_TYPE_BINARY) {
-            $default = NULL;
-        }
-        if (!$enum) {
-            $enumvalues = NULL;
-        }
-        if ($default === '') {
-            $default = NULL;
-        }
-
-    /// Perform some checks
-    /// Check empty name
-        if (empty($name)) {
-            $errors[] = $this->str['fieldnameempty'];
-        }
-    /// Check incorrect name
-        if ($name == 'changeme') {
-            $errors[] = $this->str['incorrectfieldname'];
-        }
-    /// Check duplicate name
-        if ($fieldparam != $name && $table->getField($name)) {
-            $errors[] = $this->str['duplicatefieldname'];
-        }
-    /// Integer checks
-        if ($type == XMLDB_TYPE_INTEGER) {
-            if (!(is_numeric($length) && !empty($length) && intval($length)==floatval($length) &&
-                  $length > 0 && $length <= 20)) {
-                $errors[] = $this->str['integerincorrectlength'];
-            }
-            if (!(empty($default) || (is_numeric($default) &&
-                                       !empty($default) &&
-                                       intval($default)==floatval($default)))) {
-                $errors[] = $this->str['defaultincorrect'];
-            }
-        }
-    /// Number checks
-        if ($type == XMLDB_TYPE_NUMBER) {
-            if (!(is_numeric($length) && !empty($length) && intval($length)==floatval($length) &&
-                  $length > 0 && $length <= 20)) {
-                $errors[] = $this->str['numberincorrectlength'];
-            }
-            if (!(empty($decimals) || (is_numeric($decimals) &&
-                                       !empty($decimals) &&
-                                       intval($decimals)==floatval($decimals) &&
-                                       $decimals >= 0 &&
-                                       $decimals < $length))) {
-                $errors[] = $this->str['numberincorrectdecimals'];
-            }
-            if (!(empty($default) || (is_numeric($default) &&
-                                       !empty($default)))) {
-                $errors[] = $this->str['defaultincorrect'];
-            }
-        }
-    /// Float checks
-        if ($type == XMLDB_TYPE_FLOAT) {
-            if (!(empty($length) || (is_numeric($length) &&
-                                     !empty($length) &&
-                                     intval($length)==floatval($length) &&
-                                     $length > 0 &&
-                                     $length <= 20))) {
-                $errors[] = $this->str['floatincorrectlength'];
-            }
-            if (!(empty($decimals) || (is_numeric($decimals) &&
-                                       !empty($decimals) &&
-                                       intval($decimals)==floatval($decimals) &&
-                                       $decimals >= 0 &&
-                                       $decimals < $length))) {
-                $errors[] = $this->str['floatincorrectdecimals'];
-            }
-            if (!(empty($default) || (is_numeric($default) &&
-                                       !empty($default)))) {
-                $errors[] = $this->str['defaultincorrect'];
-            }
-        }
-    /// Char checks
-        if ($type == XMLDB_TYPE_CHAR) {
-            if (!(is_numeric($length) && !empty($length) && intval($length)==floatval($length) &&
-                  $length > 0 && $length <= 255)) {
-                $errors[] = $this->str['charincorrectlength'];
-            }
-            if ($default !== NULL && $default !== '') {
-                if (substr($default, 0, 1) == "'" ||
-                    substr($default, -1, 1) == "'") {
-                    $errors[] = $this->str['defaultincorrect'];
-                }
-            }
-        }
-    /// Text checks
-        if ($type == XMLDB_TYPE_TEXT) {
-            if ($length != 'small' &&
-                $length != 'medium' &&
-                $length != 'big') {
-                $errors[] = $this->str['textincorrectlength'];
-            }
-            if ($default !== NULL && $default !== '') {
-                if (substr($default, 0, 1) == "'" ||
-                    substr($default, -1, 1) == "'") {
-                    $errors[] = $this->str['defaultincorrect'];
-                }
-            }
-        }
-    /// Binary checks
-        if ($type == XMLDB_TYPE_BINARY) {
-            if ($length != 'small' &&
-                $length != 'medium' &&
-                $length != 'big') {
-                $errors[] = $this->str['binaryincorrectlength'];
-            }
-        }
-    /// Enum checks
-        if ($enum) {
-            $enumerr = false;
-            $enumarr = explode(',',$enumvalues);
-            $maxlength = 0;
-            if ($enumarr) {
-                foreach ($enumarr as $key => $enumelement) {
-                /// Clear some spaces
-                    $enumarr[$key] = trim($enumelement);
-                    $enumelement = trim($enumelement);
-                /// Calculate needed length
-                    $le = strlen(str_replace("'", '', $enumelement));
-                    if ($le > $maxlength) {
-                        $maxlength = $le;
-                    }
-                /// Skip if under error
-                    if ($enumerr) {
-                        continue;
-                    }
-                /// Look for quoted strings
-                    if (substr($enumelement, 0, 1) != "'" ||
-                        substr($enumelement, -1, 1) != "'") {
-                        $enumerr = true;
-                    }
-                }
-            } else {
-                $enumerr = true;
-            }
-            if ($enumerr) {
-                $errors[] = $this->str['enumvaluesincorrect'];
-            } else {
-                $enumvalues = $enumarr;
-            }
-            if ($length < $maxlength) {
-                $errors[] = $this->str['wronglengthforenum'];
-            }
-        }
-
-        if (!empty($errors)) {
-            $tempfield = new XMLDBField($name);
-            $tempfield->setType($type);
-            $tempfield->setLength($length);
-            $tempfield->setDecimals($decimals);
-            $tempfield->setUnsigned($unsigned);
-            $tempfield->setNotNull($notnull);
-            $tempfield->setSequence($sequence);
-            $tempfield->setEnum($enum);
-            $tempfield->setEnumValues($enumvalues);
-            $tempfield->setDefault($default);
-        /// Prepare the output
-            $site = get_site();
-            print_header("$site->shortname: XMLDB",
-                         "$site->fullname",
-                         "<a href=\"../index.php\">" . $this->str['administration'] . "</a> -> <a href=\"index.php\">XMLDB</a>");
-            notice ('<p>' .implode(', ', $errors) . '</p>
-                     <p>' . $tempfield->readableInfo(),
-                    'index.php?action=edit_field&amp;field=' .$field->getName() . '&amp;table=' . $table->getName() . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)));
-            die; /// re-die :-P
-        }
-
-    /// Continue if we aren't under errors
-        if (empty($errors)) {
-        /// If there is one name change, do it, changing the prev and next
-        /// atributes of the adjacent fields
-            if ($fieldparam != $name) {
-                $field->setName($name);
-                if ($field->getPrevious()) {
-                    $prev =& $table->getField($field->getPrevious());
-                    $prev->setNext($name);
-                    $prev->setChanged(true);
-                }
-                if ($field->getNext()) {
-                    $next =& $table->getField($field->getNext());
-                    $next->setPrevious($name);
-                    $next->setChanged(true);
-                }
-            }
-
-        /// Set comment
-            $field->setComment($comment);
-
-        /// Set the rest of fields
-            $field->setType($type);
-            $field->setLength($length);
-            $field->setDecimals($decimals);
-            $field->setUnsigned($unsigned);
-            $field->setNotNull($notnull);
-            $field->setSequence($sequence);
-            $field->setEnum($enum);
-            $field->setEnumValues($enumvalues);
-            $field->setDefault($default);
-
-        /// If the hash has changed from the old one, change the version
-        /// and mark the structure as changed
-            $field->calculateHash(true);
-            if ($oldhash != $field->getHash()) {
-                $field->setChanged(true);
-                $table->setChanged(true);
-            /// Recalculate the structure hash
-                $structure->calculateHash(true);
-                $structure->setVersion(userdate(time(), '%Y%m%d', 99, false));
-            /// Mark as changed
-                $structure->setChanged(true);
-            }
-
-        /// Launch postaction if exists (leave this here!)
-            if ($this->getPostAction() && $result) {
-                return $this->launch($this->getPostAction());
-            }
-        }
-
-    /// Return ok if arrived here
-        return $result;
-    }
-}
-?>

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

@@ -1,159 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will provide the interface for all the edit index actions
-
-class edit_index extends XMLDBAction {
-
-    /**
-     * Init method, every subclass will have its own
-     */
-    function init() {
-        parent::init();
-
-    /// Set own custom attributes
-
-    /// Get needed strings
-        $this->loadStrings(array(
-            'change' => 'xmldb',
-            'vieworiginal' => 'xmldb',
-            'viewedited' => 'xmldb',
-            'yes' => '',
-            'no' => '',
-            'back' => 'xmldb'
-        ));
-    }
-
-    /**
-     * Invoke method, every class will have its own
-     * returns true/false on completion, setting both
-     * errormsg and output as necessary
-     */
-    function invoke() {
-        parent::invoke();
-
-        $result = true;
-
-    /// Set own core attributes
-        $this->does_generate = ACTION_GENERATE_HTML;
-
-    /// These are always here
-        global $CFG, $XMLDB;
-
-    /// Do the job, setting result as needed
-    /// Get the dir containing the file
-        $dirpath = required_param('dir', PARAM_PATH);
-        $dirpath = $CFG->dirroot . stripslashes_safe($dirpath);
-
-    /// Get the correct dirs
-        if (!empty($XMLDB->dbdirs)) {
-            $dbdir =& $XMLDB->dbdirs[$dirpath];
-        } else {
-            return false;
-        }
-        if (!empty($XMLDB->editeddirs)) {
-            $editeddir =& $XMLDB->editeddirs[$dirpath];
-            $structure =& $editeddir->xml_file->getStructure();
-        }
-
-    /// ADD YOUR CODE HERE
-
-    /// Fetch request data
-        $tableparam = required_param('table', PARAM_CLEAN);
-        if (!$table =& $structure->getTable($tableparam)) {
-            $this->errormsg = 'Wrong table specified: ' . $tableparm;
-            return false;
-        }
-        $indexparam = required_param('index', PARAM_CLEAN);
-        if (!$index =& $table->getIndex($indexparam)) {
-        /// Arriving here from a name change, looking for the new key name
-            $indexparam = required_param('name', PARAM_CLEAN);
-            $index =& $table->getIndex($indexparam);
-        }
-
-        $dbdir =& $XMLDB->dbdirs[$dirpath];
-        $origstructure =& $dbdir->xml_file->getStructure();
-
-    /// Add the main form
-        $o = '<form name="form" id="form" action="index.php" method="post">';
-        $o.= '    <input type="hidden" name ="dir" value="' . str_replace($CFG->dirroot, '', $dirpath) . '" />';
-        $o.= '    <input type="hidden" name ="table" value="' . $tableparam .'" />';
-        $o.= '    <input type="hidden" name ="index" value="' . $indexparam .'" />';
-        $o.= '    <input type="hidden" name ="action" value="edit_index_save" />';
-        $o.= '    <input type="hidden" name ="postaction" value="edit_table" />';
-        $o.= '    <table id="formelements" align="center">';
-    /// XMLDB index name
-    /// If the index has dependencies, we cannot change its name
-        $disabled = '';
-        if ($structure->getIndexUses($table->getName(), $index->getName())) {
-            $disabled = ' disabled="disabled " ';
-        }
-        $o.= '      <tr valign="top"><td><label for="name" accesskey="n">Name:</label></td><td colspan="2"><input name="name" type="text" size="30" id="name"' . $disabled . 'value="' . s($index->getName()) . '" /></td></tr>';
-    /// XMLDB key comment
-        $o.= '      <tr valign="top"><td><label for="comment" accesskey="c">Comment:</label></td><td colspan="2"><textarea name="comment" rows="3" cols="80" id="comment">' . s($index->getComment()) . '</textarea></td></tr>';
-    /// XMLDBIndex Type
-        $typeoptions = array (0 => 'not unique',
-                              1 => 'unique');
-        $o.= '      <tr valign="top"><td><label for="menuunique" accesskey="t">Type:</label></td>';
-        $o.= '        <td colspan="2">' . choose_from_menu($typeoptions, 'unique', $index->getUnique(), '', '', '', true) . '</td></tr>';
-    /// XMLDBIndex Fields
-        $o.= '      <tr valign="top"><td><label for="fields" accesskey="f">Fields:</label></td>';
-        $o.= '        <td colspan="2"><input name="fields" type="text" size="40" maxlength="80" id="fields" value="' . s(implode(', ', $index->getFields())) . '" /></td></tr>';
-    /// Change button
-        $o.= '      <tr valign="top"><td>&nbsp;</td><td colspan="2"><input type="submit" value="' .$this->str['change'] . '" /></td></tr>';
-        $o.= '    </table>';
-        $o.= '</form>';
-    /// Calculate the buttons
-        $b = ' <p align="center" class="buttons">';
-    /// The view original XML button
-        if ($table->getIndex($indexparam)) {
-            $b .= '&nbsp;<a href="index.php?action=view_index_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=original&amp;table=' . $tableparam . '&amp;index=' . $indexparam . '" target="_blank">[' . $this->str['vieworiginal'] . ']</a>';
-        } else {
-            $b .= '&nbsp;[' . $this->str['vieworiginal'] . ']';
-        }
-    /// The view edited XML button
-        if ($index->hasChanged()) {
-            $b .= '&nbsp;<a href="index.php?action=view_index_xml&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '&amp;select=edited&amp;table=' . $tableparam . '&amp;index=' . $indexparam . '" target="_blank">[' . $this->str['viewedited'] . ']</a>';
-        } else {
-            $b .= '&nbsp;[' . $this->str['viewedited'] . ']';
-        }
-    /// The back to edit table button
-        $b .= '&nbsp;<a href="index.php?action=edit_table&amp;table=' . $tableparam . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)) . '">[' . $this->str['back'] . ']</a>';
-        $b .= '</p>';
-        $o .= $b;
-
-        $this->output = $o;
-
-    /// Launch postaction if exists (leave this here!)
-        if ($this->getPostAction() && $result) {
-            return $this->launch($this->getPostAction());
-        }
-
-    /// Return ok if arrived here
-        return $result;
-    }
-}
-?>

admin/xmldb/actions/edit_index_save/edit_index_save.class.php

@@ -1,224 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will save the changes performed to one index
-
-class edit_index_save extends XMLDBAction {
-
-    /**
-     * Init method, every subclass will have its own
-     */
-    function init() {
-        parent::init();
-
-    /// Set own custom attributes
-
-    /// Get needed strings
-        $this->loadStrings(array(
-            'indexnameempty' => 'xmldb',
-            'incorrectindexname' => 'xmldb',
-            'duplicateindexname' => 'xmldb',
-            'nofieldsspecified' => 'xmldb',
-            'duplicatefieldsused' => 'xmldb',
-            'fieldsnotintable' => 'xmldb',
-            'fieldsusedinkey' => 'xmldb',
-            'fieldsusedinindex' => 'xmldb',
-            'administration' => ''
-        ));
-    }
-
-    /**
-     * Invoke method, every class will have its own
-     * returns true/false on completion, setting both
-     * errormsg and output as necessary
-     */
-    function invoke() {
-        parent::invoke();
-
-        $result = true;
-
-    /// Set own core attributes
-        $this->does_generate = ACTION_NONE;
-        //$this->does_generate = ACTION_GENERATE_HTML;
-
-    /// These are always here
-        global $CFG, $XMLDB;
-
-    /// Do the job, setting result as needed
-
-        if (!data_submitted('nomatch')) { ///Basic prevention
-            error('Wrong action call');
-        }
-
-    /// Get parameters
-        $dirpath = required_param('dir', PARAM_PATH);
-        $dirpath = $CFG->dirroot . stripslashes_safe($dirpath);
-
-        $tableparam = strtolower(required_param('table', PARAM_PATH));
-        $indexparam = strtolower(required_param('index', PARAM_PATH));
-        $name = trim(strtolower(optional_param('name', $indexparam, PARAM_PATH)));
-
-        $comment = required_param('comment', PARAM_CLEAN);
-        $comment = trim(stripslashes_safe($comment));
-
-        $unique = required_param('unique', PARAM_INT);
-        $fields = required_param('fields', PARAM_CLEAN);
-        $fields = str_replace(' ', '', trim(strtolower(stripslashes_safe($fields))));
-
-        $editeddir =& $XMLDB->editeddirs[$dirpath];
-        $structure =& $editeddir->xml_file->getStructure();
-        $table =& $structure->getTable($tableparam);
-        $index =& $table->getIndex($indexparam);
-        $oldhash = $index->getHash();
-
-        $errors = array();    /// To store all the errors found
-
-    /// Perform some checks
-    /// Check empty name
-        if (empty($name)) {
-            $errors[] = $this->str['indexnameempty'];
-        }
-    /// Check incorrect name
-        if ($name == 'changeme') {
-            $errors[] = $this->str['incorrectindexname'];
-        }
-    /// Check duplicate name
-        if ($indexparam != $name && $table->getIndex($name)) {
-            $errors[] = $this->str['duplicateindexname'];
-        }
-        $fieldsarr = explode(',', $fields);
-    /// Check the fields isn't empty
-        if (empty($fieldsarr[0])) {
-            $errors[] = $this->str['nofieldsspecified'];
-        } else {
-        /// Check that there aren't duplicate column names
-            $uniquearr = array_unique($fieldsarr);
-            if (count($fieldsarr) != count($uniquearr)) {
-                $errors[] = $this->str['duplicatefieldsused'];
-            }
-        /// Check that all the fields in belong to the table
-            foreach ($fieldsarr as $field) {
-                if (!$table->getField($field)) {
-                    $errors[] = $this->str['fieldsnotintable'];
-                    break;
-                }
-            }
-        /// Check that there isn't any key using exactly the same fields
-            $tablekeys = $table->getKeys();
-            if ($tablekeys) {
-                foreach ($tablekeys as $tablekey) {
-                    $keyfieldsarr = $tablekey->getFields();
-                /// Compare both arrays, looking for diferences
-                    $diferences = array_merge(array_diff($fieldsarr, $keyfieldsarr), array_diff($keyfieldsarr, $fieldsarr));
-                    if (empty($diferences)) {
-                        $errors[] = $this->str['fieldsusedinkey'];
-                        break;
-                    }
-                }
-            }
-        /// Check that there isn't any index using exactlt the same fields
-            $tableindexes = $table->getIndexes();
-            if ($tableindexes) {
-                foreach ($tableindexes as $tableindex) {
-                /// Skip checking against itself
-                    if ($indexparam == $tableindex->getName()) {
-                        continue;
-                    }
-                    $indexfieldsarr = $tableindex->getFields();
-                /// Compare both arrays, looking for diferences
-                    $diferences = array_merge(array_diff($fieldsarr, $indexfieldsarr), array_diff($indexfieldsarr, $fieldsarr));
-                    if (empty($diferences)) {
-                        $errors[] = $this->str['fieldsusedinindex'];
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (!empty($errors)) {
-            $tempindex = new XMLDBIndex($name);
-            $tempindex->setUnique($unique);
-            $tempindex->setFields($fieldsarr);
-        /// Prepare the output
-            $site = get_site();
-            print_header("$site->shortname: XMLDB",
-                         "$site->fullname",
-                         "<a href=\"../index.php\">" . $this->str['administration'] . "</a> -> <a href=\"index.php\">XMLDB</a>");
-            notice ('<p>' .implode(', ', $errors) . '</p>
-                     <p>' . $tempindex->readableInfo(),
-                    'index.php?action=edit_index&amp;index=' .$index->getName() . '&amp;table=' . $table->getName() . '&amp;dir=' . urlencode(str_replace($CFG->dirroot, '', $dirpath)));
-            die; /// re-die :-P
-        }
-
-    /// Continue if we aren't under errors
-        if (empty($errors)) {
-        /// If there is one name change, do it, changing the prev and next
-        /// atributes of the adjacent fields
-            if ($indexparam != $name) {
-                $index->setName($name);
-                if ($index->getPrevious()) {
-                    $prev =& $table->getIndex($index->getPrevious());
-                    $prev->setNext($name);
-                    $prev->setChanged(true);
-                }
-                if ($index->getNext()) {
-                    $next =& $table->getIndex($index->getNext());
-                    $next->setPrevious($name);
-                    $next->setChanged(true);
-                }
-            }
-
-        /// Set comment
-            $index->setComment($comment);
-
-        /// Set the rest of fields
-            $index->setUnique($unique);
-            $index->setFields($fieldsarr);
-
-        /// If the hash has changed from the old one, change the version
-        /// and mark the structure as changed
-            $index->calculateHash(true);
-            if ($oldhash != $index->getHash()) {
-                $index->setChanged(true);
-                $table->setChanged(true);
-            /// Recalculate the structure hash
-                $structure->calculateHash(true);
-                $structure->setVersion(userdate(time(), '%Y%m%d', 99, false));
-            /// Mark as changed
-                $structure->setChanged(true);
-            }
-
-        /// Launch postaction if exists (leave this here!)
-            if ($this->getPostAction() && $result) {
-                return $this->launch($this->getPostAction());
-            }
-        }
-
-    /// Return ok if arrived here
-        return $result;
-    }
-}
-?>