Not quite ready, but anyone trying the Beta at this stage will probably

not need to upgrade.

README.txt

@@ -1,32 +1,51 @@
-README     $Id$
-------
-
-Here is a basic outline of the installation process,
-which normally takes me only a few minutes:
-
-1) Move the Moodle files into your web directory. 
-
-2) Create an empty directory somewhere to store 
-   uploaded files (NOT accessible via the web).
-   This directory must be writeable by the web server
-   process.
-
-3) Create a single database for Moodle to store all
-   it's tables in.
-
-4) Copy the file config-dist.php to config.php, and 
-   edit it with all your own settings.
-
-5) Visit your new home page with a web browser.  Moodle
-   will lead you through the rest of the setup, 
-   creating an admin account and so on.
-
-6) Set up a cron task to call the file admin/cron.php
-   every five minutes or so.
-
-For more details, I highly recommend you read the 
-full installation documentation, which is stored 
-in the "doc" directory or found at http://moodle.com/doc/.
-
-Cheers!
-Martin Dougiamas
+README     $Id$
+------
+
+If you are installing the first time, then you 
+should read the installation guide which is 
+part of the Moodle documentation (along with 
+information about upgrading etc):
+
+   http://moodle.com/doc/
+
+There is a copy of all this documentation as part of 
+this Moodle distribution.  You can access your local
+copy of the installation guide here:
+
+   lang/en/docs/install.html
+
+Once Moodle is installed on your machine, then 
+you can also access a local copy of all this 
+documentation (localised to your language) at:
+
+   http://yourmoodlesite.com/doc/
+
+
+For the impatient, here is a basic outline of the 
+installation process, which normally takes me only 
+a few minutes:
+
+1) Move the Moodle files into your web directory. 
+
+2) Create an empty directory somewhere to store 
+   uploaded files (NOT accessible via the web).
+   This directory must be writeable by the web server
+   process.
+
+3) Create a single database for Moodle to store all
+   it's tables in (or choose an existing database).
+
+4) Copy the file config-dist.php to config.php, and 
+   edit it with all your own settings.
+
+5) Visit your new home page with a web browser.  Moodle
+   will lead you through the rest of the setup, 
+   creating an admin account and so on.
+
+6) Set up a cron task to call the file admin/cron.php
+   every five minutes or so.
+
+
+Cheers!
+Martin Dougiamas
+

UPGRADING.txt

@@ -1,42 +0,0 @@
-UPGRADING   $Id$
----------
-
-As Moodle grows, there are changes to the code and 
-sometimes changes to the database structures.
-
-Moodle is able to upgrade its own databases, using 
-information in files called version.php.  There is 
-one of these for the main tables (in this directory)
-and one for each module.
-
-When upgrading from any previous version of Moodle, 
-all you normally will need to do is this:
-
-1)  Make a backup of your current Moodle installation 
-    in the unlikely case that something goes wrong and 
-    you need to restore the older version.
-
-2a) If you are using CVS, just go the root directory
-    and type "cvs update -d" (or whatever the equivalent
-    is on your non-Unix server).
-
-                       OR
-
-2b) Remove the current installation, and then unpack 
-    the new tar or zip file in the same location.
-    Make sure you copy the config.php file from your 
-    old installion to the new installation (or make a 
-    new one by editing config-dist.php).
-
-3)  Visit the home page of your installation.  Moodle
-    will automatically detect the new version and perform 
-    any database upgrades that might be necessary.
-
-If all goes well (no error messages) then you can just 
-go on using Moodle normally.
-
-If you have problems with this procedure, let me know.
-
-Cheers,
-Martin
-

admin/admin.php

@@ -0,0 +1,156 @@
+<?PHP // $Id$
+      // Admin-only script to assign administrative rights to users
+
+	require_once("../config.php");
+    
+    define("MAX_USERS_PER_PAGE", 50);
+
+    optional_variable($add, "");
+    optional_variable($remove, "");
+    optional_variable($search, "");
+
+    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.");
+    }
+
+    $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",
+        "noexistingadmins",
+        "potentialadmins",
+        "nopotentialadmins",
+        "addadmin",
+        "removeadmin",
+        "search",
+        "searchagain",
+        "toomanytoshow",
+        "users",
+        "searchresults"
+        );
+
+    foreach ($stringstoload as $stringtoload){
+        $strstringtoload = "str" . $stringtoload;
+        $$strstringtoload = get_string($stringtoload);
+    }
+
+    if ($search) {
+        $searchstring = $strsearchagain;
+    } else {
+        $searchstring = $strsearch;
+    }
+
+	print_header("$site->shortname: $strassignadmins", 
+                 "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> -> $strassignadmins", "");
+
+/// Add an admin if one is specified
+    if (!empty($_GET['add'])) {
+        if (! add_admin($add)) {
+            error("Could not add that admin!");
+        }
+    }
+
+/// Remove an admin if one is specified.
+    if (!empty($_GET['remove'])) {
+        if (! remove_admin($remove)) {
+            error("Could not remove that admin!");
+        }
+    }
+
+/// Print a help notice about this page
+    if (empty($add) and empty($remove) and empty($search)) {
+        print_simple_box("<center>".get_string("adminhelpassignadmins")."</center>", "center", "50%");
+    }
+
+/// Get all existing admins
+    $admins = get_admins();
+
+/// Print the lists of existing and potential admins
+    echo "<table cellpadding=2 cellspacing=10 align=center>";
+    echo "<tr><th width=50%>$strexistingadmins</th><th width=50%>$strpotentialadmins</th></tr>";
+    echo "<tr><td width=50% nowrap valign=top>";
+
+/// First, show existing admins
+
+    if (! $admins) { 
+        echo "<p align=center>$strnoexistingadmins</p>";
+        $adminlist = "";
+
+    } else {
+        $adminarray = array();
+
+        foreach ($admins as $admin) {
+            $adminarray[] = $admin->id;
+            echo "<p align=right>$admin->firstname $admin->lastname,
+                     $admin->email &nbsp;&nbsp; ";
+            if ($primaryadmin->id == $admin->id){
+                print_spacer(10, 9, false);
+            } else {
+                echo "<a href=\"{$_SERVER['PHP_SELF']}?remove=$admin->id\"
+                title=\"$strremoveadmin\"><img src=\"../pix/t/right.gif\"
+                border=0></A>";
+            }
+            echo "</p>";
+        }
+        
+        $adminlist = implode(",",$adminarray);
+        unset($adminarray);
+    }
+
+    echo "<td width=50% nowrap valign=top>";
+
+/// Print list of potential admins
+
+    $usercount = get_users(false, $search, true, $adminlist);
+
+    if ($usercount == 0) { 
+        echo "<p align=center>$strnopotentialadmins</p>";
+
+    } else if ($usercount > MAX_USERS_PER_PAGE) { 
+        echo "<p align=center>$strtoomanytoshow ($usercount) </p>";
+
+    } else {
+
+        if ($search) {
+            echo "<p align=center>($strsearchresults : $search)</p>";
+        }
+         
+        if (!$users = get_users(true, $search, true, $adminlist)) {
+            error("Could not get users!");
+        }
+
+        foreach ($users as $user) {
+            echo "<p align=left><a href=\"{$_SERVER['PHP_SELF']}?add=$user->id\"".
+                   "title=\"$straddadmin\"><img src=\"../pix/t/left.gif\"".
+                   "border=0></a>&nbsp;&nbsp;$user->firstname $user->lastname, $user->email";
+        }
+    }
+
+    if ($search or $usercount > MAX_USERS_PER_PAGE) {
+        echo "<form action={$_SERVER['PHP_SELF']} method=post>";
+        echo "<input type=text name=search size=20>";
+        echo "<input type=submit value=\"$searchstring\">";
+        echo "</form>";
+    }
+
+    echo "</tr></table>";
+
+    print_footer();
+
+?>

admin/auth.php

@@ -0,0 +1,175 @@
+<?PHP  // $Id$
+       // config.php - allows admin to edit all configuration variables
+
+    include("../config.php");
+    require_login();
+
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
+
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
+
+
+/// If data submitted, then process and store.
+
+	if ($config = data_submitted()) {
+
+        $config = (array)$config;
+        validate_form($config, $err);
+
+        if (count($err) == 0) {
+            print_header();
+            foreach ($config as $name => $value) {
+                if (! set_config($name, $value)) {
+                    notify("Problem saving config $name as $value");
+                }
+            }
+            redirect("auth.php", get_string("changessaved"), 1);
+            exit;
+
+        } else {
+            foreach ($err as $key => $value) {
+                $focus = "form.$key";
+            }
+        }
+	}
+
+/// Otherwise fill and print the form.
+
+    if (empty($config)) {
+        $config = $CFG;
+    }
+
+    $modules = get_list_of_plugins("auth");
+    foreach ($modules as $module) {
+        $options[$module] = get_string("auth_$module"."title", "auth");
+    }
+    asort($options);
+	if (isset($_GET['auth'])) {
+	    $auth = $_GET['auth'];
+	} else {
+        $auth = $config->auth;
+	} 
+    require_once("$CFG->dirroot/auth/$auth/lib.php"); //just to make sure that current authentication functions are loaded
+    if (! isset($config->guestloginbutton)) {
+        $config->guestloginbutton = 1;
+    }
+    if (! isset($config->auth_instructions)) {
+        $config->auth_instructions = "";
+    }
+    if (! isset($config->changepassword)) {
+        $config->changepassword = "";
+    }
+    $user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "department", "address", "city", "country", "description", "idnumber", "lang");
+
+    foreach ($user_fields as $user_field) {
+        $user_field = "auth_user_$user_field";
+        if (! isset($config->$user_field)) {
+            $config->$user_field = "";
+        }
+    }
+
+    if (empty($focus)) {
+        $focus = "";
+    }
+
+    $guestoptions[0] = get_string("hide");
+    $guestoptions[1] = get_string("show");
+
+    $createoptions[0] = get_string("no");
+    $createoptions[1] = get_string("yes");
+
+    $stradministration        = get_string("administration");
+    $strauthentication        = get_string("authentication");
+    $strauthenticationoptions = get_string("authenticationoptions","auth");
+    $strsettings = get_string("settings");
+    $strusers = get_string("users");
+
+    print_header("$site->shortname: $strauthenticationoptions", "$site->fullname",
+                  "<A HREF=\"index.php\">$stradministration</A> -> <a href=\"users.php\">$strusers</a> -> $strauthenticationoptions", "$focus");
+
+    echo "<CENTER><P><B>";
+    echo "<form TARGET=\"{$CFG->framename}\" NAME=\"authmenu\" method=\"post\" action=\"auth.php\">";
+    print_string("chooseauthmethod","auth");
+
+	choose_from_menu ($options, "auth", $auth, "","top.location='auth.php?auth='+document.authmenu.auth.options[document.authmenu.auth.selectedIndex].value", "");
+
+    echo "</B></P></CENTER>";
+        
+    print_simple_box_start("center", "100%", "$THEME->cellheading");
+    print_heading($options[$auth]);
+
+    print_simple_box_start("center", "60%", "$THEME->cellcontent");
+    print_string("auth_$auth"."description", "auth");
+    print_simple_box_end();
+
+    echo "<hr>";
+
+    print_heading($strsettings);
+
+    echo "<table border=\"0\" width=\"100%\" cellpadding=\"4\">";
+
+    require_once("$CFG->dirroot/auth/$auth/config.html");
+
+    if ($auth != "email" and $auth != "none" and $auth != "manual") {
+        echo "<tr valign=\"top\">";
+	    echo "<td align=right nowrap><p>";
+        print_string("changepassword", "auth");
+        echo ":</p></td>";
+	    echo "<td>";
+        echo "<input type=\"text\" name=\"changepassword\" size=40 value=\"$config->changepassword\">";
+        echo "</td>";
+        echo "<td>";
+        print_string("changepasswordhelp","auth");
+        echo "</td></tr>";
+
+    }
+
+    echo "<tr valign=\"top\">";
+	echo "<td align=right nowrap><p>";
+    print_string("guestloginbutton", "auth");
+    echo ":</p></td>";
+	echo "<td>";
+    choose_from_menu($guestoptions, "guestloginbutton", $config->guestloginbutton, "");
+    echo "</td>";
+    echo "<td>";
+    print_string("showguestlogin","auth");
+    echo "</td></tr>";
+
+    if (function_exists('auth_user_create')){    
+	    echo "<tr valign=\"top\">";
+		echo "<td align=right nowrap><p>";
+		print_string("auth_user_create", "auth");
+		echo ":</p></td>";
+		echo "<td>";
+		choose_from_menu($createoptions, "auth_user_create", $config->auth_user_create, "");
+		echo "</td>";
+		echo "<td>";
+		print_string("auth_user_creation","auth");
+		echo "</td></tr>";
+	}
+
+    echo "</table><center><p><input type=\"submit\" value=\"";
+    print_string("savechanges");
+    echo "\"></p></center></form>";
+
+    print_simple_box_end(); 
+
+    print_footer();
+    exit; 
+
+/// Functions /////////////////////////////////////////////////////////////////
+
+function validate_form(&$form, &$err) {
+
+   // if (empty($form->fullname))
+   //     $err["fullname"] = get_string("missingsitename");
+
+    return;
+}
+
+
+?>

admin/config.html

@@ -0,0 +1,325 @@
+<form method="post" action="config.php" name="form">
+
+<table cellpadding=9 cellspacing=0 >
+<tr valign=top>
+	<td align=right><p>lang:</td>
+	<td>
+    <?php choose_from_menu (get_list_of_languages(), "lang", $config->lang, "", "", ""); ?>
+    </td>
+    <td>
+    <?php print_string("configlang") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>langdir:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options["LTR"] = get_string("langltr");
+       $options["RTL"] = get_string("langrtl");
+
+       choose_from_menu ($options, "langdir", $config->langdir, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configlangdir") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>langmenu:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[0] = get_string("no");
+       $options[1] = get_string("yes");
+
+       choose_from_menu ($options, "langmenu", $config->langmenu, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configlangmenu") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>langlist:</td>
+	<td>
+    <input name=langlist type=text size=40 value="<?php p($config->langlist) ?>">
+    </td>
+    <td>
+    <?php print_string("configlanglist") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>locale:</td>
+	<td>
+    <input name=locale type=text size=10 value="<?php p($config->locale) ?>">
+    </td>
+    <td>
+    <?php print_string("configlocale") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>country:</td>
+	<td><?php choose_from_menu ($COUNTRIES, "country", $config->country, get_string("selectacountry"), "") ?>
+	</td>
+    <td>
+    <?php print_string("configcountry") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>smtphosts:</td>
+	<td>
+    <input name=smtphosts type=text size=30 value="<?php p($config->smtphosts)?>">
+    </td>
+    <td>
+    <?php print_string("configsmtphosts") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>smtpuser:</td>
+	<td>
+    <input name=smtpuser type=text size=10 value="<?php p($config->smtpuser)?>">
+    </td>
+    <td rowspan=2>
+    <?php print_string("configsmtpuser") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>smtppass:</td>
+	<td>
+    <input name=smtppass type=text size=10 value="<?php p($config->smtppass)?>">
+    </td>
+</TR>
+<tr valign=top>
+	<td align=right><p>gdversion:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[0] = get_string("gdnot");
+       $options[1] = get_string("gd1");
+       $options[2] = get_string("gd2");
+
+       $installed  = check_gd_version();
+
+       choose_from_menu ($options, "gdversion", $installed, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configgdversion") ?>
+    </td>
+</tr>
+<tr valign=top>
+    <td align=right><p>htmleditor:</td>
+    <td>
+    <?php 
+       unset($options);
+       $options[0] = get_string("allownot");
+       $options[1] = get_string("allow");
+       choose_from_menu ($options, "htmleditor", $config->htmleditor, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("confightmleditor") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>maxeditingtime:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[3600] = get_string("numminutes", "", 60);
+       $options[2700] = get_string("numminutes", "", 45);
+       $options[1800] = get_string("numminutes", "", 30);
+       $options[900]  = get_string("numminutes", "", 15);
+       $options[300]  = get_string("numminutes", "", 5);
+       $options[60]   = get_string("numminutes", "", 1);
+
+       choose_from_menu ($options, "maxeditingtime", $config->maxeditingtime, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configmaxeditingtime") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>longtimenosee:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[1000] = get_string("numdays", "", 1000);
+       $options[365]  = get_string("numdays", "", 365);
+       $options[180]  = get_string("numdays", "", 180);
+       $options[150]  = get_string("numdays", "", 150);
+       $options[120]  = get_string("numdays", "", 120);
+       $options[90]   = get_string("numdays", "", 90);
+       $options[60]   = get_string("numdays", "", 60);
+       $options[30]   = get_string("numdays", "", 30);
+       $options[21]   = get_string("numdays", "", 21);
+       $options[14]   = get_string("numdays", "", 14);
+       $options[7]   = get_string("numdays", "", 7);
+
+       choose_from_menu ($options, "longtimenosee", $config->longtimenosee, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configlongtimenosee") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>loglifetime:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[0]    = get_string("neverdeletelogs");
+       $options[1000] = get_string("numdays", "", 1000);
+       $options[365]  = get_string("numdays", "", 365);
+       $options[180]  = get_string("numdays", "", 180);
+       $options[150]  = get_string("numdays", "", 150);
+       $options[120]  = get_string("numdays", "", 120);
+       $options[90]   = get_string("numdays", "", 90);
+       $options[60]   = get_string("numdays", "", 60);
+       $options[30]   = get_string("numdays", "", 30);
+
+       choose_from_menu ($options, "loglifetime", $config->loglifetime, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configloglifetime") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>sessiontimeout:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[14400] = get_string("numhours", "", 4);
+       $options[10800] = get_string("numhours", "", 3);
+       $options[7200]  = get_string("numhours", "", 2);
+       $options[5400]  = get_string("numhours", "", "1.5");
+       $options[3600]  = get_string("numminutes", "", 60);
+       $options[2700]  = get_string("numminutes", "", 45);
+       $options[1800]  = get_string("numminutes", "", 30);
+       $options[900]   = get_string("numminutes", "", 15);
+       $options[300]   = get_string("numminutes", "", 5);
+
+       choose_from_menu ($options, "sessiontimeout", $config->sessiontimeout, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configsessiontimeout") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>zip:</td>
+	<td>
+    <input name=zip type=text size=30 value="<?php p($config->zip) ?>">
+    </td>
+    <td>
+    <?php print_string("configzip") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>unzip:</td>
+	<td>
+    <input name=unzip type=text size=30 value="<?php p($config->unzip) ?>">
+    </td>
+    <td>
+    <?php print_string("configunzip") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>slasharguments:</td>
+	<td>
+    <?php unset($options);
+       $options[0] = "file.php?file=/pic.jpg";
+       $options[1] = "file.php/pic.jpg";
+
+       choose_from_menu ($options, "slasharguments", $config->slasharguments, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configslasharguments") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>proxyhost:</td>
+	<td>
+    <input name=proxyhost type=text size=30 value="<?php p($config->proxyhost) ?>">
+    </td>
+    <td rowspan=2>
+    <?php print_string("configproxyhost") ?>
+    </td>
+</TR>
+<tr valign=top>
+	<td align=right><p>proxyport:</td>
+	<td>
+    <input name=proxyport type=text size=5 value="<?php p($config->proxyport) ?>">
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>debug:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[7]  = get_string("no");
+       $options[15] = get_string("yes");
+
+       choose_from_menu ($options, "debug", $config->debug, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configdebug") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>framename:</td>
+	<td>
+    <?php 
+       if (empty($config->framename)) {
+           $config->framename = "_top";
+       }
+    ?>
+    <input name=framename type=text size=15 value="<?php p($config->framename)?>">
+    </td>
+    <td>
+    <?php print_string("configframename") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>secureforms:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[0]  = get_string("no");
+       $options[1]  = get_string("yes");
+
+       choose_from_menu ($options, "secureforms", $config->secureforms, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configsecureforms") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>teacherassignteachers:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[0]  = get_string("no");
+       $options[1]  = get_string("yes");
+
+       choose_from_menu ($options, "teacherassignteachers", $config->teacherassignteachers, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configteacherassignteachers") ?>
+    </td>
+</tr>
+
+<tr>
+    <td colspan=3 align=center>
+	<input type="submit" value="<?php print_string("savechanges") ?>"></td>
+</tr>
+</table>
+
+</form>

admin/config.php

@@ -0,0 +1,104 @@
+<?PHP  // $Id$
+       // config.php - allows admin to edit all configuration variables
+
+    require_once("../config.php");
+	require_once("../lib/countries.php");
+
+
+    if ($site = get_site()) {   // If false then this is a new installation
+        require_login();
+        if (!isadmin()) {
+            error("Only the admin can use this page");
+        }
+    }
+
+/// This is to overcome the "insecure forms paradox"
+    if (isset($secureforms) and $secureforms == 0) {
+        $match = "nomatch";
+    } else {
+        $match = "";
+    }
+
+/// If data submitted, then process and store.
+
+	if ($config = data_submitted($match)) {  
+
+        validate_form($config, $err);
+
+        if (count($err) == 0) {
+            print_header();
+            foreach ($config as $name => $value) {
+                unset($conf);
+                $conf->name  = $name;
+                $conf->value = $value;
+                if ($current = get_record("config", "name", $name)) {
+                    $conf->id = $current->id;
+                    if (! update_record("config", $conf)) {
+                        notify("Could not update $name to $value");
+                    }
+                } else {
+                    if (! insert_record("config", $conf)) {
+                        notify("Error: could not add new variable $name !");
+                    }
+                }
+            }
+            redirect("index.php", get_string("changessaved"), 1);
+            exit;
+
+        } else {
+            foreach ($err as $key => $value) {
+                $focus = "form.$key";
+            }
+        }
+	}
+
+/// Otherwise fill and print the form.
+
+    if (empty($config)) {
+        $config = $CFG;
+        if (!$config->locale = get_field("config", "value", "name", "locale")) {
+            $config->locale = $CFG->lang;
+        }
+    }
+    if (empty($focus)) {
+        $focus = "";
+    }
+
+    $stradmin = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strconfigvariables = get_string("configvariables");
+
+    if ($site) {
+        print_header("$site->shortname: $strconfigvariables", $site->fullname,
+                      "<a href=\"index.php\">$stradmin</a> -> ".
+                      "<a href=\"configure.php\">$strconfiguration</a> -> $strconfigvariables", $focus);
+        print_heading($strconfigvariables);
+    } else {
+        print_header();
+        print_heading($strconfigvariables);
+        print_simple_box(get_string("configintro"), "center", "50%");
+        echo "<br />";
+    }
+
+    print_simple_box_start("center", "", "$THEME->cellheading");
+	include("config.html");
+    print_simple_box_end();
+
+    if ($site) {
+        print_footer();
+    }
+
+    exit;
+
+/// Functions /////////////////////////////////////////////////////////////////
+
+function validate_form(&$form, &$err) {
+
+   // if (empty($form->fullname))
+   //     $err["fullname"] = get_string("missingsitename");
+
+    return;
+}
+
+
+?>

admin/configure.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");
+    $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("<b><a href=\"config.php\">".get_string("configvariables")."</a></b>",
+                           get_string("adminhelpconfigvariables"));
+    $table->data[] = array("<b><a href=\"site.php\">".get_string("sitesettings")."</a></b>",
+                           get_string("adminhelpsitesettings"));
+    $table->data[] = array("<b><a href=\"../theme/index.php\">".get_string("themes")."</a></b>",
+                           get_string("adminhelpthemes"));
+    $table->data[] = array("<b><a href=\"lang.php\">".get_string("language")."</a></b>",
+                           get_string("adminhelplanguage"));
+    $table->data[] = array("<b><a href=\"modules.php\">".get_string("managemodules")."</a></b>",
+                           get_string("adminhelpmanagemodules"));
+
+    print_table($table);
+    
+    print_footer($site);
+
+?>
+
+

admin/creators.php

@@ -0,0 +1,154 @@
+<?PHP // $Id$
+      // Admin only script to assign course creator rights to users
+
+	require_once("../config.php");
+
+    define("MAX_USERS_PER_PAGE", 50);
+
+    optional_variable($search, "");
+    optional_variable($add, "");
+    optional_variable($remove, "");
+
+    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.");
+    }
+
+    $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 (
+        "assigncreators",
+        "administration",
+        "existingcreators",
+        "noexistingcreators",
+        "potentialcreators",
+        "nopotentialcreators",
+        "addcreator",
+        "removecreator",
+        "search",
+        "searchagain",
+        "users",
+        "toomanytoshow",
+        "searchresults"
+        );
+
+    foreach ($stringstoload as $stringtoload){
+        $strstringtoload = "str" . $stringtoload;
+        $$strstringtoload = get_string($stringtoload);
+    }
+
+    if ($search) {
+        $searchstring = $strsearchagain;
+    } else {
+        $searchstring = $strsearch;
+    }
+
+	print_header("$site->shortname: $strassigncreators", 
+                 "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> ->
+                  $strassigncreators", "");
+
+/// Add a creator if one is specified
+
+    if (!empty($_GET['add'])) {
+        if (! add_creator($add)) {
+            error("Could not add that creator!");
+        }
+    }
+
+/// Remove a creator if one is specified.
+
+    if (!empty($_GET['remove'])) {
+        if (! remove_creator($remove)) {
+            error("Could not remove that creator!");
+        }
+    }
+
+/// Print a help notice about this page
+    if (empty($add) and empty($remove) and empty($search)) {
+        print_simple_box("<center>".get_string("adminhelpassigncreators")."</center>", "center", "50%");
+    }
+
+/// Get all existing creators
+    $creators = get_creators();
+
+/// Print the lists of existing and potential creators
+    echo "<table cellpadding=2 cellspacing=10 align=center>";
+    echo "<tr><th width=50%>$strexistingcreators</th><th width=50%>$strpotentialcreators</th></tr>";
+    echo "<tr><td width=50% nowrap valign=top>";
+
+/// First, show existing creators
+
+    if (! $creators) { 
+        echo "<p align=center>$strnoexistingcreators</a>";
+
+        $creatorlist = "";
+
+    } else {
+        $creatorarray = array();
+        foreach ($creators as $creator) {
+            $creatorarray[] = $creator->id;
+            echo "<p align=right>$creator->firstname $creator->lastname,
+            $creator->email &nbsp;&nbsp; ";
+                echo "<a href=\"{$_SERVER['PHP_SELF']}?remove=$creator->id\"
+                title=\"$strremovecreator\"><img src=\"../pix/t/right.gif\"
+                border=0></a>";
+            echo "</p>";
+        }
+        $creatorlist = implode(",",$creatorarray);
+        unset($creatorarray);
+    }
+
+    echo "<td width=50% nowrap valign=top>";
+
+/// Print list of potential creators
+
+    $usercount = get_users(false, $search, true, $creatorlist);
+
+    if ($usercount == 0) {
+        echo "<p align=center>$strnopotentialcreators</p>";
+
+    } else if ($usercount > MAX_USERS_PER_PAGE) {
+        echo "<p align=center>$strtoomanytoshow ($usercount) </p>";
+
+    } else {
+
+        if ($search) {
+            echo "<p align=center>($strsearchresults : $search)</p>";
+        }
+
+        if (!$users = get_users(true, $search, true, $creatorlist)) {
+            error("Could not get users!");
+        }
+
+        foreach ($users as $user) {
+            echo "<p align=left><a href=\"{$_SERVER['PHP_SELF']}?add=$user->id\"".
+                   "title=\"$straddcreator\"><img src=\"../pix/t/left.gif\"".
+                   "border=0></a>&nbsp;&nbsp;$user->firstname $user->lastname, $user->email";
+        }
+    }
+
+    if ($search or $usercount > MAX_USERS_PER_PAGE) {
+        echo "<form action={$_SERVER['PHP_SELF']} method=post>";
+        echo "<input type=text name=search size=20>";
+        echo "<input type=submit value=\"$searchstring\">";
+        echo "</form>";
+    }
+
+    echo "</tr></table>";
+
+    print_footer();
+
+?>

admin/cron.php

@@ -1,25 +1,29 @@
 <?PHP // $Id$
 
-// This script looks through all the module directories for cron.php files
-// and runs them.  These files can contain cleanup functions, email functions
-// or anything that needs to be run on a regular basis.
-//
-// This file is best run from cron on the host system (ie outside PHP).
-// The script can either be invoked via the web server or via a standalone
-// version of PHP compiled for CGI.
-//
-// eg   wget -q -O /dev/null 'http://moodle.somewhere.edu/admin/cron.php'
-// or   php /web/moodle/admin/cron.php 
+/// This script looks through all the module directories for cron.php files
+/// and runs them.  These files can contain cleanup functions, email functions
+/// or anything that needs to be run on a regular basis.
+///
+/// This file is best run from cron on the host system (ie outside PHP).
+/// The script can either be invoked via the web server or via a standalone
+/// version of PHP compiled for CGI.
+///
+/// eg   wget -q -O /dev/null 'http://moodle.somewhere.edu/admin/cron.php'
+/// or   php /web/moodle/admin/cron.php 
 
-    require("../config.php");
+    $FULLME = "cron";
 
-    echo "<PRE>\n";
+    $starttime = microtime();
+
+    require_once("../config.php");
+
+    echo "<pre>\n";
 
     $timenow  = time();
 
-//  Run all cron jobs for each module
+/// Run all cron jobs for each module
 
-    if ($mods = get_records_sql("SELECT * FROM modules WHERE cron > 0 AND (($timenow - lastcron) > cron)")) {
+    if ($mods = get_records_select("modules", "cron > 0 AND (($timenow - lastcron) > cron)")) {
         foreach ($mods as $mod) {
             $libfile = "$CFG->dirroot/mod/$mod->name/lib.php";
             if (file_exists($libfile)) {
@@ -36,42 +40,64 @@
         }
     }
 
+/// Run all core cron jobs, but not every time since they aren't too important.
+/// These don't have a timer to reduce load, so we'll use a random number 
+/// to randomly choose the percentage of times we should run these jobs.
 
-// Unenrol users who haven't logged in for $CFG->longtimenosee
+    srand ((double) microtime() * 10000000);
+    $random100 = rand(0,100);
 
-    if ($CFG->longtimenosee) { // value in days
-        $cutofftime = $timenow - ($CFG->longtimenosee * 3600 * 24);
-        if ($users = get_records_sql("SELECT u.* FROM user u, user_students s
-                                       WHERE lastaccess > '0' AND 
-                                             lastaccess < '$cutofftime' AND
-                                             u.id = s.user GROUP BY u.id")) {
-            foreach ($users as $user) {
-                if (delete_records("user_students", "user", $user->id)) {
+    if ($random100 < 20) {     // Approximately 20% of the time.
+        echo "Running clean-up tasks...\n";
 
-                    // Delete other things ... this should be modular than it is right now:
-                    delete_records("forum_subscriptions", "user", $user->id);
+        /// Unenrol users who haven't logged in for $CFG->longtimenosee
 
-                    echo "Deleted student enrolment for $user->firstname $user->lastname ($user->id)\n";
+        if ($CFG->longtimenosee) { // value in days
+            $longtime = $timenow - ($CFG->longtimenosee * 3600 * 24);
+            if ($users = get_users_longtimenosee($longtime)) {
+                foreach ($users as $user) {
+                    if (unenrol_student($user->id)) {
+                        echo "Deleted student enrolment for $user->firstname $user->lastname ($user->id)\n";
+                    }
                 }
             }
         }
-    }
-
-
-// Delete users who haven't confirmed within seven days
-
-    $cutofftime = $timenow - (7 * 24 * 3600);
-    if ($users = get_records_sql("SELECT * FROM user 
-                                  WHERE confirmed = '0' AND 
-                                        firstaccess > '0' AND 
-                                        firstaccess < '$cutofftime'")) {
-        foreach ($users as $user) {
-            if (delete_records("user", "id", $user->id)) {
-                echo "Deleted unconfirmed user for $user->firstname $user->lastname ($user->id)\n";
+    
+    
+        /// Delete users who haven't confirmed within seven days
+    
+        $oneweek = $timenow - (7 * 24 * 3600);
+        if ($users = get_users_unconfirmed($oneweek)) {
+            foreach ($users as $user) {
+                if (delete_records("user", "id", $user->id)) {
+                    echo "Deleted unconfirmed user for $user->firstname $user->lastname ($user->id)\n";
+                }
             }
         }
+    
+    
+        /// Delete duplicate enrolments (don't know what causes these yet - expired sessions?)
+    
+        if ($users = get_records_select("user_students", "userid > 0 GROUP BY course, userid ".
+                                        "HAVING count(*) > 1", "", "*,count(*)")) {
+            foreach ($users as $user) {
+               delete_records_select("user_students", "userid = '$user->userid' ".
+                                     "AND course = '$user->course' AND id <> '$user->id'");
+            }
+        }
+    
+    
+        /// Delete old logs to save space (this might need a timer to slow it down...)
+    
+        if (!empty($CFG->loglifetime)) {  // value in days
+            $loglifetime = $timenow - ($CFG->loglifetime * 3600 * 24);
+            delete_records_select("log", "time < '$loglifetime'");
+        }
     }
 
     echo "Cron script completed correctly\n";
 
+    $difftime = microtime_diff($starttime, microtime());
+    echo "Execution took ".$difftime." seconds\n"; 
+
 ?>

admin/delete.php

@@ -0,0 +1,63 @@
+<?PHP //$Id$
+
+// Deletes the moodledata directory, COMPLETELY!!
+// BE VERY CAREFUL USING THIS!
+
+    require_once("../config.php");
+
+    require_login();
+
+    if (!isadmin()) {
+        error("You must be admin to use this script!");
+    }
+
+    $deletedir = $CFG->dataroot;   // The directory to delete!
+
+    if (!$sure) {
+        notice_yesno ("Are you completely sure you want to delete everything inside the directory $deletedir ?", "delete.php?sure=yes", "index.php");
+        exit;
+    }
+
+    if (!$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", "index.php");
+        exit;
+    }
+
+    /// OK, here goes ...
+
+    delete_subdirectories($deletedir);
+
+    echo "<H1 align=center>Done!</H1>";
+    print_continue($CFG->wwwroot);
+    exit;
+
+
+function delete_subdirectories($rootdir) {
+
+    $dir = opendir($rootdir);
+
+    while ($file = readdir($dir)) {
+        if ($file != "." and $file != "..") {
+            $fullfile = "$rootdir/$file";
+            if (filetype($fullfile) == "dir") {
+                delete_subdirectories($fullfile);
+                echo "Deleting $fullfile ... ";
+                if (rmdir($fullfile)) {
+                    echo "Done.<BR>";
+                } else {
+                    echo "FAILED.<BR>";
+                }
+            } else {
+                echo "Deleting $fullfile ... ";
+                if (unlink("$fullfile")) {
+                    echo "Done.<BR>";
+                } else {
+                    echo "FAILED.<BR>";
+                }
+            }
+        }
+    }
+    closedir($dir);
+}
+  
+?>

admin/index.php

@@ -1,37 +1,128 @@
 <?PHP // $Id$
 
-    require("../config.php");
+/// Check that config.php exists
+    if (!file_exists("../config.php")) {
+        echo "<H2 align=center>You need to create a config.php.<BR>
+                  See the <A HREF=\"http://moodle.com/doc/?frame=install.html\">installation instructions</A>.</H2>";
+        die;
+    }
 
+    require_once("../config.php");
+
+
+/// Check that PHP is of a sufficient version
+
+    if (!check_php_version("4.1.0")) {
+        $version = phpversion();
+        print_heading("Sorry, Moodle requires PHP 4.1.0 or later (currently using version $version)");
+        die;
+    }
+
+/// Check some PHP server settings
+
+    $documentationlink = "please read the <A HREF=\"../doc/?frame=install.html&sub=webserver\">install documentation</A>";
+
+
+    if (ini_get_bool('session.auto_start')) {
+        error("The PHP server variable 'session.auto_start' should be Off - $documentationlink");
+    }
+
+    if (ini_get_bool('magic_quotes_runtime')) {
+        error("The PHP server variable 'magic_quotes_runtime' should be Off - $documentationlink");
+    }
+
+    if (!ini_get_bool('file_uploads')) {
+        error("The PHP server variable 'file_uploads' is not turned On - $documentationlink");
+    }
+
+    if (!ini_get_bool('short_open_tag')) {
+        error("The PHP server variable 'short_open_tag' is not turned On - $documentationlink");
+    }
+
+
+
+/// Check that sessions are supported
+
+    if (!is_readable(ini_get('session.save_path')) and !ini_get_bool('safe_mode')) {
+        $sessionpath = ini_get('session.save_path');
+        notify("Warning: It appears your server does not support sessions (session.save_path = '$sessionpath')");
+    }
+
+
+/// Check that config.php has been edited
 
     if ($CFG->wwwroot == "http://example.com/moodle") {
         error("Moodle has not been configured yet.  You need to to edit config.php first.");
     }
 
-    // Check databases and modules and install as needed.
-    if (! $db->Metatables() ) { 
 
-        if (!$agreelicence) {
+/// Check settings in config.php
+
+    $dirroot = dirname(realpath("../config.php"));
+    if (!empty($dirroot) and $dirroot != $CFG->dirroot) {
+        error("Please fix your settings in config.php:
+              <P>You have:
+              <P>\$CFG->dirroot = \"".addslashes($CFG->dirroot)."\";
+              <P>but it should be:
+              <P>\$CFG->dirroot = \"".addslashes($dirroot)."\";",
+              "./");
+    }
+
+/// Set some necessary variables during set-up to avoid PHP warnings later on this page
+    if (!isset($CFG->framename)) {
+        $CFG->framename = "_top";
+    }
+    if (!isset($CFG->release)) {
+        $CFG->release = "";
+    }
+    if (!isset($CFG->version)) {
+        $CFG->version = "";
+    }
+
+
+
+/// Check if the main tables have been installed yet or not.
+
+    if (! $tables = $db->Metatables() ) {    // No tables yet at all.
+        $maintables = false;
+
+    } else {                                 // Check for missing main tables
+        $maintables = true;
+        $mtables = array("config", "course", "course_categories", "course_modules", 
+                         "course_sections", "log", "log_display", "modules", 
+                         "user", "user_admins", "user_students", "user_teachers");
+        foreach ($mtables as $mtable) {
+            if (!in_array($CFG->prefix.$mtable, $tables)) { 
+                $maintables = false;
+                break;
+            }
+        }
+    }
+
+    if (! $maintables) {
+        if (empty($agreelicence)) {
             $strlicense = get_string("license");
-            print_header($strlicense, $strlicense, $strlicense);
-            print_heading("<A HREF=\"http://moodle.com\">Moodle</A> - Modular Object-Oriented Dynamic Learning Environment");
+            print_header($strlicense, $strlicense, $strlicense, "", "", false, "&nbsp;", "&nbsp;");
+            print_heading("<A HREF=\"http://moodle.org\">Moodle</A> - Modular Object-Oriented Dynamic Learning Environment");
             print_heading(get_string("copyrightnotice"));
-            print_simple_box_start("CENTER");
+            print_simple_box_start("center");
             echo text_to_html(get_string("gpl"));
             print_simple_box_end();
-            echo "<BR>";
+            echo "<br />";
             notice_yesno(get_string("doyouagree"), "index.php?agreelicence=true", 
-                                                   "http://www.gnu.org/copyleft/gpl.html");
+                                                   "http://moodle.org/doc/?frame=licence.html");
             exit;
         }
 
         $strdatabasesetup    = get_string("databasesetup");
         $strdatabasesuccess  = get_string("databasesuccess");
-        print_header($strdatabasesetup, $strdatabasesetup, $strdatabasesetup);
+        print_header($strdatabasesetup, $strdatabasesetup, $strdatabasesetup, "", "", false, "&nbsp;", "&nbsp;");
         if (file_exists("$CFG->libdir/db/$CFG->dbtype.sql")) {
             $db->debug = true;
+            set_time_limit(0);  // To allow slow databases to complete the long SQL
             if (modify_database("$CFG->libdir/db/$CFG->dbtype.sql")) {
                 $db->debug = false;
-                notify($strdatabasesuccess);
+                notify($strdatabasesuccess, "green");
             } else {
                 $db->debug = false;
                 error("Error: Main databases NOT set up successfully");
@@ -43,25 +134,27 @@
         die;
     }
 
-    // Check version of Moodle code on disk compared with database
-    // and upgrade if possible.
+/// Check version of Moodle code on disk compared with database
+/// and upgrade if possible.
 
-    include_once("$CFG->dirroot/version.php");  # defines $version and upgrades
+    include_once("$CFG->dirroot/version.php");              # defines $version 
+    include_once("$CFG->dirroot/lib/db/$CFG->dbtype.php");  # defines upgrades
 
-    if ($dversion = get_field("config", "value", "name", "version")) { 
-        if ($version > $dversion) {  // upgrade
-            $a->oldversion = $dversion;
+    if ($CFG->version) { 
+        if ($version > $CFG->version) {  // upgrade
+            $a->oldversion = $CFG->version;
             $a->newversion = $version;
             $strdatabasechecking = get_string("databasechecking", "", $a);
             $strdatabasesuccess  = get_string("databasesuccess");
-            print_header($strdatabaseupgrades, $strdatabaseupgrades, $strdatabaseupgrades);
-            notify($strdatabasechecking);
+            print_header($strdatabasechecking, $strdatabasechecking, $strdatabasechecking, 
+                         "", "", false, "&nbsp;", "&nbsp;");
+            print_heading($strdatabasechecking);
             $db->debug=true;
-            if (upgrade_moodle($dversion)) {
+            if (main_upgrade($CFG->version)) {
                 $db->debug=false;
-                if (set_field("config", "value", "$version", "name", "version")) {
-                    notify($strdatabasesuccess);
-                    print_continue("$CFG->wwwroot");
+                if (set_config("version", $version)) {
+                    notify($strdatabasesuccess, "green");
+                    print_continue("index.php");
                     die;
                 } else {
                     notify("Upgrade failed!  (Could not update version in config table)");
@@ -70,22 +163,22 @@
                 $db->debug=false;
                 notify("Upgrade failed!  See /version.php");
             }
-        } else if ($version < $dversion) {
+        } else if ($version < $CFG->version) {
             notify("WARNING!!!  The code you are using is OLDER than the version that made these databases!");
         }
        
     } else {
-        $dversion->name  = "version";
-        $dversion->value = $version;
-        $strdatabaseupgrades = get_string("databaseupgrades");
-        print_header($strdatabaseupgrades, $strdatabaseupgrades, $strdatabaseupgrades);
-        if (insert_record("config", $dversion)) {
-            notify("You are currently using Moodle version $version");
+        $strcurrentversion = get_string("currentversion");
+        print_header($strcurrentversion, $strcurrentversion, $strcurrentversion, 
+                     "", "", false, "&nbsp;", "&nbsp;");
+
+        if (set_config("version", $version)) {
+            print_heading("You are currently using Moodle version $version (Release $release)");
             print_continue("index.php");
             die;
         } else {
             $db->debug=true;
-            if (upgrade_moodle(0)) {
+            if (main_upgrade(0)) {
                 print_continue("index.php");
             } else {
                 error("A problem occurred inserting current version into databases");
@@ -94,20 +187,60 @@
         }
     }
 
+/// Updated human-readable release version if necessary
 
-    // Find and check all modules and load them up or upgrade them if necessary
+    if ($release <> $CFG->release) {  // Update the release version
+        $strcurrentrelease = get_string("currentrelease");
+        print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
+        print_heading("Moodle $release");
+        if (!set_config("release", $release)) {
+            notify("ERROR: Could not update release version in database!!");
+        }
+        print_continue("index.php");
+        print_simple_box_start("CENTER");
+        include("$CFG->dirroot/lang/en/docs/release.html");
+        print_simple_box_end();
+        print_continue("index.php");
+        exit;
+    }
 
 
+/// Upgrade backup/restore system if necessary
+
+    require_once("$CFG->dirroot/backup/lib.php");
+    upgrade_backup_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
+    
+
+/// Find and check all modules and load them up or upgrade them if necessary
+
     if (!$mods = get_list_of_plugins("mod") ) {
         error("No modules installed!");
     }
 
     foreach ($mods as $mod) {
+
+        if ($mod == "NEWMODULE") {   // Someone has unzipped the template, ignore it
+            continue;
+        }
+
         $fullmod = "$CFG->dirroot/mod/$mod";
 
         unset($module);
 
-        include_once("$fullmod/version.php");  # defines $module with version etc
+        if ( is_readable("$fullmod/version.php")) {
+            include_once("$fullmod/version.php");  # defines $module with version etc
+        } else {
+            notify("Module $mod: $fullmod/version.php was not readable");
+            continue;
+        }
+
+        if ( is_readable("$fullmod/db/$CFG->dbtype.php")) {
+            include_once("$fullmod/db/$CFG->dbtype.php");  # defines upgrading function
+        } else {
+            notify("Module $mod: $fullmod/db/$CFG->dbtype.php was not readable");
+            continue;
+        }
+
 
         if (!isset($module)) {
             continue;
@@ -119,7 +252,7 @@
             if ($currmodule->version == $module->version) {
                 // do nothing
             } else if ($currmodule->version < $module->version) {
-                notify("$module->name module needs upgrading");
+                print_heading("$module->name module needs upgrading");
                 $upgrade_function = $module->name."_upgrade";
                 if (function_exists($upgrade_function)) {
                     $db->debug=true;
@@ -130,7 +263,8 @@
                         if (! update_record("modules", $module)) {
                             error("Could not update $module->name record in modules table!");
                         }
-                        notify(get_string("modulesuccess", "", $module->name));
+                        notify(get_string("modulesuccess", "", $module->name), "green");
+                        echo "<HR>";
                     } else {
                         $db->debug=false;
                         notify("Upgrading $module->name from $currmodule->version to $module->version FAILED!");
@@ -142,16 +276,19 @@
             }
     
         } else {    // module not installed yet, so install it
-            if (!$updated_modules) {
+            if (empty($updated_modules)) {
                 $strmodulesetup    = get_string("modulesetup");
-                print_header($strmodulesetup, $strmodulesetup, $strmodulesetup);
+                print_header($strmodulesetup, $strmodulesetup, $strmodulesetup, "", "", false, "&nbsp;", "&nbsp;");
             }
+            print_heading($module->name);
             $updated_modules = true;
             $db->debug = true;
+            set_time_limit(0);  // To allow slow databases to complete the long SQL
             if (modify_database("$fullmod/db/$CFG->dbtype.sql")) {
                 $db->debug = false;
                 if ($module->id = insert_record("modules", $module)) {
-                    notify(get_string("modulesuccess", "", $module->name));
+                    notify(get_string("modulesuccess", "", $module->name), "green");
+                    echo "<HR>";
                 } else {
                     error("$module->name module could not be added to the module list!");
                 }
@@ -161,43 +298,139 @@
         }
     }
 
-    if ($updated_modules) {
+    if (!empty($updated_modules)) {
         print_continue("index.php");
         die;
     }
 
-    // Set up the overall site name etc.
-    if (! $site = get_site()) {
-        redirect("$CFG->wwwroot/admin/site.php");
-    }
 
-    if (!isadmin()) {
-        if (! record_exists_sql("SELECT * FROM user_admins")) {   // No admin user yet
-            redirect("$CFG->wwwroot/admin/user.php");
+/// Insert default values for any important configuration variables
+
+    include_once("$CFG->dirroot/lib/defaults.php");
+
+    foreach ($defaults as $name => $value) {
+        if (!isset($CFG->$name)) {
+            $CFG->$name = $value;
+            set_config($name, $value);
+            $configchange = true;
         }
-        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/");
     }
 
 
-    // At this point, the databases exist, and the user is an admin
+/// If any new configurations were found then send to the config page to check
+
+    if (!empty($configchange)) {
+        redirect("config.php");
+    }
+
+/// Set up the overall site name etc.
+    if (! $site = get_site()) {
+        redirect("site.php");
+    }
+
+/// Set up the admin user
+    if (! record_exists("user_admins")) {   // No admin user yet
+        redirect("user.php");
+    }
+
+/// Check for valid admin user
+    if (!isadmin()) {
+        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+    }
+
+
+/// At this point everything is set up and the user is an admin, so print menu
 
     $stradministration = get_string("administration");
-    print_header("$site->fullname: $stradministration","$site->fullname: $stradministration", "$stradministration");
+    print_header("$site->shortname: $stradministration","$site->fullname", "$stradministration");
+    print_simple_box_start("center", "100%", "$THEME->cellcontent2", 20);
+    print_heading($stradministration);
 
-    $table->head  = array (get_string("site"), get_string("courses"), get_string("users"));
-    $table->align = array ("CENTER", "CENTER", "CENTER");
-    $table->data[0][0] = "<P><A HREF=\"site.php\">".get_string("sitesettings")."</A></P>".
-                         "<P><A HREF=\"../course/log.php?id=$site->id\">".get_string("sitelogs")."</A></P>".
-                         "<P><A HREF=\"../theme/index.php\">".get_string("choosetheme")."</A></P>";
-    $table->data[0][1] = "<P><A HREF=\"../course/edit.php\">".get_string("addnewcourse")."</A></P>".
-                         "<P><A HREF=\"../course/teacher.php\">".get_string("assignteachers")."</A></P>".
-                         "<P><A HREF=\"../course/delete.php\">".get_string("deletecourse")."</A></P>";
-    $table->data[0][2] = "<P><A HREF=\"user.php?newuser=true\">".get_string("addnewuser")."</A></P>".
-                         "<P><A HREF=\"user.php\">".get_string("edituser")."</A></P>";
+    $table->tablealign = "right";
+    $table->align = array ("right", "left");
+    $table->wrap = array ("nowrap", "nowrap");
+    $table->cellpadding = 4;
+    $table->cellspacing = 3;
+    $table->width = "40%";
+
+    $configdata  = "<font size=+1>&nbsp;</font><a href=\"config.php\">".get_string("configvariables")."</a> - <font size=1>".
+                    get_string("adminhelpconfigvariables")."</font><br />";
+    $configdata .= "<font size=+1>&nbsp;</font><a href=\"site.php\">".get_string("sitesettings")."</a> - <font size=1>".
+                    get_string("adminhelpsitesettings")."</font><br />";
+    $configdata .= "<font size=+1>&nbsp;</font><a href=\"../theme/index.php\">".get_string("themes")."</a> - <font size=1>".
+                    get_string("adminhelpthemes")."</font><br />";
+    $configdata .= "<font size=+1>&nbsp;</font><a href=\"lang.php\">".get_string("language")."</a> - <font size=1>".
+                    get_string("adminhelplanguage")."</font><br />";
+    $configdata .= "<font size=+1>&nbsp;</font><a href=\"modules.php\">".get_string("managemodules")."</a> - <font size=1>".
+                    get_string("adminhelpmanagemodules")."</font><br />";
+
+    $table->data[] = array("<font size=+1><b><a href=\"configure.php\">".get_string("configuration")."</a></b>", 
+                            $configdata);
+
+
+    $userdata = "<font size=+1>&nbsp;</font><a href=\"auth.php\">".get_string("authentication")."</a> - <font size=1>".
+                 get_string("adminhelpauthentication")."</font><br />";
+
+    if ($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual") {
+        $userdata .= "<font size=+1>&nbsp;</font><a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true\">".
+                      get_string("addnewuser")."</a> - <font size=1>".
+                      get_string("adminhelpaddnewuser")."</font><br />";
+    }
+    $userdata .= "<font size=+1>&nbsp;</font><a href=\"user.php\">".get_string("edituser")."</a> - <font size=1>".
+                 get_string("adminhelpedituser")."</font><br />";
+    $userdata .= "<font size=+1>&nbsp;</font><a href=\"admin.php\">".get_string("assignadmins")."</a> - <font size=1>".
+                 get_string("adminhelpassignadmins")."</font><br />";
+    $userdata .= "<font size=+1>&nbsp;</font><a href=\"creators.php\">".get_string("assigncreators")."</a> - <font size=1>".
+                 get_string("adminhelpassigncreators")."</font><br />";
+    $userdata .= "<font size=+1>&nbsp;</font><a href=\"../course/index.php?edit=on\">".get_string("assignteachers")."</a> - <font size=1>".
+                 get_string("adminhelpassignteachers").
+                 " <img src=\"../pix/t/user.gif\" height=11 width=11></font><br />";
+    $userdata .= "<font size=+1>&nbsp;</font><a href=\"../course/index.php?edit=off\">".get_string("assignstudents")."</a> - <font size=1>".
+                 get_string("adminhelpassignstudents")."</font>";
+
+    $table->data[] = array("<font size=+1><b><a href=\"users.php\">".get_string("users")."</a></b>", $userdata);
+
+    $table->data[] = array("<font size=+1><b><a href=\"../course/index.php?edit=on\">".get_string("courses")."</a></b>",
+                           "<font size=+1>&nbsp;</font>".get_string("adminhelpcourses"));
+    $table->data[] = array("<font size=+1><b><a href=\"../course/log.php?id=$site->id.php\">".get_string("logs")."</a></b>",
+                           "<font size=+1>&nbsp;</font>".get_string("adminhelplogs"));
+    $table->data[] = array("<font size=+1><b><a href=\"../files/index.php?id=$site->id\">".get_string("sitefiles")."</a></b>",
+                           "<font size=+1>&nbsp;</font>".get_string("adminhelpsitefiles"));
+    if (file_exists("$CFG->dirroot/admin/$CFG->dbtype")) {
+        $table->data[] = array("<font size=+1><b><a href=\"$CFG->dbtype/frame.php\">".get_string("managedatabase")."</a></b>",
+                               "<font size=+1>&nbsp;</font>".get_string("adminhelpmanagedatabase"));
+    }
 
     print_table($table);
+    
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    ////  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=\"../doc/?frame=release.html\">$CFG->release</a> ($CFG->version)<br />".
+                     "Copyright &copy; 2000-2003 Martin Dougiamas<br />".
+                     "<a href=\"../doc/?frame=licence.html\">GNU Public License</a>";
+    echo "<center><p><font size=1>$copyrighttext</font></p></center>";
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+    echo "<table border=0 align=center width=100%><tr>";
+    echo "<td align=center width=33%>";
+    print_single_button("$CFG->wwwroot/doc", NULL, get_string("documentation"));
+    echo "</td>";
+
+    echo "<td align=center width=33%>";
+    print_single_button("phpinfo.php", NULL, get_string("phpinfo"));
+    echo "</td>";
+
+    echo "<td align=center width=33%>";
+    print_single_button("register.php", NULL, get_string("registration"));
+    echo "</td>";
+    echo "<tr></table>";
+
+    print_simple_box_end();
+
+    print_footer($site);
 
-    print_footer();
 ?>
 
 

admin/lang.php

@@ -0,0 +1,288 @@
+<?PHP // $Id$
+
+    require_once("../config.php");
+
+    optional_variable($mode, "");
+
+    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");
+    $strcomparelanguage = get_string("comparelanguage");
+    $strthislanguage = get_string("thislanguage");
+
+    switch ($mode) {
+        case "missing":
+            $navigation = "<A HREF=\"lang.php\">$strlanguage</A> -> $strmissingstrings";
+            $title = $strmissingstrings;
+            break;
+        case "compare":
+            $navigation = "<A HREF=\"lang.php\">$strlanguage</A> -> $strcomparelanguage";
+            $title = $strcomparelanguage;
+            break;
+        default:
+            $title = $strlanguage;
+            $navigation = $strlanguage;
+            break;
+    }
+
+    $currentlang = current_language();
+
+    print_header("$site->shortname: $title", "$site->fullname",
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $navigation");
+
+    if (!$mode) {
+        print_heading("$strcurrentlanguage: $currentlang - ".get_string("thislanguage"));
+        print_heading("<a href=\"lang.php?mode=missing\">$strmissingstrings</a>");
+        print_heading("<a href=\"lang.php?mode=compare\">$strcomparelanguage</a>");
+        echo "<center><hr noshade size=1>";
+        $options["lang"] = $currentlang;
+        print_single_button("http://moodle.org/download/lang/", $options, get_string("latestlanguagepack"));
+        echo "</center>";
+        print_footer();
+        exit;
+    }
+
+    // Get a list of all the root files in the English directory
+
+    $langdir = "$CFG->dirroot/lang/$currentlang";
+    $enlangdir = "$CFG->dirroot/lang/en";
+
+    if (! $stringfiles = get_directory_list($enlangdir, "", false)) {
+        error("Could not find English language pack!");
+    }
+
+    foreach ($stringfiles as $key => $file) {
+        if ($file == "README" or $file == "help" or $file == "docs" or $file == "fonts") {
+            unset($stringfiles[$key]);
+        }
+    }
+
+    if ($mode == "missing") {
+        // For each file, check that a counterpart exists, then check all the strings
+    
+        foreach ($stringfiles as $file) {
+            if (!file_exists("$langdir/$file")) {
+                echo "<P><FONT COLOR=red>".get_string("filemissing", "", "$langdir/$file")."</FONT></P>";
+                continue;
+            }
+    
+            unset($string);
+            include("$enlangdir/$file");
+            $enstring = $string;  
+    
+            unset($string);
+            include("$langdir/$file");
+    
+            $first = true;
+            foreach ($enstring as $key => $value) {
+                if (!isset($string[$key]) or $string[$key] == "") {
+                    $value = htmlspecialchars($value);
+                    $value = str_replace("$"."a", "\\$"."a", $value);
+                    $value = str_replace("%%","%",$value);
+                    if ($first) {
+                        echo "</PRE><HR><P><B>".get_string("stringsnotset","","$langdir/$file")."</B></P><PRE>";
+                        $first = false;
+                        $somethingfound = true;
+                    }
+                    echo "$"."string['$key'] = \"$value\";<BR>";
+                }
+            }
+        }
+    
+        if (! $files = get_directory_list("$CFG->dirroot/lang/en/help", "CVS")) {
+            error("Could not find English language help files!");
+        }
+    
+        foreach ($files as $filekey => $file) {    // check all the help files.
+            if (!file_exists("$langdir/help/$file")) {
+                echo "<P><FONT COLOR=red>".get_string("filemissing", "", "$langdir/help/$file")."</FONT></P>";
+                $somethingfound = true;
+                continue;
+            }
+        }
+    
+        if (! $files = get_directory_list("$CFG->dirroot/lang/en/docs", "CVS")) {
+            error("Could not find English language docs files!");
+        }
+        foreach ($files as $filekey => $file) {    // check all the docs files.
+            if (!file_exists("$langdir/docs/$file")) {
+                echo "<P><FONT COLOR=red>".get_string("filemissing", "", "$langdir/docs/$file")."</FONT></P>";
+                $somethingfound = true;
+                continue;
+            }
+        }
+    
+        if (!empty($somethingfound)) {
+            print_continue("lang.php");
+        } else {
+            notice(get_string("languagegood"), "lang.php");
+        }
+
+    } else if ($mode == "compare") {
+
+        if (isset($_POST['file'])){   // Save a file
+            $newstrings = $_POST;
+            $file = $newstrings['file'];
+            unset($newstrings['file']);
+            if (lang_save_file($langdir, $file, $newstrings)) {
+                notify(get_string("changessaved")." ($langdir/$file)");
+            } else {
+                error("Could not save the file '$file'!", "lang.php?mode=compare");
+            }
+        }
+
+        print_heading($strcomparelanguage);
+        echo "<CENTER>";
+        helpbutton("langedit",$strcomparelanguage);
+        echo "</CENTER>";
+
+        foreach ($stringfiles as $file) {
+        
+            print_heading("$file", "LEFT", 4);
+
+            if (!file_exists("$langdir/$file")) {
+                echo "<P><FONT COLOR=red>".get_string("filemissing", "", "$langdir/$file")."</FONT></P>";
+                continue;
+            }
+    
+            error_reporting(0);
+            if ($f = fopen("$langdir/$file","r+")) {
+                $editable = true;
+                fclose($f);
+            } else {
+                $editable = false;
+                echo "<P><FONT SIZE=1>".get_string("makeeditable", "", "$langdir/$file")."</FONT></P>";
+            }
+            error_reporting(7);
+
+
+            unset($string);
+            include("$enlangdir/$file");
+            $enstring = $string;  
+            ksort($enstring);
+    
+            unset($string);
+            include("$langdir/$file");
+
+            if ($editable) {
+                echo "<FORM NAME=\"$file\" ACTION=\"lang.php\" METHOD=\"POST\">";
+            }
+            echo "<TABLE WIDTH=\"100%\" CELLPADDING=2 CELLSPACING=3 BORDER=0>";
+            foreach ($enstring as $key => $envalue) {
+                $envalue = nl2br(htmlspecialchars($envalue));
+                $envalue = preg_replace('/(\$a\-\&gt;[a-zA-Z0-9]*|\$a)/', '<b>$0</b>', $envalue);  // Make variables bold. 
+                $envalue = str_replace("%%","%",$envalue);
+
+                echo "<TR>";
+                echo "<TD WIDTH=20% BGCOLOR=\"$THEME->cellheading\" NOWRAP VALIGN=TOP>$key</TD>";
+                echo "<TD WIDTH=40% BGCOLOR=\"$THEME->cellheading\" VALIGN=TOP>$envalue</TD>";
+
+                $value = $string[$key];
+                $value = str_replace("\r","",$value);              // Bad character caused by Windows
+                $value = str_replace("\n\n\n\n\n\n","\n",$value);  // Collapse runs of blank lines
+                $value = str_replace("\n\n\n\n\n","\n",$value);
+                $value = str_replace("\n\n\n\n","\n",$value);
+                $value = str_replace("\n\n\n","\n",$value);
+                $value = str_replace("\n\n\n","\n",$value);
+                $value = str_replace("\\","",$value);              // Delete all slashes
+                $value = str_replace("%%","%",$value);
+                $value = htmlspecialchars($value);
+
+                $cellcolour = $value ? $THEME->cellcontent: $THEME->highlight;
+
+                if ($editable) {
+                    echo "<TD WIDTH=40% BGCOLOR=\"$cellcolour\" VALIGN=TOP>";
+                    if (isset($string[$key])) {
+                        $valuelen = strlen($value);
+                    } else {
+                        $valuelen = strlen($envalue);
+                    }
+                    $cols=50;
+                    if (strstr($value, "\r") or strstr($value, "\n") or $valuelen > $cols) {
+                        $rows = ceil($valuelen / $cols);
+                        echo "<TEXTAREA NAME=\"string-$key\" cols=\"$cols\" rows=\"$rows\">$value</TEXTAREA>";
+                    } else {
+                        if ($valuelen) {
+                            $cols = $valuelen + 2;
+                        }
+                        echo "<INPUT TYPE=\"TEXT\" NAME=\"string-$key\" VALUE=\"$value\" SIZE=\"$cols\"></TD>";
+                    }
+                    echo "</TD>";
+
+                } else {
+                    echo "<TD WIDTH=40% BGCOLOR=\"$cellcolour\" VALIGN=TOP>$value</TD>";
+                }
+            }
+            if ($editable) {
+                echo "<TR><TD COLSPAN=2>&nbsp;<TD>";
+                echo "    <INPUT TYPE=\"hidden\" NAME=\"file\" VALUE=\"$file\">";
+                echo "    <INPUT TYPE=\"hidden\" NAME=\"mode\" VALUE=\"compare\">";
+                echo "    <INPUT TYPE=\"submit\" NAME=\"update\" VALUE=\"".get_string("savechanges").": $file\">";
+                echo "</TD></TR>";
+            }
+            echo "</TABLE>";
+            echo "</FORM>";
+        }
+
+        print_continue("lang.php");
+    
+    }
+
+    print_footer();
+
+//////////////////////////////////////////////////////////////////////
+
+function lang_save_file($path, $file, $strings) {
+// Thanks to Petri Asikainen for the original version of code 
+// used to save language files.
+//
+// $path is a full pathname to the file
+// $file is the file to overwrite.
+// $strings is an array of strings to write
+
+    global $CFG;
+
+    error_reporting(0);
+    if (!$f = fopen("$path/$file","w")) {
+        return false;
+    }
+    error_reporting(7);
+
+
+    fwrite($f, "<?PHP // \$Id\$ \n");
+    fwrite($f, "      // $file - created with Moodle $CFG->release ($CFG->version)\n\n\n");
+
+    ksort($strings);
+
+    foreach ($strings as $key => $value) {
+        list($id, $stringname) = explode("-",$key);
+        if ($CFG->lang != "zh_hk" and $CFG->lang != "zh_tw") {  // Some MB languages include backslash bytes
+            $value = str_replace("\\","",$value);           // Delete all slashes
+        }
+        $value = str_replace("$"."a", "\\$"."a", $value);   // Add slashes for $a
+        $value = str_replace("\"", "\\\\\\\"", $value);     // Add slashes for "
+        $value = str_replace("%","%%",$value);              // Escape % characters
+        if ($id == "string" and $value != ""){
+            fwrite($f,"\$string['$stringname'] = \"$value\";\n");
+        }
+    }
+    fwrite($f,"\n?>\n");
+    fclose($f);
+
+    return true;
+}
+
+?>

admin/module.php

@@ -0,0 +1,56 @@
+<?PHP  // $Id$
+       // module.php - allows admin to edit all local configuration variables for a module
+
+    require_once("../config.php");
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only an admin can use this page");
+    }
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
+
+
+/// If data submitted, then process and store.
+
+	if ($config = data_submitted()) {  
+        print_header();
+        foreach ($config as $name => $value) {
+            set_config($name, $value);
+        }
+        redirect("$CFG->wwwroot/$CFG->admin/modules.php", get_string("changessaved"), 1);
+        exit;
+	}
+
+/// Otherwise print the form.
+
+    require_variable($module);
+
+	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);
+
+    print_header("$site->shortname: $strconfigvariables", $site->fullname,
+                  "<a href=\"index.php\">$stradmin</a> -> ".
+                  "<a href=\"configure.php\">$strconfiguration</a> -> ".
+                  "<a href=\"modules.php\">$strmanagemodules</a> -> $strmodulename", $focus);
+
+    print_heading($strmodulename);
+
+    print_simple_box("<center>".get_string("configwarning")."</center>", "center", "50%");
+    echo "<br />";
+
+    print_simple_box_start("center", "", "$THEME->cellheading");
+	include("$CFG->dirroot/mod/$module/config.html");
+    print_simple_box_end();
+
+    print_footer();
+
+?>

admin/modules.php

@@ -0,0 +1,191 @@
+<?PHP // $Id$
+      // Allows the admin to create, delete and rename course categories
+
+    require_once("../config.php");
+    require_once("../course/lib.php");
+
+    optional_variable($disable);
+    optional_variable($enable);
+    optional_variable($delete);
+    optional_variable($confirm);
+
+    if (!isadmin()) {
+        error("Only administrators can use this page!");
+    }
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
+
+
+/// Print headings
+
+    $stradministration = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strmanagemodules = get_string("managemodules");
+    $strdelete = get_string("delete");
+    $strhide = get_string("hide");
+    $strshow = get_string("show");
+    $strsettings = get_string("settings");
+    $stractivitymodule = get_string("activitymodule");
+
+    print_header("$site->shortname: $strmanagemodules", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $strmanagemodules");
+
+    print_heading($strmanagemodules);
+   
+
+/// If data submitted, then process and store.
+
+    if (!empty($hide)) {
+        if (!$module = get_record("modules", "name", $hide)) {
+            error("Module doesn't exist!");
+        }
+        set_field("modules", "visible", "0", "id", $module->id);            // Hide main module
+        set_field("course_modules", "visible", "0", "module", $module->id); // Hide all related activity modules
+    }
+
+    if (!empty($show)) {
+        if (!$module = get_record("modules", "name", $show)) {
+            error("Module doesn't exist!");
+        }
+        set_field("modules", "visible", "1", "id", $module->id);            // Show main module
+        set_field("course_modules", "visible", "1", "module", $module->id); // Show all related activity modules
+    }
+
+    if (!empty($delete)) {
+      
+        $strmodulename = get_string("modulename", "$delete");
+
+        if (empty($confirm)) {
+            notice_yesno(get_string("moduledeleteconfirm", "", $strmodulename), 
+                         "modules.php?delete=$delete&confirm=$delete", 
+                         "modules.php");
+            print_footer();
+            exit;
+
+        } else {  // Delete everything!!
+
+            if ($delete == "forum") {
+                error("You can not delete the forum module!!");
+            }
+
+            if (!$module = get_record("modules", "name", $delete)) {
+                error("Module doesn't exist!");
+            }
+
+            // OK, first delete all the relevant instances from all course sections
+            if ($coursemods = get_records("course_modules", "module", $module->id)) {
+                foreach ($coursemods as $coursemod) {
+                    if (! delete_mod_from_section($coursemod->id, $coursemod->section)) {
+                        notify("Could not delete the $strmodulename with id = $coursemod->id from section $coursemod->section");
+                    }
+                }
+            }
+
+            // Now delete all the course module records
+            if (!delete_records("course_modules", "module", $module->id)) {
+                notify("Error occurred while deleting all $strmodulename records in course_modules table");
+            }
+
+            // Then delete all the logs 
+            if (!delete_records("log", "module", $module->name)) {
+                notify("Error occurred while deleting all $strmodulename records in log table");
+            }
+
+            // And log_display information
+            if (!delete_records("log_display", "module", $module->name)) {
+                notify("Error occurred while deleting all $strmodulename records in log_display table");
+            }
+
+            // And the module entry itself
+            if (!delete_records("modules", "name", $module->name)) {
+                notify("Error occurred while deleting the $strmodulename record from modules table");
+            }
+
+            // Then the tables themselves
+
+            if ($tables = $db->Metatables()) {
+                $prefix = $CFG->prefix.$module->name;
+                foreach ($tables as $table) {
+                    if (strpos($table, $prefix) === 0) {
+                        if (!execute_sql("DROP TABLE $table", false)) {
+                            notify("ERROR: while trying to drop table $table");
+                        }
+                    }
+                }
+            }  
+
+            rebuild_course_cache();  // Because things have changed
+
+
+            $a->module = $strmodulename;
+            $a->directory = "$CFG->dirroot/mod/$delete";
+            notice(get_string("moduledeletefiles", "", $a), "modules.php");
+        }
+    }
+
+/// Get and sort the existing modules
+
+    if (!$modules = get_records("modules")) {
+        error("No modules found!!");        // Should never happen
+    }
+
+    foreach ($modules as $module) {
+        $strmodulename = get_string("modulename", "$module->name");
+        $modulebyname[$strmodulename] = $module;
+    }
+    ksort($modulebyname);
+
+/// Print the table of all modules
+
+    if (empty($THEME->custompix)) {
+        $pixpath = "../pix";
+        $modpixpath = "../mod";
+    } else {
+        $pixpath = "../theme/$CFG->theme/pix";
+        $modpixpath = "../theme/$CFG->theme/pix/mod";
+    }
+
+    $table->head  = array ($stractivitymodule, "$strhide/$strshow", $strdelete, $strsettings);
+    $table->align = array ("LEFT", "CENTER", "CENTER", "CENTER");
+    $table->wrap = array ("NOWRAP", "", "","");
+    $table->size = array ("100%", "10", "10","12");
+    $table->width = "100";
+
+    foreach ($modulebyname as $modulename => $module) {
+
+        $icon = "<img src=\"$modpixpath/$module->name/icon.gif\" hspace=10 height=16 width=16 border=0>";
+
+        $delete = "<a href=\"modules.php?delete=$module->name\">$strdelete</a>";
+
+        if (file_exists("$CFG->dirroot/mod/$module->name/config.html")) {
+            $settings = "<a href=\"module.php?module=$module->name\">$strsettings</a>";
+        } else {
+            $settings = "";
+        }
+
+        if ($module->visible) {
+            $visible = "<a href=\"modules.php?hide=$module->name\" title=\"$strhide\">".
+                       "<img src=\"$pixpath/i/hide.gif\" align=\"absmiddle\" height=16 width=16 border=0></a>";
+            $class = "";
+        } else {
+            $visible = "<a href=\"modules.php?show=$module->name\" title=\"$strshow\">".
+                       "<img src=\"$pixpath/i/show.gif\" align=\"absmiddle\" height=16 width=16 border=0></a>";
+            $class = "class=\"dimmed_text\"";
+        }
+        if ($module->name == "forum") {
+            $delete = "";
+            $visible = "";
+            $class = "";
+        }
+        $table->data[] = array ("<p $class>$icon $modulename</p>", $visible, $delete, $settings);
+    }
+    print_table($table);
+
+    echo "<br /><br />";
+
+    print_footer();
+
+?>

admin/phpinfo.php

@@ -0,0 +1,34 @@
+<?PHP  // $Id$
+       // phpinfo.php - shows phpinfo for the current server
+
+    require_once("../config.php");
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
+
+    if (isset($topframe)) {
+        $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;
+    }
+
+    if (isset($bottomframe)) {
+        phpinfo();
+        exit;
+    }
+
+?>
+<head>
+<title>PHP info</title>
+</head>
+
+<frameset rows="80,*">
+   <frame src="phpinfo.php?topframe=true">
+   <frame src="phpinfo.php?bottomframe=true">
+</frameset>

admin/register.php

@@ -0,0 +1,138 @@
+<?PHP  // $Id$
+       // register.php - allows admin to register their site on moodle.org
+
+    include("../config.php");
+    require_once("../lib/countries.php");
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
+
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
+
+    if (!$admin = get_admin()) {
+        error("No admins");
+    }
+
+    if (!$admin->country and $CFG->country) {
+        $admin->country = $CFG->country;
+    }
+
+    if (!$admin->secret) {    // secret field hasn't been set yet
+        $admin->secret = random_string(15);
+    
+        if (!set_field("user", "secret", $admin->secret, "id", $admin->id)) {
+            error("Could not set admin's secret string!");
+        }
+    }
+
+
+/// Print headings
+
+    $stradministration = get_string("administration");
+    $strregistration = get_string("registration");
+    $strregistrationinfo = get_string("registrationinfo");
+
+	print_header("$site->shortname: $strregistration", "$site->fullname", 
+                 "<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> $strregistration");
+
+    print_heading($strmanagemodules);
+
+    print_simple_box($strregistrationinfo, "center", "70%");
+    echo "<br />";
+
+
+/// Print the form
+
+    print_simple_box_start("center", "", "$THEME->cellheading");
+
+    echo "<form name=\"form\" action=\"http://moodle.org/register/\" method=post>\n";
+    echo "<table cellpadding=9 border=0>\n";
+
+    echo "<tr valign=top>\n";
+    echo "<td align=right><p>Moodle URL:</td>\n";
+    echo "<td><p>$CFG->wwwroot</td>\n";
+    echo "<!-- The following hidden variables are to help prevent fake entries being sent. -->\n";
+    echo "<!-- Together they form a key.  If any of these change between updates then the entry  -->\n";
+    echo "<!-- is flagged as a new entry and will be manually checked by the list maintainer -->\n";
+   
+    echo "<input type=\"hidden\" name=\"url\" value=\"$CFG->wwwroot\">\n";
+    echo "<input type=\"hidden\" name=\"secret\" value=\"$admin->secret\">\n";
+    echo "<input type=\"hidden\" name=\"host\" value=\"".$_SERVER["HTTP_HOST"]."\">\n";
+    echo "<input type=\"hidden\" name=\"lang\" value=\"".current_language()."\">\n";
+    echo "</td></tr>\n";
+
+    echo "<tr valign=top>\n";
+    echo "<td align=right><p>".get_string("currentversion").":</td>\n";
+    echo "<td><p>$CFG->release ($CFG->version)</td>\n";
+    echo "<input type=\"hidden\" name=\"version\" value=\"$CFG->version\">\n";
+    echo "<input type=\"hidden\" name=\"release\" value=\"$CFG->release\">\n";
+    echo "</td></tr>\n";
+
+    echo "<tr valign=top>\n";
+    echo "<td align=right><p>".get_string("fullsitename").":</td>\n";
+    echo "<td><p><input size=50 type=\"text\" name=\"sitename\" value=\"$site->fullname\"></td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=top>\n";
+    echo "<td align=right><p>".get_string("country").":</td>\n";
+    echo "<td><p>";
+    choose_from_menu ($COUNTRIES, "country", $admin->country, get_string("selectacountry")."...", "", "");
+    echo "</td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=top>\n";
+    echo "<td align=right><p><a href=\"http://moodle.org/sites\" title=\"See the current list of sites\" target=_blank>".get_string("publicdirectory")."</a>:</td>\n";
+    echo "<td><p>";
+    $options[0] = get_string("publicdirectory0");
+    $options[1] = get_string("publicdirectory1");
+    $options[2] = get_string("publicdirectory2");
+    choose_from_menu ($options, "public", "2", "", "", "");
+    unset($options);
+    echo "</td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=top>\n";
+    echo "<td colspan=2><hr size=1 noshade>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=top>\n";
+    echo "<td align=right><p>".get_string("administrator").":</td>\n";
+    echo "<td><p><input size=50 type=\"text\" name=\"adminname\" value=\"$admin->firstname $admin->lastname\"></td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=top>\n";
+    echo "<td align=right><p>".get_string("email").":</td>\n";
+    echo "<td><p><input size=50 type=\"text\" name=\"adminemail\" value=\"$admin->email\"></td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=top>\n";
+    echo "<td align=right><p>".get_string("registrationemail")."</a>:</td>\n";
+    echo "<td><p>\n";
+    $options[0] = get_string("registrationno");
+    $options[1] = get_string("registrationyes");
+    choose_from_menu ($options, "mailme", "1", "", "", "");
+    unset($options);
+    echo "</td>\n";
+    echo "</tr>\n";
+
+    echo "<tr valign=top>\n";
+    echo "<td align=right>&nbsp;</td>\n";
+    echo "<td><p><input type=\"submit\" value=\"".get_string("registrationsend")."\"></td>\n";
+    echo "</tr>\n";
+
+
+    echo "</table>\n";
+    echo "</form>\n";
+
+    print_simple_box_end();
+
+    echo "<br />\n";
+
+    print_footer();
+
+?>

admin/site.html

@@ -1,31 +1,56 @@
-<FORM METHOD="post" action="site.php" NAME="form">
-<TABLE cellpadding=9 cellspacing=0 >
+<form method="post" action="site.php" name="form" <?php echo $onsubmit ?>>
+<table cellpadding=9 cellspacing=0 >
 <tr valign=top>
-	<td align=right><P><? print_string("fullsitename") ?>:</td>
-	<td><input type="text" name="fullname" size=50 value="<? p($form->fullname) ?>">
-	<? formerr($err["fullname"]) ?>
-	</td>
-</tr>
-<tr valign=top>
-	<td align=right><P><? print_string("shortsitename") ?>:</td>
-	<td><input type="text" name="shortname" size=50 value="<? p($form->shortname) ?>">
-	<? formerr($err["shortname"]) ?>
-	</td>
-</tr>
-<tr valign=top>
-    <td align=right><P><? print_string("frontpagedescription") ?>:</P><BR>
-        <? helpbutton("text", get_string("helptext")) ?>
-    </td>
-    <td><TEXTAREA NAME=summary COLS=50 ROWS=10 WRAP=virtual><? p($form->summary) ?></TEXTAREA>
-    <? formerr($err["summary"]) ?>
+    <td align=right><P><?php print_string("fullsitename") ?>:</td>
+    <td><input type="text" name="fullname" size=50 value="<?php p($form->fullname) ?>">
+    <?php if (isset($err["fullname"])) formerr($err["fullname"]); ?>
     </td>
 </tr>
 <tr valign=top>
-        <td align=right><P><? print_string("frontpageformat") ?>:</td>
-        <td><? 
+    <td align=right><P><?php print_string("shortsitename") ?>:</td>
+    <td><input type="text" name="shortname" size=50 value="<?php p($form->shortname) ?>">
+    <?php if (isset($err["shortname"])) formerr($err["shortname"]); ?>
+    </td>
+</tr>
+<tr valign=top>
+    <td align=right><P><?php print_string("frontpagedescription") ?>:</P><br />
+     <font size=1>
+     <?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);
+        } 
+      ?>
+      <br />
+     </font>
+    </td>
+    <td><? print_textarea($usehtmleditor, 10, 50, 600, 400, "summary", $form->summary); ?></td>
+</tr>
+<tr valign=top>
+        <td align=right><P><?php print_string("frontpageformat") ?>:</td>
+        <td><?php 
+           $options = array("0"  =>  get_string("frontpagenews"),
+                            "1"  =>  get_string("frontpagecourselist"),
+                            "2"  =>  get_string("frontpagecategorynames"));
+           if (count_records("course") > 200) {
+               unset($options[1]);
+               if ($form->frontpage == 1) {
+                   $form->frontpage = 2;
+               }
+           }
+           choose_from_menu ($options, "frontpage", "$form->frontpage", "");
+        ?>
+        </td>
+</tr>
+<tr valign=top>
+        <td align=right><p><?php print_string("newsitemsnumber") ?>:</td>
+        <td><?php 
            $newsitem  = get_string("newsitem");
            $newsitems = get_string("newsitems");
-           $options = array("0"  =>  get_string("showlistofcourses"),
+           $options = array("0"  =>  "0 $newsitems",
                             "1"  =>  "1 $newsitem",
                             "2"  =>  "2 $newsitems",
                             "3"  =>  "3 $newsitems",
@@ -37,16 +62,49 @@
                             "9"  =>  "9 $newsitems",
                             "10" => "10 $newsitems");
            choose_from_menu ($options, "newsitems", "$form->newsitems", "");
-           formerr($err["newsitems"]);
         ?>
         </td>
 </tr>
+<tr valign=top>
+	<td align=right><p><?php print_string("wordforteacher") ?>:</td>
+	<td><input type="text" name="teacher" maxlength="100" size=25 value="<?php p($form->teacher) ?>">
+	(<?php print_string("wordforteachereg") ?>) 
+    <?php if (isset($err["teacher"])) formerr($err["teacher"]); ?>
+	</td>
+</tr>
+<tr valign=top>
+	<td align=right><p><?php print_string("wordforteachers") ?>:</td>
+	<td><input type="text" name="teachers" maxlength="100" size=25 value="<?php p($form->teachers) ?>">
+	(<?php print_string("wordforteacherseg") ?>)
+    <?php if (isset($err["teachers"])) formerr($err["teachers"]); ?>
+	</td>
+</tr>
+<tr valign=top>
+	<td align=right><p><?php print_string("wordforstudent") ?>:</td>
+	<td><input type="text" name="student" maxlength="100" size=25 value="<?php p($form->student) ?>">
+	(<?php print_string("wordforstudenteg") ?>) 
+    <?php if (isset($err["student"])) formerr($err["student"]); ?>
+	</td>
+</tr>
+<tr valign=top>
+	<td align=right><p><?php print_string("wordforstudents") ?>:</td>
+	<td><input type="text" name="students" maxlength="100" size=25 value="<?php p($form->students) ?>">
+	(<?php print_string("wordforstudentseg") ?>) 
+    <?php if (isset($err["students"])) formerr($err["students"]); ?>
+	</td>
+</tr>
 <tr>
     <td></td>
-	<td><input type="submit" value="<? print_string("savechanges") ?>"></td>
+    <td><input type="submit" value="<?php print_string("savechanges") ?>"></td>
 </tr>
-</TABLE>
-<INPUT type="hidden" name="id" value="<?=$form->id ?>">
-<INPUT type="hidden" name="category" value="<?=$form->category ?>">
-<INPUT type="hidden" name="format" value="<?=$form->format ?>">
-</FORM>
+</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) ?>">
+</form>
+
+<?php 
+   if ($usehtmleditor) { 
+       print_richedit_javascript("form", "summary", "no");
+   }
+?>

admin/site.php

@@ -1,74 +1,119 @@
 <?PHP // $Id$
 
-	require("../config.php");
+    require_once("../config.php");
 
     if ($site = get_site()) {
         if (!isadmin()) {
             error("You need to be admin to edit this page");
         }
+        $site->format = "social";   // override
     }
-    $site->format = "social";   // override
 
 /// If data submitted, then process and store.
 
-	if (match_referer() && isset($HTTP_POST_VARS)) {
-
-        $form = (object)$HTTP_POST_VARS;
+	if ($form = data_submitted()) {
 
         validate_form($form, $err);
 
         if (count($err) == 0) {
 
+            set_config("frontpage", $form->frontpage);
+
             $form->timemodified = time();
 
             if ($form->id) {
                 if (update_record("course", $form)) {
-		            redirect("$CFG->wwwroot/admin/index.php", "Changes saved");
+                    redirect("$CFG->wwwroot/", get_string("changessaved"));
                 } else {
                     error("Serious Error! Could not update the site record! (id = $form->id)");
                 }
             } else {
                 if ($newid = insert_record("course", $form)) {
-                    $cat->name = "General";
+                    $cat->name = get_string("miscellaneous");
                     if (insert_record("course_categories", $cat)) {
-		                redirect("$CFG->wwwroot/admin/index.php", "Changes saved", "1");
+                        redirect("$CFG->wwwroot/$CFG->admin/index.php", get_string("changessaved"), 1);
                     } else {
-                        error("Serious Error! Could not set up the default categories!");
+                        error("Serious Error! Could not set up a default course category!");
                     }
                 } else {
                     error("Serious Error! Could not set up the site!");
                 }
             }
-		    die;
+            die;
 
         } else {
             foreach ($err as $key => $value) {
                 $focus = "form.$key";
             }
         }
-	}
+    }
 
 /// Otherwise fill and print the form.
 
-    if ($site && !$form) {
+    if ($site and empty($form)) {
         $form = $site;
+        $firsttime = false;
     } else {
+        $form->fullname = "";
+        $form->shortname = "";
+        $form->summary = "";
+        $form->newsitems = 3;
+        $form->id = "";
         $form->category = 0;
         $form->format = "social";
-        $form->newsitems = 0;
+        $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 {
+        if ($form->newsitems > 0) {
+            $form->frontpage = 0;
+        } else {
+            $form->frontpage = 1;
+        }
+        set_config("frontpage", $form->frontpage);
+    }
+
+    if (empty($focus)) {
+        $focus = "form.fullname";
     }
 
     $stradmin = get_string("administration");
+    $strconfiguration = get_string("configuration");
     $strsitesettings = get_string("sitesettings");
 
-    print_header("$site->fullname", "$site->fullname",
-                  "<A HREF=\"$CFG->wwwroot/admin/\">$stradmin</A> -> $strsitesettings", "$focus");
+    if ($firsttime) {
+        print_header();
+        print_heading($strsitesettings);
+        print_simple_box(get_string("configintrosite"), "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);
+    }
+
+    $defaultformat = FORMAT_HTML;
+    if ($usehtmleditor = can_use_richtext_editor()) {
+        $onsubmit = "onsubmit=\"copyrichtext(form.summary);\"";
+    } else {
+        $onsubmit = "";
+    }
 
     print_simple_box_start("center", "", "$THEME->cellheading");
-    print_heading("Editing site settings");
-	include("site.html");
+    include("site.html");
     print_simple_box_end();
-    print_footer();
+
+    if (!$firsttime) {
+        print_footer();
+    }
 
     exit;
 
@@ -82,9 +127,6 @@ function validate_form(&$form, &$err) {
     if (empty($form->shortname))
         $err["shortname"] = get_string("missingshortsitename");
 
-    if (empty($form->summary))
-        $err["summary"] = get_string("missingsitedescription");
-
     return;
 }
 

admin/user.php

@@ -1,16 +1,32 @@
 <?PHP // $Id$
 
-	require("../config.php");
-	require("../user/lib.php");
-    require("../lib/countries.php");
+    require_once("../config.php");
+    require_once("../user/lib.php");
+    require_once("../lib/countries.php");
 
-    if (! record_exists_sql("SELECT * FROM user_admins")) {   // No admin user yet
-        $user->firstname = "Admin";
-        $user->lastname  = "User";
+    $recordsperpage = 30;
+
+    optional_variable($newuser, "");
+    optional_variable($delete, "");
+    optional_variable($confirm, "");
+    optional_variable($sort, "name");
+    optional_variable($dir, "ASC");
+    optional_variable($page, 0);
+    optional_variable($search, "");
+
+    unset($user);
+    unset($admin);
+    unset($teacher);
+
+    if (! record_exists("user_admins")) {   // No admin user yet
+
+        $user->firstname = get_string("admin");
+        $user->lastname  = get_string("user");
         $user->username  = "admin";
-        $user->password  = "";
+        $user->password  = md5("admin");
         $user->email     = "root@localhost";
         $user->confirmed = 1;
+        $user->lang = $CFG->lang;
         $user->maildisplay = 1;
         $user->timemodified = time();
 
@@ -18,7 +34,7 @@
             error("SERIOUS ERROR: Could not create admin user record !!!");
         }
 
-        $admin->user = $user->id;
+        $admin->userid = $user->id;
 
         if (! insert_record("user_admins", $admin)) {
             error("Could not make user $user->id an admin !!!");
@@ -32,7 +48,7 @@
             error("Could not find site-level course");
         }
 
-        $teacher->user = $user->id;
+        $teacher->userid = $user->id;
         $teacher->course = $site->id;
         $teacher->authority = 1;
         if (! insert_record("user_teachers", $teacher)) {
@@ -41,11 +57,13 @@
 
         $USER = $user;
         $USER->loggedin = true;
+        $USER->site = $CFG->wwwroot;
         $USER->admin = true;
         $USER->teacher["$site->id"] = true;
-        save_session("USER");
+        $USER->newadminuser = true;
 
         redirect("$CFG->wwwroot/user/edit.php?id=$user->id&course=$site->id");
+        exit;
 
     } else {
         if (! $site = get_site()) {
@@ -60,12 +78,12 @@
     }
 
     if ($newuser) {                 // Create a new user
-
         $user->firstname = "";
         $user->lastname  = "";
         $user->username  = "changeme";
         $user->password  = "";
         $user->email     = "";
+        $user->lang      = $CFG->lang;
         $user->confirmed = 1;
         $user->timemodified = time();
 
@@ -79,34 +97,188 @@
         
     } else {                        // List all users for editing
 
-        if ($users = get_records_sql("SELECT * from user WHERE username <> 'guest' ORDER BY firstname")) {
-            $stredituser = get_string("edituser");
-            $stradministration = get_string("administration");
-            $stredit   = get_string("edit");
-            $strdelete = get_string("delete");
+        $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");
 
-	        print_header("$site->fullname : $stredituser", $site->fullname, 
-                         "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> $stredituser");
+        print_header("$site->shortname: $stredituser", $site->fullname, 
+                     "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> -> $stredituser");
 
-            print_heading(get_string("chooseuser"));
-
-            $table->head  = array (get_string("fullname"), get_string("email"), get_string("city"), 
-                                   get_string("country"), " ");
-            $table->align = array ("LEFT", "LEFT", "CENTER", "CENTER", "CENTER", "CENTER");
-            foreach ($users as $user) {
-                $table->data[] = array ("<A HREF=\"../user/view.php?id=$user->id&course=$site->id\">$user->firstname $user->lastname</A>",
-                                        "$user->email",
-                                        "$user->city",
-                                        $COUNTRIES[$user->country],
-                                        "<A HREF=\"../user/edit.php?id=$user->id&course=$site->id\">$stredit</A>");
+        if ($delete) {              // Delete a selected user, after confirmation
+            if (!$user = get_record("user", "id", "$delete")) {
+                error("No such user!");
             }
-            print_table($table);
 
-            print_heading("<A HREF=\"user.php?newuser=true\">".get_string("addnewuser")."</A>");
-        } else {
-            error("No users found!");
-            
+            $primaryadmin = get_admin();
+            if ($user->id == $primaryadmin->id) {
+                error("You are not allowed to delete the primary admin user!");
+            }
+
+            if ($confirm != md5($delete)) {
+                notice_yesno(get_string("deletecheckfull", "", "'$user->firstname $user->lastname'"),
+                     "user.php?delete=$delete&confirm=".md5($delete), "user.php");
+
+                exit;
+            } else if (!$user->deleted) {
+                unset($updateuser);
+                $updateuser->id = $user->id;
+                $updateuser->deleted = "1";
+                $updateuser->username = "$user->email.".time();  // Remember it just in case
+                $updateuser->email = "";               // Clear this field to free it up
+                $updateuser->timemodified = time();
+                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", "", "$user->firstname $user->lastname"));
+                } else {
+                    notify(get_string("deletednot", "", "$user->firstname $user->lastname"));
+                }
+            }
         }
+
+        // Carry on with the user listing
+
+
+        $columns = array("name", "email", "city", "country", "lastaccess");
+
+        foreach ($columns as $column) {
+            $string[$column] = get_string("$column");
+            $columnsort = "$column";
+            if ($column == "lastaccess") {
+                $columndir = "DESC";
+            } else {
+                $columndir = "ASC";
+            }
+            if ($columnsort == $sort) {
+               $$column = $string[$column];
+            } else {
+               $$column = "<A HREF=\"user.php?sort=$columnsort&dir=$columndir&search=$search\">".$string[$column]."</A>";
+            }
+        }
+
+        if ($sort == "name") {
+            $sort = "firstname";
+        }
+
+        if (!$users = get_users_listing($sort, $dir, $page, $recordsperpage, $search)) {
+            if (!$users = get_users_listing($sort, $dir, 0, $recordsperpage)) {
+                error("No users found!");
+            } else {
+                notify(get_string("nousersmatching", "", $search));
+                $search = "";
+            }
+        }
+
+        $usercount = get_users(false);
+
+        if ($search) {
+            $usersearchcount = get_users(false, $search);
+            print_heading("$usersearchcount / $usercount ".get_string("users"));
+            $usercount = $usersearchcount;
+        } else {
+            print_heading("$usercount ".get_string("users"));
+        }
+            
+        $a->start = $page;
+        $a->end = $page + $recordsperpage;
+        if ($a->end > $usercount) {
+            $a->end = $usercount;
+        }
+        echo "<TABLE align=center cellpadding=10><TR>";
+        echo "<TD>";
+        if ($page) {
+            $prevpage = $page - $recordsperpage;
+            if ($prevpage < 0) {
+                $prevpage = 0;
+            }
+            $options["dir"] = $dir;
+            $options["page"] = 0;
+            $options["sort"] = $sort;
+            $options["search"] = $search;
+            print_single_button("user.php", $options, "  <<  ");
+            echo "</TD><TD>";
+            $options["page"] = $prevpage;
+            print_single_button("user.php", $options, "  <  ");
+        }
+        echo "</TD><TD>";
+        print_heading(get_string("displayingusers", "", $a));
+        echo "</TD><TD>";
+        $nextpage = $page + $recordsperpage;
+        if ($nextpage < $usercount) {
+            $options["dir"] = $dir;
+            $options["page"] = $nextpage;
+            $options["sort"] = $sort;
+            $options["search"] = $search;
+            print_single_button("user.php", $options, "  >  ");
+            echo "</TD><TD>";
+            $options["page"] = $usercount-$recordsperpage;
+            print_single_button("user.php", $options, "  >>  ");
+        }
+        echo "</TD></TR></TABLE>";
+
+        flush();
+
+        foreach ($users as $key => $user) {
+            if (!empty($user->country)) {
+                $users[$key]->country = $COUNTRIES[$user->country];
+            }
+        }
+        if ($sort == "country") {  // Need to resort by full country name, not code
+            foreach ($users as $user) {
+                $susers[$user->id] = $user->country;
+            }
+            asort($susers);
+            foreach ($susers as $key => $value) {
+                $nusers[] = $users[$key];
+            }
+            $users = $nusers;
+        }
+
+        $table->head = array ($name, $email, $city, $country, $lastaccess, "", "");
+        $table->align = array ("LEFT", "LEFT", "LEFT", "LEFT", "LEFT", "CENTER", "CENTER");
+        $table->width = "95%";
+        foreach ($users as $user) {
+            if ($user->id == $USER->id or $user->username == "changeme") {
+                $deletebutton = "";
+            } else {
+                $deletebutton = "<A HREF=\"user.php?delete=$user->id\" TARGET=\"$strdeletecheck\">$strdelete</A>";
+            }
+            if ($user->lastaccess) {
+                $strlastaccess = format_time(time() - $user->lastaccess);
+            } else {
+                $strlastaccess = get_string("never");
+            }
+            $table->data[] = array ("<A HREF=\"../user/view.php?id=$user->id&course=$site->id\">$user->firstname $user->lastname</A>",
+                             "$user->email",
+                             "$user->city",
+                             "$user->country",
+                             $strlastaccess,
+                             "<A HREF=\"../user/edit.php?id=$user->id&course=$site->id\">$stredit</A>",
+                             $deletebutton);
+        }
+
+        echo "<TABLE align=center cellpadding=10><TR><TD>";
+        echo "<FORM ACTION=user.php METHOD=POST>";
+        echo "<INPUT TYPE=text NAME=search VALUE=\"$search\" SIZE=20>";
+        echo "<INPUT TYPE=submit VALUE=\"$strsearch\">";
+        if ($search) {
+            echo "<INPUT type=\"button\" onClick=\"document.location='user.php';\" value=\"$strshowallusers\">";
+        }
+        echo "</FORM>";    
+        echo "</TD></TR></TABLE>";
+
+        print_table($table);
+
+        if ($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
+            print_heading("<A HREF=\"user.php?newuser=true\">".get_string("addnewuser")."</A>");
+        }
+
         print_footer();
     }
 

admin/users.php

@@ -0,0 +1,49 @@
+<?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\">".get_string("authentication")."</a></b>",
+                           get_string("adminhelpauthentication"));
+
+    if ($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
+        $table->data[] = array("<b><a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true\">".get_string("addnewuser")."</a></b>",
+                               get_string("adminhelpaddnewuser"));
+    }
+    $table->data[] = array("<b><a href=\"user.php\">".get_string("edituser")."</a></b>",
+                           get_string("adminhelpedituser"));
+    $table->data[] = array("<b><a href=\"admin.php\">".get_string("assignadmins")."</a></b>",
+                           get_string("adminhelpassignadmins"));
+    $table->data[] = array("<b><a href=\"creators.php\">".get_string("assigncreators")."</a></b>",
+                           get_string("adminhelpassigncreators"));
+    $table->data[] = array("<b><a href=\"../course/index.php?edit=on\">".get_string("assignteachers")."</a></b>",
+                           get_string("adminhelpassignteachers")." <img src=\"../pix/t/user.gif\" height=11 width=11>");
+    $table->data[] = array("<b><a href=\"../course/index.php?edit=off\">".get_string("assignstudents")."</a></b>",
+                           get_string("adminhelpassignstudents"));
+
+    print_table($table);
+    
+    print_footer($site);
+
+?>
+
+

auth/README

@@ -0,0 +1,84 @@
+This directory contains authentication modules.
+
+Each of these modules describes a different way to 
+check that a user has provided a correct 
+
+   - username, and 
+   - password.
+
+Even when external forms of authentication are being
+used, Moodle still maintains the internal "user" table 
+with all the associated information about that user such
+as name, email address and so on.
+
+The active method is set by the admin on the Configuration page.
+
+
+email - authentication by email  (DEFAULT METHOD)
+
+    - user fills out form with email address
+    - email sent to user with link 
+    - user clicks on link in email to confirm
+    - user account is created
+    - user can log in
+
+
+none  - no authentication at all .. very insecure!!
+    
+    - user logs in using ANY username and password
+    - if the username doesn't already exist then
+      a new account is created
+    - when user tries to access a course they 
+      are forced to set up their account details
+
+manual - internal authentication only
+
+    - user logs in using username and password
+    - no way for user to make their own account
+
+
+ldap  - Uses an external LDAP server
+
+    - user logs in using username and password
+    - these are checked against an LDAP server
+    - if correct, user is logged in
+    - optionally, info is copied from the LDAP
+      database to the Moodle user database
+
+    (see the ldap/README for more details on config etc...)
+
+
+imap  - Uses an external IMAP server
+
+    - user logs in using username and password
+    - these are checked against an IMAP server
+    - if correct, user is logged in
+    - if the username doesn't already exist then
+      a new account is created
+
+
+pop3  - Uses an external POP3 server
+
+    - user logs in using username and password
+    - these are checked against a POP3 server
+    - if correct, user is logged in
+    - if the username doesn't already exist then
+      a new account is created
+
+
+nntp  - Uses an external NNTP server
+
+    - user logs in using username and password
+    - these are checked against an NNTP server
+    - if correct, user is logged in
+    - if the username doesn't already exist then
+      a new account is created
+
+
+db  - Uses an external database to check username/password
+    
+    - user logs in using username and password
+    - these are checked against an external database
+    - if correct, user is logged in
+    - if the username doesn't already exist then
+      a new Moodle account is created

auth/db/config.html

@@ -0,0 +1,235 @@
+<?PHP
+    if (!isset($config->auth_dbhost)) {
+        $config->auth_dbhost = "localhost";
+    }
+    if (!isset($config->auth_dbtype)) {
+        $config->auth_dbtype = "mysql";
+    }
+    if (!isset($config->auth_dbname)) {
+        $config->auth_dbname = "";
+    }
+    if (!isset($config->auth_dbuser)) {
+        $config->auth_dbuser = "";
+    }
+    if (!isset($config->auth_dbpass)) {
+        $config->auth_dbpass = "";
+    }
+    if (!isset($config->auth_dbtable)) {
+        $config->auth_dbtable = "";
+    }
+    if (!isset($config->auth_dbfielduser)) {
+        $config->auth_dbfielduser = "";
+    }
+    if (!isset($config->auth_dbfieldpass)) {
+        $config->auth_dbfieldpass = "";
+    }
+    if (!isset($config->auth_dbpasstype)) {
+        $config->auth_dbpasstype = "plaintext";
+    }
+?>
+<tr valign="top"  BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbhost:</TD>
+	<TD>
+        <INPUT name=auth_dbhost TYPE=text SIZE=30 VALUE="<?=$config->auth_dbhost?>">
+	<? if (isset($err["auth_dbhost"])) formerr($err["auth_dbhost"]); ?>
+	</TD>
+    <TD>
+    <? print_string("auth_dbhost","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbtype:</TD>
+	<TD>
+    <? $dbtypes = array("access","ado_access", "ado", "ado_mssql", "borland_ibase", "csv", "db2", "fbsql", "firebird", "ibase", "informix72", "informix", "mssql", "mysql", "mysqlt", "oci805", "oci8", "oci8po", "odbc", "odbc_mssql", "odbc_oracle", "oracle", "postgres64", "postgres7", "postgres", "proxy", "sqlanywhere", "sybase", "vfp");
+       foreach ($dbtypes as $dbtype) {
+           $dboptions[$dbtype] = $dbtype;
+       }
+       choose_from_menu($dboptions, "auth_dbtype", $config->auth_dbtype, "");
+    ?>
+      
+    </TD>
+    <TD>
+    <? print_string("auth_dbtype","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbname:</TD>
+	<TD>
+    <INPUT name=auth_dbname TYPE=text SIZE=30 VALUE="<?=$config->auth_dbname?>">
+    <? if (isset($err["auth_dbname"]))formerr($err["auth_dbname"]); ?>
+    </TD>
+    <TD>
+    <? print_string("auth_dbname","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbuser:</TD>
+	<TD>
+    <INPUT name=auth_dbuser TYPE=text SIZE=30 VALUE="<?=$config->auth_dbuser?>">
+    <? if (isset($err["auth_dbuser"])) formerr($err["auth_dbuser"]); ?>
+    </TD>
+    <TD>
+    <? print_string("auth_dbuser","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbpass:</TD>
+	<TD>
+    <INPUT name="auth_dbpass" TYPE="text" SIZE="30" VALUE="<?=$config->auth_dbpass?>">
+    <? if (isset($err["auth_dbpass"])) formerr($err["auth_dbpass"]); ?>
+    </TD>
+    <TD>
+    <? print_string("auth_dbpass","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbtable:</TD>
+	<TD>
+    <INPUT name="auth_dbtable" TYPE="text" SIZE="30" VALUE="<?=$config->auth_dbtable?>">
+    <? if (isset($err["auth_dbtable"])) formerr($err["auth_dbtable"]); ?>
+    </TD>
+    <TD>
+    <? print_string("auth_dbtable","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbfielduser:</TD>
+	<TD>
+    <INPUT name="auth_dbfielduser" TYPE="text" SIZE="30" VALUE="<?=$config->auth_dbfielduser?>">
+    <? if (isset($err["auth_dbfielduser"])) formerr($err["auth_dbfielduser"]); ?>
+    </TD>
+    <TD>
+    <? print_string("auth_dbfielduser","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbfieldpass:</TD>
+	<TD>
+    <INPUT name="auth_dbfieldpass" TYPE="text" SIZE="30" VALUE="<?=$config->auth_dbfieldpass?>">
+    <? if (isset($err["auth_dbfieldpass"])) formerr($err["auth_dbfieldpass"]); ?>
+    </TD>
+    <TD>
+    <? print_string("auth_dbfieldpass","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbpasstype:</TD>
+	<TD>
+    <? $passtype["plaintext"] = get_string("plaintext", "auth");
+       $passtype["md5"]       = get_string("md5", "auth");
+       choose_from_menu($passtype, "auth_dbpasstype", $config->auth_dbpasstype, "");
+    ?>
+      
+    </TD>
+    <TD>
+    <? print_string("auth_dbpasstype","auth") ?>
+    </TD>
+</TR>
+
+
+<TR>
+	<TD ALIGN=RIGHT><P><? print_string("firstname") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_firstname" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_firstname?>">
+    </TD>
+    <TD rowspan=12 VALIGN=CENTER>
+    <? print_string("auth_dbextrafields","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("lastname") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_lastname" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_lastname?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("email") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_email" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_email?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("phone") ?> 1:</TD>
+	<TD>
+    <INPUT name="auth_user_phone1" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_phone1?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("phone") ?> 2:</TD>
+	<TD>
+    <INPUT name="auth_user_phone2" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_phone2?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("department") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_department" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_department?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("address") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_address" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_address?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("city") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_city" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_city?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("country") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_country" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_country?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("description") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_description" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_description?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("idnumber") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_idnumber" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_idnumber?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("language") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_lang" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_lang?>">
+    </TD>
+</TR>
+
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
+	<TD>
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA> 
+    </TD>
+    <TD>
+    <? print_string("authinstructions","auth") ?>
+    <? helpbutton("text", get_string("helptext")) ?>
+    </TD>
+</TR>

auth/db/lib.php

@@ -0,0 +1,75 @@
+<?PHP  // $Id$
+       // Authentication by looking up an external database table
+
+
+function auth_user_login ($username, $password) {
+// Returns true if the username and password work
+// and false if they are wrong or don't exist.
+
+    global $CFG;
+
+    // This is a hack to workaround what seems to be a bug in ADOdb with accessing 
+    // two databases of the same kind ... it seems to get confused when trying to access
+    // the first database again, after having accessed the second.
+    // The following hack will make the database explicit which keeps it happy
+    $CFG->prefix = "$CFG->dbname.$CFG->prefix";
+
+    // Connect to the external database
+    $authdb = &ADONewConnection($CFG->auth_dbtype);         
+    $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname); 
+
+    switch ($CFG->auth_dbpasstype) {   // Re-format password accordingly
+        case "md5":
+            $password = md5($password);
+        break;
+    }
+
+    $rs = $authdb->Execute("SELECT * FROM $CFG->auth_dbtable 
+                            WHERE $CFG->auth_dbfielduser = '$username' 
+                              AND $CFG->auth_dbfieldpass = '$password' ");
+    if (!$rs) {
+        notify("Could not connect to the specified authentication database...");
+        return false;
+    }
+
+    if ( $rs->RecordCount() ) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+
+function auth_get_userinfo($username){
+// Reads any other information for a user from external database,
+// then returns it in an array
+
+    global $CFG;
+
+    $config = (array) $CFG;
+
+    ADOLoadCode($CFG->auth_dbtype);          
+    $authdb = &ADONewConnection();         
+    $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname); 
+
+    $fields = array("firstname", "lastname", "email", "phone1", "phone2", 
+                    "department", "address", "city", "country", "description", 
+                    "idnumber", "lang");
+
+    $result = array();
+
+    foreach ($fields as $field) {
+        if ($config["auth_user_$field"]) {
+            if ($rs = $authdb->Execute("SELECT ".$config["auth_user_$field"]." FROM $CFG->auth_dbtable
+                                        WHERE $CFG->auth_dbfielduser = '$username'")) {
+                if ( $rs->RecordCount() == 1 ) {
+                    $result["$field"] = $rs->fields[$config["auth_user_$field"]];
+                }
+            }
+        }
+    }
+
+    return $result;
+}
+
+?>

auth/email/config.html

@@ -0,0 +1 @@
+<!-- No config needed -->

auth/email/lib.php

@@ -0,0 +1,19 @@
+<?PHP  // $Id$
+       // Standard authentication function
+
+function auth_user_login ($username, $password) {
+// Returns true if the username and password work
+// and false if they don't
+
+    global $CFG;
+
+    if (! $user = get_user_info_from_db("username", $username)) {
+        return false;
+    }
+    
+    return ($user->password == md5($password));
+}
+
+
+
+?>

auth/imap/config.html

@@ -0,0 +1,58 @@
+<?PHP
+    if (!isset($config->auth_imaphost)) {
+        $config->auth_imaphost = "127.0.0.1";
+    }
+    if (!isset($config->auth_imaptype)) {
+        $config->auth_imaptype = "imap";
+    }
+    if (!isset($config->auth_imapport)) {
+        $config->auth_imapport = "143";
+    }
+?>
+<tr valign="top" BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_imaphost:</TD>
+	<TD>
+        <INPUT name=auth_imaphost TYPE=text SIZE=30 VALUE="<?=$config->auth_imaphost?>">
+	<? if (isset($err["auth_imaphost"])) formerr($err["auth_imaphost"]); ?>
+	</TD>
+    <TD>
+    <? print_string("auth_imaphost","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_imaptype:</TD>
+	<TD>
+    <? $imaptypes = array("imap","imapssl", "imapcert", "imaptls");
+       foreach($imaptypes as $imaptype) {
+           $imapoptions[$imaptype] = $imaptype;
+       }
+       choose_from_menu($imapoptions, "auth_imaptype", $config->auth_imaptype, "");
+    ?>
+    </TD>
+    <TD>
+    <? print_string("auth_imaptype","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_imapport:</TD>
+	<TD>
+    <INPUT name=auth_imapport TYPE=text SIZE=6 VALUE="<?=$config->auth_imapport?>">
+    <? if (isset($err["auth_imapport"])) formerr($err["auth_imapport"]); ?>
+    </TD>
+    <TD>
+    <? print_string("auth_imapport","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
+	<TD>
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA> 
+    </TD>
+    <TD>
+    <? print_string("authinstructions","auth") ?>
+    <? helpbutton("text", get_string("helptext")) ?>
+    </TD>
+</TR>

auth/imap/lib.php

@@ -0,0 +1,41 @@
+<?PHP  // $Id$
+       // Authentication by looking up an IMAP server
+
+function auth_user_login ($username, $password) {
+// Returns true if the username and password work
+// and false if they are wrong or don't exist.
+
+    global $CFG;
+
+    switch ($CFG->auth_imaptype) {
+        case "imapssl":
+            $host = "{".$CFG->auth_imaphost.":$CFG->auth_imapport/imap/ssl}";
+        break;
+
+        case "imapcert":
+            $host = "{".$CFG->auth_imaphost.":$CFG->auth_imapport/imap/ssl/novalidate-cert}";
+        break;
+
+        case "imaptls":
+            $host = "{".$CFG->auth_imaphost.":$CFG->auth_imapport/imap/notls}";
+        break;
+
+        default:
+            $host = "{".$CFG->auth_imaphost.":$CFG->auth_imapport}";
+    }
+
+    error_reporting(0);
+    $connection = imap_open($host, $username, $password, OP_HALFOPEN);
+    error_reporting($CFG->debug);   
+
+    if ($connection) {
+        imap_close($connection);
+        return true;
+
+    } else {
+        return false;
+    }
+}
+
+
+?>

auth/ldap/README-LDAP

@@ -0,0 +1,3 @@
+LDAP-module README
+
+Please read comments from lib.php 

auth/ldap/config.html

@@ -0,0 +1,216 @@
+<?PHP
+    if (!isset($config->ldap_host_url)) {
+        $config->ldap_host_url = "";
+    }
+    if (!isset($config->ldap_contexts)) {
+        $config->ldap_contexts = "";
+    }
+    if (!isset($config->ldap_user_attribute)) {
+        $config->ldap_user_attribute = "";
+    }
+    if (!isset($config->ldap_search_sub)) {
+        $config->ldap_search_sub = "";
+    }
+    if (!isset($config->ldap_bind_dn)) {
+        $config->ldap_bind_dn = "";
+    }
+    if (!isset($config->ldap_bind_pw)) {
+        $config->ldap_bind_pw = "";
+    }
+?>
+<tr valign="top" BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>ldap_host_url:</TD>
+	<TD>
+        <INPUT name=ldap_host_url TYPE=text SIZE=30 VALUE="<?=$config->ldap_host_url?>">
+	<? if (isset($err["ldap_host_url"])) formerr($err["ldap_host_url"]); ?>
+	</TD>
+    <TD>
+    <? print_string("auth_ldap_host_url","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>ldap_contexts:</TD>
+	<TD>
+    <INPUT name=ldap_contexts TYPE=text SIZE=30 VALUE="<?=$config->ldap_contexts?>">
+    <? if (isset($err["ldap_contexts"])) formerr($err["ldap_contexts"]); ?>
+    </TD>
+    <TD>
+    <? print_string("auth_ldap_contexts","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>ldap_user_attribute:</TD>
+	<TD>
+    <INPUT name=ldap_user_attribute TYPE=text SIZE=30 VALUE="<?=$config->ldap_user_attribute?>">
+    <? if (isset($err["ldap_user_attribute"])) formerr($err["ldap_user_attribute"]); ?>
+    </TD>
+    <TD>
+    <? print_string("auth_ldap_user_attribute","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>ldap_search_sub:</TD>
+	<TD>
+    <INPUT name=ldap_search_sub TYPE=text SIZE=1 VALUE="<?=$config->ldap_search_sub?>">
+    <? if (isset($err["ldap_search_sub"])) formerr($err["ldap_search_sub"]); ?>
+    </TD>
+    <TD>
+    <? print_string("auth_ldap_search_sub","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>ldap_bind_dn:</TD>
+	<TD>
+    <INPUT name=ldap_bind_dn TYPE=text SIZE=30 VALUE="<?=$config->ldap_bind_dn?>">
+    <? if (isset($err["ldap_bind_dn"])) formerr($err["ldap_bind_dn"]); ?>
+    </TD><TD>
+    <? print_string("auth_ldap_bind_dn","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>ldap_bind_pw:</TD>
+	<TD>
+    <INPUT name=ldap_bind_pw TYPE=text SIZE=30 VALUE="<?=$config->ldap_bind_pw?>">
+    <? if (isset($err["ldap_bind_pw"])) formerr($err["ldap_bind_pw"]); ?>
+    </TD><TD>
+    <? print_string("auth_ldap_bind_pw","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+        <TD ALIGN=RIGHT><P>ldap_memberattribute:</TD>
+        <TD>
+    <INPUT name=ldap_memberattribute TYPE=text SIZE=30 VALUE="<?=$config->ldap_memberattribute?>">
+    <? if (isset($err["ldap_memberattribute"])) formerr($err["ldap_memberattribute"]); ?>
+    </TD><TD>
+    <? print_string("auth_ldap_memberattribute","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+        <TD ALIGN=RIGHT><P>ldap_creators:</TD>
+        <TD>
+    <INPUT name=ldap_creators TYPE=text SIZE=30 VALUE="<?=$config->ldap_creators?>">
+    <? if (isset($err["ldap_creators"])) formerr($err["ldap_creators"]); ?>
+    </TD><TD>
+    <? print_string("auth_ldap_creators","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>ldap_create_context:</TD>
+	<TD>
+    <INPUT name=ldap_create_context TYPE=text SIZE=30 VALUE="<?=$config->ldap_create_context?>">
+    <? if (isset($err["ldap_create_context"])) formerr($err["ldap_create_context"]); ?>
+    </TD><TD>
+    <? print_string("auth_ldap_create_context","auth") ?>
+    </TD>
+</TR>
+
+<TR>
+	<TD ALIGN=RIGHT><P><? print_string("firstname") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_firstname" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_firstname?>">
+    </TD>
+    <TD rowspan=12 VALIGN=CENTER>
+    <? print_string("auth_ldapextrafields","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("lastname") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_lastname" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_lastname?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("email") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_email" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_email?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("phone") ?> 1:</TD>
+	<TD>
+    <INPUT name="auth_user_phone1" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_phone1?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("phone") ?> 2:</TD>
+	<TD>
+    <INPUT name="auth_user_phone2" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_phone2?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("department") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_department" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_department?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("address") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_address" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_address?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("city") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_city" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_city?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("country") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_country" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_country?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("description") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_description" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_description?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("idnumber") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_idnumber" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_idnumber?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("language") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_lang" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_lang?>">
+    </TD>
+</TR>
+
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
+	<TD>
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA> 
+    </TD>
+    <TD>
+    <? print_string("authinstructions","auth") ?>
+    <? helpbutton("text", get_string("helptext")) ?>
+    </TD>
+</TR>
+
+
+
+

auth/ldap/lib.php

@@ -0,0 +1,369 @@
+<?PHP  // $Id$
+//CHANGELOG:
+//24.02.2003 Added support for coursecreators
+//20.02.2003 Added support for user creation
+//12.10.2002 Reformatted source for consistency
+//03.10.2002 First version to CVS
+//29.09.2002 Clean up and splitted code to functions v. 0.02
+//29.09.2002 LDAP authentication functions v. 0.01
+//Distributed under GPL (c)Petri Asikainen 2002-2003
+
+/* README!
+Module is quite complete and  most functinality can be configured from
+configinterfave /admin/auth.php. Some of latest additions/features need to
+be configured by modifying source code.
+ 
+If you plan to use user creation feature, look function auth_user_create
+and modify it for your needs.
+You have to change all hardcoded attribute values to fit your LDAP-server.
+User-creation makes posible that your current 
+users can authenticate with existings usernames/password and new users can 
+create own accounts to LDAP-directory. I'm using this feature and new users
+are created to LDAP different context, without rights to other system. When
+user-creation feature is set like that, there's no known security issues.
+I write ldap-module on Novell E-directory / Linux & Solaris , 
+so all default values are for it.
+
+Any feedback is wellcome,
+
+Petri Asikainen paca@sci.fi
+
+
+*/
+function auth_user_login ($username, $password) {
+/// Returns true if the username and password work
+/// and false if they don't
+
+    global $CFG;
+
+    if (!$username or !$password) {    // Don't allow blank usernames or passwords
+        return false;
+    }
+ 
+    $ldap_connection = auth_ldap_connect();
+
+    if ($ldap_connection) {
+        $ldap_user_dn = auth_ldap_find_userdn($ldap_connection, $username);
+      
+        //if ldap_user_dn is empty, user does not exist
+        if(!$ldap_user_dn){
+            ldap_close($ldap_connection);
+            return false;
+        }
+
+        // Try to bind with current username and password
+        $ldap_login = @ldap_bind($ldap_connection, $ldap_user_dn, $password);
+        ldap_close($ldap_connection);
+        if ($ldap_login) {
+            return true;
+        }
+    } else {
+        @ldap_close($ldap_connection);
+        error("LDAP-module cannot connect to server: $CFG->ldap_host_url");
+    }
+    return false;
+}
+
+
+ 
+function auth_get_userinfo($username){
+/// reads userinformation from ldap and return it in array()
+    global $CFG;
+
+    $config = (array)$CFG;
+    $attrmap = auth_ldap_attributes();
+   
+    $ldap_connection=auth_ldap_connect();
+
+    $result = array();
+    $search_attribs = array();
+  
+    foreach ($attrmap as $key=>$value) {
+        if (!in_array($value, $search_attribs)) {
+            array_push($search_attribs, $value);
+        }    
+    }
+
+    $user_dn = auth_ldap_find_userdn($ldap_connection, $username);
+
+    if (! isset($CFG->ldap_objectclass)) {
+        $CFG->ldap_objectclass="objectClass=*";
+    }
+  
+    $user_info_result = ldap_read($ldap_connection,$user_dn,$CFG->ldap_objectclass, $search_attribs);
+
+    if ($user_info_result) {
+        $user_entry = ldap_get_entries($ldap_connection, $user_info_result);
+        foreach ($attrmap as $key=>$value){
+            if(isset($user_entry[0][strtolower($value)][0])){
+                $result[$key]=$user_entry[0][strtolower($value)][0];
+            }
+        }
+    }
+
+    @ldap_close($ldap_connection);
+
+    return $result;
+}
+
+function auth_get_userlist () {
+    global $CFG;
+    return auth_ldap_get_userlist("($CFG->ldap_user_attribute=*)");
+}
+function auth_user_exists ($username) {
+   global $CFG; 
+   //returns true if given usernname exist on ldap
+   $users = auth_ldap_get_userlist("($CFG->ldap_user_attribute=$username)");
+   return count($users); 
+}
+
+function auth_user_create ($userobject,$plainpass) {
+//create new user to ldap
+//use auth_user_exists to prevent dublicate usernames
+//return true if user is created, false on error
+	global $CFG;
+    $attrmap = auth_ldap_attributes();
+    $ldapconnect = auth_ldap_connect();
+    $ldapbind = auth_ldap_bind($ldapconnect);
+    
+    $newuser = array();
+     
+    foreach ($attrmap as $key=>$value){
+            if(isset($userobject->$key) ){
+                $newuser[$value]=utf8_encode($userobject->$key);
+            }
+    }
+    
+    //Following sets all mandatory and other forced attribute values
+    //this should be moved to config inteface ASAP
+    $newuser['objectClass']= array("inetOrgPerson","organizationalPerson","person","top");
+    $newuser['uniqueId']= $userobject->username;
+    $newuser['logindisabled']="TRUE";
+    $newuser['userpassword']=$plainpass;
+    unset($newuser[country]);
+        
+    $uadd = ldap_add($ldapconnect, $CFG->ldap_user_attribute."=$userobject->username,".$CFG->ldap_create_context, $newuser);
+
+    ldap_close($ldapconnect);
+    return $uadd;
+    
+}
+
+function auth_user_activate ($username) {
+//activate new ldap-user after email-address is confirmed
+	global $CFG;
+
+    $ldapconnect = auth_ldap_connect();
+    $ldapbind = auth_ldap_bind($ldapconnect);
+
+    $userdn = auth_ldap_find_userdn($ldapconnect, $username);
+    
+    $newinfo['loginDisabled']="FALSE";
+
+    $result = ldap_modify($ldapconnect, $userdn, $newinfo);
+    ldap_close($ldapconnect);
+    return $result;
+}
+
+function auth_user_disable ($username) {
+//activate new ldap-user after email-address is confirmed
+	global $CFG;
+
+    $ldapconnect = auth_ldap_connect();
+    $ldapbind = auth_ldap_bind($ldapconnect);
+
+    $userdn = auth_ldap_find_userdn($ldapconnect, $username);
+    $newinfo['loginDisabled']="TRUE";
+
+    $result = ldap_modify($ldapconnect, $userdn, $newinfo);
+    ldap_close($ldapconnect);
+    return $result;
+}
+
+function auth_iscreator($username=0) {
+///if user is member of creator group return true
+   global $CFG, $USER;
+
+   $ldapconnect = auth_ldap_connect();
+   $ldapbind = auth_ldap_bind($ldapconnect);
+
+   if (! $username) {
+       $username=$USER->username;
+   }
+   
+   if ((! $CFG->ldap_creators) OR (! $CFG->ldap_memberattribute)) {
+      return false;
+   } else {
+      $groups = explode(";",$CFG->ldap_creators);
+   }
+
+
+   //build filter
+   $filter = "(& ($CFG->ldap_user_attribute=$username)(|";
+   foreach ($groups as $group){
+       $filter .= "($CFG->ldap_memberattribute=$group)";
+   }
+   $filter .= "))";
+   //search
+   $result = auth_ldap_get_userlist($filter);
+   
+   return count($result);
+
+}
+
+//PRIVATE FUNCTIONS starts
+//private functions are named as auth_ldap*
+
+function auth_ldap_connect(){
+/// connects to ldap-server
+    global $CFG;
+
+    $result = ldap_connect($CFG->ldap_host_url);
+
+    if ($result) {
+        return $result;
+
+    } else {
+        error("LDAP-module cannot connect to server: $CFG->ldap_host_url");
+        return false;
+    }
+}
+
+
+
+function auth_ldap_bind($ldap_connection){
+/// makes bind to ldap for searching users
+/// uses ldap_bind_dn or anonymous bind
+
+    global $CFG;
+
+    if ($CFG->ldap_bind_dn){
+        //bind with search-user
+        if (!ldap_bind($ldap_connection, $CFG->ldap_bind_dn,$CFG->ldap_bind_pw)){
+            error("Error: could not bind ldap with ldap_bind_dn/pw");
+            return false;
+        }
+
+    } else {
+        //bind anonymously 
+        if ( !ldap_bind($ldap_connection)){
+            error("Error: could not bind ldap anonymously");
+            return false;
+        }  
+    }
+
+    return true;
+}
+
+
+
+function auth_ldap_find_userdn ($ldap_connection, $username){
+/// return dn of username
+/// like: cn=username,ou=suborg,o=org
+/// or false if username not found
+
+    global $CFG;
+
+    //default return value
+    $ldap_user_dn = FALSE;
+
+    auth_ldap_bind($ldap_connection);
+
+    //get all contexts and look for first matching user
+    $ldap_contexts = explode(";",$CFG->ldap_contexts);
+    
+    if (!empty($CFG->ldap_create_context)){
+	  array_push($ldap_contexts, $CFG->ldap_create_context);
+    }
+  
+    foreach ($ldap_contexts as $context) {
+
+        $context == trim($context);
+
+        if ($CFG->ldap_search_sub){
+            //use ldap_search to find first user from subtree
+            $ldap_result = ldap_search($ldap_connection, $context, "(".$CFG->ldap_user_attribute."=".$username.")",array($CFG->ldap_user_attribute));
+
+        } else {
+            //search only in this context
+            $ldap_result = ldap_list($ldap_connection, $context, "(".$CFG->ldap_user_attribute."=".$username.")",array($CFG->ldap_user_attribute));
+        }
+ 
+        $entry = ldap_first_entry($ldap_connection,$ldap_result);
+
+        if ($entry){
+            $ldap_user_dn = ldap_get_dn($ldap_connection, $entry);
+            break ;
+        }
+    }
+
+    return $ldap_user_dn;
+}
+
+function auth_ldap_attributes (){
+//returns array containg attribute mappings between Moodle and ldap
+	global $CFG;
+
+    $config = (array)$CFG;
+    $fields = array("firstname", "lastname", "email", "phone1", "phone2", 
+                    "department", "address", "city", "country", "description", 
+                    "idnumber", "lang");
+
+    $moodleattributes = array();
+    foreach ($fields as $field) {
+        if ($config["auth_user_$field"]) {
+            $moodleattributes[$field] = $config["auth_user_$field"];
+        }
+    }
+	return $moodleattributes;
+}
+
+function auth_ldap_get_userlist($filter="*") {
+/// returns all users from ldap servers
+    global $CFG;
+
+    $fresult = array();
+    $ldap_connection = auth_ldap_connect();
+
+    auth_ldap_bind($ldap_connection);
+
+    if (! isset($CFG->ldap_objectclass)) {
+        $CFG->ldap_objectclass="objectClass=*";
+    }
+
+    if ($filter=="*") {
+       $filter = "(&(".$CFG->ldap_user_attribute."=*)(".$CFG->ldap_objectclass."))";
+    }
+
+    $contexts = explode(";",$CFG->ldap_contexts);
+ 
+    if (!empty($CFG->ldap_create_context)){
+          array_push($contexts, $CFG->ldap_create_context);
+    }
+
+    foreach ($contexts as $context) {
+
+        if ($CFG->ldap_search_sub) {
+            //use ldap_search to find first user from subtree
+            $ldap_result = ldap_search($ldap_connection, $context,
+                                       $filter,
+                                       array($CFG->ldap_user_attribute));
+        } else {
+            //search only in this context
+            $ldap_result = ldap_list($ldap_connection, $context,
+                                     $filter,
+                                     array($CFG->ldap_user_attribute));
+        }
+
+        $users = ldap_get_entries($ldap_connection, $ldap_result);
+
+        //add found users to list
+        for ($i=0;$i<$users['count'];$i++) {
+            array_push($fresult, ($users[$i][$CFG->ldap_user_attribute][0]) );
+        }
+    }
+   
+    return $fresult;
+}
+
+?>

auth/manual/config.html

@@ -0,0 +1,11 @@
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
+	<TD>
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA> 
+    </TD>
+    <TD>
+    <? print_string("authinstructions","auth") ?>
+    <? helpbutton("text", get_string("helptext")) ?>
+    </TD>
+</TR>
+

auth/manual/lib.php

@@ -0,0 +1,16 @@
+<?PHP  // $Id$
+       // manual method - Just does a simple check against the database
+
+function auth_user_login ($username, $password) {
+// Returns false if the username doesn't exist yet
+// Returns true if the username and password work
+
+    if ($user = get_user_info_from_db("username", $username)) {
+        return ($user->password == md5($password));
+    }
+
+    return false;
+}
+
+
+?>

auth/nntp/config.html

@@ -0,0 +1,41 @@
+<?PHP
+    if (!isset($config->auth_nntphost)) {
+        $config->auth_nntphost = "127.0.0.1";
+    }
+    if (!isset($config->auth_nntpport)) {
+        $config->auth_nntpport = "119";
+    }
+?>
+
+<tr valign="top" BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_nntphost:</TD>
+	<TD>
+        <INPUT name="auth_nntphost" TYPE="text" SIZE=30 VALUE="<?=$config->auth_nntphost?>">
+	<? if (isset($err["auth_nntphost"]))  formerr($err["auth_nntphost"]); ?>
+	</TD>
+    <TD>
+    <? print_string("auth_nntphost","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_nntpport:</TD>
+	<TD>
+    <INPUT name=auth_nntpport TYPE=text SIZE=6 VALUE="<?=$config->auth_nntpport?>">
+    <? if (isset($err["auth_nntpport"])) formerr($err["auth_nntpport"]); ?>
+    </TD>
+    <TD>
+    <? print_string("auth_nntpport","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
+	<TD>
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA> 
+    </TD>
+    <TD>
+    <? print_string("authinstructions","auth") ?>
+    <? helpbutton("text", get_string("helptext")) ?>
+    </TD>
+</TR>

auth/nntp/lib.php

@@ -0,0 +1,27 @@
+<?PHP  // $Id$
+       // Authentication by looking up an NNTP server
+
+
+function auth_user_login ($username, $password) {
+// Returns true if the username and password work
+// and false if they are wrong or don't exist.
+
+    global $CFG;
+
+    $host = "{".$CFG->auth_nntphost.":$CFG->auth_nntpport/nntp}";
+
+    error_reporting(0);
+    $connection = imap_open($host, $username, $password, OP_HALFOPEN);
+    error_reporting($CFG->debug);   
+
+    if ($connection) {
+        imap_close($connection);
+        return true;
+
+    } else {
+        return false;
+    }
+}
+
+
+?>

auth/none/config.html

@@ -0,0 +1 @@
+<!-- No config needed -->

auth/none/lib.php

@@ -0,0 +1,17 @@
+<?PHP  // $Id$
+       // No authentication at all.  This method approves everything!
+
+function auth_user_login ($username, $password) {
+// Returns true if the username doesn't exist yet
+// Returns true if the username and password work
+
+    if (! $user = get_user_info_from_db("username", $username)) {
+        return true;
+    }
+
+    return ($user->password == md5($password));
+}
+
+
+
+?>

auth/pop3/config.html

@@ -0,0 +1,58 @@
+<?PHP
+    if (!isset($config->auth_pop3host)) {
+        $config->auth_pop3host = "127.0.0.1";
+    }
+    if (!isset($config->auth_pop3type)) {
+        $config->auth_pop3type = "pop3";
+    }
+    if (!isset($config->auth_pop3port)) {
+        $config->auth_pop3port = "110";
+    }
+?>
+<tr valign="top" BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_pop3host:</TD>
+	<TD>
+        <INPUT name=auth_pop3host TYPE=text SIZE=30 VALUE="<?=$config->auth_pop3host?>">
+	<? if (isset($err["auth_pop3host"])) formerr($err["auth_pop3host"]); ?>
+	</TD>
+    <TD>
+    <? print_string("auth_pop3host","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_pop3type:</TD>
+	<TD>
+    <? $pop3types = array("pop3","pop3cert");
+       foreach($pop3types as $pop3type) {
+           $pop3options[$pop3type] = $pop3type;
+       }
+       choose_from_menu($pop3options, "auth_pop3type", $config->auth_pop3type, "");
+    ?>
+    </TD>
+<TD>
+    <? print_string("auth_pop3type","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_pop3port:</TD>
+	<TD>
+    <INPUT name=auth_pop3port TYPE=text SIZE=6 VALUE="<?=$config->auth_pop3port?>">
+    <? if (isset($err["auth_pop3port"])) formerr($err["auth_pop3port"]); ?>
+    </TD>
+    <TD>
+    <? print_string("auth_pop3port","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
+	<TD>
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA> 
+    </TD>
+    <TD>
+    <? print_string("authinstructions","auth") ?>
+    <? helpbutton("text", get_string("helptext")) ?>
+    </TD>
+</TR>

auth/pop3/lib.php

@@ -0,0 +1,33 @@
+<?PHP  // $Id$
+       // Authentication by looking up a POP3 server
+
+function auth_user_login ($username, $password) {
+// Returns true if the username and password work
+// and false if they are wrong or don't exist.
+
+    global $CFG;
+
+    switch ($CFG->auth_pop3type) {
+        case "pop3":
+            $host = "{".$CFG->auth_pop3host.":$CFG->auth_pop3port/pop3/notls}INBOX";
+        break;
+        case "pop3cert":
+            $host = "{".$CFG->auth_pop3host.":$CFG->auth_pop3port/pop3/ssl/novalidate-cert}INBOX";
+        break;
+    }
+
+    error_reporting(0);
+    $connection = imap_open($host, $username, $password, OP_HALFOPEN);
+    error_reporting($CFG->debug);   
+
+    if ($connection) {
+        imap_close($connection);
+        return true;
+
+    } else {
+        return false;
+    }
+}
+
+
+?>

backup/README.txt

@@ -0,0 +1,33 @@
+README $Id$
+----------
+
+This directory contains my try to create a backup/recover 
+admin option to moodle. I don't know when and how it'll be 
+finished, but I'going to try it, sure.
+
+Some day, if this is fully functional, it could be integrated 
+into the main Moodle distribution (ask uncle Martin).   :-)
+
+Code here may not be tested - so there are no guarantees as
+to the quality of the code in here, even if part of a stable
+Moodle release.
+
+Please, for any comment about this option, do it in Moodle
+Developer Forum at:
+   
+   http://moodle.org/mod/forum/view.php?id=55
+   (searching an "backup" topic) 
+
+or you can put tour comments in Moodel Bugs at: 
+
+   http://moodle.org/bugs/bug.php?op=show&bugid=84.
+
+All comments will be welcome. TIA.
+
+To see the general status of the utility, take a look to
+"STATUS.txt" in this directory.
+
+And this is all, I start with it NOW. 
+
+Eloy (stronk7)
+29-04-2003

backup/STATUS.txt

@@ -0,0 +1,216 @@
+STATUS $Id$
+----------
+
+This documment shows the current status of the backup/restore option.
+
+Backup:  WORKING. COMPLETED !!
+
+Restore: WORKING. COMPLETED except logs.
+                  
+
+========== ========== ========== ========== ========== ==========
+
+Now I show the specific detailed status of every item in the process:
+
+Backup Details:
+===============
+   - Backup FrontEnd............................................DONE
+        - Check Security........................................DONE
+        - Select Info to Backup.(from mods).....................DONE
+        - Check (summary info)..................................DONE
+             - Check mods.......................................DONE
+             - Check logs.......................................DONE
+             - Check users......................................DONE
+             - Check User Files.................................DONE
+             - Check Course Files...............................DONE
+        - Launch Backup.........................................DONE
+        - Show progress.........................................DONE
+        - Determine Backup location.............................DONE
+        - Delete old entries at backup startup..................DONE
+             - From database....................................DONE
+             - From filesystem..................................DONE
+   - Backup Items:..............................................DONE
+        - Backup Info data......................................DONE
+        - Course................................................DONE
+           - Course Summary Data................................DONE
+              x course info.....................................DONE
+              x sections info...................................DONE
+              x mods info.......................................DONE
+           - User Accounts Info.................................DONE
+              x admins..........................................DONE
+                 - All..........................................DONE 
+              x course creators.................................DONE
+                 - All..........................................DONE 
+              x teachers........................................DONE
+                 - Course.......................................DONE
+                 - All..........................................DONE 
+              x students........................................DONE
+                 - Course.......................................DONE
+                 - All..........................................DONE 
+           - Logs...............................................DONE
+           - Scales.............................................DONE
+           - Categories and Questions.(STEP 1)..................DONE
+              + categories......................................DONE
+              + questions structure.............................DONE
+           - Mods Info..........................................DONE
+              x assignments.....................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files........................................DONE
+              x chats...........................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.....(NOT EXISTS).......................DONE
+              x choices.........................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.....(NOT EXISTS).......................DONE
+              x forums..........................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files........................................DONE
+              x journals........................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.(NOT EXISTS)...........................DONE
+              x quizzes.(STEP 2)................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.(ARE COURSE FILES !!!).................DONE
+              x resources.......................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files..(ARE COURSE FILES !!!)................DONE
+              x surveys.........................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.....(NOT EXISTS).......................DONE
+              x workshops.......................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files........................................DONE
+              x user files to temp..............................DONE
+              x course files to temp............................DONE
+   - Compress the backup (zip)..................................DONE.
+      - XML File................................................DONE.
+      - moddata files...........................................DONE.
+      - Course Files............................................DONE.
+      - User Files..............................................DONE.
+   - Copy finished file to browseable dir.......................DONE
+   - Delete old entries at backup end...........................DONE
+      - From database...........................................DONE      
+      - From filesystem.........................................DONE
+   - Browse backup files........................................DONE
+   - Download backup files......................................DONE
+   - Delete backup files........................................DONE
+   - Program automatic backups..................................NO EXISTS
+
+Restore Details:
+===============
+   - Delete old entries at restore start........................DONE
+      - From database...........................................DONE
+      - From filesystem.........................................DONE
+   - Restore FrontEnd...........................................DONE
+        - Check Security........................................DONE
+        - Select File to Restore................................DONE
+        - Uncompress the backup (unzip).........................DONE
+            - XML File..........................................DONE
+            - Course Files......................................DONE
+            - User Files........................................DONE
+        - Check file is a valid one.............................DONE
+        - Load info from file...................................DONE
+        - Load Backup Info......................................DONE
+        - Load Course Header....................................DONE
+        - Restore into feature..................................DONE
+           - New course (restore)...............................DONE
+           - Existing course (import)...........................DONE
+        - Select Info to Restore (depending from backup)........DONE
+        - Make decisions........................................DONE
+           - About existing users...............................DONE
+        - Launch Restore........................................DONE
+        - Show progress.........................................DONE
+   - Restore Items:.............................................DONE
+        - Course................................................DONE
+           - Course Summary Data................................DONE
+              - Course Table....................................DONE
+              - Sections Table..................................DONE
+              - Modules Table...................................DONE
+           - User Accounts Info.................................DONE
+              x teacheras. .....................................DONE
+                 - None  .......................................DONE
+                 - Course.......................................DONE
+                 - All..........................................DONE 
+              x students........................................DONE
+                 - None.........................................DONE
+                 - Course.......................................DONE
+                 - All..........................................DONE 
+              x creators........................................DONE
+                 - None.........................................DONE
+                 - Course.......................................DONE
+                 - All..........................................DONE 
+              x admins..........................................DONE
+                 - None.........................................DONE
+                 - Course.......................................DONE
+                 - All..........................................DONE
+           - Categories and Questions.(STEP 1)..................DONE
+              + categories......................................DONE
+              + questions structure.............................DONE
+           - Scales.............................................DONE
+           - Mods Info Prepare..................................DONE
+              x read modules zone...............................DONE
+              x separate every mod..............................DONE
+              x xmlize (to array) and serialize it..............DONE
+              x save to db (backup_ids).........................DONE
+           - Mods Info..........................................DONE
+              x assignments.....................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files........................................DONE
+              x chats...........................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.(NOT EXISTS)...........................DONE
+              x choices.........................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.(NOT EXISTS)...........................DONE
+              x forums..........................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files........................................DONE
+              x journals........................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.(NOT EXISTS)...........................DONE
+              x quizzes.(STEP 2)................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.(ARE COURSE FILES !!!).................DONE
+              x resources.......................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.(ARE COURSE FILES !!!).................DONE
+              x surveys.........................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.(NOT EXISTS)...........................DONE
+              x workshops.......................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files........................................DONE
+   - User files from temp.......................................DONE
+   - Course files from temp.....................................DONE
+   - Log entries................................................NO EXISTS
+   - Readjust instance in course_modules........................DONE
+   - Readjust modinfo in course (serialize).....................DONE
+   - Delete old entries at restore end.  .......................DONE
+      - From database...........................................DONE
+      - From filesystem.........................................DONE
+   - Upload backup files........................................DONE
+
+========== ========== ========== =========== =========== =========== ===
+
+This is all. It's no a little thing !!!  :-)
+
+Eloy (stronk7)
+29-04-2003

backup/backup.php

@@ -0,0 +1,103 @@
+<?PHP //$Id$
+    //This script is used to configure and execute the backup proccess.
+
+    //Define some globals for all the script
+
+    require_once ("../config.php");
+    require_once ("lib.php");
+    require_once ("backuplib.php");
+
+    optional_variable($id);       // course id
+    optional_variable($cancel);
+    optional_variable($launch);
+
+    require_login();
+
+    if (!empty($id)) {
+        if (!isteacheredit($id)) {
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    } else {
+        if (!isadmin()) {
+            error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    }
+
+    //Check site
+    if (!$site = get_site()) {
+        error("Site not found!");
+    }
+
+    //Check necessary functions exists. Thanks to gregb@crowncollege.edu
+    backup_required_functions();
+    
+    //Check backup_version
+    if ($id) {
+        $linkto = "backup.php?id=".$id;
+    } else {
+        $linkto = "backup.php";
+    }
+    upgrade_backup_db($linkto);
+
+    //Get strings
+    $strcoursebackup = get_string("coursebackup");
+    $stradministration = get_string("administration");
+
+    //If no course has been selected or cancel button pressed
+    if (!$id or $cancel) {
+        print_header("$site->shortname: $strcoursebackup", $site->fullname,
+                     "<A HREF=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</A> -> $strcoursebackup");
+
+        if ($courses = get_courses()) {
+            print_heading(get_string("choosecourse"));
+            print_simple_box_start("CENTER");
+            foreach ($courses as $course) {
+            echo "<A HREF=\"backup.php?id=$course->id\">$course->fullname ($course->shortname)</A><BR>";
+            }
+            print_simple_box_end();
+        } else {
+            print_heading(get_string("nocoursesyet"));
+            print_continue("$CFG->wwwroot/$CFG->admin/index.php");
+        }
+        print_footer();
+        exit;
+    }
+
+    //Get and check course
+    if (! $course = get_record("course", "id", $id)) {
+        error("Course ID was incorrect (can't find it)");
+    }
+
+    //Print header
+    if (isadmin()) {
+        print_header("$site->shortname: $strcoursebackup", $site->fullname,
+                     "<a href=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</a> ->
+                      <a href=\"backup.php\">$strcoursebackup</a> -> $course->fullname ($course->shortname)");
+    } else {
+        print_header("$course->shortname: $strcoursebackup", $course->fullname,
+                     "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> 
+                     $strcoursebackup");
+    }
+
+    //Print form     
+    print_heading("$strcoursebackup: $course->fullname ($course->shortname)");
+    print_simple_box_start("center", "", "$THEME->cellheading");
+
+    //Adjust some php variables to the execution of this script
+    ini_set("max_execution_time","3000");
+    ini_set("memory_limit","56M");
+
+    //Call the form, depending the step we are
+    if (!$launch) {
+        include_once("backup_form.html");
+    } else if ($launch == "check") {
+        include_once("backup_check.html");
+    } else if ($launch == "execute") {
+        include_once("backup_execute.html");
+    }
+    print_simple_box_end();
+
+    //Print footer  
+    print_footer();
+
+?>

backup/backup_check.html

@@ -0,0 +1,221 @@
+<?PHP //$Id$
+    //This page prints the backup todo list to see everything
+
+    //Check login   
+    require_login();
+
+    if (!empty($course->id)) {
+        if (!isteacheredit($course->id)) {
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    } else {
+        if (!isadmin()) {
+            error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    }
+
+
+    //Check site
+    if (!$site = get_site()) {
+        error("Site not found!");
+    }
+
+   //Checks for the required files/functions to backup every mod
+    //And check if there is data about it
+    $count = 0;
+    if ($allmods = get_records("modules") ) {
+        foreach ($allmods as $mod) {
+            $modname = $mod->name;
+            $modfile = "$CFG->dirroot/mod/$modname/backuplib.php";
+            $modbackup = $modname."_backup_mods";
+            $modcheckbackup = $modname."_check_backup_mods";
+            if (file_exists($modfile)) {
+               include_once($modfile);
+               if (function_exists($modbackup) and function_exists($modcheckbackup)) {
+                   $var = "exists_".$modname;
+                   $$var = true;
+                   $count++;
+               }
+            }
+            //Check data
+            //Check module info
+            $var = "backup_".$modname;
+            if (!isset($$var)) {
+                $$var = 1;
+            }
+            //Check include user info
+            $var = "backup_user_info_".$modname;
+            if (!isset($$var)) {
+                $$var = 1;
+            }
+        }
+    }
+
+    //Check other parameters
+    if (!isset($backup_users)) {
+        $backup_users = 1;
+    }
+   
+    if (!isset($backup_logs)) {
+        $backup_logs = 0;
+    }
+
+    if (!isset($backup_user_files)) {
+        $backup_user_files = 1;
+   }
+
+    if (!isset($backup_course_files)) {
+        $backup_course_files = 2;
+    }
+
+    if ($count == 0) {
+        notice("No backupable modules are installed!");
+    }
+?>
+
+<form name="form" method="post" <?=$onsubmit ?> action="<?=$ME ?>">
+<table cellpadding=5>
+<?
+
+    //Now print the Backup Name tr
+    echo "<tr>";
+    echo "<td align=\"right\"><P><B>";
+    echo get_string("name").":";
+    echo "</B></td><td>";
+    //Calculate the backup string
+    //Take off spaces in the filename !!
+    $backup_name = str_replace(" ","_",strtolower(get_string("backupfilename")));
+    //If non-translated, use "backup"
+    if (substr($backup_name,0,1) == "[") {
+        $backup_name = "backup";
+    }
+    //Calculate the format string
+    $backup_name_format = str_replace(" ","_",get_string("backupnameformat"));
+    //If non-translated, use "%Y%m%d-%H%M"
+    if (substr($backup_name_format,0,1) == "[") {
+        $backup_name_format = "%%Y%%m%%d-%%H%%M";
+    }
+    $backup_name .= str_replace(" ","_","-".strtolower($course->shortname)."-".userdate(time(),$backup_name_format,99,false).".zip");
+    echo $backup_name;
+    //Add as hidden name
+    echo "<input type=\"hidden\" name=\"backup_name\" value=\"".$backup_name."\">";
+    echo "</td></tr>";
+
+    //Calculate the backup unique code to allow simultaneus backups (to define
+    //the temp-directory name and records in backup temp tables
+    $backup_unique_code = time();
+    //Add as hidden name
+    echo "<input type=\"hidden\" name=\"backup_unique_code\" value=\"".$backup_unique_code."\">";
+    
+    //Line
+    echo "<tr><td colspan=\"2\"><hr noshade size=\"1\"></td></tr>";
+
+    //Now print the To Do list
+    echo "<tr>";    
+    echo "<td colspan=\"2\" align=\"center\"><P><B>";
+    echo get_string("backupdetails").":";
+    echo "</td></tr>";
+
+    //This is tha align to every ingo table                
+    $table->align = array ("LEFT","RIGHT");
+
+    if ($allmods = get_records("modules") ) {
+        foreach ($allmods as $mod) {
+            $modname = $mod->name;
+            $modbackup = $modname."_backup_mods";
+            //If exists the lib & function
+            $var = "exists_".$modname;
+            if ($$var) {
+                //Add hidden fields
+                $var = "backup_".$modname;
+                echo "<input type=\"hidden\" name=\"".$var."\" value=\"".$$var."\">";
+                $var = "backup_user_info_".$modname;
+                echo "<input type=\"hidden\" name=\"".$var."\" value=\"".$$var."\">";
+                $var = "backup_".$modname;
+                //Only if selected
+                if ($$var == 1) {
+                    //Print the full tr
+                    echo "<tr>";
+                    echo "<td colspan=\"2\"><P><B>";
+                    //Print the mod name
+                    echo "<li>".get_string("include")." ".get_string("modulenameplural",$modname)." ";
+                    //Now look for user-data status
+                    $backup_user_options[0] = get_string("withoutuserdata"); 
+                    $backup_user_options[1] = get_string("withuserdata");
+                    $var = "backup_user_info_".$modname;
+                    //Print the user info
+                    echo $backup_user_options[$$var]."<P>";
+                    //Call the check function to show more info
+                    $modcheckbackup = $modname."_check_backup_mods";
+                    $table->data = $modcheckbackup($id,$$var,$backup_unique_code);
+                    print_table($table); 
+                    echo "</td></tr>";
+                }
+            }
+        }
+        //Line
+        echo "<tr><td colspan=\"2\"><hr noshade size=\"1\"></td></tr>";
+
+        //Now print the Users tr
+        echo "<tr>";
+        echo "<td colspan=\"2\"><P><B>";
+        $user_options[0] = get_string("includeallusers");
+        $user_options[1] = get_string("includecourseusers");
+        ///$user_options[2] = get_string("includeneededusers");--->NOT IMPLEMENTED
+        echo "<li>".$user_options[$backup_users]."<P>";
+        //Add as hidden name
+        echo "<input type=\"hidden\" name=\"backup_users\" value=\"".$backup_users."\">";
+        //Print info
+        $table->data = user_check_backup($id,$backup_unique_code,$backup_users);  
+        print_table($table); 
+        echo "</td></tr>";
+
+        //Now print the Logs tr conditionally
+        if ($backup_logs) {
+            echo "<tr>";
+            echo "<td colspan=\"2\"><P><B>";
+            echo "<li>".get_string("includelogentries")."<P>";
+            //Print info
+            $table->data = log_check_backup($id);
+            print_table($table);
+            echo "</td></tr>";
+        }
+        //Add as hidden name
+        echo "<input type=\"hidden\" name=\"backup_logs\" value=\"".$backup_logs."\">";
+
+        //Now print the User Files tr conditionally
+        if ($backup_user_files) {
+            echo "<tr>";
+            echo "<td colspan=\"2\"><P><B>";
+            echo "<li>".get_string("includeuserfiles")."<P>";
+            //Print info
+            $table->data = user_files_check_backup($id,$backup_unique_code);
+            print_table($table);
+            echo "</td></tr>";
+        }
+        //Add as hidden name
+        echo "<input type=\"hidden\" name=\"backup_user_files\" value=\"".$backup_user_files."\">";
+
+        //Now print the Course Files tr conditionally
+       if ($backup_course_files) {
+            echo "<tr>";
+            echo "<td colspan=\"2\"><P><B>";
+            echo "<li>".get_string("includecoursefiles")."<P>";
+            //Print info
+            $table->data = course_files_check_backup($id,$backup_unique_code);
+            print_table($table);
+            echo "</td></tr>";
+        }
+        //Add as hidden name
+        echo "<input type=\"hidden\" name=\"backup_course_files\" value=\"".$backup_course_files."\">";
+    }
+?>
+</table>
+<BR>
+<CENTER>
+<input type="hidden" name=id     value="<? p($id) ?>">
+<input type="hidden" name=launch value="execute">
+<input type="submit" value="<? print_string("continue") ?>">
+<input type="submit" name=cancel value="<? print_string("cancel") ?>">
+</CENTER>
+</FORM>

backup/backup_execute.html

@@ -0,0 +1,296 @@
+<?PHP //$Id$
+    //This page prints the backup todo list to see everything
+
+    //Check login   
+    require_login();
+
+    if (!empty($course->id)) {
+        if (!isteacheredit($course->id)) {
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    } else {
+        if (!isadmin()) {
+            error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    }
+
+
+    //Check site
+    if (!$site = get_site()) {
+        error("Site not found!");
+    }
+
+   //Checks for the required files/functions to backup every mod
+    //And check if there is data about it
+    $count = 0;
+    if ($allmods = get_records("modules") ) {
+        foreach ($allmods as $mod) {
+            $modname = $mod->name;
+            $modfile = "$CFG->dirroot/mod/$modname/backuplib.php";
+            $modbackup = $modname."_backup_mods";
+            $modcheckbackup = $modname."_check_backup_mods";
+            if (file_exists($modfile)) {
+               include_once($modfile);
+               if (function_exists($modbackup) and function_exists($modcheckbackup)) {
+                   $var = "exists_".$modname;
+                   $$var = true;
+                   $count++;
+               }
+            }
+            //Check data
+            //Check module info
+            $var = "backup_".$modname;
+            if (!isset($$var)) {
+                //Every undefined backup_XXXX isn't exported
+                $$var = 0;
+            }
+            //Now stores all the mods preferences into an array into preferences
+            $preferences->mods[$modname]->backup = $$var;
+
+            //Check include user info
+            $var = "backup_user_info_".$modname;
+            if (!isset($$var)) {
+                $$var = 1;
+            }
+            //Now stores all the mods preferences into an array into preferences
+            $preferences->mods[$modname]->userinfo = $$var; 
+            //And the name of the mod
+            $preferences->mods[$modname]->name = $modname;
+        }
+    }
+
+    //Check other parameters
+    if (!isset($backup_users)) {
+        $backup_users = 1;
+    }
+    $preferences->backup_users = $backup_users;
+   
+    if (!isset($backup_logs)) {
+        $backup_logs = 0;
+    }
+    $preferences->backup_logs = $backup_logs;
+
+    if (!isset($backup_user_files)) {
+        $backup_user_files = 1;
+   }
+    $preferences->backup_user_files = $backup_user_files;
+
+    if (!isset($backup_course_files)) {
+        $backup_course_files = 2;
+    }
+    $preferences->backup_course_files = $backup_course_files;
+
+    if (!isset($id)) {
+        error ("Course not specified");
+    }
+    $preferences->backup_course = $id;
+
+    if (!isset($backup_name)) {
+        error ("Backup name not specified");
+    }
+    $preferences->backup_name = $backup_name;
+
+    if (!isset($backup_unique_code)) {
+        error ("Backup unique code not specified");
+    }
+    $preferences->backup_unique_code = $backup_unique_code;
+
+    //Another Info
+    $preferences->moodle_version = $CFG->version;
+    $preferences->moodle_release = $CFG->release;
+    $preferences->backup_version = $CFG->backup_version;
+    $preferences->backup_release = $CFG->backup_release;
+
+    if ($count == 0) {
+        notice("No backupable modules are installed!");
+    }
+
+    //Start the main table
+    echo "<table cellpadding=5>";
+
+    //Now print the Backup Name tr
+    echo "<tr>";
+    echo "<td align=\"right\"><P><B>";
+    echo get_string("name").":";
+    echo "</B></td><td>";
+    echo $backup_name;
+    echo "</td></tr>";
+    
+    //Start the main tr, where all the backup progress is done
+    echo "<tr>";
+    echo "<td colspan=\"2\">";
+    
+    //Start the main ul
+    echo "<ul>";
+
+    //Check for temp and backup and backup_unique_code directory
+    //Create them as needed
+    echo "<li>".get_string("creatingtemporarystructures");
+    $status = check_and_create_backup_dir($backup_unique_code);
+    //Empty dir
+    if ($status) {
+        $status = clear_backup_dir($backup_unique_code);
+    }
+
+    //Delete old_entries from backup tables
+    echo "<li>".get_string("deletingolddata");
+    $status = backup_delete_old_data();
+    if (!$status) {
+        error ("An error has ocurred");
+    }
+
+    //Create the moodle.xml file
+    if ($status) {
+        echo "<li>".get_string("creatingxmlfile");
+        //Begin a new list to xml contents
+        echo "<ul>";
+        echo "<li>".get_string("writingheader");
+        //Obtain the xml file (create and open) and print prolog information
+        $backup_file = backup_open_xml($backup_unique_code);
+        echo "<li>".get_string("writinggeneralinfo");;
+        //Prints general info about backup to file
+        if ($backup_file) {
+            $status = backup_general_info($backup_file,$preferences);
+        }
+        echo "<li>".get_string("writingcoursedata");
+
+        //Start new ul (for course)
+        echo "<ul>";
+
+        echo "<li>".get_string("courseinfo");
+        //Prints course start (tag and general info)
+        if ($status) {
+            $status = backup_course_start($backup_file,$preferences);
+        }
+        echo "<li>".get_string("sections");
+        //Section info
+        if ($status) {
+            $status = backup_course_sections($backup_file,$preferences);
+        }
+
+        //End course contents (close ul)
+        echo "</ul>";
+
+        echo "<li>".get_string("writinguserinfo");
+        //User info
+        if ($status) {
+            $status = backup_user_info($backup_file,$preferences);
+        }
+
+        //If we have selected to backup quizzes, backup categories and
+        //questions structure (step 1). See notes on mod/quiz/backuplib.php
+        if ($status and $preferences->mods['quiz']->backup) {
+            echo "<li>".get_string("writingcategoriesandquestions");
+            $status = quiz_backup_question_categories($backup_file,$preferences);
+        }
+        
+        //Print logs if selected
+        if ($status) {
+            if ($preferences->backup_logs) {  
+                echo "<li>".get_string("writingloginfo");
+                $status = backup_log_info($backup_file,$preferences);
+            }
+        }
+
+        //Print scales info
+        if ($status) {
+            echo "<li>".get_string("writingscalesinfo");
+            $status = backup_scales_info($backup_file,$preferences);
+        }
+
+        //Module info, this unique function makes all the work!!
+        //db export and module fileis copy
+        if ($status) {
+            $mods_to_backup = false;
+            //Check if we have any mod to backup
+            foreach ($preferences->mods as $module) {
+                if ($module->backup) { 
+                    $mods_to_backup = true;
+                }    
+            }
+            //If we have to backup some module
+            if ($mods_to_backup) {
+                echo "<li>".get_string("writingmoduleinfo");
+                //Start modules tag
+                $status = backup_modules_start ($backup_file,$preferences);
+                //Open ul for module list
+                echo "<ul>";
+                //Iterate over modules and call backup
+                foreach ($preferences->mods as $module) {
+                    if ($module->backup and $status) {
+                        echo "<li>".get_string("modulenameplural",$module->name);
+                        $status = backup_module($backup_file,$preferences,$module->name);
+                    }
+                }
+                //Close ul for module list
+                echo "</ul>";
+                //Close modules tag
+                $status = backup_modules_end ($backup_file,$preferences);
+            }
+        }
+
+        //Prints course end 
+        if ($status) {
+            $status = backup_course_end($backup_file,$preferences);
+        }
+        //Close the xml file and xml data
+        if ($backup_file) {
+            backup_close_xml($backup_file);
+        }
+
+        //End xml contents (close ul)
+        echo "</ul>";
+    }
+    
+    //Now, if selected, copy user files
+    if ($status) {
+        if ($preferences->backup_user_files) {
+            echo "<li>".get_string("copyinguserfiles");
+            $status = backup_copy_user_files ($preferences);
+        }
+    }
+
+    //Now, if selected, copy course files
+    if ($status) {
+        if ($preferences->backup_course_files) {
+            echo "<li>".get_string("copyingcoursefiles");
+            $status = backup_copy_course_files ($preferences);
+        }
+    }
+
+    //Now, zip all the backup directory contents
+    if ($status) {
+        echo "<li>".get_string("zippingbackup");
+        $status = backup_zip ($preferences);
+    }
+
+    //Now, copy the zip file to course directory
+    if ($status) {
+        echo "<li>".get_string("copyingzipfile");
+        $status = copy_zip_to_course_dir ($preferences);
+    }
+
+    //Now, clean temporary data (db and filesystem)
+    if ($status) {
+        echo "<li>".get_string("cleaningtempdata");
+        $status = clean_temp_data ($preferences); 
+    }
+
+    //Ends th main ul
+    echo "</ul>";
+
+    //End the main tr, where all the backup is done
+    echo "</td></tr>";
+
+    //End the main table
+    echo "</table>";
+    
+    if (!$status) {
+        error ("An error has ocurred");
+    }
+
+    //Print final message
+    print_simple_box(get_string("backupfinished"),"CENTER");
+    print_continue("$CFG->wwwroot/files/index.php?id=".$preferences->backup_course."&wdir=/backupdata");    
+
+?>

backup/backup_form.html

@@ -0,0 +1,156 @@
+<?PHP //$Id$
+    //This page prints the backup form to select everything
+
+    //Check login   
+    require_login();
+
+    if (!empty($course->id)) {
+        if (!isteacheredit($course->id)) {
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    } else {
+        if (!isadmin()) {
+            error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    }
+
+
+    //Check site
+    if (!$site = get_site()) {
+        error("Site not found!");
+    }
+
+   //Checks for the required files/functions to backup every mod
+    //And check if there is data about it 
+    $count = 0;
+    if ($allmods = get_records("modules") ) {
+        foreach ($allmods as $mod) {
+            $modname = $mod->name;
+            $modfile = "$CFG->dirroot/mod/$modname/backuplib.php";
+            $modbackup = $modname."_backup_mods";
+            $modcheckbackup = $modname."_check_backup_mods";
+            if (file_exists($modfile)) {
+               include_once($modfile);
+               if (function_exists($modbackup) and function_exists($modcheckbackup)) {
+                   $var = "exists_".$modname;
+                   $$var = true;
+                   $count++;
+               }
+            }
+            //Check data
+            //Check module info
+            $var = "backup_".$modname;
+            if (!isset($$var)) {
+                $$var = 1;
+            }
+            //Check include user info
+            $var = "backup_user_info_".$modname;
+            if (!isset($$var)) {
+                $$var = 1;
+            }
+        }
+    }
+
+    //Check other parameters
+    if (!isset($backup_users)) {
+        $backup_users = 1;
+    }
+   
+    if (!isset($backup_logs)) {
+        $backup_logs = 0;
+    }
+
+    if (!isset($backup_user_files)) {
+        $backup_user_files = 1;
+    }
+
+    if (!isset($backup_course_files)) {
+        $backup_course_files = 1;
+    }
+
+    if ($count == 0) {
+        notice("No backupable modules are installed!");
+    }
+
+?>
+
+<form name="form" method="post" <?=$onsubmit ?> action="<?=$ME ?>">
+<table cellpadding=5>
+<?
+    if ($allmods = get_records("modules") ) {
+        foreach ($allmods as $mod) {
+            $modname = $mod->name;
+            $modbackup = $modname."_backup_mods";
+            //If exists the lib & function
+            $var = "exists_".$modname;
+            if ($$var) {
+                //Print the full tr
+                echo "<tr>";
+                echo "<td align=\"right\"><P><B>";
+                echo get_string("include")." ". get_string("modulenameplural",$modname).":";
+                echo "</td><td>";
+                $backup_options[0] = get_string("no"); 
+                $backup_options[1] = get_string("yes");
+                $var = "backup_".$modname;
+                choose_from_menu($backup_options, $var, $$var, "");
+                $backup_user_options[0] = get_string("withoutuserdata"); 
+                $backup_user_options[1] = get_string("withuserdata");
+                $var = "backup_user_info_".$modname;
+                choose_from_menu($backup_user_options, $var, $$var, "");
+                echo "</td></tr>";
+            }
+        }
+        //Line
+        echo "<tr><td colspan=\"2\"><hr noshade size=\"1\"></td></tr>";
+
+        //Now print the Users tr
+        echo "<tr>";
+        echo "<td align=\"right\"><P><B>";
+        echo get_string("users").":";
+        echo "</td><td>";
+        $user_options[0] = get_string("all");
+        $user_options[1] = get_string("course");
+        //$user_options[2] = get_string("needed");-->NOT IMPLEMENTED
+        choose_from_menu($user_options, "backup_users", $backup_users, "");
+        echo "</td></tr>";
+
+        //Now print the Logs tr
+        echo "<tr>";
+        echo "<td align=\"right\"><P><B>";
+        echo get_string("logs").":";                                               
+        echo "</td><td>";
+        $log_options[0] = get_string("no");
+        $log_options[1] = get_string("yes"); 
+        choose_from_menu($log_options, "backup_logs", $backup_logs, ""); 
+        echo "</td></tr>";
+
+        //Now print the User Files tr
+        echo "<tr>";
+        echo "<td align=\"right\"><P><B>";
+        echo get_string ("userfiles").":";
+        echo "</td><td>";
+        $user_file_options[0] = get_string("no"); 
+        $user_file_options[1] = get_string("yes"); 
+        choose_from_menu($user_file_options, "backup_user_files", $backup_user_files, "");
+        echo "</td></tr>";
+
+        //Now print the Course Files tr
+        echo "<tr>";
+        echo "<td align=\"right\"><P><B>";
+        echo get_string ("coursefiles").":";
+        echo "</td><td>";
+        $course_file_options[0] = get_string("no");
+        $course_file_options[1] = get_string("yes");
+        choose_from_menu($course_file_options, "backup_course_files", $backup_course_files, "");
+        echo "</td></tr>";
+    }
+?>
+</table>
+<BR>
+<CENTER>
+<input type="hidden" name=id     value="<? p($id) ?>">
+<input type="hidden" name=launch value="check">
+<input type="submit" value="<? print_string("continue") ?>">
+<input type="submit" name=cancel value="<? print_string("cancel") ?>">
+</CENTER>
+</FORM>

backup/db/mysql.php

@@ -0,0 +1,78 @@
+<?PHP  //$Id$
+//
+// This file keeps track of upgrades to Moodle's
+// backup/restore utility.
+// 
+// Sometimes, changes between versions involve 
+// alterations to database structures and other 
+// major things that may break installations.  
+//
+// The upgrade function in this file will attempt
+// to perform all the necessary actions to upgrade
+// your older installtion to the current version.
+//
+// If there's something it cannot do itself, it 
+// will tell you what you need to do.
+//
+// Versions are defined by backup_version.php
+//
+// This file is tailored to MySQL
+
+function backup_upgrade($oldversion=0) {
+
+    global $CFG;
+
+    $result = true;
+
+    if ($oldversion < 2003050300 and $result) {
+        $result = execute_sql("CREATE TABLE `{$CFG->prefix}backup_ids` (
+                        `backup_code` INT(12) UNSIGNED NOT NULL, 
+                        `table_name` VARCHAR(30) NOT NULL, 
+                        `old_id` INT(10) UNSIGNED NOT NULL, 
+                        `new_id` INT(10) UNSIGNED,
+                         PRIMARY KEY (`backup_code`, `table_name`, `old_id`)
+                     )
+                     COMMENT = 'To store and convert ids in backup/restore'");
+    }
+
+    if ($oldversion < 2003050301 and $result) {
+        $result = execute_sql("ALTER TABLE `{$CFG->prefix}backup_ids`
+                         ADD `info` VARCHAR(30)");
+    }
+
+    if ($oldversion < 2003050400 and $result) {
+        $result = execute_sql("ALTER TABLE `{$CFG->prefix}backup_ids`
+                         MODIFY `info` VARCHAR(255)");
+    } 
+
+    if ($oldversion < 2003050401 and $result) {
+        $result = execute_sql("CREATE  TABLE  `{$CFG->prefix}backup_files` (
+                                  `backup_code` INT( 10  ) UNSIGNED NOT  NULL ,
+                                  `file_type` VARCHAR( 10  )  NOT  NULL ,
+                                  `path` VARCHAR( 255  )  NOT  NULL ,
+                                  `old_id` INT( 10  ) UNSIGNED,
+                                  `new_id` INT( 10  ) UNSIGNED,
+                               PRIMARY  KEY (  `backup_code` ,  `file_type` ,  `path`  ) 
+                               ) COMMENT  =  'To store and recode ids to user & course files.'");
+    }
+
+    if ($oldversion < 2003052000 and $result) {
+        $result = execute_sql("ALTER TABLE `{$CFG->prefix}backup_ids`
+                         MODIFY `info` TEXT");
+    } 
+
+    if ($oldversion < 2003061100 and $result) {
+        $result = execute_sql("ALTER TABLE `{$CFG->prefix}backup_ids`
+                         MODIFY `info` MEDIUMTEXT");
+    } 
+
+    if ($oldversion < 2003082600 and $result) {
+        print_simple_box("This is the first non-alpha release of the Backup/Restore module.<p>Thanks for upgrading!","center", "50%", "$THEME->cellheading", "20", "noticebox");
+    } 
+
+    //Finally, return result
+    return $result;
+
+}
+
+?>

backup/db/mysql.sql

@@ -0,0 +1,27 @@
+#
+# Table structure for table `prefix_backup_files`
+#
+
+CREATE TABLE `prefix_backup_files` (
+  `backup_code` int(10) unsigned NOT NULL default '0',
+  `file_type` varchar(10) NOT NULL default '',
+  `path` varchar(255) NOT NULL default '',
+  `old_id` int(10) unsigned default NULL,
+  `new_id` int(10) unsigned default NULL,
+  PRIMARY KEY  (`backup_code`,`file_type`,`path`)
+) TYPE=MyISAM COMMENT='To store and recode ids to user and course files.';
+# --------------------------------------------------------
+
+#
+# Table structure for table `prefix_backup_ids`
+#
+
+CREATE TABLE `prefix_backup_ids` (
+  `backup_code` int(12) unsigned NOT NULL default '0',
+  `table_name` varchar(30) NOT NULL default '',
+  `old_id` int(10) unsigned NOT NULL default '0',
+  `new_id` int(10) unsigned default NULL,
+  `info` mediumtext,
+  PRIMARY KEY  (`backup_code`,`table_name`,`old_id`)
+) TYPE=MyISAM COMMENT='To store and convert ids in backup/restore';
+

backup/db/postgres7.php

@@ -0,0 +1,34 @@
+<?PHP  //$Id$
+//
+// This file keeps track of upgrades to Moodle's
+// backup/restore utility.
+// 
+// Sometimes, changes between versions involve 
+// alterations to database structures and other 
+// major things that may break installations.  
+//
+// The upgrade function in this file will attempt
+// to perform all the necessary actions to upgrade
+// your older installtion to the current version.
+//
+// If there's something it cannot do itself, it 
+// will tell you what you need to do.
+//
+// Versions are defined by backup_version.php
+//
+
+function backup_upgrade($oldversion=0) {
+
+    global $CFG;
+
+    $result = true;
+
+
+
+
+
+    return $result;
+
+}
+
+?>

backup/db/postgres7.sql

@@ -0,0 +1,37 @@
+# THIS FILE IS UNTESTED!!!  
+# PLEASE HELP TEST/FIX IT AND CONTACT MARTIN OR ELOY!
+
+#
+# Table structure for table prefix_backup_files
+#
+
+CREATE TABLE prefix_backup_files (
+  backup_code integer NOT NULL default '0',
+  file_type varchar(10) NOT NULL default '',
+  path varchar(255) NOT NULL default '',
+  old_id integer default NULL,
+  new_id integer default NULL,
+  PRIMARY KEY (backup_code, file_type, path)
+);
+
+# --------------------------------------------------------
+
+CREATE INDEX prefix_backup_codetypepath_idx ON prefix_backup_files (backup_code,file_type,path);
+
+#
+# Table structure for table prefix_backup_ids
+#
+
+CREATE TABLE prefix_backup_ids (
+  prefix_backup_codenameid_idx PRIMARY KEY,
+  backup_code int(12) unsigned NOT NULL default '0',
+  table_name varchar(30) NOT NULL default '',
+  old_id int(10) unsigned NOT NULL default '0',
+  new_id int(10) unsigned default NULL,
+  info mediumtext,
+  PRIMARY KEY (backup_code, table_name, old_id)
+);
+
+CREATE INDEX prefix_backup_codenameid_idx ON prefix_backup_ids (backup_code,table_name,old_id);
+
+

backup/lib.php

@@ -0,0 +1,501 @@
+<?PHP //$Id$
+    //This file contains all the general function needed (file manipulation...)
+    //not directly part of the backup/restore utility
+
+    //Delete old data in backup tables (if exists)
+    //Two days seems to be apropiate
+    function backup_delete_old_data() {
+
+        global $CFG; 
+
+        //Change this if you want !!
+        $days = 2;
+        //End change this
+        $seconds = $days * 24 * 60 * 60;
+        $delete_from = time()-$seconds;
+        //Now delete from tables
+        $status = execute_sql("DELETE FROM {$CFG->prefix}backup_ids
+                               WHERE backup_code < '$delete_from'",false);
+        if ($status) {
+            $status = execute_sql("DELETE FROM {$CFG->prefix}backup_files
+                                   WHERE backup_code < '$delete_from'",false);
+        }
+        //Now, delete old directory (if exists)
+        if ($status) {
+            $status = backup_delete_old_dirs($delete_from);
+        }
+        return($status);
+    }
+
+    //Function to delete dirs/files into temp/backup directory
+    //older than $delete_from
+    function backup_delete_old_dirs($delete_from) {
+
+        global $CFG;
+
+        $status = true;
+        $list = get_directory_list($CFG->dataroot."/temp/backup", "", false);
+        foreach ($list as $file) {
+            $file_path = $CFG->dataroot."/temp/backup/".$file;
+            $moddate = filemtime($file_path);
+            if ($status && $moddate < $delete_from) {
+                //If directory, recurse
+                if (is_dir($file_path)) {
+                    $status = delete_dir_contents($file_path);
+                    //There is nothing, delete the directory itself
+                    if ($status) {
+                        $status = rmdir($file_path);
+                    }
+                //If file
+                } else {
+                    unlink("$file_path");
+                }
+            }
+        }
+
+        return $status;
+    }
+
+    //Function to check if a directory exists
+    //and, optionally, create it
+    function check_dir_exists($dir,$create=false) {
+
+        global $CFG; 
+
+        $status = true;
+        if(!is_dir($dir)) {
+            if (!$create) {
+                $status = false;
+            } else {
+                umask(0000);
+                $status = mkdir ($dir,$CFG->directorypermissions);
+            }
+        }
+        return $status;
+    }
+
+    //Function to check and create the needed dir to 
+    //save all the backup
+    function check_and_create_backup_dir($backup_unique_code) {
+   
+        global $CFG; 
+
+        $status = check_dir_exists($CFG->dataroot."/temp",true);
+        if ($status) {
+            $status = check_dir_exists($CFG->dataroot."/temp/backup",true);
+        }
+        if ($status) {
+            $status = check_dir_exists($CFG->dataroot."/temp/backup/".$backup_unique_code,true);
+        }
+        
+        return $status;
+    }
+
+    //Function to delete all the directory contents recursively
+    //it supports a excluded dit too
+    //Copied from the web !!
+    function delete_dir_contents ($dir,$excludeddir="") {
+
+        $slash = "/";
+
+        // Create arrays to store files and directories
+        $dir_files      = array();
+        $dir_subdirs    = array();
+
+        // Make sure we can delete it
+        chmod($dir, 0777);
+
+        if ((($handle = opendir($dir))) == FALSE) {
+            // The directory could not be opened
+            return false;
+        }
+
+        // Loop through all directory entries, and construct two temporary arrays containing files and sub directories
+        while($entry = readdir($handle)) {
+            if (is_dir($dir. $slash .$entry) && $entry != ".." && $entry != "." && $entry != $excludeddir) {
+                $dir_subdirs[] = $dir. $slash .$entry;
+            }
+            else if ($entry != ".." && $entry != "." && $entry != $excludeddir) {
+                $dir_files[] = $dir. $slash .$entry;
+            }
+        }
+
+        // Delete all files in the curent directory return false and halt if a file cannot be removed
+        for($i=0; $i<count($dir_files); $i++) {
+            chmod($dir_files[$i], 0777);
+            if (((unlink($dir_files[$i]))) == FALSE) {
+                return false;
+            }
+        }
+
+        // Empty sub directories and then remove the directory
+        for($i=0; $i<count($dir_subdirs); $i++) {
+            chmod($dir_subdirs[$i], 0777);
+            if (delete_dir_contents($dir_subdirs[$i]) == FALSE) {
+                return false;
+            }
+            else {
+                if (rmdir($dir_subdirs[$i]) == FALSE) {
+                return false;
+                }
+            }
+        }
+
+        // Close directory
+        closedir($handle);
+
+        // Success, every thing is gone return true
+        return true;
+    }
+
+    //Function to clear (empty) the contents of the backup_dir
+    function clear_backup_dir($backup_unique_code) {
+  
+        global $CFG; 
+
+        $rootdir = $CFG->dataroot."/temp/backup/".$backup_unique_code;
+        
+        //Delete recursively
+        $status = delete_dir_contents($rootdir);
+
+        return $status;
+    }
+
+    //Returns the module type of a course_module's id in a course 
+    function get_module_type ($courseid,$moduleid) {
+
+        global $CFG;
+
+        $results = get_records_sql ("SELECT cm.id, m.name
+                                    FROM {$CFG->prefix}course_modules cm,
+                                         {$CFG->prefix}modules m
+                                    WHERE cm.course = '$courseid' AND
+                                          cm.id = '$moduleid' AND
+                                          m.id = cm.module");
+
+        if ($results) {
+            $name = $results[$moduleid]->name;
+        } else {
+            $name = false;
+        }
+        return $name;
+    }
+
+    //This function return the names of all directories under a give directory
+    //Not recursive
+    function list_directories ($rootdir) {
+  
+        $dir = opendir($rootdir);
+        while ($file=readdir($dir)) {
+            if ($file=="." || $file=="..") {
+                continue;
+            }
+            if (is_dir($rootdir."/".$file)) {
+                $results[$file] = $file;
+            }
+        }
+        closedir($dir);  
+        return $results;       
+    }
+
+    //This function return the names of all directories and files under a give directory
+    //Not recursive
+    function list_directories_and_files ($rootdir) {
+ 
+        $dir = opendir($rootdir);
+        while ($file=readdir($dir)) {
+            if ($file=="." || $file=="..") {
+                continue;
+            }
+            $results[$file] = $file;
+        }
+        closedir($dir); 
+        return $results;
+    }
+
+    //This function clean data from backup tables and
+    //delete all temp files used
+    function clean_temp_data ($preferences) {
+
+        global $CFG;
+
+        $status = true;
+
+        //true->do it, false->don't do it. To debug if necessary.
+        if (true) {
+            //Now delete from tables
+            $status = execute_sql("DELETE FROM {$CFG->prefix}backup_ids
+                                   WHERE backup_code = '$preferences->backup_unique_code'",false);
+            if ($status) {
+                $status = execute_sql("DELETE FROM {$CFG->prefix}backup_files
+                                       WHERE backup_code = '$preferences->backup_unique_code'",false);
+            }
+            //Now, delete temp directory (if exists)
+            $file_path = $CFG->dataroot."/temp/backup/".$preferences->backup_unique_code;
+            if (is_dir($file_path)) {
+                $status = delete_dir_contents($file_path);
+                //There is nothing, delete the directory itself
+                if ($status) {
+                    $status = rmdir($file_path);
+                }
+            }
+        }
+        return $status;
+    }
+
+    // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    //This functions are used to copy any file or directory ($from_file)
+    //to a new file or directory ($to_file). It works recursively and
+    //mantains file perms.
+    //I've copied it from: http://www.php.net/manual/en/function.copy.php
+    //Little modifications done
+  
+    function backup_copy_file ($from_file,$to_file) {
+        if (is_file($from_file)) {
+            //echo "<br>Copying ".$from_file." to ".$to_file;              //Debug
+            $perms=fileperms($from_file);
+            return copy($from_file,$to_file) && chmod($to_file,$perms);
+        }
+        else if (is_dir($from_file)) {
+            return backup_copy_dir($from_file,$to_file);
+        }
+        else{
+            //echo "<br>Error: not file or dir ".$from_file;               //Debug
+            return false;
+        }
+    }
+
+    function backup_copy_dir($from_file,$to_file) {
+
+        global $CFG;
+
+        if (!is_dir($to_file)) {
+            //echo "<br>Creating ".$to_file;                                //Debug
+            $status = mkdir($to_file,$CFG->directorypermissions);
+        }
+        $dir = opendir($from_file);
+        while ($file=readdir($dir)) {
+            if ($file=="." || $file=="..") {
+                continue;
+            }
+            $status = backup_copy_file ("$from_file/$file","$to_file/$file");
+        }
+        closedir($dir);
+        return $status;
+    }
+    ///Ends copy file/dirs functions
+    // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
+    function upgrade_backup_db($continueto) {
+    /// This function upgrades the backup tables, if necessary
+    /// It's called from admin/index.php, also backup.php and restore.php
+    
+        global $CFG, $db;
+
+        require_once ("$CFG->dirroot/backup/version.php");  // Get code versions
+
+        if (empty($CFG->backup_version)) {                  // Backup has never been installed.
+            $strdatabaseupgrades = get_string("databaseupgrades");
+            print_header($strdatabaseupgrades, $strdatabaseupgrades, $strdatabaseupgrades, 
+                         "", "", false, "&nbsp;", "&nbsp;");
+
+            $db->debug=true;
+            if (modify_database("$CFG->dirroot/backup/db/$CFG->dbtype.sql")) {
+                $db->debug = false;
+                if (set_config("backup_version", $backup_version) and set_config("backup_release", $backup_release)) {
+                    notify(get_string("databasesuccess"), "green");
+                    notify(get_string("databaseupgradebackups", "", $backup_release));
+                    print_continue($continueto);
+                    exit;
+                } else {
+                    error("Upgrade of backup system failed! (Could not update version in config table)");
+                }
+            } else {
+                error("Backup tables could NOT be set up successfully!");
+            }
+        }
+
+
+        if ($backup_version > $CFG->backup_version) {       // Upgrade tables
+            $strdatabaseupgrades = get_string("databaseupgrades");
+            print_header($strdatabaseupgrades, $strdatabaseupgrades, $strdatabaseupgrades);
+
+            require_once ("$CFG->dirroot/backup/db/$CFG->dbtype.php");
+
+            $db->debug=true;
+            if (backup_upgrade($CFG->backup_version)) {
+                $db->debug=false;
+                if (set_config("backup_version", $backup_version) and set_config("backup_release", $backup_release)) {
+                    notify(get_string("databasesuccess"), "green");
+                    notify(get_string("databaseupgradebackups", "", $backup_release));
+                    print_continue($continueto);
+                    exit;
+                } else {
+                    error("Upgrade of backup system failed! (Could not update version in config table)");
+                }
+            } else {
+                $db->debug=false;
+                error("Upgrade failed!  See backup/version.php");
+            }
+
+        } else if ($backup_version < $CFG->backup_version) {
+            notify("WARNING!!!  The code you are using is OLDER than the version that made these databases!");
+        }
+    }
+
+ 
+    //This function is used to insert records in the backup_ids table
+    //If the info field is greater than max_db_storage, then its info
+    //is saved to filesystem
+    function backup_putid ($backup_unique_code, $table, $old_id, $new_id, $info="") {
+
+        global $CFG;
+
+        $max_db_storage = 128;  //Max bytes to save to db, else save to file
+                                //MUST BE LOWER THAN 256 (VARCHAR LIMIT)
+ 
+        $status = true;
+        
+        //First delete to avoid PK duplicates
+        $status = backup_delid($backup_unique_code, $table, $old_id);
+
+        //Now, serialize info
+        $info_ser = serialize($info);
+
+        //Now, if the size of $info_ser > $max_db_storage, save it to filesystem and 
+        //insert a "infile" in the info field
+
+        if (strlen($info_ser) > $max_db_storage) {
+            //Calculate filename (in current_backup_dir, $backup_unique_code_$table_$old_id.info)
+            $filename = $CFG->dataroot."/temp/backup/".$backup_unique_code."/".$backup_unique_code."_".$table."_".$old_id.".info";
+            //Save data to file
+            $status = backup_data2file($filename,$info_ser); 
+            //Set info_to save
+            $info_to_save = "infile";
+        } else {
+            //Saving to db, addslashes
+            $info_to_save = addslashes($info_ser);
+        }
+
+        //Now, insert the record
+        if ($status) {
+            $status = execute_sql("INSERT INTO {$CFG->prefix}backup_ids
+                                       (backup_code, table_name, old_id, new_id, info)
+                                   VALUES 
+                                       ($backup_unique_code, '$table', '$old_id', '$new_id', '$info_to_save')",false);
+        }
+        return $status;
+    }
+
+    //This function is used to delete recods from the backup_ids table
+    //If the info field is "infile" then the file is deleted too
+    function backup_delid ($backup_unique_code, $table, $old_id) {
+
+        global $CFG;
+
+        $status = true;
+
+        $status = execute_sql("DELETE FROM {$CFG->prefix}backup_ids
+                               WHERE backup_code = $backup_unique_code AND
+                                     table_name = '$table' AND
+                                     old_id = '$old_id'",false);
+        return $status;
+    }
+
+    //This function is used to get a record from the backup_ids table
+    //If the info field is "infile" then its info
+    //is read from filesystem
+    function backup_getid ($backup_unique_code, $table, $old_id) {
+
+        global $CFG;
+
+        $status = true;
+        $status2 = true;
+
+        $status = get_record ("backup_ids","backup_code",$backup_unique_code,
+                                           "table_name",$table, 
+                                           "old_id", $old_id);
+
+        //If info field = "infile", get file contents
+        if ($status->info == "infile") {
+            $filename = $CFG->dataroot."/temp/backup/".$backup_unique_code."/".$backup_unique_code."_".$table."_".$old_id.".info";
+            //Read data from file
+            $status2 = backup_file2data($filename,$info);
+            if ($status2) {
+                //unserialize data
+                $status->info = unserialize($info);
+            } else {
+                $status = false;
+            }
+        } else {
+            //Only if status (record exists)
+            if ($status) {
+                ////First strip slashes
+                $temp = stripslashes($status->info);
+                //Now unserialize
+                $status->info = unserialize($temp);
+            }
+        }
+
+        return $status;
+    }
+
+    //This function is used to add slashes and decode from UTF-8
+    //It's used intensivelly when restoring modules and saving them in db
+    function backup_todb ($data) {
+        return addslashes(utf8_decode($data));
+    }
+
+    //This function is used to check that every necessary function to 
+    //backup/restore exists in the current php installation. Thanks to
+    //gregb@crowncollege.edu by the idea.
+    function backup_required_functions() {
+
+        if(!function_exists('utf8_encode')) {
+            error('You need to add XML support to your PHP installation');  
+        }
+
+    }
+
+    //This function send n white characters to the browser and flush the
+    //output buffer. Used to avoid browser timeouts and to show the progress.
+    function backup_flush($n=0,$time=false) {
+        if ($time) {
+            $ti = strftime("%X",time());
+        } else {
+            $ti = "";
+        }
+        echo str_repeat(" ", $n) . $ti . "\n";
+        flush();
+    }
+    
+    //This function creates the filename and write data to it
+    //returning status as result
+    function backup_data2file ($file,&$data) {
+
+        $status = true;
+        $status2 = true;
+    
+        $f = fopen($file,"w");
+        $status = fwrite($f,$data);
+        $status2 = fclose($f);
+
+        return ($status && $status2);
+    }
+
+    //This function read the filename and read data from it
+    function backup_file2data ($file,&$data) {
+
+        $status = true;
+        $status2 = true;
+
+        $f = fopen($file,"r");
+        $data = fread ($f,filesize($file));
+        $status2 = fclose($f);
+
+        return ($status && $status2);
+    }
+?>

backup/restore.php

@@ -0,0 +1,112 @@
+<?PHP //$Id$
+    //This script is used to configure and execute the restore proccess.
+
+    //Define some globals for all the script
+
+    //Units used
+    require_once ("../config.php");
+    require_once ("../lib/xmlize.php");
+    require_once ("../course/lib.php");
+    require_once ("lib.php");
+    require_once ("restorelib.php");
+
+    //Optional
+    optional_variable($id);
+    optional_variable($file);
+    optional_variable($cancel);
+    optional_variable($launch);
+
+    //Check login       
+    require_login();
+
+    if (!empty($id)) {
+        if (!isteacheredit($id)) {
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    } else {
+        if (!isadmin()) {
+            error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    }
+
+    //Check site
+    if (!$site = get_site()) {
+        error("Site not found!");
+    }
+
+    //Check necessary functions exists. Thanks to gregb@crowncollege.edu
+    backup_required_functions();
+    
+    //Check backup_version
+    if ($file) {
+        $linkto = "restore.php?id=".$id."&file=".$file;
+    } else {
+        $linkto = "restore.php";
+    }
+    upgrade_backup_db($linkto);
+
+    //Get strings
+    $strcourserestore = get_string("courserestore");
+    $stradministration = get_string("administration");
+
+    //If no file has been selected from the FileManager, inform and end
+    if (!$file) {
+        print_header("$site->shortname: $strcourserestore", $site->fullname,
+                     "<A HREF=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</A> -> $strcourserestore");
+        print_heading(get_string("nofilesselected"));
+        print_continue("$CFG->wwwroot/$CFG->admin/index.php");
+        print_footer();
+        exit;
+    }
+
+    //If cancel has been selected, inform and end
+    if ($cancel) {
+        print_header("$site->shortname: $strcourserestore", $site->fullname,
+                     "<A HREF=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</A> -> $strcourserestore");
+        print_heading(get_string("restorecancelled"));
+        print_continue("$CFG->wwwroot/$CFG->admin/index.php");
+        print_footer();
+        exit;
+    }
+
+    //We are here, so me have a file.
+
+    //Get and check course
+    if (! $course = get_record("course", "id", $id)) {
+        error("Course ID was incorrect (can't find it)");
+    }
+
+    //Print header
+    if (isadmin()) {
+        print_header("$site->shortname: $strcourserestore", $site->fullname,
+                     "<a href=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</a> ->
+                      $strcourserestore -> ".basename($file));
+    } else {
+        print_header("$course->shortname: $strcourserestore", $course->fullname,
+                     "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->
+                     $strcourserestore");
+    }
+    //Print form
+    print_heading("$strcourserestore: ".basename($file));
+    print_simple_box_start("center", "", "$THEME->cellheading");
+    
+    //Adjust some php variables to the execution of this script
+    ini_set("max_execution_time","3000");
+    ini_set("memory_limit","56M");
+
+    //Call the form, depending the step we are
+    if (!$launch) {
+        include_once("restore_precheck.html");
+    } else if ($launch == "form") {
+        include_once("restore_form.html");
+    } else if ($launch == "check") {
+        include_once("restore_check.html");
+    } else if ($launch == "execute") {
+        include_once("restore_execute.html");
+    }
+    print_simple_box_end();
+
+    //Print footer  
+    print_footer();
+
+?>

backup/restore_check.html

@@ -0,0 +1,203 @@
+<?PHP //$Id$
+    //This page receive all the restore_form data. Then, if existing course
+    //has been selected, shows a list of courses to select one.
+    //It cheks that the parammeter from restore_form are coherent.
+    //It puts all the restore info in the session.
+    //Finally, it calls restore_execute to do the hard work
+
+    //Get objects from session
+    if ($SESSION) {
+        $info = $SESSION->info;
+        $course_header = $SESSION->course_header;
+        $restore = $SESSION->restore;
+    }
+
+    //If restore session info exists, but we are posting parameters
+    //manually, this has prioriry
+    if ($restore and isset($restore_restoreto)) {
+        unset($restore);
+    }
+
+    //Check required objects from session
+
+    //info
+    require_variable($info);
+
+    //course_header
+    require_variable($course_header);
+
+    //If the restore object doesn't exist, we are going
+    //to check every variable individually and create it
+
+    if (!$restore) {
+        //Check that we have all we need
+        //backup_unique_code
+        require_variable($backup_unique_code);
+        //file
+        require_variable($file);
+        //Checks for the required restoremod parameters
+        if ($allmods = get_records("modules")) {
+            foreach ($allmods as $mod) {
+                $modname = $mod->name;
+                $var = "restore_".$modname;
+                require_variable($$var); 
+                $var = "restore_user_info_".$modname;
+                require_variable($$var);
+            }
+        }
+        //restoreto
+        require_variable($restore_restoreto);
+        //restore_users
+        require_variable($restore_users);
+        //restore_logs
+        require_variable($restore_logs);
+        //restore_user_files
+        require_variable($restore_user_files);
+        //restore_course_files
+        require_variable($restore_course_files);
+        //restore_course_files
+        require_variable($restore_course_files);
+
+        //Check we've selected a course
+        if (!isset($course_id)) {
+            $course_id = 0;
+        }
+ 
+        //We are here, having all we need !!
+        //Create the restore object and put it in the session
+        $restore->backup_unique_code = $backup_unique_code;
+        $restore->file = $file;
+        if ($allmods = get_records("modules")) {
+            foreach ($allmods as $mod) {
+                $modname = $mod->name;
+                $var = "restore_".$modname;
+                $restore->mods[$modname]->restore=$$var;
+                $var = "restore_user_info_".$modname;
+                $restore->mods[$modname]->userinfo=$$var;
+            }
+        }
+        $restore->restoreto=$restore_restoreto;
+        $restore->users=$restore_users;
+        $restore->logs=$restore_logs;
+        $restore->user_files=$restore_user_files;
+        $restore->course_files=$restore_course_files;
+        $restore->course_id=$course_id;
+    } else {
+        //We have the object, so check if we have a new course_id
+        //passed as parammeter
+        if ($course_id) {
+            $restore->course_id=$course_id;
+        }
+    }
+    //We have the object with data, put it in the session
+    $SESSION->restore = $restore;
+
+    //From here to the wnd of the script, only use the $restore object
+
+    //Check login
+    require_login();
+
+    //Check admin
+    if (!empty($id)) {
+        if (!isteacheredit($id)) {
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    } else {
+        if (!isadmin()) {
+            error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    }
+
+    //Check site
+    if (!$site = get_site()) {
+        error("Site not found!");
+    }
+ 
+    //Depending the selected restoreto:
+    // If user is a teacher (and nor admin):
+    //    0-Current course, deleting: Put $restore->course_id and $restore->deleting (true), create the restore object
+    //    1-Current course, adding: Put $restore->course_id and $restore->deleting (false), create the restore object
+    // If the uses is an admin:
+    //    0-Existing course, deleting: Select the destination course and launch the check again, then
+    //        put $restore->course_id and $restore->deleting (true), create the restore object.
+    //    1-Existing course, adding: Select the destination course and launch the check again, then
+    //        put $restore->course_id and $restore->deleting (false), create the restore object.
+    //    2-New course: Create the restore object and launch the execute.
+
+    //If the user is a teacher and not an admin
+    if (isteacher($id) and !isadmin()) {
+        $restore->course_id = $id;
+        if ($restore->restoreto == 0) {
+            $restore->deleting = true;
+        } else {
+            $restore->deleting = false;
+        }
+    }
+
+    //If the user is an admin
+    if (isadmin()) {
+        //Set restore->deleting as needed
+        if ($restore->restoreto == 0) {
+            $restore->deleting = true;
+        } else {
+            $restore->deleting = false;
+        }
+    }
+
+    //Now, select the course if needed
+    if (($restore->restoreto == 0 or $restore->restoreto == 1) and ($restore->course_id == 0) and (isadmin())) {
+        if ($courses = get_courses()) {
+            print_heading(get_string("choosecourse"));
+            print_simple_box_start("CENTER");
+            foreach ($courses as $course) {
+                echo "<A HREF=\"restore.php?course_id=$course->id&launch=check&id=$id&file=$file\">$course->fullname ($course->shortname)</A><BR>";
+            }
+            print_simple_box_end();
+        } else {
+            print_heading(get_string("nocoursesyet"));
+            print_continue("$CFG->wwwroot/$CFG->admin/index.php");
+        }
+    //Checks everything and execute restore
+    } else if ((($restore->restoreto == 0 or $restore->restoreto == 1) and ($restore->course_id != 0)) or ($restore->restoreto == 2)) {
+        $show_continue_button = true;
+        //Check if we've selected any mod's user info and restore->users 
+        //is set to none. Change it to course and inform.
+        if ($restore->users == 2) {
+            $changed = false;
+            $mods = $restore->mods;
+            foreach ($mods as $mod) {
+                if ($mod->userinfo) {
+                    $changed = true;
+                }
+            }
+            if ($changed) {
+                echo get_string ("noteuserschangednonetocourse");
+                echo "<hr noshade size=\"1\">";
+                $restore->users = 1;
+            }
+        }
+        //Save the restore session object
+        $SESSION->restore = $restore;
+        if ($show_continue_button) {
+            //Print the continue button to execute the restore NOW !!!!
+            //All is prepared !!!
+            echo "<CENTER>";
+            $hidden["launch"]             = "execute";
+            $hidden["file"]               =  $file;
+            $hidden["id"]                 =  $id;
+            print_single_button("restore.php", $hidden, get_string("restorecoursenow"),"post");
+            echo "</CENTER>";
+        } else {
+            //Show error
+            error ("Something was wrong checking restore preferences");
+        } 
+
+    //If we are here. Something must be wrong. Debug !!!
+    } else {
+        print_object($restore);
+        print_object($info);
+        print_object($course_header);
+        error ("Something must be wrong");
+    }
+
+?>

backup/restore_execute.html

@@ -0,0 +1,300 @@
+<?PHP //$Id$
+    //This page receives the required info and executes the restore
+    //with the parameters suplied. Whe finished, delete temporary
+    //data from backup_tables and temp directory
+
+    //Get objects from session
+    if ($SESSION) {
+        $info = $SESSION->info;
+        $course_header = $SESSION->course_header;
+        $restore = $SESSION->restore;
+    }
+
+    //Check login
+    require_login();
+
+    //Check admin
+    if (!empty($id)) {
+        if (!isteacheredit($id)) {
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    } else {
+        if (!isadmin()) {
+            error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    }
+
+    //Check site
+    if (!$site = get_site()) {
+        error("Site not found!");
+    }
+
+    //Checks for the required files/functions to restore every module
+    //and include them
+    if ($allmods = get_records("modules") ) {
+        foreach ($allmods as $mod) {
+            $modname = $mod->name;
+            $modfile = "$CFG->dirroot/mod/$modname/restorelib.php";
+            //If file exists and we have selected to restore that type of module
+            if ((file_exists($modfile)) and ($restore->mods[$modname]->restore)) {
+               include_once($modfile);
+            }
+        }
+    }
+
+    //Start the main table
+    echo "<table cellpadding=5>";
+    echo "<tr><td>";
+
+    //Start the main ul
+    echo "<ul>";
+
+    //Init status
+    $status = true;
+
+    //Localtion of the xml file
+    $xml_file  = $CFG->dataroot."/temp/backup/".$restore->backup_unique_code."/moodle.xml";
+
+    //If we've selected to restore into new course
+    //create it (course)
+    //Saving conversion id variables into backup_tables
+    if ($restore->restoreto == 2) {
+        echo "<li>".get_string("creatingnewcourse");
+        if (!$status = restore_create_new_course($restore,$course_header)) {
+            notify("Error while creating the new empty course.");
+        }
+        //Print course fullname and shortname and category
+        if ($status) {
+            echo "<ul>";
+            echo "<li>".$course_header->course_fullname." (".$course_header->course_shortname.")";
+            echo "<li>".get_string("category").": ".$course_header->category->name;
+            echo "</ul>";
+            //Put the destination course_id
+            $restore->course_id = $course_header->course_id;
+        }
+    } else {
+        $course = get_record("course","id",$restore->course_id);
+        if ($course) {
+            echo "<li>".get_string("usingexistingcourse"); 
+            echo "<ul>";
+            echo "<li>".get_string("from").": ".$course_header->course_fullname." (".$course_header->course_shortname.")";
+            echo "<li>".get_string("to").": ".$course->fullname." (".$course->shortname.")";
+            if (($restore->deleting)) {
+                echo "<li>".get_string("deletingexistingcoursedata");
+            } else {
+                echo "<li>".get_string("addingdatatoexisting");
+            }
+            echo "</ul>";
+            //If we have selected to restore deleting, we do it now.
+            if ($restore->deleting) {
+                echo "<li>".get_string("deletingolddata");
+                $status = remove_course_contents($restore->course_id,false) and 
+                          delete_dir_contents($CFG->dataroot."/".$restore->course_id,"backupdata");
+                if ($status) {
+                    //Now , this situation is equivalent to the "restore to new course" one (we
+                    //have a course record and nothing more), so define it as "to new course"
+                    $restore->restoreto = 2;
+                } else {
+                    notify("An error occurred while deleting some of the course contents.");
+                }
+            }
+        } else {
+            notify("Error opening existing course.");
+            $status = false;
+        }
+    }
+
+    //Now create the course_sections and their associated course_modules
+    if ($status) {
+        //Into new course
+        if ($restore->restoreto == 2) {
+            echo "<li>".get_string("creatingsections");
+            if (!$status = restore_create_sections($restore,$xml_file)) {
+                notify("Error creating sections in the existing course.");
+            }
+        //Into existing course
+        } else if ($restore->restoreto == 0 or $restore->restoreto == 1) {
+            echo "<li>".get_string("checkingsections");
+            if (!$status = restore_create_sections($restore,$xml_file)) {
+                notify("Error creating sections in the existing course.");
+            }
+        //Error
+        } else {
+            notify("Neither a new course or an existing one was specified.");
+            $status = false;
+        }
+    }
+
+
+    //Now create users as needed 
+    if ($status and ($restore->users == 0 or $restore->users == 1)) {
+        echo "<li>".get_string("creatingusers")."<br>";
+        if (!$status = restore_create_users($restore,$xml_file)) {
+            notify("Could not restore users.");
+        }
+        //Now print info about the work done
+        if ($status) {
+            $recs = get_records_sql("select old_id, new_id from {$CFG->prefix}backup_ids
+                                     where backup_code = '$restore->backup_unique_code' and
+                                     table_name = 'user'");
+            //We've records
+            if ($recs) {
+                $new_count = 0;
+                $exists_count = 0;
+                $student_count = 0;
+                $teacher_count = 0;
+                $coursecreator_count = 0;
+                $admin_count = 0;
+                $other_count = 0;
+                $counter = 0;
+                //Iterate, filling counters
+                foreach ($recs as $rec) {
+                    //Get full record, using backup_getids
+                    $record = backup_getid($restore->backup_unique_code,"user",$rec->old_id);
+                    if (strpos($record->info,"new") !== false) {
+                        $new_count++;
+                    } 
+                    if (strpos($record->info,"exists") !== false) {
+                        $exists_count++;
+                    }
+                    if (strpos($record->info,"student")) {
+                        $student_count++;
+                    } else if (strpos($record->info,"teacher")) {
+                        $teacher_count++;
+                    } else if (strpos($record->info,"admin")) {
+                        $admin_count++;
+                    } else if (strpos($record->info,"coursecreator")) {
+                        $coursecreator_count++;
+                    } else if ($record->info == "new" or $record->info == "exists") {
+                        $other_count++;
+                    }
+                    //Do some output
+                    $counter++;
+                    if ($counter % 10 == 0) {
+                        echo ".";
+                        if ($counter % 200 == 0) {
+                            echo "<br>";
+                        }
+                        backup_flush(300);
+                    }
+                }
+                //Now print information gathered
+                echo " (".get_string("new").": ".$new_count.", ".get_string("existing").": ".$exists_count.")";
+                echo "<ul>";
+                echo "<li>".get_string("students").": ".$student_count;
+                echo "<li>".get_string("teachers").": ".$teacher_count;
+                echo "<li>".get_string("coursecreators").": ".$coursecreator_count;
+                echo "<li>".get_string("administrators").": ".$admin_count;
+                echo "<li>".get_string("other").": ".$other_count;
+                echo "</ul>";
+            } else {
+                notify("Something is wrong - no users were found!");
+                $status = false;
+            }
+        }
+    }
+
+    //Now create categories and questions as needed (STEP1)
+    if ($status and ($restore->mods['quiz']->restore)) {
+         echo "<li>".get_string("creatingcategoriesandquestions")."<br>";
+         if (!$status = restore_create_questions($restore,$xml_file)) {
+             notify("Could not restore categories and questions!");
+         }
+    }
+
+    //Now create user_files as needed
+    if ($status and ($restore->user_files)) {
+        echo "<li>".get_string("copyinguserfiles")."<br>";
+        if (!$status = restore_user_files($restore)) {
+            notify("Could not restore user files!");
+        }
+        //If all is ok (and we have a counter)
+        if ($status and ($status !== true)) {
+            //Inform about user dirs created from backup
+            echo "<ul>";
+            echo "<li>".get_string("userzones").": ".$status;
+            echo "</ul>";
+        }
+    }
+
+    //Now create course files as needed
+    if ($status and ($restore->course_files)) {
+        echo "<li>".get_string("copyingcoursefiles")."<br>";
+        if (!$status = restore_course_files($restore)) {
+            notify("Could not restore course files!");
+        }
+        //If all is ok (and we have a counter)
+        if ($status and ($status !== true)) {
+            //Inform about user dirs created from backup
+            echo "<ul>";
+            echo "<li>".get_string("filesfolders").": ".$status;
+            echo "</ul>";
+        }       
+    }
+
+    //Now create scales as needed
+    if ($status) {
+        echo "<li>".get_string("creatingscales");
+        if (!$status = restore_create_scales($restore,$xml_file)) {
+            notify("Could not restore custom scales!");
+        }
+    }
+
+    //Now create course modules as needed
+    if ($status) {
+        echo "<li>".get_string("creatingcoursemodules");
+        if (!$status = restore_create_modules($restore,$xml_file)) {
+            notify("Could not restore modules!");
+        }
+    }
+
+    //Now create log entries as needed
+    if ($status and ($restore->logs)) {
+        echo "<li>".get_string("creatinglogentries")."<b> (not implemented!!)</b>";
+    }    
+
+    //Now, if all is OK, adjust the instance field in course_modules !!
+    if ($status) {
+        echo "<li>".get_string("checkinginstances");
+        if (!$status = restore_check_instances($restore)) {
+            notify("Could not adjust instances in course_modules!");
+        }
+    }
+
+    //Now if all is OK, update:
+    //   - course modinfo field 
+    //   - categories table
+    if ($status) {
+        echo "<li>".get_string("checkingcourse");
+        //modinfo field
+        rebuild_course_cache($restore->course_id);
+        //categories table
+        $course = get_record("course","id",$restore->course_id); 
+        fix_course_sortorder($course->category);
+    }
+
+    //Cleanup temps (files and db)
+    if ($status) {
+        echo "<li>".get_string("cleaningtempdata");
+        if (!$status = clean_temp_data ($restore)) {
+            notify("Could not clean up temporary data from files and database");
+        }
+    }
+
+    //End the main ul
+    echo "</ul>";
+
+
+    //End the main table     
+    echo "</tr></td>";
+    echo "</table>";
+
+    if (!$status) {
+        error ("An error has occurred and the restore could not be completed!");
+    }
+
+    //Print final message
+    print_simple_box(get_string("restorefinished"),"CENTER");
+    print_continue("$CFG->wwwroot/course/view.php?id=".$restore->course_id);
+
+?>

backup/restore_form.html

@@ -0,0 +1,244 @@
+<?PHP //$Id$
+    //This page prints the restore form to select everything yo want
+    //to restore. Form is dinamically buid, depending of "info" object
+    //that contains the backup contents and depending of every mod
+    //capabilities.
+
+    //Get objects from session
+    $info = $SESSION->info;
+    $course_header = $SESSION->course_header;
+
+    //Check that we have all we need
+    //backup_unique_code
+    require_variable($backup_unique_code);
+    //file
+    require_variable($file);
+    //info
+    require_variable($info);
+    //course_header
+    require_variable($course_header);
+
+    //Check login
+    require_login();
+
+    //Check admin
+    if (!empty($id)) {
+        if (!isteacheredit($id)) {
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    } else {
+        if (!isadmin()) {
+            error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");   
+        }
+    }
+
+    //Check site
+    if (!$site = get_site()) {
+        error("Site not found!");
+    } 
+
+    //Checks for the required files/functions to restore every mod
+    $count = 0;
+    if ($allmods = get_records("modules") ) {
+        foreach ($allmods as $mod) {
+            $modname = $mod->name;
+            $modfile = "$CFG->dirroot/mod/$modname/restorelib.php";
+            $modrestore = $modname."_restore_mods";
+            if (file_exists($modfile)) {
+               include_once($modfile);
+               if (function_exists($modrestore)) {
+                   $var = "exists_".$modname;
+                   $$var = true;
+                   $count++;
+               }
+            }
+            //Check data
+            //Check module info
+            $var = "restore_".$modname;
+            if (!isset($$var)) {
+                $$var = 1;
+            }
+            //Check include user info
+            $var = "restore_user_info_".$modname;
+            if (!isset($$var)) {
+                $$var = 1;
+            }
+        }
+    }
+
+    //Check other parameters
+    if (!isset($restore_users)) {
+        $restore_users = 1;
+    }
+   
+    if (!isset($restore_logs)) {
+        $restore_logs = 1;
+    }
+
+    if (!isset($restore_user_files)) {
+        $restore_user_files = 1;
+    }
+
+    if (!isset($restore_course_files)) {
+        $restore_course_files = 1;
+    }
+
+    if (!isset($restore_restoreto)) {
+        if (isteacheredit($id) and !isadmin()) {
+            $restore_restoreto = 1;
+        }
+        if (isadmin()) {
+            $restore_restoreto = 2;
+        }
+    }
+
+    if ($count == 0) {
+        notice("No restorable modules are installed!");
+    }
+
+?>
+
+<form name="form" method="post" <?=$onsubmit ?> action="<?=$ME ?>">
+<table cellpadding=5>
+<?
+
+    //First, course destination
+    //Print the full tr
+    echo "<tr>";
+    echo "<td align=\"right\"><P><b>";
+    echo get_string("restoreto").":</b>";
+    echo "</td><td>";
+    if (isteacheredit($id) and !isadmin()) {
+        $restore_restoreto_options[0] = get_string("currentcoursedeleting");
+        $restore_restoreto_options[1] = get_string("currentcourseadding");
+    } 
+    if (isadmin()) {
+        $restore_restoreto_options[0] = get_string("existingcoursedeleting");
+        $restore_restoreto_options[1] = get_string("existingcourseadding");
+        $restore_restoreto_options[2] = get_string("newcourse"); 
+    }
+    choose_from_menu($restore_restoreto_options, "restore_restoreto", $restore_restoreto, "");
+    echo "</td></tr>";
+    //Line
+    echo "<tr><td colspan=\"2\"><hr noshade size=\"1\"></td></tr>";
+    //Now, check modules and info and show posibilities
+    if ($allmods = get_records("modules") ) {
+        foreach ($allmods as $mod) {
+            $modname = $mod->name;
+            $modrestore = $modname."_restore_mods";
+            //If exists the lib & function
+            $exist = "exists_".$modname;
+            $restore_var = "restore_".$modname;
+            $user_info_var = "restore_user_info_".$modname;
+            if ($$exist) {
+                //Now check that we have that module info in the backup file
+                if ($info->mods[$modname]->backup == "true") {
+                    //Print the full tr
+                    echo "<tr>";
+                    echo "<td align=\"right\"><P><B>";
+                    echo get_string("include")." ". get_string("modulenameplural",$modname).":";
+                    echo "</td><td>";
+                    $restore_options[0] = get_string("no"); 
+                    $restore_options[1] = get_string("yes");
+                    choose_from_menu($restore_options, $restore_var, $$restore_var, "");
+                    //If backup contains user data, then show menu, else fix it to
+                    //without user data
+                    if ($info->mods[$modname]->userinfo == "true") {
+                        $restore_user_options[0] = get_string("withoutuserdata"); 
+                        $restore_user_options[1] = get_string("withuserdata");
+                        choose_from_menu($restore_user_options, $user_info_var, $$user_info_var, "");
+                    } else {
+                        //Module haven't userdata
+                        echo get_string("withoutuserdata");
+                        echo "<input type=\"hidden\" name=\"$user_info_var\" value=\"0\">";
+                    }
+                    echo "</td></tr>";
+                } else {
+                    //Module isn't restorable
+                    echo "<input type=\"hidden\" name=\"$restore_var\" value=\"0\">";
+                    echo "<input type=\"hidden\" name=\"$user_info_var\" value=\"0\">";
+                }
+            } else {
+                //Module isn't restorable
+                echo "<input type=\"hidden\" name=\"$restore_var\" value=\"0\">";
+                echo "<input type=\"hidden\" name=\"$user_info_var\" value=\"0\">";
+            }
+        }
+        //Line
+        echo "<tr><td colspan=\"2\"><hr noshade size=\"1\"></td></tr>";
+
+        //Now print the Users tr
+        echo "<tr>";
+        echo "<td align=\"right\"><P><B>";
+        echo get_string("users").":";
+        echo "</td><td>";
+        //If all users are in the backup file
+        if ($info->backup_users == "all") {
+            $user_options[0] = get_string("all");
+        }
+        $user_options[1] = get_string("course");
+        $user_options[2] = get_string("none");
+        //$user_options[2] = get_string("needed");-->NOT IMPLEMENTED
+        choose_from_menu($user_options, "restore_users", $restore_users, "");
+        echo "</td></tr>";
+
+        //Now print the Logs tr
+        echo "<tr>";
+        echo "<td align=\"right\"><P><B>";
+        echo get_string("logs").":";                                               
+        echo "</td><td>";
+        //If logs are in the backup file, show menu, else fixed to no
+        if ($info->backup_logs == "true") {
+            $log_options[0] = get_string("no");
+            $log_options[1] = get_string("yes"); 
+            choose_from_menu($log_options, "restore_logs", $restore_logs, ""); 
+        } else {
+            echo get_string("no");
+            echo "<input type=\"hidden\" name=\"restore_logs\" value=\"0\">";
+        }
+        echo "</td></tr>";
+
+        //Now print the User Files tr
+        echo "<tr>";
+        echo "<td align=\"right\"><P><B>";
+        echo get_string ("userfiles").":";
+        echo "</td><td>";
+        //If user files are in the backup file, show menu, else fixed to no
+        if ($info->backup_user_files == "true") {
+            $user_file_options[0] = get_string("no"); 
+            $user_file_options[1] = get_string("yes"); 
+            choose_from_menu($user_file_options, "restore_user_files", $restore_user_files, "");
+        } else {
+            echo get_string("no");
+            echo "<input type=\"hidden\" name=\"restore_user_files\" value=\"0\">";
+        }
+        echo "</td></tr>";
+
+        //Now print the Course Files tr
+        echo "<tr>";
+        echo "<td align=\"right\"><P><B>";
+        echo get_string ("coursefiles").":";
+        echo "</td><td>";
+        //If course files are in the backup file, show menu, else fixed to no
+        if ($info->backup_course_files == "true") {
+            $course_file_options[0] = get_string("no");
+            $course_file_options[1] = get_string("yes");
+            choose_from_menu($course_file_options, "restore_course_files", $restore_course_files, "");
+        } else {
+            echo get_string("no");
+            echo "<input type=\"hidden\" name=\"restore_course_files\" value=\"0\">";
+        }
+        echo "</td></tr>";
+        echo "<input type=\"hidden\" name=\"backup_unique_code\" value=\"$backup_unique_code\">";
+        echo "<input type=\"hidden\" name=\"file\" value=\"$file\">";
+    }
+?>
+</table>
+<BR>
+<CENTER>
+<input type="hidden" name=id     value="<? p($id) ?>">
+<input type="hidden" name=launch value="check">
+<input type="submit" value="<? print_string("continue") ?>">
+<input type="submit" name=cancel value="<? print_string("cancel") ?>">
+</CENTER>
+</FORM>

backup/restore_precheck.html

@@ -0,0 +1,138 @@
+<?PHP  // $Id$
+    //This page copies th zip to the temp directory,
+    //unzip it, check that it is a valid backup file
+    //inform about its contents and fill all the necesary
+    //variables to continue with the restore.
+
+    //Checks we have the file variable
+    if (!isset($file)) {         
+        error ("File not specified");
+    }
+
+    //Check login   
+    require_login();
+ 
+    //Check admin
+    if (!empty($id)) {
+        if (!isteacheredit($id)) {
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    } else {
+        if (!isadmin()) {
+            error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");   
+        }
+    }
+
+    //Check site
+    if (!$site = get_site()) {
+        error("Site not found!");
+    }
+
+    //Prepend dataroot to variable to have the absolute path
+    $file = $CFG->dataroot."/".$file;
+
+    //Start the main table
+    echo "<table cellpadding=5>";
+    echo "<tr><td>";
+    
+    //Start the mail ul
+    echo "<ul>";
+
+    //Check the file exists 
+    if (!is_file($file)) {
+        error ("File not exists ($file)");
+    }
+
+    //Check the file name ends with .zip
+    if (!substr($file,-4) == ".zip") {
+        error ("File has an incorrect extension");
+    }
+
+    //Now calculate the unique_code for this restore
+    $backup_unique_code = time();
+    
+    //Now check and create the backup dir (if it doesn't exist)
+    $status = check_and_create_backup_dir($backup_unique_code);
+    //Empty dir
+    if ($status) {
+        echo "<li>".get_string("creatingtemporarystructures");
+        $status = clear_backup_dir($backup_unique_code);
+    }
+
+    //Now delete old data and directories under dataroot/temp/backup
+    if ($status) {   
+        echo "<li>".get_string("deletingolddata");
+        $status = backup_delete_old_data();
+    }
+  
+    //Now copy he zip file to dataroot/temp/backup/backup_unique_code
+    if ($status) {
+        echo "<li>".get_string("copyingzipfile");
+        $status = backup_copy_file($file,$CFG->dataroot."/temp/backup/".$backup_unique_code."/".basename($file));
+    }
+
+    //Now unzip the file
+    if ($status) {
+        echo "<li>".get_string("unzippingbackup");
+        $status = restore_unzip ($CFG->dataroot."/temp/backup/".$backup_unique_code."/".basename($file));
+    }
+
+    //Now check for the moodle.xml file
+    if ($status) {
+        $xml_file  = $CFG->dataroot."/temp/backup/".$backup_unique_code."/moodle.xml";
+        echo "<li>".get_string("checkingbackup");
+        $status = restore_check_moodle_file ($xml_file);
+    }
+
+    $info = "";
+    $course_header = "";
+
+    //Now read the info tag (all)
+    if ($status) {
+        echo "<li>".get_string("readinginfofrombackup");
+        //Reading info from file
+        $info = restore_read_xml_info ($xml_file);
+        //Reading course_header from file
+        $course_header = restore_read_xml_course_header ($xml_file);
+    }
+
+    //End the main ul
+    echo "</ul>";
+
+    //End the main table
+    echo "</tr></td>";
+    echo "</table>";
+
+    //Now we print in other table, the backup and the course it contains info
+    if ($info and $course_header and $status) {
+        //First, the course info
+        $status = restore_print_course_header($course_header);
+        //Now, the backup info
+        if ($status) {
+            $status = restore_print_info($info);
+        }
+    }
+
+    //Save course header and info into php session
+    if ($status) {
+        $SESSION->info = $info;
+        $SESSION->course_header = $course_header;
+    }
+
+    //Finally, a little form to continue
+    //with some hidden fields
+    if ($status) {
+        echo "<br><CENTER>";
+        $hidden["backup_unique_code"] = $backup_unique_code;
+        $hidden["launch"]             = "form";
+        $hidden["file"]               =  $file;
+        $hidden["id"]                 =  $id;
+        print_single_button("restore.php", $hidden, get_string("continue"),"post");
+        echo "</CENTER>";
+    }
+  
+    if (!$status) {
+        error ("An error has ocurred");
+    }
+
+?>

backup/version.php

@@ -0,0 +1,10 @@
+<?PHP  //$Id$
+// This file defines the current version of the
+// backup/restore code that is being used.  This can be
+// compared against the values stored in the 
+// database (backup_version) to determine whether upgrades should
+// be performed (see db/backup_*.php)
+
+$backup_version = 2003082800;   // The current version is a date (YYYYMMDDXX)
+
+$backup_release = "1.1";  // User-friendly version number

config-dist.php

@@ -1,130 +1,141 @@
-<?PHP // $Id$
-///////////////////////////////////////////////////////////////////////////
-//
-// Moodle configuration file
-// 
-// This file should be located in the top-level directory.
-//
-///////////////////////////////////////////////////////////////////////////
-// 
-// NOTICE OF COPYRIGHT
-//
-// Moodle - Modular Object-Oriented Dynamic Learning Environment
-//          http://moodle.com
-// 
-// Copyright (C) 2001  Martin Dougiamas  http://dougiamas.com
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details:
-// 
-//          http://www.gnu.org/copyleft/gpl.html
-// 
-////////////////////////////////////////////////////////////////////////////
-//
-// Site configuration variables are all stored in the CFG object.
-
-// First, you need to configure the database where all Moodle data 
-// will be stored.  This database must already have been created
-// and a username/password created to access it.   See doc/INSTALL.
-
-$CFG->dbtype    = "mysql";       // eg mysql (postgres7, oracle, access etc coming soon)
-$CFG->dbhost    = "localhost";   // eg localhost 
-$CFG->dbname    = "moodle";      // eg moodle
-$CFG->dbuser    = "username";
-$CFG->dbpass    = "password";
-
-
-// Next you need to tell Moodle where it is located.
-// Specify the full URL that moodle has been installed in:
-
-$CFG->wwwroot   = "http://example.com/moodle";
-
-
-// and now the full OS directory path to this same location:
-
-$CFG->dirroot   = "/web/moodle";
-
-
-// Now you need a place where Moodle can save uploaded files.  This directory 
-// should be writeable by the web server user (usually 'nobody' or 'apache'), 
-// but it should not be accessible directly via the web.
-
-$CFG->dataroot  = "/home/moodledata";
-
-
-// Choose a sitewide language - this will affect text, buttons etc
-// See lib/languages.php for a full list of standard language codes.
-
-$CFG->lang     = "en";      // Currently the only option
-
-
-// Choose a sitewide locale - this will affect the display of dates
-// You need to have this locale data installed on your operating 
-// system.  If you don't know what to choose try using the same 
-// string as the language.
-
-$CFG->locale     = "en";
-
-
-// Give the full names of local SMTP servers that Moodle should use to
-// send mail (eg "mail.a.com" or "mail.a.com;mail.b.com").
-// If this is left empty (eg "") then Moodle will attempt to use PHP mail.
-
-$CFG->smtphosts  = "";
-
-
-// There is no way, currently, for PHP to automatically tell whether the 
-// graphic library GD is version 1.* or 2.*.  Specify here (either 1 or 2).
-
-$CFG->gdversion = 1;
-
-
-// If students haven't logged in for a very long time, then they are 
-// automatically unsubscribed from courses.  This parameter specifies
-// that time limit, in DAYS.
-
-$CFG->longtimenosee = 100;
-
-
-// These programs are used by the file management code to zip and unzip 
-// uploaded files.  This only works on Unix systems right now.
-
-$CFG->zip   = "/usr/bin/zip";
-$CFG->unzip = "/usr/bin/unzip";
-
-
-// Files (images, uploads etc) are provided via a script which 
-// is called like this example: file.php/1/myfiles/mymusic.mp3
-// Using this form of argument allows files to be more easily 
-// cached in web browsers, proxy servers etc, but they don't 
-// work in all PHP servers.  If you have trouble viewing 
-// uploaded files or images, then set the following to false
-
-$CFG->slasharguments = true;
-
-// If this server needs to use a proxy computer (eg a firewall)
-// to access the Internet, then provide the proxy details here.
-// This will only affect a few minor features such as the ability
-// to see user locations plotted on a graph.
-// Otherwise, leave these blank
-
-$CFG->proxyhost = "";
-$CFG->proxyport = "";
-
-
-// You should not need to change anything else. To continue setting up 
-// Moodle, use your web browser to go to the moodle/admin web page.
-///////////////////////////////////////////////////////////////////////////
-
-$CFG->libdir    = "$CFG->dirroot/lib";
-
-require("$CFG->libdir/setup.php");  // Sets up all libraries, sessions etc
-
-?>
+<?PHP // $Id$
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// Moodle configuration file                                             //
+//                                                                       //
+// This file should be renamed "config.php" in the top-level directory   //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 2001-2003  Martin Dougiamas  http://dougiamas.com       //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+unset($CFG);  // Ignore this line
+
+//=========================================================================
+// 1. DATABASE SETUP
+//=========================================================================
+// First, you need to configure the database where all Moodle data       //
+// will be stored.  This database must already have been created         //
+// and a username/password created to access it.                         //
+//                                                                       //
+//   mysql      - the prefix is optional, but useful when installing     //
+//                into databases that already contain tables.            //
+//
+//   postgres7  - the prefix is REQUIRED, regardless of whether the      //
+//                database already contains tables.                      //
+
+$CFG->dbtype    = 'mysql';       // mysql or postgres7 (for now)
+$CFG->dbhost    = 'localhost';   // eg localhost or db.isp.com 
+$CFG->dbname    = 'moodle';      // database name, eg moodle
+$CFG->dbuser    = 'username';    // your database username
+$CFG->dbpass    = 'password';    // your database password
+
+$CFG->dbpersist = true;          // Use persistent database connection? 
+                                 // (should be 'true' for 99% of sites)
+
+$CFG->prefix    = 'mdl_';        // Prefix to use for all table names
+
+
+//=========================================================================
+// 2. WEB SITE LOCATION
+//=========================================================================
+// Now you need to tell Moodle where it is located. Specify the full
+// web address to where moodle has been installed.  If your web site 
+// is accessible via multiple URLs then choose the most natural one 
+// that your students would use.  Do not include a trailing slash.
+
+$CFG->wwwroot   = 'http://example.com/moodle';
+
+
+//=========================================================================
+// 3. SERVER FILES LOCATION
+//=========================================================================
+// Next, specify the full OS directory path to this same location
+// Make sure the upper/lower case is correct.  Some examples:
+//
+//    $CFG->dirroot = 'C:\FoxServ\www\moodle';    // Windows
+//    $CFG->dirroot = '/var/www/html/moodle';     // Redhat Linux
+
+$CFG->dirroot   = '/var/www/html/moodle';
+
+
+//=========================================================================
+// 4. DATA FILES LOCATION
+//=========================================================================
+// Now you need a place where Moodle can save uploaded files.  This
+// directory should be readable AND WRITEABLE by the web server user 
+// (usually 'nobody' or 'apache'), but it should not be accessible 
+// directly via the web.
+//
+// - On hosting systems you might need to make sure that your "group" has
+//   no permissions at all, but that "others" have full permissions.
+//
+// - On Windows systems you might specify something like 'C:\moodledata'
+
+$CFG->dataroot  = '/home/moodledata';
+
+
+//=========================================================================
+// 5. DATA FILES PERMISSIONS
+//=========================================================================
+// The following parameter sets the permissions of new directories
+// created by Moodle within the data directory.  The format is in 
+// octal format (as used by the Unix utility chmod, for example).
+// The default is usually OK, but you may want to change it to 0750 
+// if you are concerned about world-access to the files (you will need
+// to make sure the web server process (eg Apache) can access the files.
+// NOTE: the prefixed 0 is important, and don't use quotes.
+
+$CFG->directorypermissions = 0777;
+
+
+//=========================================================================
+// 6. DIRECTORY LOCATION  (most people can just ignore this setting)
+//=========================================================================
+// A very few webhosts use /admin as a special URL for you to access a 
+// control panel or something.  Unfortunately this conflicts with the 
+// standard location for the Moodle admin pages.  You can fix this by 
+// renaming the admin directory in your installation, and putting that 
+// new name here.  eg "moodleadmin".  This will fix admin links in Moodle.
+
+$CFG->admin = 'admin';
+
+
+//=========================================================================
+// ALL DONE!  To continue installation, visit your main page with a browser
+//=========================================================================
+
+if (! @include_once("$CFG->dirroot/lib/setup.php"))  {       // Do not edit
+    if ($CFG->dirroot == dirname(__FILE__)) {
+        echo "<p>Could not find this file: $CFG->dirroot/lib/setup.php</p>";
+        echo "<p>Are you sure all your files have been uploaded?</p>";
+    } else {
+        echo "<p>Error detected in config.php</p>";
+        echo "<p>Error in: \$CFG->dirroot = '$CFG->dirroot';</p>";
+        echo "<p>Try this: \$CFG->dirroot = '".dirname(__FILE__)."';</p>";
+    }
+    die;
+}
+
+// MAKE SURE WHEN YOU EDIT THIS FILE THAT THERE ARE NO SPACES, BLANK LINES, 
+// RETURNS, OR ANYTHING ELSE AFTER THE TWO CHARACTERS ON THE NEXT LINE.
+?>

course/category.php

@@ -0,0 +1,384 @@
+<?PHP // $Id$
+      // Displays the top level category or all courses
+      // In editing mode, allows the admin to edit a category, 
+      // and rearrange courses
+
+	require_once("../config.php");
+	require_once("lib.php");
+
+    require_variable($id);    // Category id
+    optional_variable($page, "0");     // which page to show
+    optional_variable($perpage, "20"); // how many per page
+
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
+
+    if (!$category = get_record("course_categories", "id", $id)) {
+        error("Category not known!");
+    }
+
+    if (iscreator()) {
+        if (isset($_GET['edit'])) {
+            if ($edit == "on") {
+                $USER->editing = true;
+            } else if ($edit == "off") {
+                $USER->editing = false;
+            }
+        }
+        $navbaritem = update_category_button($category->id);
+
+        $creatorediting = !empty($USER->editing);
+        $adminediting = (isadmin() and $creatorediting);
+
+    } else {
+        $navbaritem = print_course_search("", true, "navbar");
+        $adminediting = false;
+    }
+
+
+    if (isadmin()) {
+        /// Rename the category if requested
+        if (!empty($_POST['rename'])) {
+            $category->name = $_POST['rename'];
+            if (! set_field("course_categories", "name", $category->name, "id", $category->id)) {
+                notify("An error occurred while renaming the category");
+            }
+        }
+
+        /// Resort the category if requested
+
+        if (!empty($_GET['resort'])) {
+            fix_course_sortorder($category->id, "fullname ASC");
+        }
+    }
+
+
+/// Print headings
+
+    $numcategories = count_records("course_categories");
+
+    $stradministration = get_string("administration");
+    $strcategories = get_string("categories");
+    $strcategory = get_string("category");
+    $strcourses = get_string("courses");
+
+    if ($creatorediting) {
+        if ($adminediting) {
+	        print_header("$site->shortname: $category->name", "$site->fullname", 
+                         "<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> ".
+                         "<a href=\"index.php\">$strcategories</a> -> $category->name",
+                         "", "", true, $navbaritem);
+        } else {
+	        print_header("$site->shortname: $category->name", "$site->fullname", 
+                         "<a href=\"index.php\">$strcourses</a> -> $category->name", "", "", true, $navbaritem);
+        }
+    } else {
+	    print_header("$site->shortname: $category->name", "$site->fullname", 
+                     "<a href=\"index.php\">$strcourses</a> -> $category->name", "", "", true, $navbaritem);
+    }
+
+
+/// Print the category selector
+
+    $displaylist = array();
+    $parentlist = array();
+    
+    make_categories_list($displaylist, $parentlist, "");
+    
+    echo "<table align=center><tr><td>";
+    popup_form("category.php?id=", $displaylist, "switchcategory", "$category->id", "", "", "", false);
+    echo "</td></tr></table><br />";
+
+
+/// Editing functions
+
+    if ($adminediting) {
+
+    /// Move a specified course to a new category 
+
+        if (isset($moveto) and $data = data_submitted()) {   // Some courses are being moved
+
+            if (! $destcategory = get_record("course_categories", "id", $data->moveto)) {
+                error("Error finding the category");
+            }
+
+            unset($data->moveto);
+            unset($data->id);
+
+            if ($data) {
+                foreach ($data as $code => $junk) {
+                    $courseid = substr($code, 1);
+
+                    if (! $course  = get_record("course", "id", $courseid)) {
+                        notify("Error finding course $courseid");
+                    } else {
+                        if (!set_field("course", "category", $destcategory->id, "id", $course->id)) {
+                            notify("An error occurred - course not moved!");
+                        }
+                        fix_course_sortorder($destcategory->id);
+                        fix_course_sortorder($category->id);
+                        $category = get_record("course_categories", "id", $category->id);
+                    }
+                }
+            }
+        }
+
+
+    /// Hide or show a course 
+    
+        if (isset($hide) or isset($show)) {
+            if (isset($hide)) {
+                $course = get_record("course", "id", $hide);
+                $visible = 0;
+            } else {
+                $course = get_record("course", "id", $show);
+                $visible = 1;
+            }
+            if ($course) {
+                if (! set_field("course", "visible", $visible, "id", $course->id)) {
+                    notify("Could not update that course!");
+                }
+            }
+        }
+
+
+    /// Move a course up or down
+
+        if (isset($moveup) or isset($movedown)) {
+
+            $movecourse = NULL;
+            $swapcourse = NULL;
+
+            $courses = get_courses($category->id);
+
+            if (isset($moveup)) {
+                if ($movecourse = get_record("course", "id", $moveup)) {
+                    foreach ($courses as $course) {
+                        if ($course->id == $movecourse->id) {
+                            break;
+                        }
+                        $swapcourse = $course;
+                    }
+                }
+            }
+            if (isset($movedown)) {
+                if ($movecourse = get_record("course", "id", $movedown)) {
+                    $choosenext = false;
+                    foreach ($courses as $course) {
+                        if ($choosenext) {
+                            $swapcourse = $course;
+                            break;
+                        }
+                        if ($course->id == $movecourse->id) {
+                            $choosenext = true;
+                        }
+                    }
+                }
+            }
+            if ($swapcourse and $movecourse) {        // Renumber everything for robustness
+                $count=0;
+                foreach ($courses as $course) {
+                    $count++;
+                    if ($course->id == $swapcourse->id) {
+                        $course = $movecourse;
+                    } else if ($course->id == $movecourse->id) {
+                        $course = $swapcourse;
+                    }
+                    if (! set_field("course", "sortorder", $count, "id", $course->id)) {
+                        notify("Could not update that course!");
+                    }
+                }
+            }
+        }
+
+        fix_course_sortorder($category->id);
+
+    } // End of editing stuff
+
+/// Print out all the sub-categories
+
+    if ($subcategories = get_records("course_categories", "parent", $category->id)) {
+        echo "<table align=\"center\" border=0 cellspacing=2 cellpadding=4 class=\"generalbox\">";
+        echo "<tr><th>".get_string("subcategories")."</th></tr>";
+        echo "<tr><td nowrap>";
+        foreach ($subcategories as $subcategory) {
+            echo "<a href=\"category.php?id=$subcategory->id\">$subcategory->name</a><br />";
+        }
+        echo "</td></tr></table>";
+        echo "<br />";
+    }
+    
+
+/// Print out all the courses
+
+    if (!$courses = get_courses_page($category->id, "c.sortorder ASC", "c.*", $totalcount, $page*$perpage, $perpage)) {
+        print_heading(get_string("nocoursesyet"));
+
+    } else {
+
+        print_paging_bar($totalcount, $page, $perpage, "category.php?id=$category->id&perpage=$perpage&");
+
+        $strcourses  = get_string("courses");
+        $strselect   = get_string("select");
+        $stredit     = get_string("edit");
+        $strdelete   = get_string("delete");
+        $strbackup   = get_string("backup");
+        $strrestore  = get_string("restore");
+        $strmoveup   = get_string("moveup");
+        $strmovedown = get_string("movedown");
+        $strupdate   = get_string("update");
+        $strhide     = get_string("hide");
+        $strshow     = get_string("show");
+        $strassignteachers     = get_string("assignteachers");
+        $strallowguests     = get_string("allowguests");
+        $strrequireskey     = get_string("requireskey");
+
+        if (empty($THEME->custompix)) {
+            $pixpath = "$CFG->wwwroot/pix";
+        } else {
+            $pixpath = "$CFG->wwwroot/theme/$CFG->theme/pix";
+        }
+
+    
+        echo "<form name=\"movecourses\" action=\"category.php\" method=\"post\">";
+        echo "<table align=\"center\" border=0 cellspacing=2 cellpadding=4 class=\"generalbox\"><tr>";
+        echo "<th>$strcourses</th>";
+        if ($creatorediting) {
+            echo "<th>$stredit</th>";
+            if ($adminediting) {
+                echo "<th>$strselect</th>";
+            }
+        } else {
+            echo "<th>&nbsp;</th>";
+        }
+        echo "</tr>";
+
+
+        $numcourses = count($courses);
+        $count = 0;
+        $abletomovecourses = false;  // for now
+
+        foreach ($courses as $course) {
+            $count++;
+            $up = ($count == 1) ? false : true;
+            $down = ($count == $numcourses) ? false : true;
+
+            $linkcss = $course->visible ? "" : " class=\"dimmed\" ";
+            echo "<tr>";
+            echo "<td><a $linkcss href=\"view.php?id=$course->id\">$course->fullname</a></td>";
+            if ($creatorediting) {
+                if ($adminediting) {
+                    echo "<td>";
+                    echo "<a title=\"$strassignteachers\" href=\"$CFG->wwwroot/course/teacher.php?id=$course->id\"><img".
+                         " src=\"$pixpath/t/user.gif\" height=11 width=11 border=0></a> ";
+                    echo "<a title=\"$strdelete\" href=\"delete.php?id=$course->id\"><img".
+                         " src=\"$pixpath/t/delete.gif\" height=11 width=11 border=0></a> ";
+                    if (!empty($course->visible)) {
+                        echo "<a title=\"$strhide\" href=\"category.php?id=$category->id&hide=$course->id\"><img".
+                             " src=\"$pixpath/t/hide.gif\" height=11 width=11 border=0></a> ";
+                    } else {
+                        echo "<a title=\"$strshow\" href=\"category.php?id=$category->id&show=$course->id\"><img".
+                             " src=\"$pixpath/t/show.gif\" height=11 width=11 border=0></a> ";
+                    }
+    
+                    echo "<a title=\"$strbackup\" href=\"../backup/backup.php?id=$course->id\"><img".
+                         " src=\"$pixpath/t/backup.gif\" height=11 width=11 border=0></a> ";
+
+                    //Only showed if "backupdata" dir exists    
+                    if (is_dir("$CFG->dataroot/$course->id/backupdata")) {
+                        echo "<a title=\"$strrestore\" href=\"../files/index.php?id=$course->id&wdir=/backupdata\"><img".
+                             " src=\"$pixpath/t/restore.gif\" height=11 width=11 border=0></a> ";
+                    } else {
+                        echo "<img src=\"$CFG->wwwroot/pix/spacer.gif\" height=11 width=11 border=0></a> ";
+                    }
+            
+                    if ($up) {
+                        echo "<a title=\"$strmoveup\" href=\"category.php?id=$category->id&moveup=$course->id\"><img".
+                             " src=\"$pixpath/t/up.gif\" height=11 width=11 border=0></a> ";
+                    } else {
+                        echo "<img src=\"$CFG->wwwroot/pix/spacer.gif\" height=11 width=11 border=0></a> ";
+                    }
+        
+                    if ($down) {
+                        echo "<a title=\"$strmovedown\" href=\"category.php?id=$category->id&movedown=$course->id\"><img".
+                             " src=\"$pixpath/t/down.gif\" height=11 width=11 border=0></a> ";
+                    } else {
+                        echo "<img src=\"$CFG->wwwroot/pix/spacer.gif\" height=11 width=11 border=0></a> ";
+                    }
+    
+                    echo "</td>";
+                    echo "<td align=\"center\">";
+                    echo "<input type=\"checkbox\" name=\"c$course->id\">";
+                    $abletomovecourses = true;
+
+                } else if (isteacheredit($course->id)) {
+                    echo "<td>";
+                    echo "<a title=\"$strassignteachers\" href=\"$CFG->wwwroot/course/teacher.php?id=$course->id\"><img".
+                         " src=\"$pixpath/t/user.gif\" height=11 width=11 border=0></a> ";
+                }
+                echo "</td>";
+            } else {
+                echo "<td>";
+                if ($course->summary) {
+                    link_to_popup_window ("/course/info.php?id=$course->id", "courseinfo", 
+                                          "<img alt=\"info\" height=16 width=16 border=0 src=\"$pixpath/i/info.gif\">", 
+                                           400, 500, $strsummary);
+                    echo "&nbsp;";
+                }
+                if ($course->guest ) {
+                    echo "<a href=\"view.php?id=$course->id\"><img title=\"$strallowguests\" alt=\"\" height=16 width=16 border=0 src=\"$pixpath/i/user.gif\"></a>&nbsp;";
+                }
+                if ($course->password) {
+                    echo "<a href=\"view.php?id=$course->id\"><img title=\"$strrequireskey\" alt=\"\" height=16 width=16 border=0 src=\"$pixpath/i/key.gif\"></a>";
+                }
+                echo "</td>";
+            }
+            echo "</tr>";
+        }
+
+        if ($abletomovecourses) {
+            echo "<tr><td colspan=3 align=right>";
+            echo "<br />";
+            unset($displaylist[$category->id]);
+            choose_from_menu ($displaylist, "moveto", "", get_string("moveselectedcoursesto"), "javascript:document.movecourses.submit()");
+            echo "<input type=\"hidden\" name=\"id\" value=\"$category->id\">";
+            echo "</td></tr>";
+        }
+    
+        echo "</table>";
+        echo "</form>";
+        echo "<br />";
+    }
+
+
+    echo "<center>";
+    if (isadmin() and $numcourses > 1) {           /// Print button to re-sort courses by name
+        unset($options);
+        $options["id"] = $category->id;
+        $options["resort"] = "name";
+        print_single_button("category.php", $options, get_string("resortcoursesbyname"), "get");
+    }
+
+    if (iscreator()) {         /// Print button to create a new course
+        unset($options);
+        $options["category"] = $category->id;
+        print_single_button("edit.php", $options, get_string("addnewcourse"), "get");
+        echo "<br />";
+    }
+
+    if (isadmin()) {           /// Print form to rename the category
+        $strrename= get_string("rename");
+        echo "<form name=\"renameform\" action=\"category.php\" method=\"post\">";
+        echo "<input type=\"hidden\" name=\"id\" value=\"$category->id\">";
+        echo "<input type=\"text\" size=30 name=\"rename\" value=\"$category->name\">";
+        echo "<input type=\"submit\" value=\"$strrename\">";
+        echo "</form>";
+        echo "<br />";
+    }
+    echo "</center>";
+    
+    print_footer();
+
+?>

course/delete.php

@@ -1,9 +1,9 @@
 <?PHP // $Id$
       // Admin-only code to delete a course utterly
 
-	require("../config.php");
+	require_once("../config.php");
 
-    optional_variable($id);       // course id
+    require_variable($id);       // course id
     optional_variable($delete);   // delete confirmation
 
     require_login();
@@ -18,40 +18,28 @@
 
     $strdeletecourse = get_string("deletecourse");
     $stradministration = get_string("administration");
-
-    if (!$id) {
-	    print_header("$site->fullname : $strdeletecourse", $site->fullname, 
-                     "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> $strdeletecourse");
-
-        if ($courses = get_records_sql("SELECT * from course WHERE category > 0 ORDER BY fullname")) {
-            print_heading(get_string("choosecourse"));
-            print_simple_box_start("CENTER");
-            foreach ($courses as $course) {
-                echo "<A HREF=\"delete.php?id=$course->id\">$course->fullname</A><BR>";
-            }
-            print_simple_box_end();
-        } else {
-            print_heading(get_string("nocoursesyet"));
-            print_continue("$CFG->wwwroot/admin/");
-        }
-        print_footer();
-        exit;
-    }
+    $strcategories = get_string("categories");
 
     if (! $course = get_record("course", "id", $id)) {
         error("Course ID was incorrect (can't find it)");
     }
 
+    $category = get_record("course_categories", "id", $course->category);
+
     if (! $delete) {
         $strdeletecheck = get_string("deletecheck", "", $course->shortname);
         $strdeletecoursecheck = get_string("deletecoursecheck");
-	    print_header("$site->fullname : $strdeletecheck", $site->fullname, 
-                     "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> 
-                      <A HREF=\"delete.php\">$strdeletecourse</A> -> $strdeletecheck");
 
-        notice_yesno("$strdeletecoursecheck<BR><BR>$course->fullname", 
+        
+	    print_header("$site->shortname: $strdeletecheck", $site->fullname, 
+                     "<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> ".
+                     "<a href=\"index.php\">$strcategories</a> -> ".
+                     "<a href=\"category.php?id=$course->category\">$category->name</a> -> ".
+                     "$strdeletecheck");
+
+        notice_yesno("$strdeletecoursecheck<BR><BR>$course->fullname ($course->shortname)", 
                      "delete.php?id=$course->id&delete=".md5($course->timemodified), 
-                     "delete.php");
+                     "category.php?id=$course->category");
         exit;
     }
 
@@ -62,75 +50,25 @@
     // OK checks done, delete the course now.
     $strdeletingcourse = get_string("deletingcourse", "", $course->shortname);
 
-	print_header("$site->fullname : $strdeletingcourse", $site->fullname, 
-                 "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> 
-                  <A HREF=\"delete.php\">$strdeletecourse</A> -> $strdeletingcourse");
+	print_header("$site->shortname: $strdeletingcourse", $site->fullname, 
+                 "<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> ".
+                 "<a href=\"index.php\">$strcategories</a> -> ".
+                 "<a href=\"category.php?id=$course->category\">$category->name</a> -> ".
+                 "$strdeletingcourse");
 
     print_heading($strdeletingcourse);
 
-    $strdeleted = get_string("deleted");
-    // First delete every instance of every module
-
-    if ($allmods = get_records_sql("SELECT * FROM modules") ) {
-        foreach ($allmods as $mod) {
-            $modname = $mod->name;
-            $modfile = "../mod/$modname/lib.php";
-            $moddelete = $modname."_delete_instance";
-            $count=0;
-            if (file_exists($modfile)) {
-                include_once($modfile);
-                if (function_exists($moddelete)) {
-                    if ($instances = get_records($modname, "course", $course->id)) {
-                        foreach ($instances as $instance) {
-                            if ($moddelete($instance->id)) {
-                                $count++;
-                            } else {
-                                notify("Could not delete $modname instance $instance->id ($instance->name)");
-                            }
-                        }
-                    }
-                } else {
-                    notify("Function $moddelete() doesn't exist!");
-                }
-
-            }
-            notify("$strdeleted $count instances of $modname");
-        } 
-    } else {
-        error("No modules are installed!");
-    } 
-
-    // Delete any user stuff
-
-    if (delete_records("user_students", "course", $course->id)) {
-        notify("$strdeleted student enrolments");
+    if (!remove_course_contents($course->id)) {
+        notify("An error occurred while deleting some of the course contents.");
     }
 
-    if (delete_records("user_teachers", "course", $course->id)) {
-        notify("$strdeleted teachers");
-    }
-
-    // Delete logs
-
-    if (delete_records("log", "course", $course->id)) {
-        notify("$strdeleted logs");
-    }
-
-    // Delete any course stuff
-
-    if (delete_records("course_sections", "course", $course->id)) {
-        notify("$strdeleted course sections");
-    }
-    if (delete_records("course_modules", "course", $course->id)) {
-        notify("$strdeleted course modules");
-    }
-    if (delete_records("course", "id", $course->id)) {
-        notify("$strdeleted the main course record");
+    if (!delete_records("course", "id", $course->id)) {
+        notify("An error occurred while deleting the main course record.");
     }
 
     print_heading( get_string("deletedcourse", "", $course->shortname) );
 
-    print_continue("delete.php");
+    print_continue("category.php?id=$course->category");
 
     print_footer();
 

course/edit.html

@@ -1,36 +1,58 @@
 <FORM METHOD="post" action="edit.php" NAME="form">
 <table cellpadding=9 cellspacing=0 >
+<tr valign=top>
+	<td><P><? print_string("category") ?>:</td>
+	<td><? 
+           $displaylist = array();
+           $parentlist = array();
+           make_categories_list($displaylist, $parentlist);
+           choose_from_menu($displaylist, "category", "$form->category", "");
+           helpbutton("coursecategory", get_string("category"));
+        ?>
+	</td>
+</tr>
 <tr valign=top>
 	<td><P><? print_string("fullname") ?>:</td>
-	<td><input type="text" name="fullname" size=50 value="<? p($form->fullname) ?>">
+	<td><input type="text" name="fullname" maxlength="254" size=50 value="<? p($form->fullname) ?>">
     <? helpbutton("coursefullname", get_string("fullname")) ?>
-	<? formerr($err["fullname"]) ?>
+    <? if (isset($err["fullname"])) formerr($err["fullname"]); ?>
 	</td>
 </tr>
 <tr valign=top>
 	<td><P><? print_string("shortname") ?>:</td>
-	<td><input type="text" name="shortname" size=10 value="<? p($form->shortname) ?>">
+	<td><input type="text" name="shortname" maxlength="15"  size="10" value="<? p($form->shortname) ?>">
     <? helpbutton("courseshortname", get_string("shortname")) ?>
-	<? formerr($err["shortname"]) ?>
+    <? if (isset($err["shortname"])) formerr($err["shortname"]); ?>
 	</td>
 </tr>
 <tr valign=top>
 	<td><P><? print_string("summary") ?>:</td>
 	<td><TEXTAREA NAME=summary COLS=50 ROWS=10 WRAP=virtual><? p($form->summary) ?></TEXTAREA>
     <? helpbutton("text", get_string("helptext")) ?>
-	<? formerr($err["summary"]) ?>
+    <? if (isset($err["summary"])) formerr($err["summary"]); ?>
+	</td>
+</tr>
+<tr valign=top>
+	<td><P><? print_string("availability") ?>:</td>
+	<td><?
+    unset($choices);
+    $choices["0"] = get_string("courseavailablenot");
+    $choices["1"] = get_string("courseavailable");
+    choose_from_menu ($choices, "visible", $form->visible, "");
+    helpbutton("courseavailability", get_string("availability")); ?>
 	</td>
 </tr>
 <tr valign=top>
 	<td><P><? print_string("enrolmentkey") ?>:</td>
 	<td><input type="text" name="password" size=25 value="<? p($form->password) ?>">
     <? helpbutton("enrolmentkey", get_string("enrolmentkey")) ?>
-	<? formerr($err["password"]) ?>
+    <? if (isset($err["password"])) formerr($err["password"]); ?>
 	</td>
 </tr>
 <tr valign=top>
 	<td><P><? print_string("opentoguests") ?>:</td>
 	<td><?
+    unset($choices);
     $choices["0"] = get_string("guestsno");
     $choices["1"] = get_string("guestsyes");
     $choices["2"] = get_string("guestskey");
@@ -38,21 +60,11 @@
     helpbutton("guestaccess", get_string("opentoguests")); ?>
 	</td>
 </tr>
-<tr valign=top>
-	<td><P><? print_string("category") ?>:</td>
-	<td><? 
-           choose_from_menu ($form->categories, "category", "$form->category", "");
-           helpbutton("coursecategory", get_string("category"));
-	       formerr($err["category"]);
-        ?>
-	</td>
-</tr>
 <tr valign=top>
 	<td><P><? print_string("format") ?>:</td>
 	<td><? 
            choose_from_menu ($form->courseformats, "format", "$form->format", "");
            helpbutton("courseformats", get_string("courseformats"));
-	       formerr($err["format"]);
         ?>
 	</td>
 </tr>
@@ -75,7 +87,6 @@
                         "10" => "10 $newsitems");
        choose_from_menu ($options, "newsitems", "$form->newsitems", "");
        helpbutton("coursenewsitems", get_string("newsitemsnumber"));
-       formerr($err["newsitems"]);
     ?>
     </td>
 </tr>
@@ -84,35 +95,69 @@
 	<td><?
            print_date_selector("startday", "startmonth", "startyear", $form->startdate);
            helpbutton("coursestartdate", get_string("startdate"));
-	       formerr($err["startdate"]);
 	?></td>
 </tr>
 <tr valign=top>
 	<td><P><? print_string("numberweeks") ?>:</td>
 	<td><?
-           for ($i=1; $i<=20; $i++) {
+           for ($i=1; $i<=52; $i++) {
               $sectionmenu[$i] = "$i";
            }
-           choose_from_menu ($sectionmenu, "numsections", "$form->numsections");
+           choose_from_menu ($sectionmenu, "numsections", "$form->numsections", "");
            helpbutton("coursenumsections", get_string("numberweeks"));
-	       formerr($err["numsections"]);
 	?></td>
 </tr>
+<tr valign=top>
+	<td><P><? print_string("showrecent") ?>:</td>
+	<td><?
+    unset($choices);
+    $choices["0"] = get_string("no");
+    $choices["1"] = get_string("yes");
+    choose_from_menu ($choices, "showrecent", $form->showrecent, "");
+    helpbutton("courserecent", get_string("recentactivity")); ?>
+	</td>
+</tr>
+<tr valign=top>
+	<td><P><? print_string("showgrades") ?>:</td>
+	<td><?
+    unset($choices);
+    $choices["0"] = get_string("no");
+    $choices["1"] = get_string("yes");
+    choose_from_menu ($choices, "showgrades", $form->showgrades, "");
+    helpbutton("coursegrades", get_string("grades")); ?>
+	</td>
+</tr>
 <tr valign=top>
 	<td><P><? print_string("wordforteacher") ?>:</td>
-	<td><input type="text" name="teacher" size=25 value="<? p($form->teacher) ?>">
-	(<? print_string("wordforteachereg") ?>) <? formerr($err["teacher"]) ?>
+	<td><input type="text" name="teacher" maxlength="100" size=25 value="<? p($form->teacher) ?>">
+	(<? print_string("wordforteachereg") ?>) 
+    <? if (isset($err["teacher"])) formerr($err["teacher"]); ?>
+	</td>
+</tr>
+<tr valign=top>
+	<td><P><? print_string("wordforteachers") ?>:</td>
+	<td><input type="text" name="teachers" maxlength="100" size=25 value="<? p($form->teachers) ?>">
+	(<? print_string("wordforteacherseg") ?>)
+    <? if (isset($err["teachers"])) formerr($err["teachers"]); ?>
 	</td>
 </tr>
 <tr valign=top>
 	<td><P><? print_string("wordforstudent") ?>:</td>
-	<td><input type="text" name="student" size=25 value="<? p($form->student) ?>">
-	(<? print_string("wordforstudenteg") ?>) <? formerr($err["student"]) ?>
+	<td><input type="text" name="student" maxlength="100" size=25 value="<? p($form->student) ?>">
+	(<? print_string("wordforstudenteg") ?>) 
+    <? if (isset($err["student"])) formerr($err["student"]); ?>
+	</td>
+</tr>
+<tr valign=top>
+	<td><P><? print_string("wordforstudents") ?>:</td>
+	<td><input type="text" name="students" maxlength="100" size=25 value="<? p($form->students) ?>">
+	(<? print_string("wordforstudentseg") ?>) 
+    <? if (isset($err["students"])) formerr($err["students"]); ?>
 	</td>
 </tr>
 <tr>
 	<td></td>
 	<td><input type="submit" value="<? print_string("savechanges") ?>"></td>
 </TABLE>
-<INPUT type="hidden" name="id" value="<?=$course->id ?>">
+<INPUT type="hidden" name="id" value="<?=$form->id ?>">
 </FORM>

course/edit.php

@@ -1,39 +1,41 @@
 <?PHP // $Id$
       // Edit course settings
 
-	require("../config.php");
-	require("lib.php");
+	require_once("../config.php");
+	require_once("lib.php");
 
     optional_variable($id, 0);   // course id
+    optional_variable($category, 0);   // category id
+
+    require_login();
 
     if ($id) {
         if (! $course = get_record("course", "id", $id)) {
             error("Course ID was incorrect");
         }
 
-	    require_login($course->id);
-
-        if (!isteacher($course->id)) {
-            error("Only teachers can edit the course!");
+        if (!isteacheredit($course->id)) {
+            error("You do not currently have editing privileges!");
         }
     } else {  // Admin is creating a new course
-        require_login();
 
-        if (!isadmin()) {
-            error("Only administrators can use this page");
+        if (!iscreator()) {
+            error("You do not currently have course creation privileges!");
         }
+
+        $course = NULL;
     }
 
     if (! $site = get_site()) {
-        redirect("$CFG->wwwroot/admin/");
+        redirect("$CFG->wwwroot/$CFG->admin/index.php");
     }
 
 
+
+
 /// If data submitted, then process and store.
 
-	if (match_referer() && isset($HTTP_POST_VARS)) {
-
-        $form = (object)$HTTP_POST_VARS;
+	if ($form = data_submitted()) {
 
         $form->startdate = make_timestamp($form->startyear, $form->startmonth, $form->startday);
 
@@ -43,9 +45,10 @@
 
             $form->timemodified = time();
 
-            if ($course) {
+            if (!empty($course)) {
                 if (update_record("course", $form)) {
                     add_to_log($course->id, "course", "update", "edit.php?id=$id", "");
+                    fix_course_sortorder($form->category);
 		            redirect("view.php?id=$course->id", get_string("changessaved"));
                 } else {
                     error("Serious Error! Could not update the course record! (id = $form->id)");
@@ -53,14 +56,36 @@
             } else {
                 $form->timecreated = time();
 
-                if ($newid = insert_record("course", $form)) {  // Set up new course
-                    $section->course = $newid;   // Create a default section.
+                if ($newcourseid = insert_record("course", $form)) {  // Set up new course
+                    $section = NULL;
+                    $section->course = $newcourseid;   // Create a default section.
                     $section->section = 0;
-                    $section->timemodified = time();
                     $section->id = insert_record("course_sections", $section);
 
-                    add_to_log($newid, "course", "new", "view.php?id=$newid", "");
-		            redirect("teacher.php?id=$newid", get_string("changessaved"));
+                    fix_course_sortorder($form->category);
+                    add_to_log($newcourseid, "course", "new", "view.php?id=$newcourseid", "");
+
+                    if (isadmin()) { // Redirect admin to add teachers
+                        redirect("teacher.php?id=$newcourseid", get_string("changessaved"));
+
+                    } else {         // Add current teacher and send to course
+                        
+                        $newteacher = NULL;
+                        $newteacher->userid = $USER->id;
+                        $newteacher->course = $newcourseid;
+                        $newteacher->authority = 1;   // First teacher is the main teacher
+                        $newteacher->editall = 1;     // Course creator can edit their own course
+
+                        if (!$newteacher->id = insert_record("user_teachers", $newteacher)) {
+                            error("Could not add you to this new course!");
+                        }
+
+                        $USER->teacher[$newcourseid] = true;
+                        $USER->teacheredit[$newcourseid] = true;
+
+                        redirect("view.php?id=$newcourseid", get_string("changessaved"));
+                    }
+
                 } else {
                     error("Serious Error! Could not create the new course!");
                 }
@@ -76,24 +101,43 @@
 
 /// Otherwise fill and print the form.
 
-    if (!$form) {
-        if ($course) {
+    if (empty($form)) {
+        if (!empty($course)) {
             $form = $course;
         } else {
             $form->startdate = time() + 3600 * 24;
             $form->fullname = get_string("defaultcoursefullname");
             $form->shortname = get_string("defaultcourseshortname");
-            $form->teacher = get_string("defaultcourseteacher");
-            $form->student = get_string("defaultcoursestudent");
             $form->summary = get_string("defaultcoursesummary");
             $form->format = "weeks";
+            $form->password = "";
+            $form->guest = 0;
             $form->numsections = 10;
             $form->newsitems = 5;
-            $form->category = 1;
+            $form->showrecent = 1;
+            $form->category = $category;
+            $form->id = "";
+            $form->visible = 1;
+
+            if (current_language() == $CFG->lang) {
+                $form->teacher  = $site->teacher;
+                $form->teachers = $site->teachers;
+                $form->student  = $site->student;
+                $form->students = $site->students;
+            } else {
+                $form->teacher = get_string("defaultcourseteacher");
+                $form->teachers = get_string("defaultcourseteachers");
+                $form->student = get_string("defaultcoursestudent");
+                $form->students = get_string("defaultcoursestudents");
+            }
         }
     }
 
-    $form->categories = get_records_sql_menu("SELECT id,name FROM course_categories");
+    if (empty($focus)) {
+        $focus = "";
+    }
+
+    $form->categories = get_records_select_menu("course_categories", "", "name", "id,name");
     
     $form->courseformats = array (
              "weeks"  => get_string("formatweeks"),
@@ -104,19 +148,20 @@
     $streditcoursesettings = get_string("editcoursesettings");
     $straddnewcourse = get_string("addnewcourse");
     $stradministration = get_string("administration");
+    $strcategories = get_string("categories");
 
-    if (isset($course)) {
+    if (!empty($course)) {
 	    print_header($streditcoursesettings, "$course->fullname", 
-                     "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> 
+                     "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> 
                       -> $streditcoursesettings", $focus);
     } else {
-        print_header("$site->shortname : $straddnewcourse", "$site->fullname",
-                     "<A HREF=\"$CFG->wwwroot/admin/\">$stradministration</A> 
-                      -> $straddnewcourse", $focus);
+        print_header("$site->shortname: $straddnewcourse", "$site->fullname",
+                     "<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> ".
+                     "<a href=\"index.php\">$strcategories</a> -> $straddnewcourse", $focus);
     }
 
-    print_simple_box_start("center", "", "$THEME->cellheading");
     print_heading($streditcoursesettings);
+    print_simple_box_start("center", "", "$THEME->cellheading");
 	include("edit.html");
     print_simple_box_end();
 
@@ -134,6 +179,20 @@ function validate_form($course, &$form, &$err) {
     if (empty($form->shortname))
         $err["shortname"] = get_string("missingshortname");
 
+    if ($foundcourses = get_records("course", "shortname", $form->shortname)) {
+        if (!empty($course->id)) {
+            unset($foundcourses[$course->id]);
+        }
+        if (!empty($foundcourses)) {
+            foreach ($foundcourses as $foundcourse) {
+                $foundcoursenames[] = $foundcourse->fullname;
+            }
+            $foundcoursenamestring = addslashes(implode(',', $foundcoursenames));
+
+            $err["shortname"] = get_string("shortnametaken", "", $foundcoursenamestring);
+        }
+    }
+
     if (empty($form->summary))
         $err["summary"] = get_string("missingsummary");
 

course/editsection.html

@@ -1,11 +1,35 @@
-<BLOCKQUOTE>
-<FORM name="form" method="post" action="editsection.php">
-<P><B><? print_string("summaryof", "", "$sectionname $form->section") ?></B></P>
-<TEXTAREA NAME=summary COLS=60 ROWS=4 WRAP=virtual><?=$form->summary ?></TEXTAREA>
-<P>
-<INPUT type="hidden" name=id value="<?=$form->id ?>">
-<INPUT type="submit" value="<? print_string("savechanges") ?>">
-<INPUT type="reset" value="<? print_string("revert") ?>">
-</P>
-</FORM>
-</BLOCKQUOTE>
+<center>
+<form name="theform" method="post" <?php echo $onsubmit ?> action="editsection.php">
+<table border=0 cellpadding=0 cellspacing=0>
+<tr>
+<td align=top>
+<p><b><?php print_string("summaryof", "", "$sectionname $form->section") ?></b></p>
+</td>
+<td align=top width=100>
+&nbsp;
+</td>
+<td align=top>
+<font size=-1>
+     <?php helpbutton("summaries", get_string("helpsummaries"), "moodle", true, true);
+        if ($usehtmleditor) { 
+           helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
+        } else {   
+           helpbutton("text", get_string("helptext"), "moodle", true, true);   
+        } 
+     ?>
+</font>
+</td>
+</tr></table>
+<?php print_textarea($usehtmleditor, 4, 60, 660, 200, "summary", $form->summary); ?>
+<p>
+<input type="hidden" name=id value="<?php echo $form->id ?>">
+<input type="submit" value="<?php print_string("savechanges") ?>">
+<input type="reset" value="<?php print_string("revert") ?>">
+</p>
+</form>
+</center>
+<?php 
+   if ($usehtmleditor) { 
+       print_richedit_javascript("theform", "summary", "yes");
+   }
+?>

course/editsection.php

@@ -1,11 +1,13 @@
 <?PHP // $Id$
       // Edit the introduction of a section
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     require_variable($id);    // Week ID
 
+    require_login();
+
     if (! $section = get_record("course_sections", "id", $id)) {
         error("Course section is incorrect");
     }
@@ -14,8 +16,6 @@
         error("Could not find the course!");
     }
 
-    require_login($course->id);
-    
     if (!isteacher($course->id)) {
         error("Only teachers can edit this!");
     }
@@ -23,11 +23,11 @@
 
 /// If data submitted, then process and store.
 
-    if (match_referer() && isset($HTTP_POST_VARS)) {
+    if ($form = data_submitted()) {
 
         $timenow = time();
 
-        if (! set_field("course_sections", "summary", $summary, "id", $section->id)) {
+        if (! set_field("course_sections", "summary", $form->summary, "id", $section->id)) {
             error("Could not update the summary!");
         }
 
@@ -39,14 +39,22 @@
 
 /// Otherwise fill and print the form.
 
-    if (! $form ) {
+    if (empty($form)) {
         $form = $section;
     }
 
+    if ($usehtmleditor = can_use_richtext_editor()) {
+        $onsubmit = "onsubmit=\"copyrichtext(theform.summary);\"";
+    } else {
+        $onsubmit = "";
+    }
+
     $sectionname = get_string("name$course->format");
     $stredit = get_string("edit", "", " $sectionname $section->section");
 
-    print_header($stredit, $stredit, "", "form.summary");
+	print_header("$course->shortname: $stredit", "$course->fullname", 
+                 "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> 
+                  -> $stredit", "form.summary");
 
     include("editsection.html");
 

course/enrol.html

@@ -1,42 +1,45 @@
-<CENTER>
-
-<table cellpadding=20>
-  <tr valign=top> 
+<table cellpadding="20" align="center">
+  <tr valign="top">
     <td>
-    <P ALIGN=CENTER>
-       <? if ($teacher) {
-              $teacher->fullname = "$teacher->firstname $teacher->lastname";
-              $teachername = "<A HREF=../user/view.php?id=$teacher->id&course=$site->id>$teacher->fullname</A>.";
+    <p align="center">
+       <?php
+          if ($teacher) {
+              $teachername = "<a href=\"../user/view.php?id=$teacher->id&course=$site->id\">".
+                             "$teacher->firstname $teacher->lastname</a>.";
           } else {
               $teachername = get_string("yourteacher", "", strtolower($course->teacher));
           }
           print_string("enrolmentkeyfrom", "", $teachername);
        ?>
-       </P>
+       </p>
     </td>
+
   </tr>
-  <tr valign=top> 
-    <td bgcolor="<?=$THEME->cellheading?>"> <CENTER><? formerr($errormsg) ?> </CENTER>
+  <tr valign=top>
+    <td class="generalbox" bgcolor="<?php p($THEME->cellheading)?>"><center><?php if (isset ($errormsg)) {formerr($errormsg);} ?></center>
       <form name="form" method="post" action="enrol.php">
         <table>
-          <tr> 
-            <td width=50% align=right><P><? print_string("enrolmentkey") ?>:</P></td>
-            <td width=50% > 
-              <input type="password" name="password" size=20 value="<? p($password) ?>" >
-              <input type="hidden" name="id" value="<? p($id) ?>" >
+          <tr>
+            <td width="50%" align="right"><p><?php print_string("enrolmentkey") ?>:</p></td>
+            <td width="50%">
+              <input type="password" name="password" size="20" value="<?php p($password) ?>" >
+              <input type="hidden" name="id" value="<?php p($id) ?>" >
             </td>
-          <tr> 
-            <td width=50%>&nbsp;</td>
-            <td width=50%> 
-              <table cellpadding=1 cellspacing=0><tr>
-              <td><input type=submit value="<? print_string("login") ?>"></form></td>
-              <td><form action="<?=$CFG->wwwroot?>/" method=post>
-                  <input type=submit value="<? print_string("cancel") ?>"></form></td>
-              </tr></table>
+          <tr>
+            <td width="50%">&nbsp;</td>
+            <td width="50%">
+              <table cellpadding="1" cellspacing="0" align="center">
+                <tr>
 
+                    <td><input type="submit" value="<?php print_string("login") ?>">&nbsp;&nbsp;</form></td>
+                    <td><form action="<?php p($CFG->wwwroot)?>/index.php" method=post>
+                        <input type="submit" value="<?php print_string("cancel") ?>"></form></td>
+                </tr>
+              </table>
             </td>
         </table>
     </td>
+
   </tr>
 </table>
 

course/enrol.php

@@ -1,25 +1,27 @@
 <?PHP // $Id$
       // Asks for a course pass key, once only, and enrols that user
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
+
+    require_variable($id);
 
     require_login();
-    require_variable($id);
 
     if (! $course = get_record("course", "id", $id) ) {
         error("That's an invalid course id");
     }
 
-    if (match_referer() && isset($HTTP_POST_VARS)) {    // form submitted
+    if ($form = data_submitted()) {
 
-        if ($password == $course->password) {
+        if ($form->password == $course->password) {
 
             if (isguest()) {
-                add_to_log($course->id, "course", "guest", "view.php?id=$course->id", "$REMOTE_ADDR, $REMOTE_HOST");
+                add_to_log($course->id, "course", "guest", "view.php?id=$course->id", $_SERVER['REMOTE_ADDR']);
 
-            } else {
-                if (! enrol_student_in_course($USER->id, $course->id)) {
+            } else if (!record_exists("user_students", "userid", $USER->id, "course", $course->id)) {
+
+                if (! enrol_student($USER->id, $course->id)) {
                     error("An error occurred while trying to enrol you.");
                 }
 
@@ -38,12 +40,10 @@
             }
 
             $USER->student["$id"] = true;
-            save_session("USER");
             
             if ($SESSION->wantsurl) {
                 $destination = $SESSION->wantsurl;
                 unset($SESSION->wantsurl);
-                save_session("SESSION");
             } else {
                 $destination = "$CFG->wwwroot/course/view.php?id=$id";
             }
@@ -55,42 +55,53 @@
         }
     }
 
+    $strloginto = get_string("loginto", "", $course->shortname);
+    $strcourses = get_string("courses");
 
     if (! $site = get_site()) {
         error("Could not find a site!");
     }
 
     if ($course->password == "") {   // no password, so enrol
-        
+
         if (isguest()) {
             add_to_log($course->id, "course", "guest", "view.php?id=$course->id", "$USER->id");
+
+        } else if (empty($confirm)) {
+
+            print_header($strloginto, $course->fullname, "<a href=\".\">$strcourses</a> -> $strloginto"); 
+            echo "<br />";
+            notice_yesno(get_string("enrolmentconfirmation"), "enrol.php?id=$course->id&confirm=1", $CFG->wwwroot);
+            print_footer();
+            exit;
+
         } else {
-            if (! enrol_student_in_course($USER->id, $course->id)) {
+
+            if (! enrol_student($USER->id, $course->id)) {
                 error("An error occurred while trying to enrol you.");
             }
             add_to_log($course->id, "course", "enrol", "view.php?id=$course->id", "$USER->id");
-        }
 
-        $USER->student["$id"] = true;
-        save_session("USER");
+            $USER->student["$id"] = true;
         
-        if ($SESSION->wantsurl) {
-            $destination = $SESSION->wantsurl;
-            unset($SESSION->wantsurl);
-            save_session("SESSION");
-        } else {
-            $destination = "$CFG->wwwroot/course/view.php?id=$id";
+            if ($SESSION->wantsurl) {
+                $destination = $SESSION->wantsurl;
+                unset($SESSION->wantsurl);
+            } else {
+                $destination = "$CFG->wwwroot/course/view.php?id=$id";
+            }
+    
+            redirect($destination);
         }
-
-        redirect($destination);
     }
 
     $teacher = get_teacher($course->id);
+    if (!isset($password)) {
+        $password = "";
+    }
 
-    $strloginto = get_string("loginto", "", $course->shortname);
-    $strcourses = get_string("courses");
 
-    print_header($strloginto, $strloginto, "<A HREF=\".\">$strcourses</A> -> $strloginto", "form.password"); 
+    print_header($strloginto, $course->fullname, "<A HREF=\".\">$strcourses</A> -> $strloginto", "form.password"); 
 
     print_course($course); 
 

course/format/social.php

@@ -0,0 +1,80 @@
+<?php  // $Id$
+    // social.php - course format featuring social forum
+    //              included from view.php
+    
+    require_once("$CFG->dirroot/mod/forum/lib.php");
+    require_once("$CFG->dirroot/mod/resource/lib.php");
+
+    $leftwidth = 210;
+?>
+
+<table width="100%" border="0" cellspacing="5" cellpadding="5">
+  <tr>
+    <td width="<?php echo $leftwidth?>" valign="top"> 
+      <?php 
+      $moddata[]="<a title=\"".get_string("listofallpeople")."\" href=\"../user/index.php?id=$course->id\">".get_string("participants")."</a>";
+      $modicon[]="<img src=\"$pixpath/i/users.gif\" height=16 width=16 alt=\"\">";
+      $editmyprofile = "<a title=\"$USER->firstname $USER->lastname\" href=\"../user/edit.php?id=$USER->id&course=$course->id\">".
+                        get_string("editmyprofile")."</A>";
+      if ($USER->description) {
+          $moddata[]= $editmyprofile;
+      } else {
+          $moddata[]= $editmyprofile." <blink>*</blink>";
+      }
+      $modicon[]="<img src=\"$pixpath/i/user.gif\" height=16 width=16 alt=\"\">";
+      print_side_block(get_string("people"), "", $moddata, $modicon, "", $leftwidth);
+
+      
+
+/// Then, print all the available resources (Section 0)
+      print_section_block(get_string("activities"), $course, $sections[0], 
+                          $mods, $modnames, $modnamesused, true, "100%");
+
+
+/// Print all the recent activity
+      // Print all the recent activity
+      if ($course->showrecent) {
+          print_side_block_start(get_string("recentactivity"), $leftwidth, "sideblockrecentactivity");
+          print_recent_activity($course);
+          print_side_block_end();
+      }
+
+
+/// Print a form to search forums
+      $searchform = forum_print_search_form($course, "", true);
+      $searchform = "<div align=\"center\">$searchform</div>";
+      print_side_block(get_string("search","forum"), $searchform, "", "", "", $leftwidth);
+
+/// Admin links and controls
+      print_course_admin_links($course);
+
+/// My courses
+      print_courses_sideblock(0, "$leftwidth");
+
+      echo "</td>";
+
+      echo "<td width=\"*\" valign=\"top\">";
+      if ($social = forum_get_course_forum($course->id, "social")) {
+          if (forum_is_subscribed($USER->id, $social->id)) {
+              $subtext = get_string("unsubscribe", "forum");
+          } else {
+              $subtext = get_string("subscribe", "forum");
+          }
+          $headertext = "<table border=0 width=100% cellpadding=0 cellspacing=0><tr><td>".
+                         get_string("socialheadline").
+                         "</td><td align=right><font size=1>".
+                         "<a href=\"../mod/forum/subscribe.php?id=$social->id\">$subtext</a></td>".
+                         "</tr></table>";
+          print_heading_block($headertext);
+          echo "<img alt=\"\" height=7 src=\"../pix/spacer.gif\"><br>";
+    
+          forum_print_latest_discussions($social->id, 10, "plain", "", false);
+
+      } else {
+          notify("Could not find or create a social forum here");
+      }
+      ?>
+    </td> 
+  </tr> 
+</table>
+

course/format/topics.php

@@ -0,0 +1,312 @@
+<?PHP // $Id$
+      // Display the whole course as "topics" made of of modules
+      // In fact, this is very similar to the "weeks" format, in that
+      // each "topic" is actually a week.  The main difference is that
+      // the dates aren't printed - it's just an aesthetic thing for 
+      // courses that aren't so rigidly defined by time.
+      // Included from "view.php"
+
+    require_once("$CFG->dirroot/mod/forum/lib.php");
+
+    if (isset($topic)) {
+        $displaysection = course_set_display($course->id, $topic);
+    } else {
+        if (isset($USER->display[$course->id])) {       // for admins, mostly
+            $displaysection = $USER->display[$course->id];
+        } else {
+            $displaysection = course_set_display($course->id, 0);
+        }
+    }
+
+    if (isteacher($course->id) and isset($marker)) {
+        $course->marker = $marker;
+        if (! set_field("course", "marker", $marker, "id", $course->id)) {
+            error("Could not mark that topic for this course");
+        }
+    }
+
+    if ($course->newsitems) {
+        $news = forum_get_course_forum($course->id, "news");
+    }
+
+    $streditsummary   = get_string("editsummary");
+    $stradd           = get_string("add");
+    $stractivities    = get_string("activities");
+    $strshowalltopics = get_string("showalltopics");
+    $strtopic         = get_string("topic");
+    if (isediting($course->id)) { 
+        $strstudents = moodle_strtolower($course->students);
+        $strtopichide = get_string("topichide", "", $strstudents);
+        $strtopicshow = get_string("topicshow", "", $strstudents);
+        $strmarkthistopic = get_string("markthistopic");
+        $strmarkedthistopic = get_string("markedthistopic");
+        $strmoveup = get_string("moveup");
+        $strmovedown = get_string("movedown");
+    }
+
+
+/// Layout the whole page as three big columns.
+    echo "<table border=0 cellpadding=3 cellspacing=0 width=100%>";
+
+/// The left column ...
+
+    echo "<tr valign=top><td valign=top width=180>";
+    
+/// Links to people
+    $moddata[]="<a title=\"".get_string("listofallpeople")."\" href=\"../user/index.php?id=$course->id\">".get_string("participants")."</a>";
+    $modicon[]="<img src=\"$pixpath/i/users.gif\" height=16 width=16 alt=\"\">";
+    $editmyprofile = "<a title=\"$USER->firstname $USER->lastname\" href=\"../user/edit.php?id=$USER->id&course=$course->id\">".get_string("editmyprofile")."</a>";
+    if ($USER->description) {
+        $moddata[]= $editmyprofile;
+    } else {
+        $moddata[]= $editmyprofile." <blink>*</blink>";
+    }
+    $modicon[]="<img src=\"$pixpath/i/user.gif\" height=16 width=16 alt=\"\">";
+    print_side_block(get_string("people"), "", $moddata, $modicon);
+
+
+/// Links to all activity modules by type
+    $moddata = array();
+    $modicon = array();
+    if ($modnamesused) {
+        foreach ($modnamesused as $modname => $modfullname) {
+            $moddata[] = "<a href=\"../mod/$modname/index.php?id=$course->id\">".$modnamesplural[$modname]."</a>";
+            $modicon[] = "<img src=\"$modpixpath/$modname/icon.gif\" height=16 width=16 alt=\"\">";
+        }
+    }
+    print_side_block($stractivities, "", $moddata, $modicon);
+
+/// Print a form to search forums
+    $searchform = forum_print_search_form($course, "", true);
+    $searchform = "<div align=\"center\">$searchform</div>";
+    print_side_block(get_string("search","forum"), $searchform);
+
+/// Admin links and controls
+    print_course_admin_links($course);
+
+/// My courses
+    print_courses_sideblock(0, "180");
+
+/// Start main column
+    echo "</td><td width=\"*\">";
+
+    print_heading_block(get_string("topicoutline"), "100%", "outlineheadingblock");
+    print_spacer(8, 1, true);
+
+    echo "<table class=\"topicsoutline\" border=\"0\" cellpadding=\"8\" cellspacing=\"0\" width=\"100%\">";
+
+/// If currently moving a file then show the current clipboard
+    if (ismoving($course->id)) {
+        $stractivityclipboard = get_string("activityclipboard", "", addslashes($USER->activitycopyname));
+        $strcancel= get_string("cancel");
+        echo "<tr>";
+        echo "<td colspan=3 valign=top bgcolor=\"$THEME->cellcontent\" class=\"topicoutlineclip\" width=\"100%\">";
+        echo "<p><font size=2>";
+        echo "$stractivityclipboard&nbsp;&nbsp;(<a href=\"mod.php?cancelcopy=true\">$strcancel</a>)";
+        echo "</font></p>";
+        echo "</td>";
+        echo "</tr>";
+        echo "<tr><td colspan=3><img src=\"../pix/spacer.gif\" width=1 height=1></td></tr>";
+    }
+
+
+/// Print Section 0 
+
+    $section = 0;
+    $thissection = $sections[$section];
+
+    if ($thissection->summary or $thissection->sequence or isediting($course->id)) {
+        echo "<tr>";
+        echo "<td nowrap bgcolor=\"$THEME->cellheading\" class=\"topicsoutlineside\" valign=top width=20>&nbsp;</td>";
+        echo "<td valign=top bgcolor=\"$THEME->cellcontent\" class=\"topicsoutlinecontent\" width=\"100%\">";
+    
+        if (isediting($course->id)) {
+            $thissection->summary .= " <a title=\"$streditsummary\" ".
+                                     "href=\"editsection.php?id=$thissection->id\"><img src=\"$pixpath/t/edit.gif\" ".
+                                     "height=11 width=11 border=0 alt=\"$streditsummary\"></a></p>";
+        }
+    
+        echo text_to_html($thissection->summary);
+    
+        print_section($course, $thissection, $mods, $modnamesused);
+    
+        if (isediting($course->id)) {
+            echo "<div align=right>";
+            popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$section&add=", 
+                        $modnames, "section$section", "", "$stradd...", "mods", $stractivities);
+            echo "</div>";
+        }
+    
+        echo "</td>";
+        echo "<td nowrap bgcolor=\"$THEME->cellheading\" class=\"topicsoutlineside\" valign=top align=center width=10>";
+        echo "&nbsp;</td></tr>";
+        echo "<tr><td colspan=3><img src=\"../pix/spacer.gif\" width=1 height=1></td></tr>";
+    }
+
+
+/// Now all the normal modules by topic
+/// Everything below uses "section" terminology - each "section" is a topic.
+
+    $timenow = time();
+    $section = 1;
+    $sectionmenu = array();
+
+    while ($section <= $course->numsections) {
+
+        if (!empty($displaysection) and $displaysection != $section) {
+            if (empty($sections[$section])) {
+                $strsummary = "";
+            } else {
+                $strsummary = " - ".strip_tags($sections[$section]->summary);
+                if (strlen($strsummary) < 57) {
+                    $strsummary = " - $strsummary";
+                } else {
+                    $strsummary = " - ".substr($strsummary, 0, 60)."...";
+                }
+            }
+            $sectionmenu["topic=$section"] = s("$section$strsummary");
+            $section++;
+            continue;
+        }
+
+        if (!empty($sections[$section])) {
+            $thissection = $sections[$section];
+
+        } else {
+            unset($thissection);
+            $thissection->course = $course->id;   // Create a new section structure
+            $thissection->section = $section;
+            $thissection->summary = "";
+            $thissection->visible = 1;
+            if (!$thissection->id = insert_record("course_sections", $thissection)) {
+                notify("Error inserting new topic!");
+            }
+        }
+
+        $currenttopic = ($course->marker == $section);
+
+        if (!$thissection->visible) {
+            $colorsides = "bgcolor=\"$THEME->hidden\" class=\"topicsoutlinesidehidden\"";
+            $colormain  = "bgcolor=\"$THEME->cellcontent\" class=\"topicsoutlinecontenthidden\"";
+        } else if ($currenttopic) {
+            $colorsides = "bgcolor=\"$THEME->cellheading2\" class=\"topicsoutlinesidehighlight\"";
+            $colormain  = "bgcolor=\"$THEME->cellcontent\" class=\"topicsoutlinecontenthighlight\"";
+        } else {
+            $colorsides = "bgcolor=\"$THEME->cellheading\" class=\"topicsoutlineside\"";
+            $colormain  = "bgcolor=\"$THEME->cellcontent\" class=\"topicsoutlinecontent\"";
+        }
+
+        echo "<tr>";
+        echo "<td nowrap $colorsides valign=top width=20>";
+        echo "<p align=center><font size=3><b>$section</b></font></p>";
+        echo "</td>";
+    
+        if (!isteacher($course->id) and !$thissection->visible) {   // Hidden for students
+            echo "<td valign=top align=center $colormain width=\"100%\">";
+            echo get_string("notavailable");
+            echo "</td>";
+
+        } else {
+            echo "<td valign=top $colormain width=\"100%\">";
+
+            if (isediting($course->id)) {
+                $thissection->summary .= " <a title=\"$streditsummary\" href=editsection.php?id=$thissection->id>".
+                     "<img src=\"$pixpath/t/edit.gif\" border=0 height=11 width=11></a>";
+            }
+    
+            echo text_to_html($thissection->summary);
+    
+            print_section($course, $thissection, $mods, $modnamesused);
+    
+            if (isediting($course->id)) {
+                echo "<div align=right>";
+                popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$section&add=", 
+                            $modnames, "section$section", "", "$stradd...");
+                echo "</div>";
+            }
+    
+            echo "</td>";
+        }
+        echo "<td nowrap $colorsides valign=top align=center width=10>";
+        echo "<font size=1>";
+
+        if ($displaysection == $section) {      // Show the zoom boxes
+            echo "<a href=\"view.php?id=$course->id&topic=all\" title=\"$strshowalltopics\">".
+                 "<img src=\"$pixpath/i/all.gif\" height=25 width=16 border=0></a><br />";
+        } else {
+            $strshowonlytopic = get_string("showonlytopic", "", $section);
+            echo "<a href=\"view.php?id=$course->id&topic=$section\" title=\"$strshowonlytopic\">".
+                 "<img src=\"$pixpath/i/one.gif\" height=16 width=16 border=0></a><br />";
+        }
+
+        if (isediting($course->id)) {
+            if ($course->marker == $section) {  // Show the "light globe" on/off
+                echo "<a href=\"view.php?id=$course->id&marker=0\" title=\"$strmarkedthistopic\">".
+                     "<img src=\"$pixpath/i/marked.gif\" vspace=3 height=16 width=16 border=0></a><br />";
+            } else {
+                echo "<a href=\"view.php?id=$course->id&marker=$section\" title=\"$strmarkthistopic\">".
+                     "<img src=\"$pixpath/i/marker.gif\" vspace=3 height=16 width=16 border=0></a><br />";
+            }
+
+            if ($thissection->visible) {        // Show the hide/show eye
+                echo "<a href=\"view.php?id=$course->id&hide=$section\" title=\"$strtopichide\">".
+                     "<img src=\"$pixpath/i/hide.gif\" vspace=3 height=16 width=16 border=0></a><br />";
+            } else {
+                echo "<a href=\"view.php?id=$course->id&show=$section\" title=\"$strtopicshow\">".
+                     "<img src=\"$pixpath/i/show.gif\" vspace=3 height=16 width=16 border=0></a><br />";
+            }
+
+            if ($section > 1) {                       // Add a arrow to move section up
+                echo "<a href=\"view.php?id=$course->id&section=$section&move=-1\" title=\"$strmoveup\">".
+                     "<img src=\"$pixpath/t/up.gif\" vspace=3 height=11 width=11 border=0></a><br />";
+            }
+
+            if ($section < $course->numsections) {    // Add a arrow to move section down
+                echo "<a href=\"view.php?id=$course->id&section=$section&move=1\" title=\"$strmovedown\">".
+                     "<img src=\"$pixpath/t/down.gif\" vspace=3 height=11 width=11 border=0></a><br />";
+            }
+
+        }
+
+        echo "</td>";
+        echo "</tr>";
+        echo "<tr><td colspan=3><img src=\"../pix/spacer.gif\" width=1 height=1></td></tr>";
+
+        $section++;
+    }
+    echo "</table>";
+
+    if (!empty($sectionmenu)) {
+        echo "<center>";
+        echo popup_form("$CFG->wwwroot/course/view.php?id=$course->id&", $sectionmenu, 
+                   "sectionmenu", "", get_string("jumpto"), "", "", true);
+        echo "</center>";
+    }
+    
+
+    if ($news or $course->showrecent) {
+        echo "</td><td width=210>";
+
+        /// Print all the news items.
+
+        if ($news) {
+            print_side_block_start(get_string("latestnews"), 210, "sideblocklatestnews");
+            echo "<font size=\"-2\">";
+            forum_print_latest_discussions($news->id, $course->newsitems, "minimal", "", false);
+            echo "</font>";
+            print_side_block_end();
+        }
+        
+        // Print all the recent activity
+        if ($course->showrecent) {
+            print_side_block_start(get_string("recentactivity"), 210, "sideblockrecentactivity");
+            print_recent_activity($course);
+            print_side_block_end();
+        }
+    
+        print_spacer(1, 120, true);
+    }
+
+    echo "</td></tr></table>\n";
+
+?>

course/format/weeks.php

@@ -0,0 +1,294 @@
+<?PHP // $Id$
+      // Display the whole course as "weeks" made of of modules
+      // Included from "view.php"
+
+    require_once("$CFG->dirroot/mod/forum/lib.php");
+
+
+    if (isset($week)) {
+        $displaysection = course_set_display($course->id, $week);
+    } else {
+        if (isset($USER->display[$course->id])) {
+            $displaysection = $USER->display[$course->id];
+        } else {
+            $displaysection = course_set_display($course->id, 0);
+        }
+    }
+
+    if ($course->newsitems) {
+        $news = forum_get_course_forum($course->id, "news");
+    }
+    
+    $streditsummary  = get_string("editsummary");
+    $stradd          = get_string("add");
+    $stractivities   = get_string("activities");
+    $strshowallweeks = get_string("showallweeks");
+    $strweek         = get_string("week");
+    if (isediting($course->id)) {
+        $strstudents = moodle_strtolower($course->students);
+        $strweekhide = get_string("weekhide", "", $strstudents);
+        $strweekshow = get_string("weekshow", "", $strstudents);
+        $strmoveup = get_string("moveup");
+        $strmovedown = get_string("movedown");
+    }
+
+
+/// Layout the whole page as three big columns.
+    echo "<table border=0 cellpadding=3 cellspacing=0 width=100%>";
+
+/// The left column ...
+
+    echo "<tr valign=top><td valign=top width=180>";
+
+/// Links to people
+    $moddata[]="<a title=\"".get_string("listofallpeople")."\" href=\"../user/index.php?id=$course->id\">".get_string("participants")."</a>";
+    $modicon[]="<img src=\"$pixpath/i/users.gif\" height=16 width=16 alt=\"\">";
+    $editmyprofile = "<a title=\"$USER->firstname $USER->lastname\" href=\"../user/edit.php?id=$USER->id&course=$course->id\">".get_string("editmyprofile")."</a>";
+    if ($USER->description) {
+        $moddata[]= $editmyprofile;
+    } else {
+        $moddata[]= $editmyprofile." <blink>*</blink>";
+    }
+    $modicon[]="<img src=\"$pixpath/i/user.gif\" height=16 width=16 alt=\"\">";
+    print_side_block(get_string("people"), "", $moddata, $modicon);
+
+
+/// Then all the links to activities by type
+    $moddata = array();
+    $modicon = array();
+    if ($modnamesused) {
+        foreach ($modnamesused as $modname => $modfullname) {
+            $moddata[] = "<a href=\"../mod/$modname/index.php?id=$course->id\">".$modnamesplural[$modname]."</a>";
+            $modicon[] = "<img src=\"$modpixpath/$modname/icon.gif\" height=16 width=16 alt=\"\">";
+        }
+    }
+    print_side_block($stractivities, "", $moddata, $modicon);
+
+/// Print a form to search forums
+    $searchform = forum_print_search_form($course, "", true);
+    $searchform = "<div align=\"center\">$searchform</div>";
+    print_side_block(get_string("search","forum"), $searchform);
+    
+
+/// Admin links and controls
+    print_course_admin_links($course);
+
+/// My courses
+    print_courses_sideblock(0, "180");
+
+/// Start main column
+    echo "</td><td width=\"*\">";
+    print_heading_block(get_string("weeklyoutline"), "100%", "outlineheadingblock");
+    print_spacer(8, 1, true);
+
+    echo "<table class=\"weeklyoutline\" border=\"0\" cellpadding=\"8\" cellspacing=\"0\" width=\"100%\">";
+
+/// If currently moving a file then show the current clipboard
+    if (ismoving($course->id)) {
+        $stractivityclipboard = get_string("activityclipboard", "", addslashes($USER->activitycopyname));
+        $strcancel= get_string("cancel");
+        echo "<tr>";
+        echo "<td colspan=3 valign=top bgcolor=\"$THEME->cellcontent\" class=\"weeklyoutlineclip\" width=\"100%\">";
+        echo "<p><font size=2>";
+        echo "$stractivityclipboard&nbsp;&nbsp;(<a href=\"mod.php?cancelcopy=true\">$strcancel</a>)";
+        echo "</font></p>";
+        echo "</td>";
+        echo "</tr>";
+        echo "<tr><td colspan=3><img src=\"../pix/spacer.gif\" width=1 height=1></td></tr>";
+    }
+
+/// Print Section 0 with general activities
+
+    $section = 0;
+    $thissection = $sections[$section];
+
+    if ($thissection->summary or $thissection->sequence or isediting($course->id)) {
+        echo "<tr>";
+        echo "<td nowrap bgcolor=\"$THEME->cellheading\" class=\"weeklyoutlineside\" valign=top width=20>&nbsp;</td>";
+        echo "<td valign=top bgcolor=\"$THEME->cellcontent\" class=\"weeklyoutlinecontent\" width=\"100%\">";
+
+        if (isediting($course->id)) {
+            $thissection->summary .= " <a title=\"$streditsummary\" ".
+                                  "href=\"editsection.php?id=$thissection->id\"><img height=11 width=11 src=\"$pixpath/t/edit.gif\" ".
+                                  "border=0 alt=\"$streditsummary\"></a></p>";
+        }
+    
+        echo text_to_html($thissection->summary);
+    
+        print_section($course, $thissection, $mods, $modnamesused);
+
+        if (isediting($course->id)) {
+            echo "<div align=right>";
+            popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$section&add=", 
+                        $modnames, "section$section", "", "$stradd...", "mods", $stractivities);
+            echo "</div>";
+        }
+
+        echo "</td>";
+        echo "<td nowrap bgcolor=\"$THEME->cellheading\" class=\"weeklyoutlineside\" valign=top align=center width=10>";
+        echo "&nbsp;</td></tr>";
+        echo "<tr><td colspan=3><img src=\"../pix/spacer.gif\" width=1 height=1></td></tr>";
+    }
+
+
+/// Now all the weekly sections
+    $timenow = time();
+    $weekdate = $course->startdate;    // this should be 0:00 Monday of that week
+    $weekdate += 7200;                 // Add two hours to avoid possible DST problems
+    $section = 1;
+    $sectionmenu = array();
+    $weekofseconds = 604800;
+    $course->enddate = $course->startdate + ($weekofseconds * $course->numsections);
+
+    $strftimedateshort = " ".get_string("strftimedateshort");
+
+    while ($weekdate < $course->enddate) {
+
+        $nextweekdate = $weekdate + ($weekofseconds);
+        $weekday = userdate($weekdate, $strftimedateshort);
+        $endweekday = userdate($weekdate+518400, $strftimedateshort);
+
+        if (!empty($displaysection) and $displaysection != $section) {  // Check this week is visible
+            $sectionmenu["week=$section"] = s("$strweek $section |     $weekday - $endweekday");
+            $section++;
+            $weekdate = $nextweekdate;
+            continue;
+        }
+
+        if (!empty($sections[$section])) {
+            $thissection = $sections[$section];
+
+        } else {
+            unset($thissection);
+            $thissection->course = $course->id;   // Create a new week structure
+            $thissection->section = $section;
+            $thissection->summary = "";
+            $thissection->visible = 1;
+            if (!$thissection->id = insert_record("course_sections", $thissection)) {
+                notify("Error inserting new week!");
+            }
+        }
+
+        $currentweek = (($weekdate <= $timenow) && ($timenow < $nextweekdate));
+
+        if (!$thissection->visible) {
+            $colorsides = "bgcolor=\"$THEME->hidden\" class=\"weeklyoutlinesidehidden\"";
+            $colormain  = "bgcolor=\"$THEME->cellcontent\" class=\"weeklyoutlinecontenthidden\"";
+        } else if ($currentweek) {
+            $colorsides = "bgcolor=\"$THEME->cellheading2\" class=\"weeklyoutlinesidehighlight\"";
+            $colormain  = "bgcolor=\"$THEME->cellcontent\" class=\"weeklyoutlinecontenthighlight\"";
+        } else {
+            $colorsides = "bgcolor=\"$THEME->cellheading\" class=\"weeklyoutlineside\"";
+            $colormain  = "bgcolor=\"$THEME->cellcontent\" class=\"weeklyoutlinecontent\"";
+        }
+
+        echo "<tr>";
+        echo "<td nowrap $colorsides valign=top width=20>";
+        echo "<p align=center><font size=3><b>$section</b></font></p>";
+        echo "</td>";
+
+        echo "<td valign=top $colormain width=\"100%\">";
+
+        if (!isteacher($course->id) and !$thissection->visible) {   // Hidden for students
+            echo "<p class=\"weeklydatetext\">$weekday - $endweekday ";
+            echo "(".get_string("notavailable").")";
+            echo "</p>";
+            echo "</td>";
+
+        } else {
+
+            echo "<p class=\"weeklydatetext\">$weekday - $endweekday</p>";
+
+            if (isediting($course->id)) {
+                $thissection->summary .= " <a title=\"$streditsummary\" href=\"editsection.php?id=$thissection->id\">".
+                      "<img src=\"$pixpath/t/edit.gif\" height=11 width=11 border=0></a></p>";
+            }
+
+            echo text_to_html($thissection->summary);
+
+            print_section($course, $thissection, $mods, $modnamesused);
+
+            if (isediting($course->id)) {
+                echo "<div align=right>";
+                popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&amp;section=$section&add=", 
+                            $modnames, "section$section", "", "$stradd...");
+                echo "</div>";
+            }
+
+            echo "</td>";
+        }   
+        echo "<td nowrap $colorsides valign=top align=center width=10>";
+        echo "<font size=1>";
+
+        if ($displaysection == $section) { 
+            echo "<a href=\"view.php?id=$course->id&week=all\" title=\"$strshowallweeks\">".
+                 "<img src=\"$pixpath/i/all.gif\" height=25 width=16 border=0></a><br />";
+        } else {
+            $strshowonlyweek = get_string("showonlyweek", "", $section);
+            echo "<a href=\"view.php?id=$course->id&week=$section\" title=\"$strshowonlyweek\">".
+                 "<img src=\"$pixpath/i/one.gif\" height=16 width=16 border=0></a><br />";
+        }
+
+        if (isediting($course->id)) {
+            if ($thissection->visible) {        // Show the hide/show eye
+                echo "<a href=\"view.php?id=$course->id&hide=$section\" title=\"$strweekhide\">".
+                     "<img src=\"$pixpath/i/hide.gif\" vspace=3 height=16 width=16 border=0></a><br />";
+            } else {
+                echo "<a href=\"view.php?id=$course->id&show=$section\" title=\"$strweekshow\">".
+                     "<img src=\"$pixpath/i/show.gif\" vspace=3 height=16 width=16 border=0></a><br />";
+            }
+
+            if ($section > 1) {                       // Add a arrow to move section up
+                echo "<a href=\"view.php?id=$course->id&section=$section&move=-1\" title=\"$strmoveup\">".
+                     "<img src=\"$pixpath/t/up.gif\" vspace=3 height=11 width=11 border=0></a><br />";
+            }
+
+            if ($section < $course->numsections) {    // Add a arrow to move section down
+                echo "<a href=\"view.php?id=$course->id&section=$section&move=1\" title=\"$strmovedown\">".
+                     "<img src=\"$pixpath/t/down.gif\" vspace=3 height=11 width=11 border=0></a><br />";
+            }
+
+        }
+
+        echo "</td>";
+        echo "</tr>";
+        echo "<tr><td colspan=3><img src=\"../pix/spacer.gif\" width=1 height=1></td></tr>";
+
+        $section++;
+        $weekdate = $nextweekdate;
+    }
+    echo "</table>";
+
+    if (!empty($sectionmenu)) {
+        echo "<center>";
+        echo popup_form("$CFG->wwwroot/course/view.php?id=$course->id&", $sectionmenu, 
+                   "sectionmenu", "", get_string("jumpto"), "", "", true);
+        echo "</center>";
+    }
+    
+    if (!empty($news) or !empty($course->showrecent)) {
+        echo "</td><td width=210>";
+
+        // Print all the news items.
+
+        if (!empty($news)) {
+            print_side_block_start(get_string("latestnews"), 210, "sideblocklatestnews");
+            echo "<font size=\"-2\">";
+            forum_print_latest_discussions($news->id, $course->newsitems, "minimal", "", false);
+            echo "</font>";
+            print_side_block_end();
+        }
+        
+        // Print all the recent activity
+        if (!empty($course->showrecent)) {
+            print_side_block_start(get_string("recentactivity"), 210, "sideblockrecentactivity");
+            print_recent_activity($course);
+            print_side_block_end();
+        }
+    
+        print_spacer(1, 120, true);
+    }
+
+    echo "</td></tr></table>\n";
+
+?>

course/grade.php

@@ -0,0 +1,107 @@
+<?PHP // $Id$
+      // Displays all grades for a student in a course
+
+	require_once("../config.php");
+	require_once("lib.php");
+
+    require_variable($id);              // course id
+
+    if (! $course = get_record("course", "id", $id)) {
+        error("Course ID was incorrect");
+    }
+
+	require_login($course->id);
+
+    $strgrades = get_string("grades");
+    $strgrade = get_string("grade");
+    $strmax = get_string("maximumshort");
+    $stractivityreport = get_string("activityreport");
+
+
+/// Get a list of all students
+
+    $columnhtml = array();  // Accumulate column html in this array.
+    $grades = array();      // Collect all grades in this array
+    $maxgrades = array();   // Collect all max grades in this array
+    $totalgrade = 0;
+    $totalmaxgrade = 0;
+
+
+/// Collect modules data
+    get_all_mods($course->id, $mods, $modnames, $modnamesplural, $modnamesused);
+
+
+/// Search through all the modules, pulling out grade data
+    $sections = get_all_sections($course->id); // Sort everything the same as the course
+    for ($i=0; $i<=$course->numsections; $i++) {
+        if (isset($sections[$i])) {   // should always be true
+            $section = $sections[$i];
+            if (!empty($section->sequence)) {
+                $sectionmods = explode(",", $section->sequence);
+                foreach ($sectionmods as $sectionmod) {
+                    $mod = $mods[$sectionmod];
+                    if ($mod->visible) {
+                        $instance = get_record("$mod->modname", "id", "$mod->instance");
+                        $libfile = "$CFG->dirroot/mod/$mod->modname/lib.php";
+                        if (file_exists($libfile)) {
+                            require_once($libfile);
+                            $gradefunction = $mod->modname."_grades";
+                            if (function_exists($gradefunction)) {   // Skip modules without grade function
+                                if ($modgrades = $gradefunction($mod->instance)) {
+
+                                    $image = "<A HREF=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\"".
+                                             "   TITLE=\"$mod->modfullname\">".
+                                             "<IMG BORDER=0 VALIGN=absmiddle SRC=\"../mod/$mod->modname/icon.gif\" ".
+                                             "HEIGHT=16 WIDTH=16 ALT=\"$mod->modfullname\"></A>";
+                                    $columnhtml[] = "$image ".
+                                                 "<A HREF=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\">".
+                                                 "$instance->name".
+                                                 "</A>";
+        
+                                    if (empty($modgrades->grades[$USER->id])) {
+                                        $grades[]  = "";
+                                    } else {
+                                        $grades[]  = $modgrades->grades[$USER->id];
+                                        $totalgrade += (float)$modgrades->grades[$USER->id];
+                                    }
+    
+                                    if (empty($modgrades->maxgrade)) {
+                                        $maxgrades[] = "";
+                                    } else {
+                                        $maxgrades[]    = $modgrades->maxgrade;
+                                        $totalmaxgrade += $modgrades->maxgrade;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    } 
+
+
+/// OK, we have all the data, now present it to the user
+
+    print_header("$course->shortname: $strgrades", "$course->fullname", 
+                 "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> 
+                  -> $strgrades");
+    
+    print_heading($strgrades);
+
+    $table->head  = array( get_string("activity"), get_string("maximumgrade"), get_string("grade"));
+    $table->align = array("LEFT", "RIGHT", "RIGHT");
+
+    foreach ($grades as $key => $grade) {
+        $table->data[] = array($columnhtml[$key], $maxgrades[$key], $grade);
+    }
+
+    $table->data[] = array(get_string("total"), $totalmaxgrade, $totalgrade);
+
+    print_table($table);
+
+    print_continue("view.php?id=$course->id");
+
+    print_footer($course);
+    
+?>

course/grades.php

@@ -0,0 +1,241 @@
+<?PHP // $Id$
+      // Displays all grades for a course
+
+	require_once("../config.php");
+	require_once("lib.php");
+    require_once("../lib/psxlsgen.php");
+
+    require_variable($id);              // course id
+    optional_variable($download, "");   // to download data 
+
+    require_login();
+
+    if (! $course = get_record("course", "id", $id)) {
+        error("Course ID was incorrect");
+    }
+
+    if (!isteacher($course->id)) {
+        error("Only teachers can use this page!");
+    }
+
+    $strgrades = get_string("grades");
+    $strgrade = get_string("grade");
+    $strmax = get_string("maximumshort");
+    $stractivityreport = get_string("activityreport");
+
+
+/// Get a list of all students
+
+    if (!$students = get_course_students($course->id, "u.lastname ASC")) {
+	    print_header("$course->shortname: $strgrades", "$course->fullname", 
+                     "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> 
+                      -> $strgrades");
+        print_heading(get_string("nostudentsyet"));
+        print_footer($course);
+        exit;
+    }
+
+    foreach ($students as $student) {
+        $grades[$student->id] = array();    // Collect all grades in this array
+        $gradeshtml[$student->id] = array(); // Collect all grades html formatted in this array
+        $totals[$student->id] = array();    // Collect all totals in this array
+    }
+    $columns = array();     // Accumulate column names in this array.
+    $columnhtml = array();  // Accumulate column html in this array.
+
+
+/// Collect modules data
+    get_all_mods($course->id, $mods, $modnames, $modnamesplural, $modnamesused);
+
+
+/// Search through all the modules, pulling out grade data
+    $sections = get_all_sections($course->id); // Sort everything the same as the course
+    for ($i=0; $i<=$course->numsections; $i++) {
+        if (isset($sections[$i])) {   // should always be true
+            $section = $sections[$i];
+            if ($section->sequence) {
+                $sectionmods = explode(",", $section->sequence);
+                foreach ($sectionmods as $sectionmod) {
+                    $mod = $mods[$sectionmod];
+                    $instance = get_record("$mod->modname", "id", "$mod->instance");
+                    $libfile = "$CFG->dirroot/mod/$mod->modname/lib.php";
+                    if (file_exists($libfile)) {
+                        require_once($libfile);
+                        $gradefunction = $mod->modname."_grades";
+                        if (function_exists($gradefunction)) {   // Skip modules without grade function
+                            if ($modgrades = $gradefunction($mod->instance)) {
+
+                                if (!empty($modgrades->maxgrade)) {
+                                    if ($mod->visible) {
+                                        $maxgrade = "$strmax: $modgrades->maxgrade";
+                                        $maxgradehtml = "<BR>$strmax: $modgrades->maxgrade";
+                                    } else {
+                                        $maxgrade = "$strmax: $modgrades->maxgrade";
+                                        $maxgradehtml = "<BR><FONT class=\"dimmed_text\">$strmax: $modgrades->maxgrade</FONT>";
+                                    }
+                                } else {
+                                    $maxgrade = "";
+                                    $maxgradehtml = "";
+                                }
+    
+                                $image = "<A HREF=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\"".
+                                         "   TITLE=\"$mod->modfullname\">".
+                                         "<IMG BORDER=0 VALIGN=absmiddle SRC=\"../mod/$mod->modname/icon.gif\" ".
+                                         "HEIGHT=16 WIDTH=16 ALT=\"$mod->modfullname\"></A>";
+                                if ($mod->visible) {
+                                    $columnhtml[] = "$image ".
+                                                 "<A HREF=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\">".
+                                                 "$instance->name".
+                                                 "</A>$maxgradehtml";
+                                } else {
+                                    $columnhtml[] = "$image ".
+                                                 "<A CLASS=\"dimmed\" HREF=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\">".
+                                                 "$instance->name".
+                                                 "</A>$maxgradehtml";
+                                }
+                                $columns[] = "$mod->modfullname: $instance->name - $maxgrade";
+    
+                                foreach ($students as $student) {
+                                    if (!empty($modgrades->grades[$student->id])) {
+                                        $grades[$student->id][] = $currentstudentgrade = $modgrades->grades[$student->id];
+                                        if ($mod->visible) {
+                                            $gradeshtml[$student->id][] = $modgrades->grades[$student->id];
+                                        } else {
+                                            $gradeshtml[$student->id][] = "<FONT class=\"dimmed_text\">".
+                                                                           $modgrades->grades[$student->id].
+                                                                           "</FONT>";
+                                        }
+                                    } else {
+                                        $grades[$student->id][] = $currentstudentgrade = "";
+                                        $gradeshtml[$student->id][] = "";
+                                    }
+                                    if (!empty($modgrades->maxgrade)) {
+                                        $totals[$student->id] = (float)($totals[$student->id]) + (float)($currentstudentgrade);
+                                    } else {
+                                        $totals[$student->id] = (float)($totals[$student->id]) + 0;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    } // a new Moodle nesting record? ;-)
+
+
+/// OK, we have all the data, now present it to the user
+
+    if ($download == "xls") {
+
+        $myxls = new PhpSimpleXlsGen();
+        $myxls->totalcol = count($columns) + 5;
+
+/// Print names of all the fields
+
+        $myxls->ChangePos(0,0);
+        $myxls->InsertText(get_string("firstname"));
+        $myxls->InsertText(get_string("lastname"));
+        foreach ($columns as $column) {
+            $myxls->InsertText(strip_tags($column));
+        }
+        $myxls->InsertText(get_string("total"));
+
+    
+/// Print all the lines of data.
+
+        $i = 0;
+        foreach ($grades as $studentid => $studentgrades) {
+            $i++;
+            $student = $students[$studentid];
+
+            $myxls->ChangePos($i,0);
+            $myxls->InsertText($student->firstname);
+            $myxls->InsertText($student->lastname);
+
+            foreach ($studentgrades as $grade) {
+                $myxls->InsertText(strip_tags($grade));
+            }
+            $myxls->InsertNumber($totals[$student->id]);
+        }
+
+        $myxls->SendFileName("$course->shortname $strgrades");
+
+        exit;
+
+
+    } else if ($download == "txt") {
+
+/// Print header to force download
+
+        header("Content-Type: application/download\n"); 
+        header("Content-Disposition: attachment; filename=\"$course->shortname $strgrades.txt\"");
+
+/// Print names of all the fields
+
+        echo get_string("firstname")."\t".get_string("lastname");
+        foreach ($columns as $column) {
+            $column = strip_tags($column);
+            echo "\t$column";
+        }
+        echo "\t".get_string("total")."\n";
+    
+/// Print all the lines of data.
+
+        foreach ($grades as $studentid => $studentgrades) {
+            $student = $students[$studentid];
+            echo "$student->firstname\t$student->lastname";
+            foreach ($studentgrades as $grade) {
+                $grade = strip_tags($grade);
+                echo "\t$grade";
+            }
+            echo "\t".$totals[$student->id];
+            echo "\n";
+        }
+    
+        exit;
+    
+    
+    } else {  // Just print the web page
+
+	    print_header("$course->shortname: $strgrades", "$course->fullname", 
+                     "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> 
+                      -> $strgrades");
+    
+        print_heading($strgrades);
+
+        $table->head  = array_merge(array ("", get_string("firstname"), get_string("lastname")), $columnhtml, get_string("total"));
+        $table->width = array(35, "");
+        $table->align = array("LEFT", "RIGHT", "LEFT");
+        foreach ($columns as $column) {
+            $table->width[] = "";
+            $table->align[] = "CENTER";
+        }
+        $table->width[] = "";
+        $table->align[] = "CENTER";
+    
+        foreach ($students as $key => $student) {
+            $studentgrades = $gradeshtml[$student->id];
+            $picture = print_user_picture($student->id, $course->id, $student->picture, false, true);
+            $name = array ("$picture", "$student->firstname", "$student->lastname");
+            $total = array ($totals[$student->id]);
+    
+            $table->data[] = array_merge($name, $studentgrades, $total);
+        }
+    
+        print_table($table);
+
+        echo "<TABLE BORDER=0 ALIGN=CENTER><TR>";
+        echo "<TD>";
+        $options["id"] = "$course->id";
+        $options["download"] = "xls";
+        print_single_button("grades.php", $options, get_string("downloadexcel"));
+        echo "<TD>";
+        $options["download"] = "txt";
+        print_single_button("grades.php", $options, get_string("downloadtext"));
+        echo "</TABLE>";
+    
+        print_footer($course);
+    }
+    
+?>

course/index.php

@@ -1,23 +1,380 @@
 <?PHP // $Id$
-      // Display list of all courses
+      // For most people, just lists the course categories
+      // Allows the admin to create, delete and rename course categories
 
-    require("../config.php");
-    require("lib.php");
+	require_once("../config.php");
+	require_once("lib.php");
 
-    $title = get_string("courses");
 
-    print_header($title, $title, $title, "");
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
 
-    optional_variable($cat, 1);
+    if (isadmin()) {
+        if (isset($_GET['edit'])) {
+            if ($edit == "on") {
+                $USER->editing = true;
+            } else if ($edit == "off") {
+                $USER->editing = false;
+            }
+        }
+    }
 
-    echo "<TABLE WIDTH=80% ALIGN=CENTER><TR><TD>";
+    $adminediting = (isadmin() and !empty($USER->editing));
 
-    print_all_courses($cat);
 
-    echo "</TD></TR></TABLE>";
+/// Unless it's an editing admin, just print the regular listing of courses/categories
+
+    if (!$adminediting) {
+        $countcategories = count_records("course_categories");
+
+        if ($countcategories > 1) {
+            $strcourses = get_string("courses");
+            print_header($strcourses, $strcourses, $strcourses, "", "", true, update_categories_button());
+            print_heading(get_string("categories"));
+            print_simple_box_start("center", "50%");
+            print_whole_category_list();
+            print_simple_box_end();
+            print_course_search();
+        } else {
+            $strfulllistofcourses = get_string("fulllistofcourses");
+            print_header("$site->shortname: $strfulllistofcourses", $strfulllistofcourses, $strfulllistofcourses);
+            print_courses(0, "80%");
+        }
+
+        if (iscreator()) {       // Print link to create a new course
+            echo "<center><p>";
+            unset($options);
+            $option["category"] = $category->id;
+            print_single_button("edit.php", $options, get_string("addnewcourse"), "get");
+            echo "</p></center>";
+        }
+            
+        print_footer();
+        exit;
+    }
+
+/// From now on is all the admin functions
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only administrators can use this page!");
+    }
+
+/// Print headings
+
+    $stradministration = get_string("administration");
+    $strcategories = get_string("categories");
+    $strcategory = get_string("category");
+    $strcourses = get_string("courses");
+    $stredit = get_string("edit");
+    $strdelete = get_string("delete");
+    $straction = get_string("action");
+    $straddnewcategory = get_string("addnewcategory");
+
+	print_header("$site->shortname: $strcategories", "$site->fullname", 
+                 "<a href=\"../$CFG->admin/index.php\">$stradministration</a> -> $strcategories",
+                 "addform.addcategory", "", true, update_categories_button());
+
+    print_heading($strcategories);
+
+
+/// If data for a new category was submitted, then add it
+    if ($form = data_submitted()) {
+        if (!empty($form->addcategory)) {
+            unset($newcategory);
+            $newcategory->name = $form->addcategory;
+            $newcategory->sortorder = 999;
+            if (!insert_record("course_categories", $newcategory)) {
+                notify("Could not insert the new category '$newcategory->name'");
+            } else {
+                notify(get_string("categoryadded", "", $newcategory->name));
+            }
+        }
+    }
+
+
+/// Delete a category if necessary
+
+    if (isset($delete)) {
+        if ($tempcat = get_record("course_categories", "id", $delete)) {
+            if (delete_records("course_categories", "id", $tempcat->id)) {
+                notify(get_string("categorydeleted", "", $tempcat->name));
+            }
+            if ($children = get_records("course_categories", "parent", $tempcat->id)) {
+                // Send the children to live with their grandparent
+                foreach ($children as $childcat) {
+                    if (! set_field("course_categories", "parent", $tempcat->parent, "id", $childcat->id)) {
+                        notify("Could not update a child category!");
+                    }
+                }
+            }
+        }
+    }
+
+
+/// Create a default category if necessary
+    if (!$categories = get_categories()) {    /// No category yet!
+        // Try and make one
+        unset($tempcat);
+        $tempcat->name = get_string("miscellaneous");
+        if (!$tempcat->id = insert_record("course_categories", $tempcat)) {
+            error("Serious error: Could not create a default category!");
+        }
+    }
+
+
+/// Move a category to a new parent if required
+
+    if (isset($move) and isset($moveto)) {
+        if ($tempcat = get_record("course_categories", "id", $move)) {
+            if ($tempcat->parent != $moveto) {
+                if (! set_field("course_categories", "parent", $moveto, "id", $tempcat->id)) {
+                    notify("Could not update that category!");
+                }
+            }
+        }
+    }
+
+
+/// Hide or show a category 
+    if (isset($hide) or isset($show)) {
+        if (isset($hide)) {
+            $tempcat = get_record("course_categories", "id", $hide);
+            $visible = 0;
+        } else {
+            $tempcat = get_record("course_categories", "id", $show);
+            $visible = 1;
+        }
+        if ($tempcat) {
+            if (! set_field("course_categories", "visible", $visible, "id", $tempcat->id)) {
+                notify("Could not update that category!");
+            }
+            if (! set_field("course", "visible", $visible, "category", $tempcat->id)) {
+                notify("Could not hide/show any courses in this category !");
+            }
+        }
+    }
+
+
+/// Move a category up or down
+
+    if (isset($moveup) or isset($movedown)) {
+        
+        $swapcategory = NULL;
+        $movecategory = NULL;
+
+        if (isset($moveup)) {
+            if ($movecategory = get_record("course_categories", "id", $moveup)) {
+                $categories = get_categories("$movecategory->parent");
+
+                foreach ($categories as $category) {
+                    if ($category->id == $movecategory->id) {
+                        break;
+                    }
+                    $swapcategory = $category;
+                }
+            }
+        }
+        if (isset($movedown)) {
+            if ($movecategory = get_record("course_categories", "id", $movedown)) {
+                $categories = get_categories("$movecategory->parent");
+
+                $choosenext = false;
+                foreach ($categories as $category) {
+                    if ($choosenext) {
+                        $swapcategory = $category;
+                        break;
+                    }
+                    if ($category->id == $movecategory->id) {
+                        $choosenext = true;
+                    }
+                }
+            }
+        }
+        if ($swapcategory and $movecategory) {        // Renumber everything for robustness
+            $count=0;
+            foreach ($categories as $category) {
+                $count++;
+                if ($category->id == $swapcategory->id) {
+                    $category = $movecategory;
+                } else if ($category->id == $movecategory->id) {
+                    $category = $swapcategory;
+                }
+                if (! set_field("course_categories", "sortorder", $count, "id", $category->id)) {
+                    notify("Could not update that category!");
+                }
+            }
+        }
+    }
+
+/// Find the default category (the one with the lowest ID)
+    $categories = get_categories();
+    $default = 99999;
+    foreach ($categories as $category) {
+        fix_course_sortorder($category->id);
+        if ($category->id < $default) {
+            $default = $category->id;
+        }
+    }
+
+/// Find any orphan courses that don't yet have a valid category and set to default
+    if ($courses = get_courses()) {
+        $foundorphans = false;
+        foreach ($courses as $course) {
+            if ($course->category and !isset($categories[$course->category])) {
+                set_field("course", "category", $default, "id", $course->id);
+                $foundorphans = true;
+            }
+        }
+        if ($foundorphans) {
+            fix_course_sortorder($default);
+        }
+    }
+
+/// Print form for creating new categories
+
+    echo "<center>";
+    echo "<form name=\"addform\" action=\"index.php\" method=\"post\">";
+    echo "<input type=\"text\" size=30 name=\"addcategory\">";
+    echo "<input type=\"submit\" value=\"$straddnewcategory\">";
+    echo "</form>";
+    echo "</center>";
+
+    echo "<br />";
+
+
+/// Print out the categories with all the knobs
+
+    $strcategories = get_string("categories");
+    $strcourses = get_string("courses");
+    $strmovecategoryto = get_string("movecategoryto");
+    $stredit = get_string("edit");
+
+    $displaylist = array();
+    $parentlist = array();
+
+    $displaylist[0] = get_string("top");
+    make_categories_list($displaylist, $parentlist, "");
+
+    echo "<table align=\"center\" border=0 cellspacing=2 cellpadding=5 class=\"generalbox\"><tr>";
+    echo "<th>$strcategories</th>";
+    echo "<th>$strcourses</th>";
+    echo "<th>$stredit</th>";
+    echo "<th>$strmovecategoryto</th>";
+
+    print_category_edit(NULL, $displaylist, $parentlist);
+
+    echo "</table>";
+    echo "<br />";
+
+    /// Print link to create a new course
+    echo "<center>";
+    unset($options);
+    $option["category"] = $category->id;
+    print_single_button("edit.php", $options, get_string("addnewcourse"), "get");
+    echo "<br />";
+    echo "</center>";
 
     print_footer();
 
+
+
+function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $up=false, $down=false) {
+/// Recursive function to print all the categories ready for editing
+
+    global $THEME, $CFG;
+
+    static $str = '';
+    static $pixpath = '';
+    
+    if (empty($str)) {
+        $str->delete   = get_string("delete");
+        $str->moveup   = get_string("moveup");
+        $str->movedown = get_string("movedown");
+        $str->edit     = get_string("editthiscategory");
+        $str->hide     = get_string("hide");
+        $str->show     = get_string("show");
+    }
+    
+    if (empty($pixpath)) {
+        if (empty($THEME->custompix)) {
+            $pixpath = "$CFG->wwwroot/pix";
+        } else {
+            $pixpath = "$CFG->wwwroot/theme/$CFG->theme/pix";
+        }
+    }
+
+    if ($category) {
+        echo "<tr><td align=\"left\" nowrap=\"nowrap\" bgcolor=\"$THEME->cellcontent\">";
+        echo "<p>";
+        for ($i=0; $i<$depth;$i++) {
+            echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
+        }
+        $linkcss = $category->visible ? "" : " class=\"dimmed\" ";
+        echo "<a $linkcss title=\"$str->edit\" href=\"category.php?id=$category->id&edit=on\">$category->name</a>";
+        echo "</p>";
+        echo "</td>";
+
+        echo "<td align=\"right\">$category->coursecount</td>";
+
+        echo "<td nowrap=\"nowrap\">";    /// Print little icons
+
+        echo "<a title=\"$str->delete\" href=\"index.php?delete=$category->id\"><img".
+             " src=\"$pixpath/t/delete.gif\" height=11 width=11 border=0></a> ";
+
+        if (!empty($category->visible)) {
+            echo "<a title=\"$str->hide\" href=\"index.php?hide=$category->id\"><img".
+                 " src=\"$pixpath/t/hide.gif\" height=11 width=11 border=0></a> ";
+        } else {
+            echo "<a title=\"$str->show\" href=\"index.php?show=$category->id\"><img".
+                 " src=\"$pixpath/t/show.gif\" height=11 width=11 border=0></a> ";
+        }
+
+        if ($up) {
+            echo "<a title=\"$str->moveup\" href=\"index.php?moveup=$category->id\"><img".
+                 " src=\"$pixpath/t/up.gif\" height=11 width=11 border=0></a> ";
+        }
+        if ($down) {
+            echo "<a title=\"$str->movedown\" href=\"index.php?movedown=$category->id\"><img".
+                 " src=\"$pixpath/t/down.gif\" height=11 width=11 border=0></a> ";
+        }
+        echo "</td>";
+
+        echo "<td align=\"left\" width=\"0\">";
+        $tempdisplaylist = $displaylist;
+        unset($tempdisplaylist[$category->id]);
+        foreach ($parentslist as $key => $parents) {
+            if (in_array($category->id, $parents)) {
+                unset($tempdisplaylist[$key]);
+            }
+        }
+        popup_form ("index.php?move=$category->id&moveto=", $tempdisplaylist, "moveform$category->id", "$category->parent", "", "", "", false);
+        echo "</td>";
+        echo "</tr>";
+    } else {
+        $category->id = "0";
+    }
+
+    if ($categories = get_categories($category->id)) {   // Print all the children recursively
+        $countcats = count($categories);
+        $count = 0;
+        $first = true;
+        $last = false;
+        foreach ($categories as $cat) {
+            $count++;
+            if ($count == $countcats) {
+                $last = true;
+            }
+            $up = $first ? false : true;
+            $down = $last ? false : true;
+            $first = false;
+
+            print_category_edit($cat, $displaylist, $parentslist, $depth+1, $up, $down);         
+        }
+    }
+}
+
+
 ?>
-
-

course/info.php

@@ -0,0 +1,73 @@
+<?PHP // $Id$
+
+/// Displays external information about a course
+
+    require_once("../config.php");
+    require_once("lib.php");
+
+    require_variable($id);    // Course id
+    optional_variable($name);
+
+    if (!$id and !$name) {
+        error("Must specify course id or short name");
+    }
+
+    if ($name) {
+        if (! $course = get_record("course", "shortname", $name) ) {
+            error("That's an invalid short course name");
+        }
+    } else {
+        if (! $course = get_record("course", "id", $id) ) {
+            error("That's an invalid course id");
+        }
+    }
+
+    $site = get_site();
+
+    if (empty($THEME->custompix)) {
+        $pixpath = "$CFG->wwwroot/pix";
+    } else {
+        $pixpath = "$CFG->wwwroot/theme/$CFG->theme/pix";
+    }
+
+    print_header(get_string("summaryof", "", $course->fullname));
+
+    echo "<h3 align=\"center\">$course->fullname<br />($course->shortname)</h3>";
+
+    echo "<center>";
+    if ($course->guest) {
+        $strallowguests = get_string("allowguests");
+        echo "<p><font size=1><img align=\"absmiddle\" alt=\"\" height=16 width=16 border=0 src=\"$pixpath/i/user.gif\"></a>&nbsp;$strallowguests</font></p>";
+    }
+    if ($course->password) {
+        $strrequireskey = get_string("requireskey");
+        echo "<p><font size=1><img align=\"absmiddle\" alt=\"\" height=16 width=16 border=0 src=\"$pixpath/i/key.gif\"></a>&nbsp;$strrequireskey</font></p>";
+    }
+
+
+    if ($teachers = get_course_teachers($course->id)) {
+        echo "<table align=center><tr><td nowrap>";
+        echo "<p><font size=\"1\">\n";
+        foreach ($teachers as $teacher) {
+            if ($teacher->authority > 0) {
+                if (!$teacher->role) {
+                    $teacher->role = $course->teacher;
+                }
+                echo "$teacher->role: <a target=\"userinfo\" href=\"$CFG->wwwroot/user/view.php?id=$teacher->id&course=$site->id\">$teacher->firstname $teacher->lastname</a><br />";
+            }
+        }
+        echo "</font></p>";
+        echo "</td</tr></table>";
+    }
+    echo "<br />";
+
+    print_simple_box_start("center", "100%");
+    echo text_to_html($course->summary);
+    print_simple_box_end();
+
+    echo "<br />";
+
+    close_window_button();
+
+?>
+

course/log.php

@@ -1,14 +1,16 @@
 <?PHP // $Id$
       // Displays different views of the logs.
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     require_variable($id);    // Course ID
-    optional_variable($user); // User to display
-    optional_variable($date); // Date to display
+    optional_variable($user, 0); // User to display
+    optional_variable($date, 0); // Date to display
+    optional_variable($page, "0");     // which page to show
+    optional_variable($perpage, "100"); // how many per page
 
-    require_login($id);
+    require_login();
 
     if (! $course = get_record("course", "id", $id) ) {
         error("That's an invalid course id");
@@ -22,13 +24,13 @@
         if (!isadmin()) {
             error("Only administrators can look at the site logs");
         }
-        $user = "";
     }
 
     $strlogs = get_string("logs");
+    $stradministration = get_string("administration");
 
 
-    if ($user || $date) {
+    if (!empty($_GET['chooselog'])) {
         $userinfo = get_string("allparticipants");
         $dateinfo = get_string("alldays");
 
@@ -39,22 +41,34 @@
             $userinfo = "$u->firstname $u->lastname";
         }
         if ($date) {
-            $dateinfo = userdate($date, "%A, %e %B %Y");
+            $dateinfo = userdate($date, get_string("strftimedaydate"));
         }
 
-        print_header("$course->shortname: $strlogs", "$course->fullname", 
-                     "<A HREF=\"view.php?id=$course->id\">$course->shortname</A> ->
-                      <A HREF=\"log.php?id=$course->id\">$strlogs</A> -> $userinfo, $dateinfo", "");
+        if ($course->category) {
+            print_header("$course->shortname: $strlogs", "$course->fullname", 
+                         "<A HREF=\"view.php?id=$course->id\">$course->shortname</A> ->
+                          <A HREF=\"log.php?id=$course->id\">$strlogs</A> -> $userinfo, $dateinfo", "");
+        } else {
+            print_header("$course->shortname: $strlogs", "$course->fullname", 
+                         "<A HREF=\"../$CFG->admin/index.php\">$stradministration</A> ->
+                          <A HREF=\"log.php?id=$course->id\">$strlogs</A> -> $userinfo, $dateinfo", "");
+        }
         
         print_heading("$course->fullname: $userinfo, $dateinfo (".usertimezone().")");
 
         print_log_selector_form($course, $user, $date);
 
-        print_log($course, $user, $date, "ORDER BY l.time DESC");
+        print_log($course, $user, $date, "l.time DESC", $page, $perpage, 
+                  "log.php?id=$course->id&chooselog=1&user=$user&date=$date");
 
     } else {
-        print_header("$course->shortname: $strlogs", "$course->fullname", 
-                 "<A HREF=\"view.php?id=$course->id\">$course->shortname</A> -> $strlogs", "");
+        if ($course->category) {
+            print_header("$course->shortname: $strlogs", "$course->fullname", 
+                     "<A HREF=\"view.php?id=$course->id\">$course->shortname</A> -> $strlogs", "");
+        } else {
+            print_header("$course->shortname: $strlogs", "$course->fullname", 
+                     "<A HREF=\"../$CFG->admin/index.php\">$stradministration</A> -> $strlogs", "");
+        }
 
         print_heading(get_string("chooselogs").":");
 

course/loggraph.php

@@ -1,9 +1,9 @@
 <?PHP // $Id$
       // Produces a graph of log accesses
 
-    require("../config.php");
-    require("lib.php");
-    require("$CFG->libdir/graphlib.php");
+    require_once("../config.php");
+    require_once("lib.php");
+    require_once("$CFG->libdir/graphlib.php");
 
     require_variable($id);    // Course ID
     require_variable($type);  // Graph Type
@@ -34,36 +34,63 @@
     switch ($type) {
      case "usercourse.png":
 
-       $COURSE_MAX_LOG_DISPLAY = $COURSE_MAX_LOG_DISPLAY * 3600 * 24;  // seconds
-       if ($timenow - $course->startdate > $COURSE_MAX_LOG_DISPLAY) {
-           $course->startdate = $timenow - $COURSE_MAX_LOG_DISPLAY;
+       $site = get_site();
+        
+       if ($course->id == $site->id) {
+           $courseselect = 0;
+       } else {
+           $courseselect = $course->id;
        }
-       $timestart = usergetmidnight($course->startdate);
+
+       $maxseconds = COURSE_MAX_LOG_DISPLAY * 3600 * 24;  // seconds
+       if ($timenow - $course->startdate > $maxseconds) {
+           $course->startdate = $timenow - $maxseconds;
+       }
+       $timestart = $coursestart = usergetmidnight($course->startdate);
+
+       if ((($timenow - $timestart)/86400.0) > 40) {
+           $reducedays = 7;
+       } else {
+           $reducedays = 0;
+       }
+
        $i = 0;
        while ($timestart < $timenow) {
-           $timefinish = $timestart + (3600 * 24);
-           if (! $logcount = get_record_sql("SELECT COUNT(*) as count FROM log
-                                             WHERE user = '$user->id' AND course = '$course->id'
-                                               AND `time` > '$timestart' AND `time` < '$timefinish'")) {
-               $logs[$i] = 0;
+           $timefinish = $timestart + 86400;
+           if ($reducedays) {
+               if ($i % $reducedays) {
+                   $days[$i] = "";
+               } else {
+                   $days[$i] = userdate($timestart, "%a %d %b");
+               }
+           } else {
+               $days[$i] = userdate($timestart, "%a %d %b");
            }
-           $logs[$i] = $logcount->count;
-           $days[$i] = userdate($timestart, "%a %e %b");
+           $logs[$i] = 0;
            $i++;
            $timestart = $timefinish;
        }
 
+       if ($rawlogs = get_logs_usercourse($user->id, $courseselect, $coursestart)) {
+           foreach ($rawlogs as $rawlog) {
+               $logs[$rawlog->day] = $rawlog->num;
+           }
+       }
+
        $maxlogs = max($logs);
 
 
        $graph = new graph(750, 400);
-       $graph->parameter['title'] = "Hits on $course->shortname by $user->firstname $user->lastname";
+
+       $a->coursename = $course->shortname;
+       $a->username = "$user->firstname $user->lastname";
+       $graph->parameter['title'] = get_string("hitsoncourse", "", $a);
 
        $graph->x_data           = $days;
 
        $graph->y_data['logs']   = $logs;
-       $graph->y_format['logs'] = array('colour' => 'blue','bar' => 'fill','legend' =>'actual','bar_size' => 0.9);
-       $graph->y_label_left     = "Hits";
+       $graph->y_format['logs'] = array('colour' => 'blue','line' => 'line');
+       $graph->y_label_left     = get_string("hits");
        $graph->label_size       = "6";
 
        $graph->y_order = array('logs');
@@ -71,41 +98,54 @@
        
        $graph->parameter['shadow']          = 'none';
 
+       error_reporting(5); // ignore most warnings such as font problems etc
        $graph->draw_stack();
 
        break;
 
      case "userday.png":
 
-       if ($date) {
-           $timestart = usergetmidnight($date);
+       $site = get_site();
+        
+       if ($course->id == $site->id) {
+           $courseselect = 0;
        } else {
-           $timestart = usergetmidnight(time());
+           $courseselect = $course->id;
        }
-       while ($timestart < $timenow) {
-           $timefinish = $timestart + 3600;
-           if (! $logcount = get_record_sql("SELECT COUNT(*) as count FROM log
-                                             WHERE user = '$user->id' AND course = '$course->id'
-                                               AND `time` > '$timestart' AND `time` < '$timefinish'")) {
-               $logs[$i] = 0;
+
+       if ($date) {
+           $daystart = usergetmidnight($date);
+       } else {
+           $daystart = usergetmidnight(time());
+       }
+       $dayfinish = $daystart + 86400;
+
+       for ($i=0; $i<=23; $i++) {
+           $logs[$i] = 0;
+           $hour = $daystart + $i * 3600;
+           $hh        = (int)userdate($hour, "%I");
+           $hours[$i] = userdate($hour, "$hh %p");
+       }
+
+       if ($rawlogs = get_logs_userday($user->id, $courseselect, $daystart)) {
+           foreach ($rawlogs as $rawlog) {
+               $logs[$rawlog->hour] = $rawlog->num;
            }
-           $logs[$i] = $logcount->count;
-           $hh = (int)userdate($timestart, "%I");
-           $hours[$i] = userdate($timestart, "$hh %p");
-           $i++;
-           $timestart = $timefinish;
        }
 
        $maxlogs = max($logs);
 
        $graph = new graph(750, 400);
-       $graph->parameter['title'] = "Today's hits on $course->shortname by $user->firstname $user->lastname";
+
+       $a->coursename = $course->shortname;
+       $a->username = "$user->firstname $user->lastname";
+       $graph->parameter['title'] = get_string("hitsoncoursetoday", "", $a);
 
        $graph->x_data           = $hours;
 
        $graph->y_data['logs']   = $logs;
        $graph->y_format['logs'] = array('colour' => 'blue','bar' => 'fill','legend' =>'actual','bar_size' => 0.9);
-       $graph->y_label_left     = "Hits";
+       $graph->y_label_left     = get_string("hits");
        $graph->label_size       = "6";
 
        $graph->y_order = array('logs');
@@ -113,6 +153,7 @@
        
        $graph->parameter['shadow']          = 'none';
 
+       error_reporting(5); // ignore most warnings such as font problems etc
        $graph->draw_stack();
 
        break;

course/loginas.php

@@ -1,11 +1,12 @@
 <?PHP // $Id$
       // Allows a teacher/admin to login as another user (in stealth mode)
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     require_variable($id);     // course id
-    require_variable($user);   // login as this user
+    optional_variable($user);   // login as this user
+    optional_variable($return); // return to being the real user again
 
     if (! $course = get_record("course", "id", $id)) {
         error("Course ID was incorrect");
@@ -13,11 +14,21 @@
 
     require_login($course->id);
 
+    if ($return and $USER->realuser) {
+        $USER = get_user_info_from_db("id", $USER->realuser);
+        $USER->loggedin = true;
+        $USER->site = $CFG->wwwroot;
+        redirect($_SERVER["HTTP_REFERER"]);
+        exit;
+    }
+
+    // $user must be defined to go on
+
     if (!isteacher($course->id)) {
         error("Only teachers can use this page!");
     }
 
-    if ($course->category and !isstudent($course->id, $user)) {
+    if ($course->category and !isstudent($course->id, $user) and !isadmin()) {
         error("This student is not in this course!");
     }
 
@@ -28,8 +39,8 @@
 
     $USER = get_user_info_from_db("id", $user);
     $USER->loggedin = true;
+    $USER->site = $CFG->wwwroot;
     $USER->realuser = $teacher_id;
-    save_session("USER");
 
     set_moodle_cookie($USER->username);
     $student_name = "$USER->firstname $USER->lastname";

course/loglive.php

@@ -1,10 +1,12 @@
 <?PHP // $Id$
       //  Displays live view of recent logs
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
-    require_login($id);
+    require_variable($id);
+
+    require_login();
 
     if (! $course = get_record("course", "id", $id) ) {
         error("That's an invalid course id");
@@ -15,15 +17,16 @@
     }
 
     $strlivelogs = get_string("livelogs");
-    $strupdatesevery = get_string("updatesevery", "moodle", $COURSE_LIVELOG_REFRESH);
+    $strupdatesevery = get_string("updatesevery", "moodle", COURSE_LIVELOG_REFRESH);
 
     print_header("$strlivelogs ($strupdatesevery)", "$strlivelogs", "", "", 
-                 "<META HTTP-EQUIV='Refresh' CONTENT='$COURSE_LIVELOG_REFRESH; URL=loglive.php?id=$id'>");
+                 "<META HTTP-EQUIV='Refresh' CONTENT='".COURSE_LIVELOG_REFRESH."; URL=loglive.php?id=$id'>");
 
     $user=0;
     $date=time() - 3600;
 
-    print_log($course, $user, $date, "ORDER BY l.time DESC");
+    print_log($course, $user, $date, "l.time DESC", 0, 500, 
+              "loglive.php?id=$course->id&user=$user&date=$date");
 
     exit;
 

course/mod.php

@@ -5,18 +5,35 @@
     require("../config.php");
     require("lib.php");
 
-    if (isset($course) && isset($HTTP_POST_VARS)) {    // add or update form submitted
-        $mod = (object)$HTTP_POST_VARS;
+    require_login();
 
-        require_login($mod->course);
+    if (isset($SESSION->modform)) {   // Variables are stored in the session
+        $mod = $SESSION->modform;
+        unset($SESSION->modform);
+    } else {
+        $mod = (object)$_POST;
+    }
 
-        if (!isteacher($mod->course)) {
+    if (isset($cancel)) {  
+        if (!empty($SESSION->returnpage)) {
+            $return = $SESSION->returnpage;
+            unset($SESSION->returnpage);
+            redirect($return);
+        } else {
+            redirect("view.php?id=$mod->course");
+        }
+    }
+
+
+    if (isset($_POST["course"])) {    // add or update form submitted
+
+        if (!isteacheredit($mod->course)) {
             error("You can't modify this course!");
         }
 
         $modlib = "../mod/$mod->modulename/lib.php";
         if (file_exists($modlib)) {
-            include($modlib);
+            include_once($modlib);
         } else {
             error("This module is missing important code! ($modlib)");
         }
@@ -29,7 +46,9 @@
                 if (! $updateinstancefunction($mod)) {
                     error("Could not update the $mod->modulename");
                 }
-                add_to_log($mod->course, "course", "update mod", "../mod/$mod->modulename/view.php?id=$mod->coursemodule", "$mod->modulename $mod->instance"); 
+                add_to_log($mod->course, "course", "update mod", 
+                           "../mod/$mod->modulename/view.php?id=$mod->coursemodule", 
+                           "$mod->modulename $mod->instance"); 
                 break;
 
             case "add":
@@ -48,7 +67,9 @@
                 if (! set_field("course_modules", "section", $sectionid, "id", $mod->coursemodule)) {
                     error("Could not update the course module with the correct section");
                 }   
-                add_to_log($mod->course, "course", "add mod", "../mod/$mod->modulename/view.php?id=$mod->coursemodule", "$mod->modulename $mod->instance"); 
+                add_to_log($mod->course, "course", "add mod", 
+                           "../mod/$mod->modulename/view.php?id=$mod->coursemodule", 
+                           "$mod->modulename $mod->instance"); 
                 break;
             case "delete":
                 if (! $deleteinstancefunction($mod->instance)) {
@@ -60,17 +81,20 @@
                 if (! delete_mod_from_section($mod->coursemodule, "$mod->section")) {
                     notify("Could not delete the $mod->modulename from that section");
                 }
-                add_to_log($mod->course, "course", "delete mod", "view.php?id=$mod->course", "$mod->modulename $mod->instance"); 
+                add_to_log($mod->course, "course", "delete mod", 
+                           "view.php?id=$mod->course", 
+                           "$mod->modulename $mod->instance"); 
                 break;
             default:
                 error("No mode defined");
 
         }
 
-        if ($SESSION->returnpage) {
+        rebuild_course_cache($mod->course);
+
+        if (!empty($SESSION->returnpage)) {
             $return = $SESSION->returnpage;
             unset($SESSION->returnpage);
-            save_session("SESSION");
             redirect($return);
         } else {
             redirect("view.php?id=$mod->course");
@@ -78,20 +102,167 @@
         exit;
     }
 
-    if (isset($return)) {  
-        $SESSION->returnpage = $HTTP_REFERER;
-        save_session("SESSION");
-    }
 
     if (isset($move)) {  
 
         require_variable($id);   
 
-        move_module($id, $move);
+        if (! $cm = get_record("course_modules", "id", $id)) {
+            error("This course module doesn't exist");
+        }
 
-        redirect($HTTP_REFERER);
+        if (!isteacheredit($cm->course)) {
+            error("You can't modify this course!");
+        }
+    
+        move_module($cm, $move);
+
+        rebuild_course_cache($cm->course);
+
+        $site = get_site();
+        if ($site->id == $cm->course) {
+            redirect($CFG->wwwroot);
+        } else {
+            redirect("view.php?id=$cm->course");
+        }
         exit;
 
+    } else if (isset($movetosection) or isset($moveto)) {  
+        
+        if (! $cm = get_record("course_modules", "id", $USER->activitycopy)) {
+            error("The copied course module doesn't exist!");
+        }
+
+        if (isset($movetosection)) {
+            if (! $section = get_record("course_sections", "id", $movetosection)) {
+                error("This section doesn't exist");
+            }
+            $beforecm = NULL;
+
+        } else {                      // normal moveto
+            if (! $beforecm = get_record("course_modules", "id", $moveto)) {
+                error("The destination course module doesn't exist");
+            }
+            if (! $section = get_record("course_sections", "id", $beforecm->section)) {
+                error("This section doesn't exist");
+            }
+        }
+
+        if (!isteacheredit($section->course)) {
+            error("You can't modify this course!");
+        }
+
+        if (!ismoving($section->course)) {
+            error("You need to copy something first!");
+        }
+
+        moveto_module($cm, $section, $beforecm);
+
+        unset($USER->activitycopy);
+        unset($USER->activitycopycourse);
+        unset($USER->activitycopyname);
+
+        rebuild_course_cache($section->course);
+
+        $site = get_site();
+        if ($site->id == $section->course) {
+            redirect($CFG->wwwroot);
+        } else {
+            redirect("view.php?id=$section->course");
+        }
+
+    } else if (isset($hide)) {
+
+        if (! $cm = get_record("course_modules", "id", $hide)) {
+            error("This course module doesn't exist");
+        }
+
+        if (!isteacheredit($cm->course)) {
+            error("You can't modify this course!");
+        }
+   
+        hide_course_module($cm->id);
+
+        rebuild_course_cache($cm->course);
+
+        $site = get_site();
+        if ($site->id == $cm->course) {
+            redirect($CFG->wwwroot);
+        } else {
+            redirect("view.php?id=$cm->course");
+        }
+        exit;
+
+    } else if (isset($show)) {
+
+        if (! $cm = get_record("course_modules", "id", $show)) {
+            error("This course module doesn't exist");
+        }
+
+        if (!isteacheredit($cm->course)) {
+            error("You can't modify this course!");
+        }
+
+        if (! $section = get_record("course_sections", "id", $cm->section)) {
+            error("This module doesn't exist");
+        }
+
+        if (! $module = get_record("modules", "id", $cm->module)) {
+            error("This module doesn't exist");
+        }
+
+        $site = get_site();
+
+        if ($module->visible and ($section->visible or ($site->id == $cm->course))) {
+            show_course_module($cm->id);
+            rebuild_course_cache($cm->course);
+        }
+
+        if ($site->id == $cm->course) {
+            redirect($CFG->wwwroot);
+        } else {
+            redirect("view.php?id=$cm->course");
+        }
+        exit;
+
+    } else if (isset($copy)) { // value = course module
+
+        if (! $cm = get_record("course_modules", "id", $copy)) {
+            error("This course module doesn't exist");
+        }
+
+        if (!isteacheredit($cm->course)) {
+            error("You can't modify this course!");
+        }
+
+        if (! $section = get_record("course_sections", "id", $cm->section)) {
+            error("This module doesn't exist");
+        }
+
+        if (! $module = get_record("modules", "id", $cm->module)) {
+            error("This module doesn't exist");
+        }
+
+        if (! $instance = get_record($module->name, "id", $cm->instance)) {
+            error("Could not find the instance of this module");
+        }
+
+        $USER->activitycopy = $copy;
+        $USER->activitycopycourse = $cm->course;
+        $USER->activitycopyname = $instance->name;
+
+        redirect("view.php?id=$cm->course");
+
+    } else if (isset($cancelcopy)) { // value = course module
+
+        $courseid = $USER->activitycopycourse;
+
+        unset($USER->activitycopy);
+        unset($USER->activitycopycourse);
+        unset($USER->activitycopyname);
+
+        redirect("view.php?id=$courseid");
+
     } else if (isset($delete)) {   // value = course module
 
         if (! $cm = get_record("course_modules", "id", $delete)) {
@@ -102,9 +273,7 @@
             error("This course doesn't exist");
         }
 
-        require_login($course->id);
-
-        if (!isteacher($course->id)) {
+        if (!isteacheredit($course->id)) {
             error("You can't modify this course!");
         }
 
@@ -134,7 +303,18 @@
         $form->fullmodulename  = $fullmodulename;
         $form->instancename = $instance->name;
 
-        include("mod_delete.html");
+        $strdeletecheck = get_string("deletecheck", "", "$form->fullmodulename");
+        $strdeletecheckfull = get_string("deletecheckfull", "", "$form->fullmodulename '$form->instancename'");
+
+        print_header("$course->shortname: $strdeletecheck", "$course->fullname",
+                     "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> -> 
+                      $strdeletecheck");
+
+        print_simple_box_start("center", "60%", "#FFAAAA", 20, "noticebox");
+        print_heading($strdeletecheckfull);
+        include_once("mod_delete.html");
+        print_simple_box_end();
+        print_footer($course);
 
         exit;
 
@@ -149,6 +329,10 @@
             error("This course doesn't exist");
         }
 
+        if (!isteacheredit($course->id)) {
+            error("You can't modify this course!");
+        }
+
         if (! $module = get_record("modules", "id", $cm->module)) {
             error("This module doesn't exist");
         }
@@ -161,6 +345,10 @@
             error("This course section doesn't exist");
         }
 
+        if (isset($return)) {  
+            $SESSION->returnpage = "$CFG->wwwroot/mod/$module->name/view.php?id=$cm->id";
+        }
+
         $form->coursemodule = $cm->id;
         $form->section      = $cm->section;     // The section ID
         $form->course       = $course->id;
@@ -184,7 +372,7 @@
     } else if (isset($add)) {
 
         if (!$add) {
-            redirect($HTTP_REFERER);
+            redirect($_SERVER["HTTP_REFERER"]);
             die;
         }
 
@@ -203,7 +391,8 @@
         $form->course     = $course->id;
         $form->module     = $module->id;
         $form->modulename = $module->name;
-        $form->instance   = $cm->instance;
+        $form->instance   = "";
+        $form->coursemodule = "";
         $form->mode       = "add";
 
         $sectionname    = get_string("name$course->format");
@@ -221,34 +410,36 @@
         error("No action was specfied");
     }
 
-    require_login($course->id);
-
-    if (!isteacher($course->id)) {
+    if (!isteacheredit($course->id)) {
         error("You can't modify this course!");
     }
 
     $streditinga = get_string("editinga", "moodle", $fullmodulename);
+    $strmodulenameplural = get_string("modulenameplural", $module->name);
 
     if ($course->category) {
         print_header("$course->shortname: $streditinga", "$course->fullname",
                      "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> -> 
+                      <A HREF=\"$CFG->wwwroot/mod/$module->name/index.php?id=$course->id\">$strmodulenameplural</A> -> 
                       $streditinga", "form.name", "", false);
     } else {
         print_header("$course->shortname: $streditinga", "$course->fullname",
                      "$streditinga", "form.name", "", false);
     }
 
+    unset($SESSION->modform); // Clear any old ones that may be hanging around.
+
     $modform = "../mod/$module->name/mod.html";
 
     if (file_exists($modform)) {
 
-        print_heading($pageheading);
+        print_heading_with_help($pageheading, "mods", $module->name);
         print_simple_box_start("center", "", "$THEME->cellheading");
-        include($modform);
+        include_once($modform);
         print_simple_box_end();
 
     } else {
-        notice("This module cannot be added to this course yet!", "$CFG->wwwroot/course/view.php?id=$course->id");
+        notice("This module cannot be added to this course yet! (No file found at: $modform)", "$CFG->wwwroot/course/view.php?id=$course->id");
     }
 
     print_footer($course);

course/mod_delete.html

@@ -1,16 +1,13 @@
-<table align=center cellpadding=20> <tr> <td colspan=2 bgcolor=#ffaaaa>
+<form name="form" method="post" action="<?php echo "$CFG->wwwroot/course/mod.php" ?>">
 
-<CENTER>
-<FORM name="form" method="post" action="<?=$ME ?>">
-<? print_heading(get_string("deletecheckfull", "", "$form->fullmodulename '$form->instancename'")); ?>
 <input type="hidden" name=mode         value="delete">
-<input type="hidden" name=section      value="<? echo $form->section; ?>">
-<input type="hidden" name=course       value="<? p($form->course) ?>">
-<input type="hidden" name=coursemodule value="<? p($form->coursemodule) ?>">
-<input type="hidden" name=modulename   value="<? p($form->modulename) ?>">
-<input type="hidden" name=instance     value="<? p($form->instance) ?>">
-<input type="submit" value=" Yes "> <input type=button value=" No " onclick="javascript:history.go(-1);">
-</FORM>
+<input type="hidden" name=section      value="<?php p($form->section) ?>">
+<input type="hidden" name=course       value="<?php p($form->course) ?>">
+<input type="hidden" name=coursemodule value="<?php p($form->coursemodule) ?>">
+<input type="hidden" name=modulename   value="<?php p($form->modulename) ?>">
+<input type="hidden" name=instance     value="<?php p($form->instance) ?>">
 
-</td></tr></table>
+<input type="submit" value=" <?php print_string("yes")?> "> 
+<input type=button value=" <?php print_string("no")?> " onclick="javascript:history.go(-1);">
 
+</form>

course/recent.php

@@ -0,0 +1,101 @@
+<?PHP // $Id$
+
+//  Display all recent activity in a flexible way
+
+    require_once("../config.php");
+    require_once("lib.php");
+
+    require_variable($id);
+
+    if (! $course = get_record("course", "id", $id) ) {
+        error("That's an invalid course id");
+    }
+
+    require_login($course->id);
+
+    add_to_log($course->id, "course", "recent", "recent.php?id=$course->id", "$course->id");
+
+    if (empty($THEME->custompix)) {
+        $pixpath = "../pix";
+        $modpixpath = "../mod";
+    } else {
+        $pixpath = "../theme/$CFG->theme/pix";
+        $modpixpath = "../theme/$CFG->theme/pix/mod";
+    }
+
+    $strrecentactivity = get_string("recentactivity");
+
+    $loggedinas = "<p class=\"logininfo\">".user_login_string($course, $USER)."</p>";
+
+    print_header("$course->fullname: $strrecentactivity", "$course->fullname", 
+                 "<a href=\"view.php?id=$course->id\">$course->shortname</a> -> $strrecentactivity", 
+                 "", "", true, "", $loggedinas);
+
+    get_all_mods($course->id, $mods, $modnames, $modnamesplural, $modnamesused);
+
+    print_heading("Since:  Last Login | 1 day | 7 days | 14 days | 21 days | 30 days");
+
+    if (empty($days)) {
+        $timestart = $USER->lastlogin;
+    } else {
+        $timestart = time() - ($days * 3600 * 24);
+    }
+
+    print_heading(get_string("activitysince", "", userdate($timestart)));
+
+    $sections = get_all_sections($course->id);
+
+    for ($i=0; $i<=$course->numsections; $i++) {
+
+        if (isset($sections[$i])) {   // should always be true
+
+            $section = $sections[$i];
+        
+            if ($section->sequence) {
+                echo "<hr>";
+                echo "<h2>";
+                switch ($course->format) {
+                    case "weeks": print_string("week"); break;
+                    case "topics": print_string("topic"); break;
+                    default: print_string("section"); break;
+                }
+                echo " $i</h2>";
+
+                echo "<ul>";
+
+                $sectionmods = explode(",", $section->sequence);
+
+                foreach ($sectionmods as $sectionmod) {
+                    if (empty($mods[$sectionmod])) {
+                        continue;
+                    }
+                    $mod = $mods[$sectionmod];
+
+                    $instance = get_record("$mod->modname", "id", "$mod->instance");
+                    $libfile = "$CFG->dirroot/mod/$mod->modname/lib.php";
+
+                    if (file_exists($libfile)) {
+                        require_once($libfile);
+                        $print_recent_instance_activity = $mod->modname."_print_recent_instance_activity";
+                        if (function_exists($print_recent_instance_activity)) {
+                            $image = "<img src=\"$modpixpath/$mod->modname/icon.gif\" ".
+                                     "height=16 width=16 alt=\"$mod->modfullname\">";
+                            echo "<h4>$image $mod->modfullname: ".
+                                 "<a href=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\">".
+                                 "$instance->name</a></h4>";
+                            echo "<ul>";
+                            $print_recent_instance_activity($instance, $timestart);
+                            echo "</ul>";
+                        }
+                    }
+                }
+
+                echo "</ul>";
+            }
+        }
+    }
+
+    print_footer($course);
+
+?>
+

course/scales.php

@@ -0,0 +1,237 @@
+<?PHP // $Id$
+      // Allows a creator to edit custom scales, and also display help about scales
+
+	require_once("../config.php");
+	require_once("lib.php");
+
+    require_variable($id);             // course id
+    optional_variable($scaleid);  // scale id
+    optional_variable($name);          // scale name
+    optional_variable($description);   // scale description
+    optional_variable($scale);         // scale scale
+    optional_variable($delete);        // scale id
+
+    if (! $course = get_record("course", "id", $id)) {
+        error("Course ID was incorrect");
+    }
+
+	require_login($course->id);
+
+    $strscale = get_string("scale");
+    $strscales = get_string("scales");
+    $strcustomscales = get_string("scalescustom");
+    $strstandardscales = get_string("scalesstandard");
+    $strname = get_string("name");
+    $strdescription = get_string("description");
+    $strsavechanges = get_string("savechanges");
+    $strchangessaved = get_string("changessaved");
+    $strdeleted = get_string("deleted");
+    $strdelete = get_string("delete");
+
+
+    if (isset($_GET['list'])) {       /// Just list the scales (in a helpwindow)
+
+        print_header($strscales);
+
+        if (isset($_GET['scale'])) {
+            if ($scale = get_record("scale", "id", "$scale")) {
+                $scalemenu = make_menu_from_list($scale->scale);
+
+                print_simple_box_start("center");
+                print_heading($scale->name);
+                echo "<center>";
+                choose_from_menu($scalemenu, "", "", "");
+                echo "</center>";
+                echo text_to_html($scale->description);
+                print_simple_box_end();
+            }
+            echo "<br />";
+            close_window_button();
+            exit;
+        }
+
+        if ($scales = get_records("scale", "courseid", "$course->id", "name ASC")) {
+            print_heading($strcustomscales);
+            foreach ($scales as $scale) {
+                $scalemenu = make_menu_from_list($scale->scale);
+
+                print_simple_box_start("center");
+                print_heading($scale->name);
+                echo "<center>";
+                choose_from_menu($scalemenu, "", "", "");
+                echo "</center>";
+                echo text_to_html($scale->description);
+                print_simple_box_end();
+                echo "<hr />";
+            }
+        }
+
+        if ($scales = get_records("scale", "courseid", "0", "name ASC")) {
+            print_heading($strstandardscales);
+            foreach ($scales as $scale) {
+                $scalemenu = make_menu_from_list($scale->scale);
+
+                print_simple_box_start("center");
+                print_heading($scale->name);
+                echo "<center>";
+                choose_from_menu($scalemenu, "", "", "");
+                echo "</center>";
+                echo text_to_html($scale->description);
+                print_simple_box_end();
+                echo "<hr />";
+            }
+        }
+
+        close_window_button();
+        exit;
+    }
+
+
+/// The rest is all about editing the scales
+
+    if (!isteacheredit($course->id)) {
+        error("Only editing teachers can modify scales !");
+    }
+
+
+/// If scale data is being submitted, then save it and continue
+
+    $errors = NULL;
+
+    if ($form = data_submitted()) {
+        if (!empty($form->delete)) {       /// Delete a scale
+            $scale = get_record("scale", "id", $scaleid);
+            if (delete_records("scale", "id", $scaleid)) {
+                $notify = "$scale->name: $strdeleted";
+            }
+        } else {                           /// Update scale data
+            if (empty($form->name)) {
+                $errors[$scaleid]->name = true;
+                $focus = "form$scaleid.save";
+            }
+            if (empty($form->scale)) {
+                $errors[$scaleid]->scale = true;
+                $focus = "form$scaleid.save";
+            }
+    
+            if (!$errors) {
+                $newscale=NULL;
+                $newscale->name = $form->name;
+                $newscale->scale = $form->scale;
+                $newscale->description = $form->description;
+                $newscale->courseid = $course->id;
+                $newscale->userid = $USER->id;
+                $newscale->timemodified = time();
+    
+                if (empty($scaleid)) {
+                    if (!insert_record("scale", $newscale)) {
+                        error("Could not insert the new scale!");
+                    }
+                } else {
+                    $newscale->id = $scaleid;
+                    if (!update_record("scale", $newscale)) {
+                        error("Could not update that scale!");
+                    }
+                }
+    
+                $notify = "$newscale->name: $strchangessaved";
+                $focus = "form$scaleid.save";
+            }
+        }
+	}
+
+
+/// Print out the headers
+
+	print_header("$course->shortname: $strscales", "$course->fullname", 
+                 "<a href=\"view.php?id=$course->id\">$course->shortname</A> 
+                  -> $strscales", $focus);
+
+    print_heading_with_help($strcustomscales, "scales");
+
+    if (!empty($notify)) {
+        notify($notify, "green");
+    }
+
+
+/// Otherwise print out all the scale forms
+
+    $customscales = get_records("scale", "courseid", "$course->id", "name ASC");
+
+    $blankscale->id = "";
+    $blankscale->name = "";
+    $blankscale->scale = "";
+    $blankscale->description = "";
+    $customscales[] = $blankscale;
+
+    foreach ($customscales as $scale) {
+        if (!empty($errors) and ($form->scaleid == $scale->id)) {
+            $scale->name = $form->name;
+            $scale->scale = $form->scale;
+            $scale->description = $form->description;
+        }
+        echo "<form method=\"post\" action=\"scales.php\" name=\"form$scale->id\">";
+        echo "<table cellpadding=9 cellspacing=0 align=center class=generalbox>";
+        echo "<tr valign=top>";
+        if (!empty($errors[$scale->id]->name)) {
+            $class = "class=\"highlight\"";
+        } else {
+            $class = "";
+        }
+        echo "<td align=\"right\"><p><b>$strname:</b></p></td>";
+        echo "<td $class><input type=\"text\" name=\"name\" size=\"50\" value=\"".s($scale->name)."\">";
+        echo "</td>";
+        echo "</tr>";
+        echo "<tr valign=top>";
+        if (!empty($errors[$scale->id]->scale)) {
+            $class = "class=\"highlight\"";
+        } else {
+            $class = "";
+        }
+        echo "<td align=\"right\"><p><b>$strscale:</b></p></td>";
+        echo "<td $class><textarea name=\"scale\" cols=50 rows=1 wrap=virtual>".s($scale->scale)."</textarea>";
+        echo "</td>";
+        echo "</tr>";
+        echo "<tr valign=top>";
+        echo "<td align=\"right\"><p><b>$strdescription:</b></p>";
+        helpbutton("text", get_string("helptext"));
+        echo "</td>";
+        echo "<td><textarea name=\"description\" cols=50 rows=8 wrap=virtual>".s($scale->description)."</textarea>";
+        echo "</td>";
+        echo "</tr>";
+        echo "<tr>";
+	    echo "<td colspan=2 align=\"center\">";
+        echo "<input type=\"hidden\" name=\"id\" value=\"$course->id\">";
+        echo "<input type=\"hidden\" name=\"scaleid\" value=\"$scale->id\">";
+        echo "<input type=\"submit\" name=\"save\" value=\"$strsavechanges\">";
+        if ($scale->id) {
+            echo "<input type=\"submit\" name=\"delete\" value=\"$strdelete\">";
+        }
+        echo "</td></tr></table>";
+        echo "</form>";
+        echo "<br />";
+    }
+
+    echo "<br /><hr noshade=\"noshade\" size=\"1\">";
+
+
+    if ($scales = get_records("scale", "courseid", "0", "name ASC")) {
+        print_heading($strstandardscales);
+        foreach ($scales as $scale) {
+            $scalemenu = make_menu_from_list($scale->scale);
+
+            print_simple_box_start("center");
+            print_heading($scale->name);
+            echo "<center>";
+            choose_from_menu($scalemenu, "", "", "");
+            echo "</center>";
+            echo text_to_html($scale->description);
+            print_simple_box_end();
+            echo "<hr />";
+        }
+    }
+
+    print_footer($course);
+
+
+?>

course/search.php

@@ -0,0 +1,96 @@
+<?PHP // $Id$
+
+/// Displays external information about a course
+
+    require_once("../config.php");
+    require_once("lib.php");
+
+    optional_variable($search, "");    // search words
+    optional_variable($page, "0");     // which page to show
+    optional_variable($perpage, "10"); // how many per page
+
+    $search = trim(strip_tags($search));
+
+    if ($search) {
+        $searchterms = explode(" ", $search);    // Search for words independently
+        foreach ($searchterms as $key => $searchterm) {
+            if (strlen($searchterm) < 2) {
+                unset($searchterms[$key]);
+            }
+        }
+        $search = trim(implode(" ", $searchterms));
+    }
+
+    $site = get_site();
+
+    if (empty($THEME->custompix)) {
+        $pixpath = "$CFG->wwwroot/pix";
+    } else {
+        $pixpath = "$CFG->wwwroot/theme/$CFG->theme/pix";
+    }
+
+    $displaylist = array();
+    $parentlist = array();
+    make_categories_list($displaylist, $parentlist, "");
+
+    $strcourses = get_string("courses");
+    $strsearch = get_string("search");
+    $strsearchresults = get_string("searchresults");
+    $strcategory = get_string("category");
+
+    if (!$search) {
+        print_header("$site->fullname : $strsearch", $site->fullname, 
+                     "<a href=\"index.php\">$strcourses</a> -> $strsearch", "", "");
+        print_simple_box_start("center");
+        echo "<center>";
+        echo "<br />";
+        print_course_search("", false, "plain");
+        echo "<br /><p>";
+        print_string("searchhelp");
+        echo "</p>";
+        echo "</center>";
+        print_simple_box_end();
+        print_footer();
+        exit;
+    }
+
+    $searchform = print_course_search($search, true, "navbar");
+
+    print_header("$site->fullname : $strsearchresults", $site->fullname, 
+                 "<a href=\"index.php\">$strcourses</a> -> <a href=\"search.php\">$strsearch</a> -> '$search'", "", "", "", $searchform);
+
+
+    $lastcategory = -1;
+    if ($courses = get_courses_search($searchterms, "fullname ASC", 
+                                      $page*$perpage, $perpage, $totalcount)) {
+
+        print_heading("$strsearchresults: $totalcount");
+
+        print_paging_bar($totalcount, $page, $perpage, "search.php?search=$search&perpage=$perpage&");
+
+        foreach ($courses as $course) {
+            $course->fullname = highlight("$search", $course->fullname);
+            $course->summary = highlight("$search", $course->summary);
+            $course->summary .= "<br /><p align=\"right\">";
+            $course->summary .= "$strcategory: <a href=\"category.php?id=$course->category\">";
+            $course->summary .= $displaylist[$course->category];
+            $course->summary .= "</a></p>";
+            print_course($course);
+            print_spacer(5,5);
+        }
+
+        print_paging_bar($totalcount, $page, $perpage, "search.php?search=$search&perpage=$perpage&");
+
+    } else {
+        print_heading(get_string("nocoursesfound", "", $search));
+    }
+
+    echo "<br /><br />";
+
+    print_course_search($search);
+
+    print_footer();
+
+
+?>
+

course/social.php

@@ -1,81 +0,0 @@
-<?  // $Id$
-    // social.php - course format featuring social forum
-    //              included from view.php
-    
-    include("../mod/forum/lib.php");
-    include("../mod/reading/lib.php"); 
-?>
-
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="5" CELLPADDING="5">
-  <TR>
-    <TD WIDTH="15%" VALIGN="TOP">
-      <? 
-      print_simple_box(get_string("people"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-      $moddata[]="<A HREF=\"../user/index.php?id=$course->id\">".get_string("listofallpeople")."</A>";
-      $modicon[]="<IMG SRC=\"../user/users.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-      $editmyprofile = "<A HREF=\"../user/view.php?id=$USER->id&course=$course->id\">".
-                        get_string("editmyprofile")."</A>";
-      if ($USER->description) {
-          $moddata[]= $editmyprofile;
-      } else {
-          $moddata[]= $editmyprofile.$blinker;
-      }
-      $modicon[]="<IMG SRC=\"../user/user.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-      print_side_block("", $moddata, "", $modicon);
-
-      
-
-      // Then, print all the available resources (Section 0)
-      print_simple_box(get_string("resources"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-      print_section($site->id, $sections[0], $mods, $modnamesused, true);
-
-      if (isediting($site->id)) {
-          echo "<DIV ALIGN=right>";
-          popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&section=0&add=",
-                      $modnames, "section0", "", get_string("add")."...");
-          echo "</DIV>";
-      }      
-
-      // Print all the recent activity
-      print_simple_box(get_string("recentactivity"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-      echo "<TABLE CELLPADDING=4 CELLSPACING=0><TR><TD>";
-      print_recent_activity($course);
-      echo "</TD></TR></TABLE>";
-      echo "<BR>";
-
-      // Print a form to search forums
-      print_simple_box(get_string("search","forum"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-      echo "<DIV ALIGN=CENTER>";
-      forum_print_search_form($course);
-      echo "</DIV>";
-
-      // Admin links and controls
-      if (isteacher($course->id)) {
-          print_course_admin_links($course->id);
-      }
-
-      echo "</TD>";
-
-      echo "<TD WIDTH=\"55%\" VALIGN=\"TOP\">";
-      if ($social = forum_get_course_forum($course->id, "social")) {
-          if (forum_is_subscribed($USER->id, $social->id)) {
-              $subtext = get_string("unsubscribe", "forum");
-          } else {
-              $subtext = get_string("subscribe", "forum");
-          }
-          $headertext = "<TABLE BORDER=0 WIDTH=100% CELLPADDING=0 CELLSPACING=0><TR><TD>".get_string("socialheadline")."</TD><TD ALIGN=RIGHT><FONT SIZE=1><A HREF=\"../mod/forum/subscribe.php?id=$social->id\">$subtext</A></TD></TR></TABLE>";
-          print_simple_box("$headertext", $align="CENTER", $width="100%", $color="$THEME->cellheading");
-          echo "<IMG ALT=\"\" HEIGHT=7 SRC=\"../pix/spacer.gif\"><BR>";
-    
-          forum_print_latest_discussions($social->id, 10, "plain", "DESC", false);
-          $SESSION->fromdiscussion = "$CFG->wwwroot/course/view.php?id=$course->id";
-          save_session("SESSION");
-
-      } else {
-          notify("Could not find or create a social forum here");
-      }
-      ?>
-    </TD> 
-  </TR> 
-</TABLE>
-

course/student.php

@@ -0,0 +1,149 @@
+<?PHP // $Id$
+      // Script to assign students to courses
+
+	require_once("../config.php");
+
+    define("MAX_USERS_PER_PAGE", 50);
+
+    require_variable($id);         // course id
+    optional_variable($add, "");
+    optional_variable($remove, "");
+    optional_variable($search, ""); // search string
+
+    if (! $site = get_site()) {
+        redirect("$CFG->wwwroot/$CFG->admin/index.php");
+    }
+
+    if (! $course = get_record("course", "id", $id)) {
+        error("Course ID was incorrect (can't find it)");
+    }
+
+    require_login($course->id);
+
+    if (!isteacher($course->id)) {
+        error("You must be a teacher in this course, or an admin");
+    }
+
+    $strassignstudents = get_string("assignstudents");
+    $strexistingstudents   = get_string("existingstudents");
+    $strnoexistingstudents = get_string("noexistingstudents");
+    $strpotentialstudents  = get_string("potentialstudents");
+    $strnopotentialstudents  = get_string("nopotentialstudents");
+    $straddstudent    = get_string("addstudent");
+    $strremovestudent = get_string("removestudent");
+    $strsearch        = get_string("search");
+    $strsearchresults  = get_string("searchresults");
+    $strsearchagain   = get_string("searchagain");
+    $strtoomanytoshow   = get_string("toomanytoshow");
+    $strstudents   = get_string("students");
+
+    if ($search) {
+        $searchstring = $strsearchagain;
+    } else {
+        $searchstring = $strsearch;
+    }
+
+    if ($course->students != $strstudents) {
+        $parastudents = " ($course->students)";
+    } else {
+        $parastudents = "";
+    }
+
+	print_header("$course->shortname: $strassignstudents", 
+                 "$site->fullname", 
+                 "<a href=\"view.php?id=$course->id\">$course->shortname</a> -> $strassignstudents", "");
+
+/// Add a student if one is specified
+
+    if (!empty($add)) {
+        if (! enrol_student($add, $course->id)) {
+            error("Could not add that student to this course!");
+        }
+    }
+
+/// Remove a student if one is specified.
+
+    if (!empty($remove)) {
+        if (! unenrol_student($remove, $course->id)) {
+            error("Could not add that student to this course!");
+        }
+    }
+
+/// Print a help notice about the need to use this page
+
+    if (empty($add) and empty($remove) and empty($search)) {
+        $note = get_string("assignstudentsnote");
+        if ($course->password) {
+            $note .= "<p>".get_string("assignstudentspass", "", "<a href=\"edit.php?id=$course->id\">$course->password</a>");
+        }
+        print_simple_box($note, "center", "50%");
+    }
+
+/// Get all existing students for this course.
+    $students = get_course_students($course->id, "u.lastname ASC, u.firstname ASC");
+
+/// Print the lists of existing and potential students
+
+    echo "<table cellpadding=1 cellspacing=5 align=center>";
+    echo "<tr><th width=50%>$strexistingstudents$parastudents</th><td>&nbsp;</td><th width=50%>$strpotentialstudents</th></tr>";
+    echo "<tr><td width=50% nowrap valign=top>";
+
+/// First, show existing students for this course
+
+    if (empty($students)) { 
+        echo "<p align=center>$strnoexistingstudents</a>";
+        $studentlist = "";
+
+    } else {
+        $studentarray = array();
+        foreach ($students as $student) {
+            $studentarray[] = $student->id;
+            echo "<p align=right>$student->firstname $student->lastname, $student->email &nbsp;&nbsp; <a href=\"student.php?id=$course->id&remove=$student->id\" title=\"$strremovestudent\"><img src=\"../pix/t/right.gif\" border=0></a></p>";
+        }
+        $studentlist = implode(",",$studentarray);
+        unset($studentarray);
+    }
+
+    echo "<td>&nbsp;</td>";
+    echo "<td width=50% nowrap valign=top>";
+
+/// Print list of potential students
+
+    $usercount = get_users(false, $search, true, $studentlist, "lastname ASC, firstname ASC");
+
+    if ($usercount == 0) {
+        echo "<p align=center>$strnopotentialstudents</p>";
+
+    } else if ($usercount > MAX_USERS_PER_PAGE) {
+        echo "<p align=center>$strtoomanytoshow ($usercount) </p>";
+
+    } else {
+
+        if ($search) {
+            echo "<p align=center>($strsearchresults : $search)</p>";
+        }
+
+        if (!$users = get_users(true, $search, true, $studentlist)) {
+            error("Could not get users!");
+        }
+
+        foreach ($users as $user) {
+            echo "<p align=left><a href=\"{$_SERVER['PHP_SELF']}?id=$course->id&add=$user->id\"".
+                   "title=\"$straddstudent\"><img src=\"../pix/t/left.gif\"".
+                   "border=0></a>&nbsp;&nbsp;$user->firstname $user->lastname, $user->email";
+        }
+    }
+
+    if ($search or $usercount > MAX_USERS_PER_PAGE) {
+        echo "<form action={$_SERVER['PHP_SELF']} method=post>";
+        echo "<input type=hidden name=id value=\"$course->id\">";
+        echo "<input type=text name=search size=20>";
+        echo "<input type=submit value=\"$searchstring\">";
+        echo "</form>";
+    }
+
+    echo "</tr></table>";
+
+    print_footer();
+
+?>

course/teacher.php

@@ -1,189 +1,224 @@
 <?PHP // $Id$
       // Admin-only script to assign teachers to courses
 
-	require("../config.php");
-	require("../user/lib.php");
+	require_once("../config.php");
 
-    optional_variable($id);       // course id
+    define("MAX_USERS_PER_PAGE", 50);
 
-    if (! $site = get_site()) {
-        redirect("$CFG->wwwroot/admin/");
-    }
+    require_variable($id);         // course id
+    optional_variable($add, "");
+    optional_variable($remove, "");
+    optional_variable($search, ""); // search string
 
     require_login();
 
-    if (!isadmin()) {
-        error("You must be an administrator to use this page.");
-    }
-
-    $strassignteachers = get_string("assignteachers");
-    $stradministration = get_string("administration");
-
-    if (!$id) {
-	    print_header("$site->fullname: $strassignteachers", "$site->fullname", 
-                     "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> $strassignteachers");
-
-        if ($courses = get_records_sql("SELECT * from course WHERE category > 0 ORDER BY fullname")) {
-
-            print_heading("Choose a course to add teachers to");
-            print_simple_box_start("CENTER");
-            foreach ($courses as $course) {
-                echo "<A HREF=\"teacher.php?id=$course->id\">$course->fullname</A><BR>";
-            }
-            print_simple_box_end();
-        } else {
-            print_heading(get_string("nocoursesyet"));
-            print_continue("$CFG->wwwroot/admin/");
-        }
-        print_footer();
-        exit;
-    }
-
     if (! $course = get_record("course", "id", $id)) {
         error("Course ID was incorrect (can't find it)");
     }
 
+    if (!(isteacheredit($course->id) and iscreator()) and 
+        !(isteacheredit($course->id) and !empty($CFG->teacherassignteachers) ) ) {
+        error("You must be an administrator or course creator to use this page.");
+    }
 
-	print_header("$site->fullname: $course->shortname: $strassignteachers", 
-                 "$site->fullname", 
-                 "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> 
-                  <A HREF=\"teacher.php\">$strassignteachers</A> ->
-                  $course->shortname", "");
-    print_heading("<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->fullname</A>");
+    $strassignteachers = get_string("assignteachers");
+    $strcourses = get_string("courses");
+    $strteachers = get_string("teachers");
+    $stradministration = get_string("administration");
+    $strexistingteachers   = get_string("existingteachers");
+    $strnoexistingteachers = get_string("noexistingteachers");
+    $strpotentialteachers  = get_string("potentialteachers");
+    $strnopotentialteachers  = get_string("nopotentialteachers");
+    $straddteacher    = get_string("addteacher");
+    $strremoveteacher = get_string("removeteacher");
+    $strsearch        = get_string("search");
+    $strsearchresults  = get_string("searchresults");
+    $strsearchagain   = get_string("searchagain");
+    $strtoomanytoshow   = get_string("toomanytoshow");
+    $strname   = get_string("name");
+    $strorder   = get_string("order");
+    $strrole   = get_string("role");
+    $stredit   = get_string("edit");
+    $stryes   = get_string("yes");
+    $strno   = get_string("no");
+
+    if ($search) {
+        $searchstring = $strsearchagain;
+    } else {
+        $searchstring = $strsearch;
+    }
+
+    if ($course->teachers != $strteachers) {
+        $parateachers = " ($course->teachers)";
+    } else {
+        $parateachers = "";
+    }
 
 
-/// Get all existing teachers for this course.
-    $teachers = get_records_sql("SELECT u.*,t.authority,t.id as teachid FROM user u, user_teachers t 
-                                 WHERE t.course = '$course->id' 
-                                   AND t.user = u.id 
-                                   ORDER BY t.authority ASC");
 
-/// Add a teacher if one is specified
+/// Print headers
 
-    if ($add) {
-        if (! $user = get_record("user", "id", $add)) {
-            error("That teacher (id = $add) doesn't exist", "teacher.php?id=$course->id");
-        }
+	print_header("$course->shortname: $strassignteachers", 
+                 "$course->fullname", 
+                 "<a href=\"index.php\">$strcourses</a> -> ".
+                 "<a href=\"view.php?id=$course->id\">$course->shortname</a> -> ".
+                 "$strassignteachers", "");
 
-        if ($teachers) {
-            foreach ($teachers as $tt) {
-                if ($tt->id == $user->id) {
-                    error("That user is already a teacher for this course.", "teacher.php?id=$course->id");
-                }
+
+/// If data submitted, then process and store.
+
+    if ($form = data_submitted()) {
+        $rank = array();
+
+        // Peel out all the data from variable names.
+        foreach ($form as $key => $val) {
+            if ($key <> "id") {
+                $type = substr($key,0,1);
+                $num  = substr($key,1);
+                $rank[$num][$type] = $val;
             }
         }
 
-        $teacher->user   = $user->id;
-        $teacher->course = $course->id;
-        if ($teachers) {
-            $teacher->authority = 2;
-        } else {
-            $teacher->authority = 1;   // First teacher is the main teacher
+        foreach ($rank as $num => $vals) {
+            if (! $teacher = get_record("user_teachers", "course", "$course->id", "userid", "$num")) {
+                error("No such teacher in course $course->shortname with user id $num");
+            }
+            $teacher->role = $vals['r'];
+            $teacher->authority = $vals['a'];
+            $teacher->editall = $vals['e'];
+            if (!update_record("user_teachers", $teacher)) {
+                error("Could not update teacher entry id = $teacher->id");
+            }
         }
-        $teacher->id = insert_record("user_teachers", $teacher);
-        if (! $teacher->id) {
+		redirect("teacher.php?id=$course->id", get_string("changessaved"));
+	}
+
+/// Add a teacher if one is specified
+
+    if (!empty($_GET['add'])) {
+        if (! add_teacher($add, $course->id)) {
             error("Could not add that teacher to this course!");
         }
-        $user->authority = $teacher->authority;
-        $teachers[] = $user;
     }
 
 /// Remove a teacher if one is specified.
 
-    if ($remove) {
-        if (! $user = get_record("user", "id", $remove)) {
-            error("That teacher (id = $remove) doesn't exist", "teacher.php?id=$course->id");
+    if (!empty($_GET['remove'])) {
+        if (! remove_teacher($remove, $course->id)) {
+            error("Could not add that teacher to this course!");
         }
-        if ($teachers) {
-            foreach ($teachers as $tt) {
-                if ($tt->id == $user->id) {
-                    delete_records("user_teachers", "id", "$tt->teachid");
-                }
-            }
-        }
-        $teachers = get_records_sql("SELECT u.*,t.authority,t.id as teachid FROM user u, user_teachers t 
-                                 WHERE t.course = '$course->id' 
-                                   AND t.user = u.id 
-                                   ORDER BY t.authority ASC");
     }
 
+/// Display all current teachers for this course.
+    $teachers = get_course_teachers($course->id);
 
-/// Print the lists of existing and potential teachers
+    print_heading_with_help("$strexistingteachers $parateachers", "teachers");
 
-    echo "<TABLE CELLPADDING=2 CELLSPACING=10 ALIGN=CENTER>";
-    echo "<TR><TH WIDTH=50%>Existing Teachers</TH><TH WIDTH=50%>Potential Teachers</TH></TR>";
-    echo "<TR><TD WIDTH=50% NOWRAP VALIGN=TOP>";
-
-/// First, show existing teachers for this course
-
-    if (! $teachers) { 
-        echo "<P ALIGN=CENTER>No existing teachers</A>";
+    if (empty($teachers)) {
+        echo "<p align=center>$strnoexistingteachers</a>";
+        $teacherlist = "";
 
     } else {
-        foreach ($teachers as $teacher) {
-            echo "<P ALIGN=right>$teacher->firstname $teacher->lastname, $teacher->email &nbsp;&nbsp; <A HREF=\"teacher.php?id=$course->id&remove=$teacher->id\" TITLE=\"Remove teacher\"><IMG SRC=\"../pix/t/right.gif\" BORDER=0></A></P>";
+
+        $table->head  = array ("", $strname, $strorder, $strrole, $stredit, "&nbsp");
+        $table->align = array ("right", "left", "center", "center", "center", "center");
+        $table->size  = array ("35", "", "", "", "10", "");
+    
+        $ordermenu = NULL;
+        $ordermenu[0] = get_string("hide");
+        for ($i=1; $i<=8; $i++) {
+            $ordermenu[$i] = $i;
         }
+
+        $editmenu = NULL;
+        $editmenu[0] = $strno;
+        $editmenu[1] = $stryes;
+
+        $teacherarray = array();
+    
+        echo "<form action=teacher.php method=post>";
+        foreach ($teachers as $teacher) {
+            $teacherarray[] = $teacher->id;
+    
+            $picture = print_user_picture($teacher->id, $course->id, $teacher->picture, false, true);
+    
+            $authority = choose_from_menu ($ordermenu, "a$teacher->id", $teacher->authority, "", "", "", true);
+
+            if ($USER->id == $teacher->id) {
+                $editall = "<input name=\"e$teacher->id\" type=\"hidden\" value=\"1\">$stryes";
+            } else {
+                $editall = choose_from_menu ($editmenu, "e$teacher->id", $teacher->editall, "", "", "", true);
+            }
+    
+            $removelink = "<a href=\"teacher.php?id=$course->id&remove=$teacher->id\">$strremoveteacher</a>";
+
+            if (!$teacher->role) {
+                $teacher->role = $course->teacher;
+            }
+    
+            $table->data[] = array ($picture, "$teacher->firstname $teacher->lastname", $authority,
+                                    "<input type=text name=\"r$teacher->id\" value=\"$teacher->role\" size=30>",
+                                    $editall, $removelink);
+        }
+        $teacherlist = implode(",",$teacherarray);
+        unset($teacherarray);
+
+        print_table($table);
+        echo "<input type=hidden name=id value=\"$course->id\">";
+        echo "<center><input type=submit value=\"".get_string("savechanges")."\"> ";
+        echo "</center>";
+        echo "</form>";
+        echo "<br />";
     }
 
-    echo "<TD WIDTH=50% NOWRAP VALIGN=TOP>";
 
 /// Print list of potential teachers
 
-    if ($search) {
-        $users = get_records_sql("SELECT * from user WHERE confirmed = 1 
-                                  AND (firstname LIKE '%$search%' OR 
-                                       lastname LIKE '%$search%' OR 
-                                       email LIKE '%$search%')
-                                  AND username <> 'guest'");
-    } else {
-        $users = get_records_sql("SELECT * from user WHERE confirmed = 1 
-                                  AND username <> 'guest'");
-    }
+    print_heading("$strpotentialteachers $parateachers");
 
-    
-    if ($users) {
-        foreach ($users as $user) {  // Remove users who are already teachers
-            if ($teachers) {
-                foreach ($teachers as $teacher) {
-                    if ($teacher->id == $user->id) {
-                        continue 2;
-                    }
-                }
-            }
-            $potential[] = $user;
-        }
-    }
+    $usercount = get_users(false, $search, true, $teacherlist);
 
-    if (! $potential) { 
-        echo "<P ALIGN=CENTER>No potential teachers</A>";
-        if ($search) {
-            echo "<FORM ACTION=teacher.php METHOD=GET>";
-            echo "<INPUT TYPE=hidden NAME=id VALUE=\"$course->id\">";
-            echo "<INPUT TYPE=text NAME=search SIZE=20>";
-            echo "<INPUT TYPE=submit VALUE=\"Search again\">";
-            echo "</FORM>";
-        }
+    if ($usercount == 0) {
+        echo "<p align=center>$strnopotentialteachers</p>";
+
+    } else if ($usercount > MAX_USERS_PER_PAGE) {
+        echo "<p align=center>$strtoomanytoshow ($usercount) </p>";
 
     } else {
+
         if ($search) {
-            echo "<P ALIGN=CENTER>(Search results)</P>";
+            echo "<p align=center>($strsearchresults : $search)</p>";
         }
-        if (count($potential) <= 20) {
-            foreach ($potential as $user) {
-                echo "<P ALIGN=LEFT><A HREF=\"teacher.php?id=$course->id&add=$user->id\" TITLE=\"Add teacher\"><IMG SRC=\"../pix/t/left.gif\" BORDER=0></A>&nbsp;&nbsp;$user->firstname $user->lastname, $user->email";
-            }
-        } else {
-            echo "<P ALIGN=CENTER>There are too many users to show.<BR>";
-            echo "Enter a search word here.";
-            echo "<FORM ACTION=teacher.php METHOD=GET>";
-            echo "<INPUT TYPE=hidden NAME=id VALUE=\"$course->id\">";
-            echo "<INPUT TYPE=text NAME=search SIZE=20>";
-            echo "<INPUT TYPE=submit VALUE=Search>";
-            echo "</FORM>";
+
+        if (!$users = get_users(true, $search, true, $teacherlist)) {
+            error("Could not get users!");
         }
+
+        unset($table);
+        $table->head  = array ("", get_string("name"), get_string("email"), "");
+        $table->align = array ("right", "left", "center", "center");
+        $table->size  = array ("35", "", "", "");
+
+
+        foreach ($users as $user) {
+            $addlink = "<a href=\"teacher.php?id=$course->id&add=$user->id\">$straddteacher</a>";
+            $picture = print_user_picture($user->id, $course->id, $user->picture, false, true);
+            $table->data[] = array ($picture, "$user->firstname $user->lastname", $user->email, $addlink);
+        }
+        print_table($table);
     }
 
-    echo "</TR></TABLE>";
+    if ($search or $usercount > MAX_USERS_PER_PAGE) {
+        echo "<center>";
+        echo "<form action=teacher.php method=get>";
+        echo "<input type=hidden name=id value=\"$course->id\">";
+        echo "<input type=text name=search size=20>";
+        echo "<input type=submit value=\"$searchstring\">";
+        echo "</form>";
+        echo "</center>";
+    }
+
+    echo "</td></tr></table>";
 
     print_footer();
 

course/topics.php

@@ -1,195 +0,0 @@
-<?PHP // $Id$
-      // Display the whole course as "topics" made of of modules
-      // In fact, this is very similar to the "weeks" format, in that
-      // each "topic" is actually a week.  The main difference is that
-      // the dates aren't printed - it's just an aesthetic thing for 
-      // courses that aren't so rigidly defined by time.
-      // Included from "view.php"
-
-    include("../mod/forum/lib.php");
-
-    if (! $sections = get_all_sections($course->id) ) {
-        $section->course = $course->id;   // Create a default section.
-        $section->section = 0;
-        $section->id = insert_record("course_sections", $section);
-        if (! $sections = get_all_sections($course->id) ) {
-            error("Error finding or creating section structures for this course");
-        }
-    }
-    
-    if (isset($topic)) {
-        if ($topic == "all") {
-            unset($USER->topic);
-        } else {
-            $USER->topic = $topic;
-        }
-        save_session("USER");
-    }
-
-    if (isteacher($course->id) and isset($marker)) {
-        $course->marker = $marker;
-        if (! set_field("course", "marker", $marker, "id", $course->id)) {
-            error("Could not mark that topic for this course");
-        }
-    }
-
-
-    // Layout the whole page as three big columns.
-    echo "<TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 WIDTH=100%>";
-    echo "<TR VALIGN=top><TD VALIGN=top WIDTH=180>";
-    
-    // Layout the left column
-
-
-    // Links to people
-
-    $blinker = " <BLINK>*</BLINK>";
-
-    print_simple_box(get_string("people"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-    $moddata[]="<A HREF=\"../user/index.php?id=$course->id\">".get_string("listofallpeople")."</A>";
-    $modicon[]="<IMG SRC=\"../user/users.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-    $editmyprofile = "<A HREF=\"../user/view.php?id=$USER->id&course=$course->id\">".get_string("editmyprofile")."</A>";
-    if ($USER->description) {
-        $moddata[]= $editmyprofile;
-    } else {
-        $moddata[]= $editmyprofile.$blinker;
-    }
-    $modicon[]="<IMG SRC=\"../user/user.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-    print_side_block("", $moddata, "", $modicon);
-
-
-    // Then all the links to module types
-
-    $moddata = array();
-    $modicon = array();
-    if ($modnamesused) {
-        foreach ($modnamesused as $modname => $modfullname) {
-            $moddata[] = "<A HREF=\"../mod/$modname/index.php?id=$course->id\">".$modnamesplural[$modname]."</A>";
-            $modicon[] = "<IMG SRC=\"../mod/$modname/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-        }
-    }
-    print_simple_box("Activities", $align="CENTER", $width="100%", $color="$THEME->cellheading");
-    print_side_block("", $moddata, "", $modicon);
-
-    // Print a form to search forums
-    print_simple_box(get_string("search","forum"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-    echo "<DIV ALIGN=CENTER>";
-    forum_print_search_form($course);
-    echo "</DIV>";
-
-    // Admin links and controls
-    if (isteacher($course->id)) {
-        print_course_admin_links($course->id);
-    }
-
-    // Start main column
-    echo "</TD><TD WIDTH=\"*\">";
-
-    print_simple_box(get_string("topicoutline"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-    
-    // Everything below uses "section" terminology - each "section" is a topic.
-
-    // Now all the sectionly modules
-    $timenow = time();
-    $section = 1;
-
-    $streditsummary = get_string("editsummary");
-    $stradd         = get_string("add");
-
-    echo "<TABLE BORDER=0 CELLPADDING=8 CELLSPACING=0 WIDTH=100%>";
-    while ($section <= $course->numsections) {
-
-        if (isset($USER->topic)) {         // Just display a single topic
-            if ($USER->topic != $section) { 
-                $section++;
-                continue;
-            }
-        }
-
-        $currenttopic = ($course->marker == $section);
-
-        if ($currenttopic) {
-            $highlightcolor = $THEME->cellheading2;
-        } else {
-            $highlightcolor = $THEME->cellheading;
-        }
-
-        echo "<TR>";
-        echo "<TD NOWRAP BGCOLOR=\"$highlightcolor\" VALIGN=top WIDTH=20>";
-        echo "<P ALIGN=CENTER><FONT SIZE=3><B>$section</B></FONT></P>";
-        echo "</TD>";
-
-        echo "<TD VALIGN=top BGCOLOR=\"$THEME->cellcontent\" WIDTH=\"100%\">";
-
-        if (! $thissection = $sections[$section]) {
-            $thissection->course = $course->id;   // Create a new section structure
-            $thissection->section = $section;
-            $thissection->summary = "";
-            if (!$thissection->id = insert_record("course_sections", $thissection)) {
-                notify("Error inserting new topic!");
-            }
-        }
-
-        if (isediting($course->id)) {
-            $thissection->summary .= "&nbsp;<A HREF=editsection.php?id=$thissection->id><IMG SRC=\"../pix/t/edit.gif\" BORDER=0 ALT=\"$streditsummary\"></A></P>";
-        }
-
-        echo text_to_html($thissection->summary);
-
-        print_section($course->id, $thissection, $mods, $modnamesused);
-
-        if (isediting($course->id)) {
-            echo "<DIV ALIGN=right>";
-            popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&section=$section&add=", 
-                        $modnames, "section$section", "", "$stradd...");
-            echo "</DIV>";
-        }
-
-        echo "</TD>";
-        echo "<TD NOWRAP BGCOLOR=\"$highlightcolor\" VALIGN=top ALIGN=CENTER WIDTH=10>";
-        echo "<FONT SIZE=1>";
-        if (isset($USER->topic)) {
-            $strshowalltopics = get_string("showalltopics");
-            echo "<A HREF=\"view.php?id=$course->id&topic=all\" TITLE=\"$strshowalltopics\"><IMG SRC=../pix/i/all.gif BORDER=0></A><BR><BR>";
-        } else {
-            $strshowonlytopic = get_string("showonlytopic", "", $section);
-            echo "<A HREF=\"view.php?id=$course->id&topic=$section\" TITLE=\"$strshowonlytopic\"><IMG SRC=../pix/i/one.gif BORDER=0></A><BR><BR>";
-        }
-        if (isediting($course->id) and $course->marker != $section) {
-            $strmarkthistopic = get_string("markthistopic");
-            echo "<A HREF=\"view.php?id=$course->id&marker=$section\" TITLE=\"$strmarkthistopic\"><IMG SRC=../pix/i/marker.gif BORDER=0></A><BR><BR>";
-        }
-        echo "</TD>";
-        echo "</TR>";
-        echo "<TR><TD COLSPAN=3><IMG SRC=\"../pix/spacer.gif\" WIDTH=1 HEIGHT=1></TD></TR>";
-
-        $section++;
-    }
-    echo "</TABLE>";
-    
-
-    echo "</TD><TD WIDTH=210>";
-
-    // Print all the news items.
-
-    if ($course->newsitems) {
-        if ($news = forum_get_course_forum($course->id, "news")) {
-            print_simple_box(get_string("latestnews"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-            print_simple_box_start("CENTER", "100%", "#FFFFFF", 3, 0);
-            echo "<FONT SIZE=1>";
-            forum_print_latest_discussions($news->id, $course->newsitems, "minimal", "DESC", false);
-            echo "</FONT>";
-            print_simple_box_end();
-        }
-        echo "<BR>";
-    }
-    
-    // Print all the recent activity
-    print_simple_box(get_string("recentactivity"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-    print_simple_box_start("CENTER", "100%", "#FFFFFF", 3, 0);
-    print_recent_activity($course);
-    print_simple_box_end();
-
-    echo "</TD></TR></TABLE>\n";
-
-?>

course/unenrol.php

@@ -5,8 +5,8 @@
 //  but will remove them from the student list and prevent 
 //  any course email being sent to them.
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     require_variable($id);               //course
     optional_variable($user, $USER->id); //user
@@ -26,19 +26,15 @@
 
     if (isset($confirm)) {
 
-        if (! unenrol_student_in_course($user->id, $course->id)) {
+        if (! unenrol_student($user->id, $course->id)) {
             error("An error occurred while trying to unenrol you.");
         }
 
-        // remove some other things
-        delete_records("forum_subscriptions", "user", $user->id);
-
         add_to_log($course->id, "course", "unenrol", "view.php?id=$course->id", "$user->id");
 
         if ($user->id == $USER->id) {
             unset($USER->student["$id"]);
-            save_session("USER");
-            redirect("$CFG->wwwroot");
+            redirect("$CFG->wwwroot/");
         }
         
         redirect("$CFG->wwwroot/user/index.php?id=$course->id");

course/user.php

@@ -2,30 +2,31 @@
 
 // Display user activity reports for a course
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
+
+    $modes = array("outline", "complete", "todaylogs", "alllogs");
 
     require_variable($id);       // course id
     require_variable($user);     // user id
-    optional_variable($mode, "outline");
+    optional_variable($mode, "todaylogs");
+    optional_variable($page, "0");
+    optional_variable($perpage, "100");
 
-    $modes = array("outline", "complete", "todaylogs", "alllogs");
+    require_login();
 
     if (! $course = get_record("course", "id", $id)) {
         error("Course id is incorrect.");
     }
 
-    require_login($course->id);
+    if (!isteacher($course->id)) {
+        error("You are not allowed to look at this page");
+    }
 
     if (! $user = get_record("user", "id", $user)) {
         error("User ID is incorrect");
     }
 
-    if (!isteacher($course->id) and $user->id != $USER->id ) {
-        error("You are not allowed to look at this page");
-    }
-
-
     add_to_log($course->id, "course", "user report", "user.php?id=$course->id&user=$user->id&mode=$mode", "$user->id"); 
 
     $stractivityreport = get_string("activityreport");
@@ -49,33 +50,36 @@
     }
     print_heading("$user->firstname $user->lastname");
 
-    echo "<TABLE CELLPADDING=10 ALIGN=CENTER><TR>";
-    echo "<TD>Reports: </TD>";
+    echo "<table cellpadding=10 align=center><tr>";
+    echo "<td>$stractivityreport: </td>";
+
     foreach ($modes as $listmode) {
         $strmode = get_string($listmode);
         if ($mode == $listmode) {
-            echo "<TD><U>$strmode</U></TD>";
+            echo "<td><u>$strmode</u></td>";
         } else {
-            echo "<TD><A HREF=user.php?id=$course->id&user=$user->id&mode=$listmode>$strmode</A></TD>";
+            echo "<td><a href=user.php?id=$course->id&user=$user->id&mode=$listmode>$strmode</a></td>";
         }
     }
-    echo "</TR></TABLE>";
+    echo "</tr></table>";
 
-    get_all_mods($course->id, $mods, $modnames, $modnamesplural, $modnamesused, $modsectioncounts);
+    get_all_mods($course->id, $mods, $modnames, $modnamesplural, $modnamesused);
 
     switch ($mode) {
         case "todaylogs" :
             echo "<HR><CENTER>";
             print_log_graph($course, $user->id, "userday.png");
             echo "</CENTER>";
-            print_log($course, $user->id, usergetmidnight(time()), "ORDER BY l.time DESC");
+            print_log($course, $user->id, usergetmidnight(time()), "l.time DESC", $page, $perpage, 
+                      "user.php?id=$course->id&user=$user->id&mode=$mode");
             break;
 
         case "alllogs" :
             echo "<HR><CENTER>";
             print_log_graph($course, $user->id, "usercourse.png");
             echo "</CENTER>";
-            print_log($course, $user->id, 0, "ORDER BY l.time DESC");
+            print_log($course, $user->id, 0, "l.time DESC", $page, $perpage, 
+                      "user.php?id=$course->id&user=$user->id&mode=$mode");
             break;
 
         case "outline" :
@@ -107,6 +111,9 @@
 
                         $sectionmods = explode(",", $section->sequence);
                         foreach ($sectionmods as $sectionmod) {
+                            if (empty($mods[$sectionmod])) {
+                                continue;
+                            }
                             $mod = $mods[$sectionmod];
                             $instance = get_record("$mod->modname", "id", "$mod->instance");
                             $libfile = "$CFG->dirroot/mod/$mod->modname/lib.php";
@@ -175,7 +182,7 @@ function print_outline_row($mod, $instance, $result) {
     echo "<TD>&nbsp;&nbsp;&nbsp;</TD>";
     if (isset($result->time)) {
         $timeago = format_time(time() - $result->time);
-        echo "<TD VALIGN=top NOWRAP>".userdate($result->time)." ($timeago ago)</TD>";
+        echo "<TD VALIGN=top NOWRAP>".userdate($result->time)." ($timeago)</TD>";
     }
     echo "</TR>";
 }

course/view.php

@@ -2,8 +2,8 @@
 
 //  Display the course home page.
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     optional_variable($id);
     optional_variable($name);
@@ -22,51 +22,87 @@
         }
     }
 
-    require_login($id);
+    require_login($course->id);
 
     add_to_log($course->id, "course", "view", "view.php?id=$course->id", "$course->id");
 
-    if ( isteacher($course->id) ) {
-        if ($edit == "on") {
-            $USER->editing = true;
-        } else if ($edit == "off") {
-            $USER->editing = false;
+    if (isteacheredit($course->id)) {
+        if (isset($edit)) {
+            if ($edit == "on") {
+                $USER->editing = true;
+            } else if ($edit == "off") {
+                $USER->editing = false;
+            }
         }
-    }
-    if ($help == "on") {
-        $USER->help = true;
-    } else if ($help == "off") {
-        $USER->help = false;
+
+        if (isset($hide)) {
+            set_section_visible($course->id, $hide, "0");
+        }
+
+        if (isset($show)) {
+            set_section_visible($course->id, $show, "1");
+        }
+
+        if (!empty($section)) {
+            if (!empty($move)) {
+                if (!move_section($course, $section, $move)) {
+                    notify("An error occurred while moving a section");
+                }
+            }
+        }
+    } else {
+        $USER->editing = false;
     }
 
-    save_session("USER");
+    $SESSION->fromdiscussion = "$CFG->wwwroot/course/view.php?id=$course->id";
 
     if (! $course->category) {      // This course is not a real course.
-        redirect("$CFG->wwwroot");
+        redirect("$CFG->wwwroot/");
+    }
+
+    if (empty($THEME->custompix)) {
+        $pixpath = "../pix";
+        $modpixpath = "../mod";
+    } else {
+        $pixpath = "../theme/$CFG->theme/pix";
+        $modpixpath = "../theme/$CFG->theme/pix/mod";
     }
 
     $courseword = get_string("course");
 
+    $loggedinas = "<p class=\"logininfo\">".user_login_string($course, $USER)."</p>";
+
     print_header("$courseword: $course->fullname", "$course->fullname", "$course->shortname", "search.search", "", true,
-                  update_course_icon($course->id));
+                  update_course_icon($course->id), $loggedinas);
 
-    get_all_mods($course->id, $mods, $modnames, $modnamesplural, $modnamesused, $modsectioncounts);
-    $sections = get_all_sections($course->id);
+    get_all_mods($course->id, $mods, $modnames, $modnamesplural, $modnamesused);
 
-    switch ($course->format) {
-        case "weeks":
-            include("weeks.php");
-            break;
-        case "social":
-            include("social.php");
-            break;
-        case "topics":
-            include("topics.php");
-            break;
-        default:
-            error("Course format not defined yet!");
+    if (! $sections = get_all_sections($course->id)) {   // No sections found
+        // Double-check to be extra sure
+        if (! $section = get_record("course_sections", "course", $course->id, "section", 0)) {
+            $section->course = $course->id;   // Create a default section.
+            $section->section = 0;
+            $section->visible = 1;
+            $section->id = insert_record("course_sections", $section);
+        }
+        if (! $sections = get_all_sections($course->id) ) {      // Try again
+            error("Error finding or creating section structures for this course");
+        }
     }
 
-    print_footer($course);
+    if (empty($course->modinfo)) {       // Course cache was never made
+        rebuild_course_cache($course->id);
+        if (! $course = get_record("course", "id", $course->id) ) {
+            error("That's an invalid course id");
+        }
+    }
+
+    if (!file_exists("$CFG->dirroot/course/format/$course->format.php")) {   // Default format is weeks
+        $course->format = "weeks";
+    }
+
+    require("$CFG->dirroot/course/format/$course->format.php");  // Include the actual course format
+
+    print_footer();
 
 ?>

course/weeks.php

@@ -1,189 +0,0 @@
-<?PHP // $Id$
-      // Display the whole course as "weeks" made of of modules
-      // Included from "view.php"
-
-    include("../mod/forum/lib.php");
-
-    if (! $sections = get_all_sections($course->id)) {
-        $section->course = $course->id;   // Create a default section.
-        $section->section = 0;
-        $section->id = insert_record("course_sections", $section);
-        if (! $sections = get_all_sections($course->id) ) {
-            error("Error finding or creating section structures for this course");
-        }
-    }
-
-    if (isset($week)) {
-        if ($week == "all") {
-            unset($USER->section);
-        } else {
-            $USER->section = $week;
-        }
-        save_session("USER");
-    }
-
-
-    // Layout the whole page as three big columns.
-    echo "<TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 WIDTH=100%>";
-    echo "<TR VALIGN=top><TD VALIGN=top WIDTH=180>";
-    
-    // Layout the left column
-
-
-    // Links to people
-
-    print_simple_box(get_string("people"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-    $moddata[]="<A HREF=\"../user/index.php?id=$course->id\">".get_string("listofallpeople")."</A>";
-    $modicon[]="<IMG SRC=\"../user/users.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-    $editmyprofile = "<A HREF=\"../user/view.php?id=$USER->id&course=$course->id\">".get_string("editmyprofile")."</A>";
-    if ($USER->description) {
-        $moddata[]= $editmyprofile;
-    } else {
-        $moddata[]= $editmyprofile.$blinker;
-    }
-    $modicon[]="<IMG SRC=\"../user/user.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-    print_side_block("", $moddata, "", $modicon);
-
-
-    // Then all the links to module types
-
-    $moddata = array();
-    $modicon = array();
-    if ($modnamesused) {
-        foreach ($modnamesused as $modname => $modfullname) {
-            $moddata[] = "<A HREF=\"../mod/$modname/index.php?id=$course->id\">".$modnamesplural[$modname]."</A>";
-            $modicon[] = "<IMG SRC=\"../mod/$modname/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
-        }
-    }
-    print_simple_box(get_string("activities"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-    print_side_block("", $moddata, "", $modicon);
-
-    // Print a form to search forums
-    print_simple_box(get_string("search","forum"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-    echo "<DIV ALIGN=CENTER>";
-    forum_print_search_form($course);
-    echo "</DIV>";
-
-    // Admin links and controls
-    if (isteacher($course->id)) {
-        print_course_admin_links($course->id);
-    }
-
-    // Start main column
-    echo "</TD><TD WIDTH=\"*\">";
-
-    print_simple_box(get_string("weeklyoutline"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-    
-    // Now all the weekly modules
-    $timenow = time();
-    $weekdate = $course->startdate;    // this should be 0:00 Monday of that week
-    $week = 1;
-    $weekofseconds = 604800;
-    $course->enddate = $course->startdate + ($weekofseconds * $course->numsections);
-
-    $streditsummary = get_string("editsummary");
-    $stradd         = get_string("add");
-
-    echo "<TABLE BORDER=0 CELLPADDING=8 CELLSPACING=0 WIDTH=100%>";
-    while ($weekdate < $course->enddate) {
-
-        $nextweekdate = $weekdate + ($weekofseconds);
-
-        if (isset($USER->section)) {         // Just display a single week
-            if ($USER->section != $week) { 
-                $week++;
-                $weekdate = $nextweekdate;
-                continue;
-            }
-        }
-
-        $thisweek = (($weekdate <= $timenow) && ($timenow < $nextweekdate));
-
-        $weekday = date("j F", $weekdate);
-        $endweekday = date("j F", $weekdate+(6*24*3600));
-
-        if ($thisweek) {
-            $highlightcolor = $THEME->cellheading2;
-        } else {
-            $highlightcolor = $THEME->cellheading;
-        }
-
-        echo "<TR>";
-        echo "<TD NOWRAP BGCOLOR=\"$highlightcolor\" VALIGN=top WIDTH=20>";
-        echo "<P ALIGN=CENTER><FONT SIZE=3><B>$week</B></FONT></P>";
-        echo "</TD>";
-
-        echo "<TD VALIGN=top BGCOLOR=\"$THEME->cellcontent\" WIDTH=\"100%\">";
-        echo "<P><FONT SIZE=3 COLOR=\"$THEME->cellheading2\">$weekday - $endweekday</FONT></P>";
-
-        if (! $thisweek = $sections[$week]) {
-            $thisweek->course = $course->id;   // Create a new week structure
-            $thisweek->section = $week;
-            $thisweek->summary = "";
-            if (!$thisweek->id = insert_record("course_sections", $thisweek)) {
-                notify("Error inserting new week!");
-            }
-        }
-
-        if (isediting($course->id)) {
-            $thisweek->summary .= "&nbsp;<A TITLE=\"$streditsummary\" HREF=\"editsection.php?id=$thisweek->id\"><IMG SRC=\"../pix/t/edit.gif\" BORDER=0 ALT=\"$streditsummary\"></A></P>";
-        }
-
-        echo text_to_html($thisweek->summary);
-
-        print_section($course->id, $thisweek, $mods, $modnamesused);
-
-        if (isediting($course->id)) {
-            echo "<DIV ALIGN=right>";
-            popup_form("$CFG->wwwroot/course/mod.php?id=$course->id&section=$week&add=", 
-                        $modnames, "section$week", "", "$stradd...");
-            echo "</DIV>";
-        }
-
-        echo "</TD>";
-        echo "<TD NOWRAP BGCOLOR=\"$highlightcolor\" VALIGN=top ALIGN=CENTER WIDTH=10>";
-        echo "<FONT SIZE=1>";
-        if (isset($USER->section)) {
-            $strshowallweeks = get_string("showallweeks");
-            echo "<A HREF=\"view.php?id=$course->id&week=all\" TITLE=\"$strshowallweeks\"><IMG SRC=../pix/i/all.gif BORDER=0></A></FONT>";
-        } else {
-            $strshowonlyweek = get_string("showonlyweek", "", $week);
-            echo "<A HREF=\"view.php?id=$course->id&week=$week\" TITLE=\"$strshowonlyweek\"><IMG SRC=../pix/i/one.gif BORDER=0></A></FONT>";
-        }
-        echo "</TD>";
-        echo "</TR>";
-        echo "<TR><TD COLSPAN=3><IMG SRC=\"../pix/spacer.gif\" WIDTH=1 HEIGHT=1></TD></TR>";
-
-        $week++;
-        $weekdate = $nextweekdate;
-    }
-    echo "</TABLE>";
-    
-
-    echo "</TD><TD WIDTH=210>";
-
-    // Print all the news items.
-
-    if ($course->newsitems) {
-        if ($news = forum_get_course_forum($course->id, "news")) {
-            print_simple_box(get_string("latestnews"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-            print_simple_box_start("CENTER", "100%", "#FFFFFF", 3, 0);
-            echo "<FONT SIZE=1>";
-            forum_print_latest_discussions($news->id, $course->newsitems, "minimal", "DESC", false);
-            echo "</FONT>";
-            print_simple_box_end();
-        }
-        echo "<BR>";
-    }
-    
-    // Print all the recent activity
-    print_simple_box(get_string("recentactivity"), $align="CENTER", $width="100%", $color="$THEME->cellheading");
-    print_simple_box_start("CENTER", "100%", "#FFFFFF", 3, 0);
-    print_recent_activity($course);
-    print_simple_box_end();
-
-    echo "<BR><IMG SRC=\"../pix/spacer.gif\" WIDTH=210 HEIGHT=1>";
-
-    echo "</TD></TR></TABLE>\n";
-
-?>

doc/background.html

@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-  <TITLE>Moodle Docs: Background</TITLE>
-  <LINK REL="stylesheet" HREF="../theme/standard/styles.css" TYPE="TEXT/CSS">
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-  
-<H2>Background</H2>
- 
-<P>Moodle is an active and evolving work in progress.</P>
-<P>I've been working on it, in some way or other, for several years. It started 
-  in the 90's when I was webmaster at <a href="http://dougiamas.com/">Curtin University 
-  of Technology</a> and a system administrator of their WebCT installation. I 
-  encountered many frustrations with the WebCT beast and developed an itch that 
-  needed scratching - there had to be a better way (no, not Blackboard :-)</P>
-<P>I also know a lot of people in schools and smaller institutions (and some big 
-  ones!) who want to make better use of the Internet but don't know where to start 
-  in the maze of technologies and pedagogies that are out there. I've always hoped 
-  there would be a Free alternative that such people could use to help them move 
-  their teaching skills into the online environment.</P>
-<P>My strong beliefs in the unrealised possibilities of Internet-based education 
-  led me to complete a Masters and then a PhD in Education, combining my former 
-  career in Computer Science with newly constructed knowledge about the nature 
-  of learning and collaboration.</P>
-<P>Since then Moodle has progressed through several very different prototypes 
-  to achieve something I'm ready to call version 1.0 and release upon an unsuspecting 
-  world (August 20, 2002). I've been using it in several courses and find it an 
-  extremely usable and reliable tool for building high-quality online courses 
-  - others are reporting the same. Given the context in which it's been designed, 
-  it works particularly well for smaller institutions, or for smaller, more intimate 
-  classes.</P>
-<P>When compared to the big commercial tools such as WebCT or Blackboard I think 
-  it still falls short in some areas (such as scalability and standards support), 
-  but it comes out ahead in many others (see <a href="features.html">Features</a>). 
-</P>
-<P>&nbsp;</P>
-
-<P ALIGN="CENTER"><FONT SIZE="1"><A HREF="index.html" TARGET="_top">Moodle Documentation</A></FONT></P>
-<P ALIGN="CENTER"><FONT SIZE="1">Version: $Id$</FONT></P>
-
-</BODY>
-</HTML>

doc/contents.html

@@ -1,22 +0,0 @@
-<HEAD>
-    <!-- $Id$ -->
-    <TITLE>Moodle Docs: Table of Contents</TITLE>
-	<LINK REL="stylesheet" HREF="../theme/standard/styles.css" TYPE="TEXT/CSS">
-</HEAD>
-
-<BODY BGCOLOR="#FFFFFF">
-    <FONT SIZE=2 FACE="san-serif">
-    <P><B>Moodle Documentation</B></P>
-    <LI><A TARGET="main" HREF="intro.html">Introduction</A>
-    
-<LI><A TARGET="main" HREF="background.html">Background</A> 
-<LI><A TARGET="main" HREF="features.html">Features</A> 
-<LI><A TARGET="main" HREF="install.html">Installation</A>
-<LI><A TARGET="main" HREF="teacher.html">Teacher Manual</A> 
-<LI><A TARGET="main" HREF="developer.html">Developer Manual</A> 
-<LI><A TARGET="main" HREF="future.html">Future</A>
-<LI><A TARGET="main" HREF="credits.html">Credits</A> 
-<LI><A TARGET="main" HREF="licence.html">License</A>
-</FONT>
-</BODY>
-

doc/contents.php

@@ -0,0 +1,19 @@
+<?PHP  // $Id$
+
+    require("../config.php");
+
+    if (! $info = document_file("files.php", false)) {
+        error("404 - File Not Found");
+    }
+
+    include($info->filepath);
+
+    print_header();
+
+    echo "<font size=2 face=\"san-serif\">";
+    foreach ($string as $file => $filename) {
+        echo "<li><a target=\"main\" href=\"$CFG->wwwroot/doc/?file=$file\">$filename</a></li>";
+    }
+    echo "</font>";
+    
+?>

doc/credits.html

@@ -1,115 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-  <TITLE>Moodle Docs: Credits</TITLE>
-  <LINK REL="stylesheet" HREF="../theme/standard/styles.css" TYPE="TEXT/CSS">
-</HEAD>
-  <BODY BGCOLOR="#ffffff">
-        
-<H2>Credits</H2>
-       
-<P><B>Moodle </B>itself is Copyright &copy; 2001-2002, <A HREF="http://dougiamas.com/"> 
-  Martin Dougiamas</A>. &nbsp;It is distributed under the <A HREF="licence.html"> 
-  GNU Public License</A>.</P>
-   
-<H3>Other contributors</H3>
-   
-<UL>
-    <LI><B>Dr Peter Taylor</B>, at Curtin University of Technology, for working 
-with the prototype and making many useful suggestions</LI>
-   
-</UL>
-  <BR>
-   
-<P></P>
-   
-<H3>Moodle libraries</H3>
-   
-<BLOCKQUOTE>      
-  <P>Some of Moodle's libraries were written by other people, and are being 
-redistributed as part of Moodle under the LGPL. &nbsp;Copyright information 
-from this software is included below:</P>
-       
-  <P><B>ADOdb &nbsp; </B>- &nbsp;lib/adodb<BR>
-    </P>
-       
-  <BLOCKQUOTE>          
-    <P>Database abstraction library for MySQL, PostgreSQL, MSSQL, Oracle,
-Interbase, Foxpro, Access, ADO, Sybase, DB2 and ODBC.</P>
-     
-    <P>Version: 2.00 14 May 2002&nbsp;<BR>
-  Copyright &copy;  2000, 2001 John Lim (jlim@natsoft.com.my)<BR>
-  License: Dual LGPL and BSD-style<BR>
-  URL: &nbsp;<A HREF="http://php.weblogs.com/adodb" TARGET="newpage">http://php.weblogs.com/adodb</A><BR>
-      </P>
-      </BLOCKQUOTE>
-     
-    <P><B>Graph Class</B> &nbsp; - &nbsp;lib/graphlib.php </P>
-           
-    <BLOCKQUOTE>              
-      <P>Class to draw line, point, bar, and area graphs, including numeric
- x-axis and double y-axis.</P>
-       
-      <P>  Version: 1.6.3<BR>
-  Copyright &copy;&nbsp;2000&nbsp; Herman Veluwenkamp,&nbsp;hermanV@mindless.com<BR>
-  License: LGPL<BR>
-        </P>
-        </BLOCKQUOTE>
-               
-      <P><B>PHP mailer</B> &nbsp; - &nbsp;lib/class.phpmailer.php<BR>
-        </P>
-              
-      <BLOCKQUOTE>Class for sending email using either sendmail, PHP mail(), 
-or SMTP.&nbsp; Methods are based upon the standard AspEmail(tm) classes.<BR>
-         <BR>
-          Version 1.25, Created 07/02/2001<BR>
-  Copyright &copy; 2001 Brent R. Matzelle &lt;bmatzelle@yahoo.com&gt;<BR>
-  License: LGPL<BR>
-  URL: &nbsp; <A HREF="http://phpmailer.sourceforge.net" TARGET="newpage">http://phpmailer.sourceforge.net</A><BR>
-          <BR>
-          </BLOCKQUOTE>
-                   
-        <P><B>SMTP class &nbsp; </B>- &nbsp;lib/class.smtp.php<BR>
-          </P>
-                   
-        <BLOCKQUOTE>Class that can be used to connect and communicate with
- any SMTP server. <BR>
-  It implements all the SMTP functions defined in RFC821 except TURN.<BR>
-           <BR>
- Version: 03/26/2001 <BR>
- Copyright &copy; 2001 &nbsp;Chris Ryan &lt;chris@greatbridge.com&gt;<BR>
-           <BR>
-            </BLOCKQUOTE>
-                       
-          <P><B>PHP Simple Excel File Generator</B>&nbsp; - &nbsp; lib/psxlsgen.php</P>
-                       
-          <BLOCKQUOTE>Class to generate very simple MS Excel files (xls)
-via PHP.<BR>
-              <BR>
-  Version: 0.3b<BR>
- Copyright &copy; 2001 &nbsp;Erol Ozcan &lt;eozcan@superonline.com&gt;<BR>
- License: GNU LGPL<BR>
-  URL: <A HREF="http://psxlsgen.sourceforge.net">http://psxlsgen.sourceforge.net</A><BR>
-              </BLOCKQUOTE>
-
-          <P><B>IP-Atlas</B>&nbsp; - &nbsp; lib/ipatlas</P>
-                       
-          <BLOCKQUOTE>PHP scripts to show the location of an IP address on a map.<BR>
-              <BR>
-  Version: 1.0<BR>
- Copyright &copy; 2002 &nbsp; Ivan Kozik<BR>
- License: GNU GPL<BR>
-  URL: <A HREF="http://www.xpenguin.com/ip-atlas.php">http://www.xpenguin.com/ip-atlas.php</A><BR>
-              </BLOCKQUOTE>
-                           
-              </BLOCKQUOTE>
-                           
-            <BLOCKQUOTE><BR>
-                </BLOCKQUOTE>
-                               
-              <P ALIGN="CENTER"><FONT SIZE="1"><A HREF="index.html" TARGET="_top">Moodle Documentation</A></FONT></P>
-              <P ALIGN="CENTER"><FONT SIZE="1">Version: $Id$</FONT></P>
-
-                                    
-              </BODY>
-              </HTML>

doc/developer.html

@@ -1,235 +0,0 @@
-<HEAD>
-    <TITLE>Moodle Docs: Developers Manual</TITLE>
-	<LINK REL="stylesheet" HREF="../theme/standard/styles.css" TYPE="TEXT/CSS">
-</HEAD>
-
-<BODY BGCOLOR="#FFFFFF">
-<H2>Developers Manual</H2>
-<P>This document describes some of Moodle's design and how you can contribute.</P>
-<P>Sections in this document:</P>
-<OL>
-  <LI><A HREF="#architecture">Moodle architecture</A></LI>
-  <LI><A HREF="#contribute">How you can contribute</A> 
-    <ul>
-      <li><A HREF="#activities">Learning activities</A></li>
-      <li><A HREF="#themes">Themes</A></li>
-      <li><A HREF="#languages">Languages</A></li>
-      <li><A HREF="#database">Database Schemas</A></li>
-      <li><a href="#courseformats">Course formats</a></li>
-      <li><a href="#doc">Documentation and articles</a></li>
-      <li><a href="#bugs">Participating in the bug tracker</a></li>
-    </ul>
-  </LI>
-</OL>
-<P>&nbsp;</P>
-<H3><a name="architecture"></a>1. Moodle architecture</H3>
-<P>From a system administrator's perspective, Moodle has been designed according 
-  to the following criteria:</P>
-<ol>
-  <li><strong>Moodle should run on the widest variety of platforms</strong><br>
-    <br>
-    The web application platform that runs on most platforms is PHP combined with 
-    MySQL, and this is the environment that Moodle has been developed in (on Linux, 
-    Windows, and Mac OS X). Moodle also uses the ADOdb library for database abstraction, 
-    which means Moodle can use <a href="http://php.weblogs.com/ADOdb_manual#drivers">more 
-    than ten different brands of database</a> (unfortunately, though, it can not 
-    yet <em><strong>set up tables</strong></em> in all these databases - more 
-    on this later). <br><br>
-  </li>
-  <li><strong>Moodle should be easy to install, learn and modify</strong><br>
-    <br>
-    Early prototypes of Moodle (1999) were built using <a href="http://www.zope.org/">Zope</a> 
-    - an advanced object-oriented web application server. Unfortunately I found 
-    that although the technology was pretty cool, it had a very steep learning 
-    curve and was not very flexible in terms of system administration. The PHP 
-    scripting language, on the other hand, is very easy to get into (especially 
-    if you've done any programming using any other scripting language). Early 
-    on I made the decision to avoid using a class-oriented design - again, to 
-    keep it simple to understand for novices. Code reuse is instead achieved by 
-    libraries of clearly-named functions and consistent layout of script files. 
-    PHP is also easy to install (binaries are available for every platform) and 
-    is widely available to the point that most web hosting services provide it 
-    as standard.<br><br>
-  </li>
-  <li><strong>It should be easy to upgrade from one version to the next</strong><br>
-    <br>
-    Moodle knows what version it is (as well as the versions of all plug-in modules) 
-    and a mechanism has been built-in so that Moodle can properly upgrade itself 
-    to new versions (for example it can rename database tables or add new fields). 
-    If using CVS in Unix for example, one can just do a &quot;cvs update -d&quot; 
-    and then visit the site home page to complete an upgrade.<br><br>
-  </li>
-  <li><strong>It should be modular to allow for growth</strong><br>
-    <br>
-    Moodle has a number of features that are modular, including themes, activities, 
-    interface languages, database schemas and course formats. This allows anyone 
-    to add features to the main codebase or to even distribute them separately. 
-    More on this below in the next section.<br><br>
-  </li>
-  <li><strong>It should be able to be used in conjunction with other systems</strong><br>
-    <br>
-    One thing Moodle does is keep all files for one course within a single, normal 
-    directory on the server. This would allow a system administrator to provide 
-    seamless forms of file-level access for each teacher, such as Appletalk, SMB, 
-    NFS, FTP, WebDAV and so on. Otherwise, there is work yet to do. Features planned 
-    for Moodle in future versions include: flexible connection to existing databases 
-    of user details and grades; import and export of Moodle data using XML-based 
-    formats; and increased use of style sheets for interface formatting (so that 
-    it can be integrated visually into other web sites).</li>
-</ol>
-<p>&nbsp;</p>
-<H3><a name="contribute" id="contribute"></a>2. How you can contribute</H3>
-<P>As mentioned above, Moodle has a number of features that are modular. Even 
-  if you are not a programmer there are things you can change or help with.</P>
-<P><strong><a name="activities" id="activities"></a>Learning Activities</strong></P>
-<blockquote> 
-  <p>These are by far the most important modules, and reside in the 'mod' directory. 
-    There are six default modules: assignment, choice, forum, journal, reading, 
-    and survey. Each module is in a separate subdirectory and consists of the 
-    following mandatory elements (plus extra scripts unique to each module):</p>
-  <ul>
-    <li>mod.html: a form to set up or update an instance of this module</li>
-    <li>version.php: defines some meta-info and provides upgrading code</li>
-    <li>icon.gif: a 16x16 icon for the module</li>
-    <li>db/: SQL dumps of all the required db tables and data (for each database 
-      type) </li>
-    <li>index.php: a page to list all instances in a course</li>
-    <li>view.php: a page to view a particular instance</li>
-    <li>lib.php: any/all functions defined by the module should be in here. If 
-      the modulename if called widget, then the required functions include: 
-      <ul>
-        <li>widget_add_instance() - code to add a new instance of widget</li>
-        <li>widget_update_instance() - code to update an existing instance</li>
-        <li>widget_delete_instance() - code to delete an instance</li>
-        <li>widget_user_outline() - given an instance, return a summary of a user's 
-          contribution</li>
-        <li>widget_user_complete() - given an instance, print details of a user's 
-          contribution<br>
-        </li>
-        <li>To avoid possible conflict, any module functions should be named starting 
-          with widget_ and any constants you define should start with WIDGET_ 
-        </li>
-      </ul>
-    </li>
-    <li>Lastly, each module will have some language files that contain strings 
-      for that module. See below.<br>
-    </li>
-  </ul>
-</blockquote>
-<p> <strong><a name="themes" id="themes"></a>Themes</strong></p>
-<blockquote> 
-  <p>Themes (or skins) define the look of a site. A number of simple themes are 
-    provided in the main distribution, but you may want to copy one of these and 
-    customise it to suit your own needs (eg local logo, colours, styles, graphics 
-    etc)</p>
-  <p>Each theme is in a subdirectory of the &quot;theme&quot; directory. You can 
-    copy the &quot;standard&quot; theme as a template.<br>
-  </p>
-</blockquote>
-<p><strong><a name="languages" id="languages"></a>Languages</strong></p>
-<blockquote> 
-  <p>Moodle has been designed for internationalisation. Each 'string' or 'page' 
-    of text that is displayed as part of the interface is drawn from a set of 
-    language files. Each language is a subdirectory of the directory 'lang'. The 
-    structure of the lang directory is as follows:</p>
-  <p><strong>lang/en</strong> - directory containing all files for one language 
-    (eg English)</p>
-  <ul>
-    <li>moodle.php - strings for main interface</li>
-    <li>assignment.php - strings for assignment module</li>
-    <li>choice.php - strings for choice module</li>
-    <li>forum.php - strings for forum module</li>
-    <li>journal.php - strings for journal module </li>
-    <li>reading.php - strings for reading module</li>
-    <li>survey.php - strings for reading module</li>
-    <li>.... plus other modules if any.<br>
-      <br>
-      A string is called from these files using the <strong><em>get_string()</em></strong><em> 
-      </em>or<em> <strong>print_string()</strong> </em>functions. Each string 
-      supports variable substitution, to support variable ordering in different 
-      languages.<em><br>
-      <br>
-      </em>eg $strdueby = get_string(&quot;assignmentdueby&quot;, &quot;assignment&quot;, 
-      userdate($date)); <br>
-      <br>
-      If a string doesn't exist in a particular language, then the equivalent 
-      in English will automatically be used instead.</li>
-  </ul>
-  <p><strong>lang/en/help</strong> - contains whole help pages (for popup context-sensitive 
-    help)</p>
-  <blockquote> 
-    <p>Main help pages are situated here, while help pages specific to each module 
-      are located in subdirectories with the module's name.</p>
-    <p>You can insert a helpbutton in a page with the helpbutton function.</p>
-    <p>eg helpbutton(&quot;text&quot;, &quot;Click here for help about text&quot;);</p>
-    <p>and for modules:</p>
-    <p>helpbutton(&quot;forumtypes&quot;, &quot;Forum types&quot;, &quot;forum&quot;);</p>
-  </blockquote>
-</blockquote>
-<p><br>
-  <strong><a name="database" id="database"></a>Database Schemas</strong></p>
-<blockquote> 
-  <p>Given a working database with defined tables, the intentionally simple SQL 
-    used in Moodle should work fine with a wide variety of database brands.</p>
-  <p>A problem exists with <strong>automatically creating</strong> new tables 
-    in a database, which is what Moodle tries to do upon initial installation. 
-    Because every database is very different, there doesn't yet exist any way 
-    to do this in a platform-independent way. To support this automation in each 
-    database, schemas can be created that list the required SQL to create Moodle 
-    tables in a particular database. These are files in <strong>lib/db</strong> 
-    and inside the <strong>db</strong> subdirectory of each module.</p>
-  <p>Currently, only MySQL is supported because that's what I know. If you are 
-    familiar with another database (especially open source databases) and are 
-    willing to help port the MySQL schema, please get in contact with me (<a href="mailto:martin@moodle.com">martin@moodle.com</a>).</p>
-</blockquote>
-<p>&nbsp;</p>
-<p><strong><a name="courseformats" id="courseformats"></a>Course Formats</strong></p>
-<blockquote> 
-  <p>Moodle 1.0 supports three different course formats: weekly, topics and social. 
-  </p>
-  <p>These are a little more connected to the rest of the code (and hence, less 
-    &quot;pluggable&quot;) but it is still quite easy to add new ones.</p>
-  <p>If you have any ideas for different formats that you need or would like to 
-    see, get in touch with me and I'll do my absolute best to have them available 
-    in future releases.</p>
-</blockquote>
-<p>&nbsp;</p>
-<p><strong><a name="doc" id="doc"></a>Documentation and articles</strong></p>
-<blockquote> 
-  <p>If you feel like writing a tutorial, an article, an academic paper or anything 
-    else about Moodle, please do! Put it on the web and make sure you include 
-    links to <a href="http://moodle.com/">http://moodle.com/</a></p>
-  </blockquote>
-<p>&nbsp;</p>
-<p><strong><a name="bugs" id="bugs"></a>Participating in the bug tracker</strong></p>
-<blockquote> 
-  <p>Finally, I would like to invite you to register on the &quot;bug tracker&quot; 
-    at <a href="http://bugs.moodle.org">bugs.moodle.org</a> so you can file any 
-    bugs that you find and perhaps participate in discussing and fixing them. 
-  </p>
-  <p>&quot;Bugs&quot; not only includes software bugs with current versions of 
-    Moodle, but also new ideas, feature requests and even constructive criticism 
-    of existing features. The beauty of open source is that anyone can participate 
-    in some way and help to create a better product for all of us to enjoy. In 
-    this project, your input is very welcome!</p>
-</blockquote>
-<p>&nbsp;</p>
-<blockquote> 
-  <blockquote> 
-    <blockquote> 
-      <p align="center">Thanks for using Moodle!</p>
-      <p align="center">Cheers,<br>
-        <a href="http://dougiamas.com/" target="_top">Martin Dougiamas</a></p>
-    </blockquote>
-  </blockquote>
-</blockquote>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<blockquote> 
-  <p>&nbsp;</p>
-</blockquote>
-<P ALIGN="CENTER"><FONT SIZE="1"><A HREF="index.html" TARGET="_top">Moodle Documentation</A></FONT></P>
-<P ALIGN="CENTER"><FONT SIZE="1">Version: $Id: developer.html,v 1.2 2001/12/09 
-  10:34:19 martin Exp $</FONT></P>
-
-</BODY>

doc/features.html

@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-  <TITLE>Moodle Docs: Background</TITLE>
-  <LINK REL="stylesheet" HREF="../theme/standard/styles.css" TYPE="TEXT/CSS">
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-  
-<H2>Features</H2>
- 
-Here is a big list of some of the features in Moodle 1.0: 
-<UL><LI>Supports a social constructionist pedagogy (collaboration, activities, critical reflection, etc)</LI><LI>Suitable for 100% online classes as well as supplementing face-to-face learning<LI>Simple, lightweight, browser-compatible interface</LI><LI>Plug-in "themes" allow you to customise the colours, fonts, layout etc</LI><LI>Easy to install on most platforms</LI><LI>Easy administration - students can create their own accounts.  Email addresses are verified.</LI><LI>One account works for the whole server</LI><LI>Security - teachers can add an "enrolment key" to their courses to keep out non-students.  They can give out this key face-to-face or via personal email etc</LI><LI>Students are encouraged to build an online profile including photos, description etc</LI><LI>Every user can specify their own timezone, and every date in Moodle is translated to that timezone (eg posting dates, assignment due dates etc)</LI><LI>Choice of course formats such as by week, by topic or a discussion-focussed social format</LI><LI>Flexible array of course modules - Forums, Journals, Readings, Choices, Surveys, Assignments.</LI><LI>New modules can be written and plugged in to existing Moodle installations</LI><LI>The code is clearly-written PHP under a GPL license - easy to modify and localise</LI><LI>Full database abstraction supports all major brands of database (except for initial table definition)</LI><LI>Ready for internationalisation - supports plug-in languages and locale-based date formats etc</LI><LI>Mail integration - copies of forum posts, teacher feedback etc can be mailed in HTML or plain text.</LI><LI>Recent changes to the course since the last login are displayed on the course home page</LI><LI>Full user logging and tracking - activity reports for each student are available with graphs and details about each module (last access, number of times read) as well as a detailed "story" of each students involvement including postings, journal entries etc on one page.</LI>
-</UL>
-<B>Forum Module</B>
-<UL><LI>Different types of forums are available, such as teacher-only, course news, open-to-all, and one-thread-per-user.</LI><LI>All postings have the authors photo attached.</LI><LI>Discussions can be viewed nested, flat or threaded, oldest or newest first.</LI><LI>Individual forums can be subscribed to by each person so that copies are forwarded via email, or the teacher can force subscription for all</LI>
-</UL>
-<B>Survey Module</B>
-<UL><LI>Built-in surveys (COLLES, ATTLS) have been proven as instruments for analysing online classes</LI><LI>Online survey reports always available, including many graphs.  Data is downloadable as an Excel spreadsheet or CSV text file.</LI><LI>Survey interface prevents partly-finished surveys.</LI><LI>Feedback is provided to the student of their results compared to the class averages</UL>
-<B>Readings Module</B>
-<UL><LI>Supports display of any electronic content</LI><LI>Files can be uploaded and managed on the server, or created on the fly using web forms (text or HTML)</LI><LI>External content on the web can be linked to or seamlessly included within the course interface.</LI></UL>
-<B>Choice Module</B>
-<UL><LI>Like a poll.  Can either be used to vote on something, or to get feedback from every student (eg research consent)</LI></UL>
-<B>Journal Module</B>
-<UL><LI>Journals are private between student and teacher.</LI><LI>Each journal entry can be directed by an open question.</LI><LI>For each particular journal entry, the whole class can be assessed on one page in one form.</LI><LI>Teacher feedback is appended to the journal entry page, and notification is mailed out.</LI></UL>
-<B>Assignment Module</B>
-<UL><LI>Assignments can be specified with a due date and a maximum grade.</LI><LI>Students can upload their assignments (any file format) to the server - they are date-stamped.</LI><LI>Late assignments are allowed, but the amount of lateness is shown clearly to the teacher</LI><LI>For each particular assignment, the whole class can be assessed (grade and comment) on one page in one form.</LI><LI>Teacher feedback is appended to the assignment page for each student, and notification is mailed out.</LI></UL>
-<P>&nbsp;</P>
-
-<P ALIGN="CENTER"><FONT SIZE="1"><A HREF="index.html" TARGET="_top">Moodle Documentation</A></FONT></P>
-<P ALIGN="CENTER"><FONT SIZE="1">Version: $Id: features.html,v 1.2 2001/12/09 
-  10:34:19 martin Exp $</FONT></P>
-
-</BODY>
-</HTML>

doc/future.html

@@ -1,46 +0,0 @@
-<HEAD>
-    <TITLE>Moodle Docs: Future</TITLE>
-	<LINK REL="stylesheet" HREF="../theme/standard/styles.css" TYPE="TEXT/CSS">
-</HEAD>
-
-<BODY BGCOLOR="#FFFFFF">
-
-<H2>Future</H2>
-<P>I'm committed to continuing my work on Moodle and on keeping it Open and Free. 
-  I have a deeply-held belief in the importance of unrestricted education and 
-  empowered teaching, and Moodle is the main way I can contribute to the realisation 
-  of these ideals. 
-
-<P>As Moodle gains in maturity, I hope its directions are influenced by the community 
-  of developers and users. A dynamic database of proposed features and their status 
-  can be found at <A TARGET=_top HREF="http://bugs.moodle.org/">bugs.moodle.org</A>. 
-  Your <a href="developer.html">contributions</a> in the form of ideas, code, 
-  feedback and promotion are all very welcome. 
-
-<P>Now that 1.0.1 has been released, most of my efforts will concentrate on the 
-  macro level (supporting larger classes and integrating into larger institutions) 
-  and the micro level (improving support for decisions and processes, for both 
-  teachers and learners). 
-
-<P>The next 6 months or so I will have to slow down my own development a little 
-  (because I have a PhD thesis to finish).  During this time there'll be a number 
-  of small upgrades 1.0.2, 1.0.3 etc that I expect will contain minor new features 
-  and polishing.  I'll also be working with people adding new plugins (support for 
-  more databases, new modules and new themes).
-
-<P>Sometime in the first half of 2003 you can expect a major release (1.1, maybe 1.5) that has 
-  new features like:
-
-  <UL>
-  <LI>Full user account management (eg connection to external databases, import/export etc)
-  <LI>Full grade management
-  <LI>Ability to define groups and group work
-  <LI>Automatic linking in texts to uploaded readings (like Wiki)
-  <LI>Online support for teachers to design and maintain classes
-  <LI>Online support for students in collaboration processes
-  </UL>
-   
-<P ALIGN="CENTER">&nbsp;</P>
-<P ALIGN="CENTER"><FONT SIZE="1"><A HREF="index.html" TARGET="_top">Moodle Documentation</A></FONT></P>
-<P ALIGN="CENTER"><FONT SIZE="1">Version: $Id$</FONT></P>
-</BODY>

doc/index.html

@@ -1,8 +0,0 @@
-<HEAD>
-    <TITLE>Moodle Documentation</TITLE>
-</HEAD>
-
-<FRAMESET COLS="200,*">
-    <FRAME NAME="contents" SRC="contents.html">
-    <FRAME NAME="main" SRC="intro.html">
-</FRAMESET>