OK, better get this out now

(not really sure if this script should exist!!)
Bug 1702
(http://moodle.org/bugs/bug.php?op=show&bugid=1702)

Merged from HEAD

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>".fullname($admin, true).",
+                     $admin->email &nbsp;&nbsp; ";
+            if ($primaryadmin->id == $admin->id){
+                print_spacer(10, 9, false);
+            } else {
+                echo "<a href=\"admin.php?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=\"admin.php?add=$user->id\"".
+                   "title=\"$straddadmin\"><img src=\"../pix/t/left.gif\"".
+                   "border=0></a>&nbsp;&nbsp;".fullname($user).", $user->email";
+        }
+    }
+
+    if ($search or $usercount > MAX_USERS_PER_PAGE) {
+        echo "<form action=admin.php 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, "","document.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/backup.php

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

admin/block.php

@@ -0,0 +1,60 @@
+<?PHP  // $Id$
+
+// block.php - allows admin to edit all local configuration variables for a block
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/blocklib.php');
+
+    require_login();
+
+    if (!isadmin()) {
+        error('Only an admin can use this page');
+    }
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
+
+    require_variable($_REQUEST['block']);
+    $blockid = intval($_REQUEST['block']);
+
+    if(($blockrecord = get_record('blocks', 'id', $blockid)) === false) {
+        error('This block does not exist');
+    }
+
+    $block = block_instance($blockrecord->name, NULL);
+    if($block === false) {
+        error('Problem in instantiating block object');
+    }
+
+/// If data submitted, then process and store.
+
+	if ($config = data_submitted()) {
+	    unset($config['block']); // This will always be set if we have reached this point
+	    $block->handle_config($config);
+        print_header();
+        redirect("$CFG->wwwroot/$CFG->admin/blocks.php", get_string("changessaved"), 1);
+        exit;
+	}
+
+/// Otherwise print the form.
+
+    $stradmin = get_string('administration');
+    $strconfiguration = get_string('configuration');
+    $strmanageblocks = get_string('manageblocks');
+    $strblockname = $block->get_title();
+
+    print_header($site->shortname.': '.$strblockname.": $strconfiguration", $site->fullname,
+                  "<a href=\"index.php\">$stradmin</a> -> ".
+                  "<a href=\"configure.php\">$strconfiguration</a> -> ".
+                  "<a href=\"blocks.php\">$strmanageblocks</a> -> ".$strblockname);
+
+    print_heading($strblockname);
+
+    print_simple_box('<center>'.get_string('configwarning').'</center>', 'center', '50%');
+    echo '<br />';
+
+    $block->print_config();
+
+    print_footer();
+
+?>

admin/blocks.php

@@ -0,0 +1,172 @@
+<?PHP // $Id$
+
+    // Allows the admin to configure blocks (hide/show, delete and configure)
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/blocklib.php');
+
+    optional_variable($_GET['hide']);
+    optional_variable($_GET['show']);
+    optional_variable($_GET['delete']);
+    optional_variable($_GET['confirm'], 0);
+    $delete = $_GET['delete']; // Dependency remover
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only administrators can use this page!");
+    }
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
+
+
+/// Print headings
+
+    $stradministration = get_string('administration');
+    $strconfiguration = get_string('configuration');
+    $strmanageblocks = get_string('manageblocks');
+    $strdelete = get_string('delete');
+    $strversion = get_string('version');
+    $strhide = get_string('hide');
+    $strshow = get_string('show');
+    $strsettings = get_string('settings');
+    $strcourses = get_string('courses');
+    $strname = get_string('name');
+
+    print_header("$site->shortname: $strmanageblocks", "$site->fullname",
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $strmanageblocks");
+
+    print_heading($strmanageblocks);
+
+
+/// If data submitted, then process and store.
+
+    if (!empty($_GET['hide'])) {
+        if (!$block = get_record('blocks', 'id', $_GET['hide'])) {
+            error("Block doesn't exist!");
+        }
+        set_field('blocks', 'visible', '0', 'id', $block->id);      // Hide block
+    }
+
+    if (!empty($_GET['show'])) {
+        if (!$block = get_record('blocks', 'id', $_GET['show'])) {
+            error("Block doesn't exist!");
+        }
+        set_field('blocks', 'visible', '1', 'id', $block->id);      // Show block
+    }
+
+    if (!empty($delete)) {
+
+        if (!$block = get_record('blocks', 'id', $delete)) {
+            error("Block doesn't exist!");
+        }
+
+        $blockobject = block_instance($block->name, $site);
+        $strblockname = $blockobject->get_title();
+
+        if (!$_GET['confirm']) {
+            notice_yesno(get_string('blockdeleteconfirm', '', $strblockname),
+                         'blocks.php?delete='.$block->id.'&amp;confirm=1',
+                         'blocks.php');
+            print_footer();
+            exit;
+
+        } else {
+            // Delete block
+            if (!delete_records('blocks', 'id', $block->id)) {
+                notify("Error occurred while deleting the $strblockname record from blocks table");
+            }
+
+            blocks_update_every_block_by_id($block->id, 'delete');                        // Delete blocks in all courses by id
+
+            // Then the tables themselves
+
+            if ($tables = $db->Metatables()) {
+                $prefix = $CFG->prefix.$block->name;
+                foreach ($tables as $table) {
+                    if (strpos($table, $prefix) === 0) {
+                        if (!execute_sql("DROP TABLE $table", false)) {
+                            notify("ERROR: while trying to drop table $table");
+                        }
+                    }
+                }
+            }
+
+            $a->block = $strblockname;
+            $a->directory = $CFG->dirroot.'/blocks/'.$block->name;
+            notice(get_string('blockdeletefiles', '', $a), 'blocks.php');
+        }
+    }
+
+/// Main display starts here
+
+/// Get and sort the existing blocks
+
+    if (!$blocks = get_records('blocks')) {
+        error('No blocks found!');  // Should never happen
+    }
+
+    foreach ($blocks as $block) {
+        if(($blockobject = block_instance($block->name, NULL)) === false) {
+            // Failed to load
+            continue;
+        }
+        $blockbyname[$blockobject->get_title()] = $block->id;
+        $blockobjects[$block->id] = $blockobject;
+    }
+    ksort($blockbyname);
+
+/// Print the table of all blocks
+
+    if (empty($THEME->custompix)) {
+        $pixpath = '../pix';
+        // [pj] This is not used anywhere, but I'm leaving it in for the future
+        //$modpixpath = '../mod';
+    } else {
+        $pixpath = '../theme/'.$CFG->theme.'/pix';
+        // [pj] This is not used anywhere, but I'm leaving it in for the future
+        //$modpixpath = '../theme/'.$CFG->theme.'/pix/mod';
+    }
+
+    $table->head  = array ($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strdelete, $strsettings);
+    $table->align = array ('LEFT', 'RIGHT', 'LEFT', 'CENTER', 'CENTER', 'CENTER');
+    $table->wrap = array ("NOWRAP", "", "", "", "","");
+    $table->size = array ("100%", "10", "10", "10", "10","12");
+    $table->width = "100";
+
+    foreach ($blockbyname as $blockname => $blockid) {
+
+        // [pj] This is not used anywhere, but I'm leaving it in for the future
+        //$icon = "<img src=\"$modpixpath/$block->name/icon.gif\" hspace=10 height=16 width=16 border=0>";
+        $blockobject = $blockobjects[$blockid];
+
+        $delete = '<a href="blocks.php?delete='.$blockid.'">'.$strdelete.'</a>';
+
+        $settings = ''; // By default, no configuration
+        if($blockobject->has_config()) {
+            $settings = '<a href="block.php?block='.$blockid.'">'.$strsettings.'</a>';
+        }
+
+        $count = blocks_get_courses_using_block_by_id($blockid);
+        $class = ''; // Nothing fancy, by default
+
+        if ($blocks[$blockid]->visible) {
+            $visible = '<a href="blocks.php?hide='.$blockid.'" title="'.$strhide.'">'.
+                       '<img src="'.$pixpath.'/i/hide.gif" style="height: 16px; width: 16px;" /></a>';
+        } else {
+            $visible = '<a href="blocks.php?show='.$blockid.'" title="'.$strshow.'">'.
+                       '<img src="'.$pixpath.'/i/show.gif" style="height: 16px; width: 16px;" /></a>';
+            $class = ' class="dimmed_text"'; // Leading space required!
+        }
+
+        $table->data[] = array ('<p'.$class.'>'.$blockobject->get_title().'</p>', $count, $blockobject->get_version(), $visible, $delete, $settings);
+    }
+    echo '<p>';
+    print_table($table);
+    echo '</p>';
+    print_footer();
+
+?>

admin/config.html

@@ -0,0 +1,496 @@
+<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>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>timezone:</td>
+    <td><?php
+       if (abs($config->timezone) > 13) {
+           $config->timezone = 99;
+       }
+       $timenow = time();
+
+       for ($tz = -26; $tz <= 26; $tz++) {
+           $zone = (float)$tz/2.0;
+           $usertime = $timenow + ($tz * 1800);
+           if ($tz == 0) {
+               $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT)";
+           } else if ($tz < 0) {
+               $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT$zone)";
+           } else {
+               $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT+$zone)";
+           }
+       }
+
+       choose_from_menu ($timezones, "timezone", $config->timezone, get_string("serverlocaltime"), "", "99");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configtimezone") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>country:</td>
+	<td><?php choose_from_menu (get_list_of_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>deleteunconfirmed:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[0]    = get_string("never");
+       $options[168]  = get_string("numdays", "", 7);
+       $options[144]  = get_string("numdays", "", 6);
+       $options[120]  = get_string("numdays", "", 5);
+       $options[96]   = get_string("numdays", "", 4);
+       $options[72]   = get_string("numdays", "", 3);
+       $options[48]   = get_string("numdays", "", 2);
+       $options[24]   = get_string("numdays", "", 1);
+       $options[12]   = get_string("numhours", "", 12);
+       $options[6]    = get_string("numhours", "", 6);
+       $options[1]    = get_string("numhours", "", 1);
+
+       choose_from_menu ($options, "deleteunconfirmed", $config->deleteunconfirmed, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configdeleteunconfirmed") ?>
+    </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>sessioncookie:</td>
+	<td>
+    <input name=sessioncookie type=text size=10 value="<?php p($config->sessioncookie)?>">
+    </td>
+    <td>
+    <?php print_string("configsessioncookie") ?>
+    </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 valign=top>
+	<td align=right><p>allowunenroll:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[0]  = get_string("no");
+       $options[1]  = get_string("yes");
+
+       choose_from_menu ($options, "allowunenroll", $config->allowunenroll, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configallowunenroll") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>maxbytes:</td>
+	<td>
+    <?php 
+       $options = get_max_upload_sizes();
+       choose_from_menu ($options, "maxbytes", $config->maxbytes, "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configmaxbytes") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>fullnamedisplay:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options['language']  = get_string('language');
+       $options['firstname lastname']  = get_string('firstname') . ' + ' . get_string('lastname');
+       $options['lastname firstname']  = get_string('lastname') . ' + ' . get_string('firstname');
+       $options['firstname']  = get_string('firstname');
+
+       choose_from_menu ($options, "fullnamedisplay", $config->fullnamedisplay, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configfullnamedisplay") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>extendedusernamechars:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[0] = get_string("no");
+       $options[1] = get_string("yes");
+
+       choose_from_menu ($options, "extendedusernamechars", $config->extendedusernamechars, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configextendedusernamechars") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>forcelogin:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[0]  = get_string('no');
+       $options[1]  = get_string('yes');
+
+       choose_from_menu ($options, "forcelogin", $config->forcelogin, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configforcelogin") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>forceloginforprofiles:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[0]  = get_string('no');
+       $options[1]  = get_string('yes');
+
+       choose_from_menu ($options, "forceloginforprofiles", $config->forceloginforprofiles, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configforceloginforprofiles") ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td align=right><p>opentogoogle:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[0] = get_string("no");
+       $options[1] = get_string("yes");
+
+       choose_from_menu ($options, "opentogoogle", $config->opentogoogle, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configopentogoogle") ?>
+    </td>
+</tr>
+
+<tr valign=top>
+        <td align=right><p>enablerssfeeds:</td>
+        <td>
+    <?php
+       unset($options);
+       $options[0] = get_string("no");
+       $options[1] = get_string("yes");
+
+       choose_from_menu ($options, "enablerssfeeds", $config->enablerssfeeds, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php 
+        print_string("configenablerssfeeds");
+        //Check for required functions...
+        if(!function_exists('utf8_encode')) {
+            echo "<font color=\"red\"> You need to add XML support to your PHP installation.</font>";
+        } 
+    ?>
+    </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,106 @@
+<?PHP  // $Id$
+       // config.php - allows admin to edit all configuration variables
+
+    require_once("../config.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) {
+                if ($name == "sessioncookie") {
+                    $value = eregi_replace("[^a-zA-Z]", "", $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,50 @@
+<?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"));
+    $table->data[] = array("<b><a href=\"blocks.php\">".get_string("manageblocks")."</a></b>",
+                           get_string("adminhelpmanageblocks"));
+    $table->data[] = array("<b><a href=\"filters.php\">".get_string("managefilters")."</a></b>",
+                           get_string("adminhelpmanagefilters"));
+    if (!isset($CFG->disablescheduledbackups)) {
+        $table->data[] = array("<b><a href=\"backup.php\">".get_string("backup")."</a></b>",
+                               get_string("adminhelpbackup"));
+    }
+
+    print_table($table);
+    
+    print_footer($site);
+
+?>
+
+

admin/creators.php

@@ -0,0 +1,148 @@
+<?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();
+
+/// 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>".fullname($creator, true).", $creator->email &nbsp;&nbsp; ";
+                echo "<a href=\"creators.php?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) {
+            $fullname = fullname($user, TRUE);
+            echo "<p align=left><a href=\"creators.php?add=$user->id\"".
+                   "title=\"$straddcreator\"><img src=\"../pix/t/left.gif\"".
+                   "border=0></a>&nbsp;&nbsp;$fullname, $user->email";
+        }
+    }
+
+    if ($search or $usercount > MAX_USERS_PER_PAGE) {
+        echo "<form action=creators.php 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,46 @@
 <?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();
+    
+/// The current directory in PHP version 4.3.0 and above isn't necessarily the
+/// directory of the script when run from the command line. The require_once()
+/// would fail, so we'll have to chdir()
+
+    if (!isset($_SERVER['REMOTE_ADDR']) && isset($_SERVER['argv'][0])) {
+        chdir(dirname($_SERVER['argv'][0]));
+    }
+
+    require_once("../config.php");
+
+    if (!$alreadyadmin = isadmin()) {
+        unset($_SESSION['USER']);
+        unset($USER);
+        unset($_SESSION['SESSION']);
+        unset($SESSION);
+        $USER = get_admin();      /// Temporarily, to provide environment for this script
+    }
+
+    echo "<pre>\n";
 
     $timenow  = time();
+    echo "Server Time: ".date('r',$timenow)."\n\n";
 
-//  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 +57,117 @@
         }
     }
 
+/// 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 ($students = get_users_longtimenosee($longtime)) {
+                foreach ($students as $student) {
+                    if (unenrol_student($student->userid, $student->course)) {
+                        echo "Deleted student enrolment for user $student->userid from course $student->course\n";
+                    }
                 }
             }
         }
+    
+    
+        /// Delete users who haven't confirmed within required period
+
+        $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+        if ($users = get_users_unconfirmed($oneweek)) {
+            foreach ($users as $user) {
+                if (delete_records("user", "id", $user->id)) {
+                    echo "Deleted unconfirmed user for ".fullname($user, true)." ($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'");
+        }
+
+        /// Delete old cached texts
+
+        if (!empty($CFG->cachetext)) {   // Defined in config.php
+            $cachelifetime = time() - $CFG->cachetext;
+            delete_records_select("cache_text", "timemodified < '$cachelifetime'");
+        }
     }
 
+    if (file_exists("$CFG->dataroot/cronextra.php")) {
+        include("$CFG->dataroot/cronextra.php");
+    }
 
-// 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";
+    if (!isset($CFG->disablescheduledbackups)) {   // Defined in config.php
+        //Execute backup's cron
+        //Perhaps a long time and memory could help in large sites
+        @set_time_limit(0);
+        ini_set("memory_limit","56M");
+        if (file_exists("$CFG->dirroot/backup/backup_scheduled.php") and
+            file_exists("$CFG->dirroot/backup/backuplib.php") and
+            file_exists("$CFG->dirroot/backup/lib.php") and
+            file_exists("$CFG->libdir/blocklib.php")) {
+            include_once("$CFG->dirroot/backup/backup_scheduled.php");
+            include_once("$CFG->dirroot/backup/backuplib.php");
+            include_once("$CFG->dirroot/backup/lib.php");
+            require_once ("$CFG->libdir/blocklib.php");
+            echo "Running backups if required...\n";
+            flush();
+    
+            if (! schedule_backup_cron()) {
+                echo "Something went wrong while performing backup tasks!!!\n";
+            } else {
+                echo "Backup tasks finished\n";
             }
         }
     }
 
+    if (!empty($CFG->enablerssfeeds)) {  //Defined in admin/variables page
+        if (file_exists("$CFG->dirroot/rss/rsslib.php")) {
+            include_once("$CFG->dirroot/rss/rsslib.php");
+            echo "Running rssfeeds if required...\n";
+            flush();
+
+            if ( ! cron_rss_feeds()) {
+                echo "Something went wrong while generating rssfeeds!!!\n";
+            } else {
+                echo "Rssfeeds finished\n";
+            }
+        }
+    }
+
+    //Unset session variables and destroy it
+    @session_unset();
+    @session_destroy();
+
     echo "Cron script completed correctly\n";
 
+    $difftime = microtime_diff($starttime, microtime());
+    echo "Execution took ".$difftime." seconds\n"; 
+
 ?>

admin/dbperformance.php

@@ -0,0 +1,36 @@
+<?PHP  // $Id$
+       // dbperformance.php - shows latest ADOdb stats for the current server
+
+    require_once("../config.php");
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only the admin can use this page");
+    }
+
+    $strdatabaseperformance = get_string("databaseperformance");
+    $stradministration = get_string("administration");
+    $site = get_site();
+
+    if (isset($topframe)) {
+	    print_header("$site->shortname: $strdatabaseperformance", "$site->fullname", 
+                     "<a target=\"$CFG->framename\" href=\"index.php\">$stradministration</a> -> Database performance");
+        exit;
+    }
+
+    if (isset($bottomframe) or isset($_GET['do'])) {
+        $perf =&NewPerfMonitor($db);
+        $perf->UI($pollsecs=5);
+        exit;
+    }
+
+?>
+<head>
+<title><?php echo "$site->shortname: $strdatabaseperformance" ?></title>
+</head>
+
+<frameset rows="80,*">
+   <frame src="dbperformance.php?topframe=true">
+   <frame src="dbperformance.php?bottomframe=true">
+</frameset>

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/filters.html

@@ -0,0 +1,139 @@
+<?php print_simple_box_start("center", "", "$THEME->cellheading"); ?>
+
+<form name="filters" id="filters" method="post" action="filters.php">
+  <table align="center" border="0" cellpadding="5" cellspacing="0">
+    <tr>
+      <td valign="top"><div align="right">
+        <br />
+        <input name="up" type="submit" id="up" value="&uarr;" />
+        <br />
+        <input name="down" type="submit" id="down" value="&darr;" />
+        <br />
+        </div></td>
+      <td valign="top">
+          <?php p($stractive) ?>
+          <br />
+      
+          <select name="iselect" size="20" id="iselect" 
+                  onclick="document.filters.add.disabled=true;
+                           document.filters.remove.disabled=false;
+                           document.filters.uselect.selectedIndex=-1;">
+          <?php 
+              $runscript = "";
+              foreach ($installedfilters as $filter) {
+                  if ($selectedfilter == $filter) {
+                      $selected = " selected ";
+                      $runscript = "eval(\"document.filters.add.disabled=true\");
+                                    eval(\"document.filters.remove.disabled=false\");
+                                    eval(\"document.filters.uselect.selectedIndex=-1\");";
+                  } else {
+                      $selected = "";
+                  }
+                  echo "<option value=\"$filter\" $selected>".$allfilters[$filter]."</option>";
+              }
+          ?>
+          </select></td>
+      <td valign="top">
+        <br />
+        <input name="add" type="submit" id="add" value="&larr;" />
+        <br />
+        <input name="remove" type="submit" id="remove" value="&rarr;" />              
+        <br />
+      </td>
+      <td valign="top">
+          <?php p($strinactive) ?>
+          <br />
+          <select name="uselect" size="20" id="select" 
+                  onclick="document.filters.add.disabled=false;
+                           document.filters.remove.disabled=true;
+                           document.filters.iselect.selectedIndex=-1;">
+          <?php
+              foreach ($uninstalledfilters as $filter) {
+                  if ($selectedfilter == $filter) {
+                      $selected = " selected ";
+                      $runscript = "eval(\"document.filters.add.disabled=false\");
+                                    eval(\"document.filters.remove.disabled=true\");
+                                    eval(\"document.filters.iselect.selectedIndex=-1\");";
+                  } else {
+                      $selected = "";
+                  }
+                  echo "<option value=\"$filter\" $selected>".$allfilters[$filter]."</option>";
+              }
+          ?>
+         </select></td>
+    </tr>
+  </table>
+</form>
+
+<script language="Javascript">
+<!--
+<?php echo $runscript ?>
+
+-->
+</script>
+<?php print_simple_box_end(); ?>
+
+<br />
+<br />
+
+
+<?php print_simple_box_start("center", "", "$THEME->cellheading"); ?>
+
+<form name="options" id="options" method="post" action="filters.php">
+<input type="hidden" name="options" value="1">
+<table cellpadding="20">
+<tr valign=top>
+	<td nowrap="nowrap" align="right"><?php p($strcachetext) ?>:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[10800] = get_string('numhours', '', 3);
+       $options[7200]  = get_string('numhours', '', 2);
+       $options[3600]  = get_string('numhours', '', 1);
+       $options[2700]  = get_string('numminutes', '', 45);
+       $options[1800]  = get_string('numminutes', '', 30);
+       $options[900]   = get_string('numminutes', '', 15);
+       $options[600]   = get_string('numminutes', '', 10);
+       $options[540]   = get_string('numminutes', '',  9);
+       $options[480]   = get_string('numminutes', '',  8);
+       $options[420]   = get_string('numminutes', '',  7);
+       $options[360]   = get_string('numminutes', '',  6);
+       $options[300]   = get_string('numminutes', '',  5);
+       $options[240]   = get_string('numminutes', '',  4);
+       $options[180]   = get_string('numminutes', '',  3);
+       $options[120]   = get_string('numminutes', '',  2);
+       $options[60]    = get_string('numminutes', '',  1);
+       $options[30]    = get_string('numseconds', '',  30);
+       $options[0]     = get_string('no');
+
+       choose_from_menu ($options, "cachetext", $CFG->cachetext, "", "", "");
+    ?>
+    </td>
+    <td>
+	<?php p($strconfigcachetext) ?>
+    </td>
+</tr>
+<tr valign=top>
+	<td nowrap="nowrap" align="right"><?php p($strfilteruploadedfiles) ?>:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[0] = get_string('no');
+       $options[1] = get_string('yes');
+
+       choose_from_menu ($options, "filteruploadedfiles", $CFG->filteruploadedfiles, "", "", "");
+    ?>
+    </td>
+    <td>
+	<?php p($strconfigfilteruploadedfiles) ?>
+    </td>
+</tr>
+<tr valign=top>
+    <td>&nbsp;</td>
+    <td><input type="submit" value="<?php print_string("savechanges") ?>"></td>
+    <td>&nbsp;</td>
+</tr>
+</table>
+</form>
+
+<?php print_simple_box_end(); ?>

admin/filters.php

@@ -0,0 +1,170 @@
+<?PHP // $Id$
+      // Allows the admin to create, delete and rename course categories
+
+    require_once("../config.php");
+
+    optional_variable($iselect);
+    optional_variable($uselect);
+    optional_variable($add);
+    optional_variable($remove);
+    optional_variable($up);
+    optional_variable($down);
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only administrators can use this page!");
+    }
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
+
+/// Print headings
+
+    $stradministration = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strmanagefilters = get_string("managefilters");
+    $strversion = get_string("version");
+    $strsettings = get_string("settings");
+    $strup = get_string("up");
+    $strdown = get_string("down");
+    $stractive = get_string("active");
+    $strinactive = get_string("inactive");
+    $strcachetext = get_string("cachetext", "admin");
+    $strconfigcachetext = get_string("configcachetext");
+    $strfilteruploadedfiles = get_string("filteruploadedfiles", "admin");
+    $strconfigfilteruploadedfiles = get_string("configfilteruploadedfiles");
+
+    print_header("$site->shortname: $strmanagefilters", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $strmanagefilters");
+
+    print_heading($strmanagefilters);
+
+
+/// Make a list of all available filters and the best names for them we can find
+    $allfilters = array();
+
+    $filterlocations = array("mod", "filter");
+
+    foreach ($filterlocations as $filterlocation) {
+        $plugins = get_list_of_plugins($filterlocation);
+        foreach ($plugins as $key => $plugin) {
+            if (is_readable("$CFG->dirroot/$filterlocation/$plugin/filter.php")) {
+                $name = trim(get_string("filtername", $plugin));
+                if (empty($name) or $name == "[[filtername]]") {
+                    $name = $plugin;
+                }
+                $allfilters["$filterlocation/$plugin"] = $name;
+            }
+        }
+    }
+
+   
+/// Make an array of all the currently installed filters
+
+    $installedfilters = array();
+    if (!empty($CFG->textfilters)) {
+        $installedfilters = explode(',',$CFG->textfilters);
+
+        // Do a little cleanup for robustness
+        foreach ($installedfilters as $key => $installedfilter) {
+            if (empty($installedfilter)) {
+                unset($installedfilters[$key]);
+                set_config("textfilters", implode(',', $installedfilters));
+            }
+        }
+    }
+
+    $selectedfilter = "none";
+
+/// If data submitted, then process and store.
+
+    if (!empty($options)) {
+	    if ($config = data_submitted()) {  
+            unset($config->options);
+            foreach ($config as $name => $value) {
+                set_config($name, $value);
+            }
+        }
+    }
+
+    if (!empty($add) and !empty($uselect)) {
+        $selectedfilter = $uselect;
+        if (!in_array($selectedfilter, $installedfilters)) {
+            $installedfilters[] = $selectedfilter;
+            set_config("textfilters", implode(',', $installedfilters));
+        }
+
+    } else if (!empty($remove) and !empty($iselect)) {
+        $selectedfilter = $iselect;
+        foreach ($installedfilters as $key => $installedfilter) {
+            if ($installedfilter == $selectedfilter) {
+                unset($installedfilters[$key]);
+            }
+        }
+        set_config("textfilters", implode(',', $installedfilters));
+
+    } else if ((!empty($up) or !empty($down)) and !empty($iselect)) {
+
+        if (!empty($up)) {
+            if ($allfilters[$iselect]) {
+                foreach ($installedfilters as $key => $installedfilter) {
+                    if ($installedfilter == $iselect) {
+                        $movefilter = $key;
+                        break;
+                    }
+                    $swapfilter = $key;
+                }
+            }
+        }
+        if (!empty($down)) {
+            if ($allfilters[$iselect]) {
+                $choosenext = false;
+                foreach ($installedfilters as $key => $installedfilter) {
+                    if ($choosenext) {
+                        $swapfilter = $key;
+                        break;
+                    }
+                    if ($installedfilter == $iselect) {
+                        $movefilter = $key;
+                        $choosenext = true;
+                    }
+                }
+            }
+        }
+        if (isset($swapfilter) and isset($movefilter)) {
+            $tempfilter = $installedfilters[$swapfilter];
+            $installedfilters[$swapfilter] = $installedfilters[$movefilter];
+            $installedfilters[$movefilter] = $tempfilter;
+            set_config("textfilters", implode(',', $installedfilters));
+        }
+        $selectedfilter = $iselect;
+    }
+
+
+
+/// Make an array of all the currently uninstalled filters
+
+    $uninstalledfilters = array();
+    foreach ($allfilters as $filter => $name) {
+        $installed = false;
+        foreach ($installedfilters as $installedfilter) {
+            if ($installedfilter == $filter) {
+                $installed = true;
+            }
+        }
+        if (!$installed) {
+            $uninstalledfilters[] = $filter;
+        }
+    }
+
+/// Print the current form
+
+    include("filters.html");
+
+
+    print_footer();
+
+?>

admin/index.php

@@ -1,37 +1,116 @@
 <?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");
+    }
+
+
+/// 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("../index.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 = "";
+    }
+
+/// Turn off time limits, sometimes upgrades can be slow.
+
+    @set_time_limit(0);
+
+/// 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;
             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 +122,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 +151,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,32 +175,92 @@
         }
     }
 
+/// 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
+
+/// Upgrade blocks system if necessary
+    require_once("$CFG->dirroot/lib/blocklib.php");
+    upgrade_blocks_db("$CFG->wwwroot/$CFG->admin/index.php");  // Return here afterwards
+
+/// Check all blocks and load (or upgrade them if necessary)
+    upgrade_blocks_plugins("$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;
         }
 
+        if (!empty($module->requires)) {
+            if ($module->requires > $CFG->version) {
+                $info->modulename = $mod;
+                $info->moduleversion  = $module->version;
+                $info->currentmoodle = $CFG->version;
+                $info->requiremoodle = $module->requires;
+                notify(get_string('modulerequirementsnotmet', 'error', $info));
+                unset($info);
+                continue;
+            }
+        }
+
         $module->name = $mod;   // The name MUST match the directory
         
         if ($currmodule = get_record("modules", "name", $module->name)) {
             if ($currmodule->version == $module->version) {
                 // do nothing
             } else if ($currmodule->version < $module->version) {
-                notify("$module->name module needs upgrading");
+                if (empty($updated_modules)) {
+                    $strmodulesetup  = get_string("modulesetup");
+                    print_header($strmodulesetup, $strmodulesetup, $strmodulesetup, "", "", false, "&nbsp;", "&nbsp;");
+                }
+                print_heading("$module->name module needs upgrading");
                 $upgrade_function = $module->name."_upgrade";
                 if (function_exists($upgrade_function)) {
                     $db->debug=true;
@@ -130,7 +271,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 +284,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 +306,158 @@
         }
     }
 
-    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");
+
+/// 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;
+        }
     }
 
+
+/// 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
+    require_login();
+
     if (!isadmin()) {
-        if (! record_exists_sql("SELECT * FROM user_admins")) {   // No admin user yet
-            redirect("$CFG->wwwroot/admin/user.php");
-        }
-        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/");
+        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
     }
 
 
-    // At this point, the databases exist, and the user is an admin
+/// 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>";
+    if (!empty($CFG->upgrade)) {  // Print notice about extra upgrading that needs to be done
+        print_simple_box(get_string("upgrade$CFG->upgrade", "admin", 
+                                    "$CFG->wwwroot/$CFG->admin/upgrade$CFG->upgrade.php"), "center");
+        print_spacer(10,10);
+    }
+
+    $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 />";
+    $configdata .= "<font size=+1>&nbsp;</font><a href=\"blocks.php\">".get_string("manageblocks")."</a> - <font size=1>".
+                    get_string("adminhelpmanageblocks")."</font><br />";
+    $configdata .= "<font size=+1>&nbsp;</font><a href=\"filters.php\">".get_string("managefilters")."</a> - <font size=1>".
+                    get_string("adminhelpmanagefilters")."</font><br />";
+    if (!isset($CFG->disablescheduledbackups)) {
+        $configdata .= "<font size=+1>&nbsp;</font><a href=\"backup.php\">".get_string("backup")."</a> - <font size=1>".
+                        get_string("adminhelpbackup")."</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 (is_internal_auth()) {
+        $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=\"$CFG->wwwroot/$CFG->admin/uploaduser.php\">".
+                      get_string("uploadusers")."</a> - <font size=1>".
+                      get_string("adminhelpuploadusers")."</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\">".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/$CFG->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; 1999-2004 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,304 @@
+<?PHP // $Id$
+
+    require_once("../config.php");
+
+    optional_variable($mode, "");
+    optional_variable($currentfile, "moodle.php");
+
+    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) {
+        $currlang = current_language();
+        $langs = get_list_of_languages();
+        echo "<table align=center><tr><td align=\"right\">";
+        echo "<b>$strcurrentlanguage:</b>";
+        echo "</td><td>";
+        echo popup_form ("$CFG->wwwroot/admin/lang.php?lang=", $langs, "chooselang", $currlang, "", "", "", true);
+        echo "</td></tr></table>";
+        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 (substr($file, -4) != ".php") {
+            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")) {
+                if (!touch("$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['currentfile'])){   // Save a file
+            $newstrings = $_POST;
+            unset($newstrings['currentfile']);
+            if (lang_save_file($langdir, $currentfile, $newstrings)) {
+                notify(get_string("changessaved")." ($langdir/$currentfile)", "green");
+            } else {
+                error("Could not save the file '$currentfile'!", "lang.php?mode=compare&currentfile=$currentfile");
+            }
+        }
+
+        print_heading_with_help($strcomparelanguage, "langedit");
+
+        print_simple_box_start("center", "80%");
+        echo '<center><font size="2">';
+        foreach ($stringfiles as $file) {
+            if ($file == $currentfile) {
+                echo "<b>$file</b> &nbsp; ";
+            } else {
+                echo "<a href=\"lang.php?mode=compare&currentfile=$file\">$file</a> &nbsp; ";
+            }
+        }
+        echo '</font></center>';
+        print_simple_box_end();
+
+        
+        print_heading("$currentfile", "center", 4);
+
+        if (!file_exists("$langdir/$currentfile")) {
+            if (!touch("$langdir/$currentfile")) {
+                echo "<p><font color=red>".get_string("filemissing", "", "$langdir/$currentfile")."</font></p>";
+                continue;
+            }
+        }
+
+        error_reporting(0);
+        if ($f = fopen("$langdir/$currentfile","r+")) {
+            $editable = true;
+            fclose($f);
+        } else {
+            $editable = false;
+            echo "<p><font size=1>".get_string("makeeditable", "", "$langdir/$currentfile")."</font></p>";
+        }
+        error_reporting(7);
+
+
+        unset($string);
+        include("$enlangdir/$currentfile");
+        $enstring = $string;  
+        ksort($enstring);
+
+        unset($string);
+        include("$langdir/$currentfile");
+
+        if ($editable) {
+            echo "<form name=\"$currentfile\" action=\"lang.php\" method=\"post\">";
+        }
+        echo "<table width=\"100%\" cellpadding=2 cellspacing=3 border=0>";
+        foreach ($enstring as $key => $envalue) {
+            $envalue = nl2br(htmlspecialchars($envalue));
+            $envalue = preg_replace('/(\$a\-\&gt;[a-zA-Z0-9]*|\$a)/', '<b>$0</b>', $envalue);  // Make variables bold. 
+            $envalue = str_replace("%%","%",$envalue);
+            $envalue = str_replace("\\","",$envalue);              // Delete all slashes
+
+            echo "\n\n<tr>";
+            echo "<td dir=ltr lang=en width=20% bgcolor=\"$THEME->cellheading\" nowrap valign=top>$key</td>\n";
+            echo "<td dir=ltr lang=en width=40% bgcolor=\"$THEME->cellheading\" valign=top>$envalue</td>\n";
+
+            $value = $string[$key];
+            $value = str_replace("\r","",$value);              // Bad character caused by Windows
+            $value = preg_replace("/\n{3,}/", "\n\n", $value); // Collapse runs of blank lines
+            $value = trim($value, "\n");                       // Delete leading/trailing lines
+            $value = str_replace("\\","",$value);              // Delete all slashes
+            $value = str_replace("%%","%",$value);
+            $value = str_replace("<","&lt;",$value);
+            $value = str_replace(">","&gt;",$value);
+            $value = str_replace('"',"&quot;",$value);
+
+            $cellcolour = $value ? $THEME->cellcontent: $THEME->highlight;
+
+            if ($editable) {
+                echo "<td width=40% bgcolor=\"$cellcolour\" valign=top>\n";
+                if (isset($string[$key])) {
+                    $valuelen = strlen($value);
+                } else {
+                    $valuelen = strlen($envalue);
+                }
+                $cols=50;
+                if (strstr($value, "\r") or strstr($value, "\n") or $valuelen > $cols) {
+                    $rows = ceil($valuelen / $cols);
+                    echo "<textarea name=\"string-$key\" cols=\"$cols\" rows=\"$rows\">$value</textarea>\n";
+                } else {
+                    if ($valuelen) {
+                        $cols = $valuelen + 2;
+                    }
+                    echo "<input type=\"text\" name=\"string-$key\" value=\"$value\" size=\"$cols\"></td>";
+                }
+                echo "</TD>\n";
+
+            } else {
+                echo "<td width=40% bgcolor=\"$cellcolour\" valign=top>$value</td>\n";
+            }
+        }
+        if ($editable) {
+            echo "<tr><td colspan=2>&nbsp;<td><br />";
+            echo "    <input type=\"hidden\" name=\"currentfile\" value=\"$currentfile\">";
+            echo "    <input type=\"hidden\" name=\"mode\" value=\"compare\">";
+            echo "    <input type=\"submit\" name=\"update\" value=\"".get_string("savechanges").": $currentfile\">";
+            echo "</td></tr>";
+        }
+        echo "</table>";
+        echo "</form>";
+
+    }
+
+    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, $USER;
+
+    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("'", "\\'", $value);           // Add slashes for '
+        $value = str_replace('"', "\\\"", $value);          // Add slashes for "
+        $value = str_replace("%","%%",$value);              // Escape % characters
+        $value = str_replace("\r", "",$value);              // Remove linefeed characters
+        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: $strmodulename: $strconfiguration", $site->fullname,
+                  "<a href=\"index.php\">$stradmin</a> -> ".
+                  "<a href=\"configure.php\">$strconfiguration</a> -> ".
+                  "<a href=\"modules.php\">$strmanagemodules</a> -> $strmodulename");
+
+    print_heading($strmodulename);
+
+    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,197 @@
+<?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);
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only administrators can use this page!");
+    }
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
+
+
+/// Print headings
+
+    $stradministration = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strmanagemodules = get_string("managemodules");
+    $strdelete = get_string("delete");
+    $strversion = get_string("version");
+    $strhide = get_string("hide");
+    $strshow = get_string("show");
+    $strsettings = get_string("settings");
+    $stractivities = get_string("activities");
+    $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, $stractivities, $strversion, "$strhide/$strshow", $strdelete, $strsettings);
+    $table->align = array ("LEFT", "RIGHT", "LEFT", "CENTER", "CENTER", "CENTER");
+    $table->wrap = array ("NOWRAP", "", "", "", "","");
+    $table->size = array ("100%", "10", "10", "10", "10","12");
+    $table->width = "100";
+
+    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 = "";
+        }
+
+        $count = count_records("$module->name");
+
+        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>", $count, $module->version, $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,137 @@
+<?PHP  // $Id$
+       // register.php - allows admin to register their site on moodle.org
+
+    include("../config.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 (get_list_of_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=\"".fullname($admin, true)."\"></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><?php  print_textarea($usehtmleditor, 20, 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,121 @@
 <?PHP // $Id$
 
-	require("../config.php");
+    require_once("../config.php");
 
     if ($site = get_site()) {
+        require_login();
         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;
+        $course = $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 +129,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/timezone.php

@@ -0,0 +1,57 @@
+<?php   // $Id$
+
+    include("../config.php");
+
+    require_login();
+
+    if (!isadmin()) {
+        error("You must be an admin");
+    }
+
+    $strtimezone = get_string("timezone");
+    $strsavechanges = get_string("savechanges");
+    $strusers = get_string("users");
+    $strall = get_string("all");
+
+    print_header($strtimezone, $strtimezone, $strtimezone);
+
+    print_heading("");
+
+    if (isset($zone)) {
+        $db->debug = true;
+        echo "<center>";
+        execute_sql("UPDATE {$CFG->prefix}user SET timezone = '$zone'");
+        $db->debug = false;
+        echo "</center>";
+
+        $USER->timezone = $zone;
+    }
+
+    $user = $USER;
+
+    if (abs($user->timezone) > 13) {
+        $user->timezone = 99;
+    }
+    $timenow = time();
+
+    for ($tz = -26; $tz <= 26; $tz++) {
+        $zone = (float)$tz/2.0;
+        $usertime = $timenow + ($tz * 1800);
+        if ($tz == 0) {
+            $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT)";
+        } else if ($tz < 0) {
+            $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT$zone)";
+        } else {
+            $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT+$zone)";
+        }
+    }
+
+    echo "<center><form action=timezone.php method=get>";
+    echo "$strusers ($strall): ";
+    choose_from_menu ($timezones, "zone", $user->timezone, get_string("serverlocaltime"), "", "99");
+    echo "<input type=submit value=\"$strsavechanges\">";
+    echo "</form>";
+
+    print_footer();
+
+?>

admin/upgradelogs.php

@@ -0,0 +1,131 @@
+<?PHP  //$Id$
+
+    require("../config.php");
+
+    optional_variable($confirm);
+
+    require_login();
+
+    if (!isadmin()) {
+        error("You must be an admin to use this script");
+    }
+
+    if ($CFG->version < 2004013101) {
+        error("This script does not work with this old version of Moodle");
+    }
+
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
+
+/// Turn off time limits, sometimes upgrades can be slow.
+
+    @set_time_limit(0);
+
+
+/// Print header
+
+    $stradministration = get_string("administration");
+    $strupgradinglogs  = get_string("upgradinglogs", "admin");
+
+    print_header("$site->shortname: $stradministration: $strupgradinglogs", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> $strupgradinglogs");
+
+    if (empty($_GET['confirm'])) {
+        notice_yesno(get_string("upgradelogsinfo", "admin"), 
+                     "upgradelogs.php?confirm=true", 
+                     "index.php");
+        print_footer();
+        exit;
+    }
+
+
+/// Try and extract as many cmids as possible from the existing logs
+
+    if ($coursemodules = get_records_sql("SELECT cm.*, m.name 
+                                            FROM {$CFG->prefix}course_modules cm, 
+                                                 {$CFG->prefix}modules m
+                                            WHERE cm.module = m.id")) {
+        $cmcount = count($coursemodules);
+        $count = 0;
+        $starttime = time();
+        $sleeptime = 0;
+
+        if ($CFG->dbtype == "mysql") {
+            $LIKE = "LIKE";
+        } else {
+            $LIKE = "ILIKE";
+        }
+
+        if ($cmcount > 10) {
+            print_simple_box('This process may take a very long time ... please be patient and let it finish.', 
+                             'center', '', '#ffcccc');
+            $sleeptime = 1;
+        }
+        foreach ($coursemodules as $cm) {
+
+            switch ($cm->name) { 
+                case "forum":
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
+                                 WHERE module = '$cm->name' AND url = 'view.php?id=$cm->id'", false);
+
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
+                                 WHERE module = '$cm->name' AND url = 'view.php?f=$cm->instance'", false);
+    
+                    if ($discussions = get_records("forum_discussions", "forum", $cm->instance)) {
+                        foreach ($discussions as $discussion) {
+                            execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
+                                         WHERE module = '$cm->name' AND url $LIKE 'discuss.php?d=$discussion->id%'", false);
+                        }
+                    }
+                    break;
+
+                case "glossary": 
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
+                                 WHERE module = '$cm->name' AND url $LIKE 'view.php?id=$cm->id%'", false);
+                    break;
+
+                case "quiz": 
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
+                                 WHERE module = '$cm->name' AND url = 'view.php?id=$cm->id'", false);
+                    break;
+
+                case "assignment": 
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
+                                 WHERE module = '$cm->name' AND url = 'view.php?id=$cm->id'", false);
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
+                                 WHERE module = '$cm->name' AND url = 'view.php?a=$cm->instance'", false);
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
+                                 WHERE module = '$cm->name' AND url = 'submissions.php?id=$cm->instance'", false);
+                    break;
+                    
+                case "journal": 
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
+                                 WHERE module = '$cm->name' AND url = 'report.php?id=$cm->id'", false);
+
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
+                                 WHERE module = '$cm->name' AND url = 'view.php?id=$cm->id'", false);
+                    break;
+
+            }
+
+            $count++;
+            $elapsedtime = time() - $starttime;
+            $projectedtime = (int)(((float)$cmcount / (float)$count) * $elapsedtime) - $elapsedtime;
+
+            if ($cmcount > 10) {
+                notify("Processed $count of $cmcount coursemodules.  Estimated completion: ".format_time($projectedtime));
+                flush();
+                sleep($sleeptime);     // To help reduce database load
+            }
+        }
+    }
+
+    delete_records("config", "name", "upgrade", "value", "logs");
+
+    notify("Log upgrading was successful!");
+
+
+    print_footer();
+
+?>

admin/uploaduser.php

@@ -0,0 +1,284 @@
+<?PHP // $Id$
+
+/// Bulk user registration script from a comma separated file
+/// Returns list of users with their user ids
+
+    require_once("../config.php");
+
+    optional_variable($numusers, 0);
+
+    require_login();
+
+    if (!isadmin()) {
+        error("You must be an administrator to edit users this way.");
+    }
+
+    if (! $site = get_site()) {
+        error("Could not find site-level course");
+    }
+
+    if (!$adminuser = get_admin()) {
+        error("Could not find site admin");
+    }
+
+    $streditmyprofile = get_string("editmyprofile");
+    $stradministration = get_string("administration");
+    $strchoose = get_string("choose");
+    $struser = get_string("user");
+    $strusers = get_string("users");
+    $strusersnew = get_string("usersnew");
+    $struploadusers = get_string("uploadusers");
+    $straddnewuser = get_string("importuser");
+
+    $csv_encode = '/\&\#44/';
+    if (isset($CFG->CSV_DELIMITER)) {        
+        $csv_delimiter = '\\' . $CFG->CSV_DELIMITER;
+        $csv_delimiter2 = $CFG->CSV_DELIMITER;
+
+        if (isset($CFG->CSV_ENCODE)) {
+            $csv_encode = '/\&\#' . $CFG->CSV_ENCODE . '/';
+        }
+    } else {
+        $csv_delimiter = "\,";
+        $csv_delimiter2 = ",";
+    }
+
+/// Print the header
+
+    print_header("$site->shortname: $struploadusers", $site->fullname, 
+                 "<a href=\"index.php\">$stradministration</a> -> 
+                  <a href=\"users.php\">$strusers</a> -> $struploadusers");
+
+
+/// If a file has been uploaded, then process it
+
+    if ($filename = valid_uploaded_file($_FILES['userfile'])) {
+
+        //Fix mac/dos newlines
+        $text = my_file_get_contents($filename);
+        $text = preg_replace('!\r\n?!',"\n",$text);
+        $fp = fopen($filename, "w");
+        fwrite($fp,$text);
+        fclose($fp);
+
+        $fp = fopen($filename, "r");
+
+        // make arrays of valid fields for error checking
+        $required = array("username" => 1, 
+                          "password" => 1, 
+                          "firstname" => 1, 
+                          "lastname" => 1,
+                          "email" => 1);
+        $optionalDefaults = array("institution" => 1, 
+                                  "department" => 1, 
+                                  "city" => 1, 
+                                  "country" => 1,
+                                  "lang" => 1, 
+                                  "timezone" => 1);
+        $optional = array("idnumber" => 1, 
+                          "icq" => 1, 
+                          "phone1" => 1, 
+                          "phone2" => 1,
+                          "address" => 1, 
+                          "url" => 1,
+                          "description" => 1, 
+                          "mailformat" => 1, 
+                          "maildisplay" => 1, 
+                          "htmleditor" => 1, 
+                          "autosubscribe" => 1,
+                          "idnumber" => 1, 
+                          "icq" => 1, 
+                          "course1" => 1, 
+                          "course2" => 1,
+                          "course3" => 1, 
+                          "course4" => 1, 
+                          "course5" => 1,
+			  "group1" => 1,
+			  "group2" => 1,
+			  "group3" => 1,
+			  "group4" => 1,
+			  "group5" =>1);
+
+        // --- get header (field names) ---
+        $header = split($csv_delimiter, fgets($fp,1024));
+        // check for valid field names
+        foreach ($header as $i => $h) {
+            $h = trim($h); $header[$i] = $h; // remove whitespace
+            if (!($required[$h] or $optionalDefaults[$h] or $optional[$h])) {
+                error(get_string('invalidfieldname', 'error', $h), 'uploaduser.php');
+            }
+            if ($required[$h]) {
+                $required[$h] = 2;
+            }
+        }
+        // check for required fields
+        foreach ($required as $key => $value) {
+            if ($value < 2) {
+                error(get_string('fieldrequired', 'error', $key), 'uploaduser.php');
+            }
+        }
+        $linenum = 2; // since header is line 1
+
+        while (!feof ($fp)) {
+            foreach ($optionalDefaults as $key => $value) {
+                $user->$key = addslashes($adminuser->$key);
+            }
+           //Note: commas within a field should be encoded as &#44 (for comma separated csv files)
+           //Note: semicolon within a field should be encoded as &#59 (for semicolon separated csv files)
+            $line = split($csv_delimiter, fgets($fp,1024));
+            foreach ($line as $key => $value) {
+                //decode encoded commas
+                $record[$header[$key]] = preg_replace($csv_encode,$csv_delimiter2,trim($value));
+            }
+            if ($record[$header[0]]) {
+                // add a new user to the database
+                optional_variable($newuser, ""); 
+
+                // add fields to object $user
+                foreach ($record as $name => $value) {
+                    // check for required values
+                    if ($required[$name] and !$value) {
+                        error(get_string('missingfield', 'error', $name). " ".
+                              get_string('erroronline', 'error', $linenum), 
+                              'uploaduser.php');
+                    }
+                    // password needs to be encrypted
+                    else if ($name == "password") {
+                        $user->password = md5($value);
+                    }
+                    // normal entry
+                    else {
+                        $user->{$name} = addslashes($value);
+                    }
+                }
+                $user->confirmed = 1;
+                $user->timemodified = time();
+                $linenum++;
+                $username = $user->username;
+                $addcourse[0] = $user->course1;
+                $addcourse[1] = $user->course2;
+                $addcourse[2] = $user->course3;
+                $addcourse[3] = $user->course4;
+                $addcourse[4] = $user->course5;
+                $addgroup[0] = $user->group1;
+                $addgroup[1] = $user->group2;
+                $addgroup[2] = $user->group3;
+                $addgroup[3] = $user->group4;
+                $addgroup[4] = $user->group5;
+                $courses = get_courses("all");
+                for ($i=0; $i<5; $i++) {
+                    $courseid[$i]=0;
+                }
+                foreach ($courses as $course) {
+                    for ($i=0; $i<5; $i++) {
+                        if ($course->shortname == $addcourse[$i]) {
+                            $courseid[$i] = $course->id;
+                        }
+                    }
+                }
+                if (! $user->id = insert_record("user", $user)) {
+                    if (!$user = get_record("user", "username", "changeme")) {   // half finished user from another time
+                        //Record not added - probably because user is already registered
+                        //In this case, output userid from previous registration
+                        //This can be used to obtain a list of userids for existing users
+                        if ($user = get_record("user","username",$username)) {
+                            notify("$user->id ".get_string('usernotaddedregistered', 'error', $username));
+                        } else {
+                            notify(get_string('usernotaddederror', 'error', $username));
+                        } 
+                    }
+                } else if ($user->username != "changeme") {
+                    notify("$struser: $user->id = $user->username");
+                    $numusers++;
+                }
+                for ($i=0; $i<5; $i++) {
+                    if ($addcourse[$i] && !$courseid[$i]) {
+                        notify(get_string('unknowncourse', 'error', $addcourse[$i]));
+                    }
+                }
+		for ($i=0; $i<5; $i++) {
+                  $groupid[$i] = 0;
+                  if ($addgroup[$i]) {
+		    if (!$courseid[$i]) {
+		      notify(get_string('coursegroupunknown','error',$addgroup[$i]));
+		    } else {
+		      if ($group = get_record("groups","courseid",$courseid[$i],"name",$addgroup[$i])) {
+			$groupid[$i] = $group->id;
+		      } else {
+			notify(get_string('groupunknown','error',$addgroup[$i]));
+		      }
+		    }
+		  }
+		}
+                for ($i=0; $i<5; $i++) {
+                    if ($courseid[$i]) {
+                        if (enrol_student($user->id, $courseid[$i])) {
+                            notify('-->'. get_string('enrolledincourse', '', $addcourse[$i]));
+                        } else {
+                            notify('-->'.get_string('enrolledincoursenot', '', $addcourse[$i]));
+                        }
+                    }
+                }
+                for ($i=0; $i<5; $i++) {
+		  if ($courseid[$i] && $groupid[$i]) {
+		    if (record_exists("user_students","userid",$user->id,"course",$courseid[$i])) {
+		      $usergroup = user_group($courseid[$i],$user->id);
+                      if ($usergroup) {
+			notify('-->' . get_string('groupalready','error',$usergroup->name));
+		      } else {
+			$group_member->groupid = $groupid[$i];
+			$group_member->userid = $user->id;
+			$group_member->timeadded = time();
+			if (insert_record("groups_members",$group_member)) {
+			  notify('-->' . get_string('addedtogroup','',$addgroup[$i]));
+			} else {
+			  notify('-->' . get_string('addedtogroupnot','',$addgroup[$i]));
+			}
+		      }
+		    } else {
+			notify('-->' . get_string('addedtogroupnotenrolled','',$addgroup[$i]));
+		    }
+		  }
+		}
+
+                unset ($user);
+            }
+        }
+        fclose($fp);
+        notify("$strusersnew: $numusers");
+
+        echo '<hr />';
+    }
+
+/// Print the form
+    print_heading_with_help($struploadusers, 'uploadusers');
+
+    $maxuploadsize = get_max_upload_file_size();
+    echo '<center>';
+    echo '<form method="post" enctype="multipart/form-data" action="uploaduser.php">'.
+         $strchoose.':<input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'">'.
+         '<input type="file" name="userfile" size=30>'.
+         '<input type="submit" value="'.$struploadusers.'">'.
+         '</form></br>';
+    echo '</center>';
+
+    print_footer($course);
+
+
+
+function my_file_get_contents($filename, $use_include_path = 0) {
+/// Returns the file as one big long string
+
+    $data = "";
+    $file = @fopen($filename, "rb", $use_include_path);
+    if ($file) {
+        while (!feof($file)) {
+            $data .= fread($file, 1024);
+        }
+        fclose($file);
+    }
+    return $data;
+}
+
+?>
+

admin/user.php

@@ -1,16 +1,32 @@
 <?PHP // $Id$
 
-	require("../config.php");
-	require("../user/lib.php");
-    require("../lib/countries.php");
+    require_once("../config.php");
 
-    if (! record_exists_sql("SELECT * FROM user_admins")) {   // No admin user yet
-        $user->firstname = "Admin";
-        $user->lastname  = "User";
+    optional_variable($newuser, "");
+    optional_variable($delete, "");
+    optional_variable($confirm, "");
+    optional_variable($confirmuser, "");
+    optional_variable($sort, "name");
+    optional_variable($dir, "ASC");
+    optional_variable($page, 0);
+    optional_variable($search, "");
+    optional_variable($lastinitial, "");     // only show students with this last initial
+    optional_variable($firstinitial, "");    // only show students with this first initial
+    optional_variable($perpage, "30");       // how many per page
+
+    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,253 @@
         
     } 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");
+        if ($firstinitial or $lastinitial or $search or $page) {
+            print_header("$site->shortname: $stredituser", $site->fullname, 
+                         "<a href=\"index.php\">$stradministration</a> -> ".
+                         "<a href=\"users.php\">$strusers</a> -> ".
+                         "<a href=\"user.php\">$stredituser</a>");
+        } else {
+            print_header("$site->shortname: $stredituser", $site->fullname, 
+                         "<a href=\"index.php\">$stradministration</a> -> ".
+                         "<a href=\"users.php\">$strusers</a> -> $stredituser");
+        }
 
-            print_heading(get_string("chooseuser"));
+        if ($confirmuser) {
+            if (!$user = get_record("user", "id", "$confirmuser")) {
+                error("No such user!");
+            }
 
-            $table->head  = array (get_string("fullname"), get_string("email"), get_string("city"), 
-                                   get_string("country"), " ");
-            $table->align = array ("LEFT", "LEFT", "CENTER", "CENTER", "CENTER", "CENTER");
+            unset($confirmeduser);
+            $confirmeduser->id = $confirmuser;
+            $confirmeduser->confirmed = 1;
+            $confirmeduser->timemodified = time();
+
+            if (update_record("user", $confirmeduser)) {
+                notify(get_string("userconfirmed", "", fullname($user, true)) );
+            } else {
+                notify(get_string("usernotconfirmed", "", fullname($user, true)));
+            }
+
+        } else if ($delete) {              // Delete a selected user, after confirmation
+            if (!$user = get_record("user", "id", "$delete")) {
+                error("No such user!");
+            }
+
+            $primaryadmin = get_admin();
+            if ($user->id == $primaryadmin->id) {
+                error("You are not allowed to delete the primary admin user!");
+            }
+
+            if ($confirm != md5($delete)) {
+                $fullname = fullname($user, true);
+                notice_yesno(get_string("deletecheckfull", "", "'$fullname'"),
+                     "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", "", fullname($user, true)) );
+                } else {
+                    notify(get_string("deletednot", "", fullname($user, true)));
+                }
+            }
+        }
+
+        // Carry on with the user listing
+
+        $columns = array("firstname", "lastname", "email", "city", "country", "lastaccess");
+
+        foreach ($columns as $column) {
+            $string[$column] = get_string("$column");
+            if ($sort != $column) {
+                $columnicon = "";
+                if ($column == "lastaccess") {
+                    $columndir = "DESC";
+                } else {
+                    $columndir = "ASC";
+                }
+            } else {
+                $columndir = $dir == "ASC" ? "DESC":"ASC";
+                if ($column == "lastaccess") {
+                    $columnicon = $dir == "ASC" ? "up":"down";
+                } else {
+                    $columnicon = $dir == "ASC" ? "down":"up";
+                }
+                $columnicon = " <img src=\"$CFG->pixpath/t/$columnicon.gif\" />";
+
+            }
+            $$column = "<a href=\"user.php?sort=$column&dir=$columndir&search=$search&firstinitial=$firstinitial&lastinitial=$lastinitial\">".$string[$column]."</a>$columnicon";
+        }
+
+        if ($sort == "name") {
+            $sort = "firstname";
+        }
+
+        $users = get_users_listing($sort, $dir, $page*$perpage, $perpage, $search, $firstinitial, $lastinitial);
+        $usercount = get_users(false);
+        $usersearchcount = get_users(false, $search, true, "", "", $firstinitial, $lastinitial);
+
+        if ($search or $firstinitial or $lastinitial) {
+            print_heading("$usersearchcount / $usercount ".get_string("users"));
+            $usercount = $usersearchcount;
+        } else {
+            print_heading("$usercount ".get_string("users"));
+        }
+
+        $alphabet = explode(',', get_string('alphabet'));
+        $strall = get_string("all");
+
+
+        /// Bar of first initials
+
+        echo "<center><p align=\"center\">";
+        echo get_string("firstname")." : ";
+        if ($firstinitial) {
+            echo " <a href=\"user.php?sort=firstname&dir=ASC&".
+                 "perpage=$perpage&lastinitial=$lastinitial\">$strall</a> ";
+        } else {
+            echo " <b>$strall</b> ";
+        }
+        foreach ($alphabet as $letter) {
+            if ($letter == $firstinitial) {
+                echo " <b>$letter</b> ";
+            } else {
+                echo " <a href=\"user.php?sort=firstname&dir=ASC&".
+                     "perpage=$perpage&lastinitial=$lastinitial&firstinitial=$letter\">$letter</a> ";
+            }
+        }
+        echo "<br />";
+
+        /// Bar of last initials
+
+        echo get_string("lastname")." : ";
+        if ($lastinitial) {
+            echo " <a href=\"user.php?sort=lastname&dir=ASC&".
+                 "perpage=$perpage&firstinitial=$firstinitial\">$strall</a> ";
+        } else {
+            echo " <b>$strall</b> ";
+        }
+        foreach ($alphabet as $letter) {
+            if ($letter == $lastinitial) {
+                echo " <b>$letter</b> ";
+            } else {
+                echo " <a href=\"user.php?sort=lastname&dir=ASC&".
+                     "perpage=$perpage&firstinitial=$firstinitial&lastinitial=$letter\">$letter</a> ";
+            }
+        }
+        echo "</p>";
+        echo "</center>";
+
+        print_paging_bar($usercount, $page, $perpage,
+                "user.php?sort=$sort&dir=$dir&perpage=$perpage&firstinitial=$firstinitial&lastinitial=$lastinitial&search=$search&");
+
+        flush();
+
+
+        if (!$users) {
+            $match = array();
+            if ($search) {
+               $match[] = $search;
+            }
+            if ($firstinitial) {
+               $match[] = get_string("firstname").": $firstinitial"."___";
+            }
+            if ($lastinitial) {
+               $match[] = get_string("lastname").": $lastinitial"."___";
+            }
+            $matchstring = implode(", ", $match);
+            print_heading(get_string("nousersmatching", "", $matchstring));
+
+        } else {
+
+            $countries = get_list_of_countries();
+
+            foreach ($users as $key => $user) {
+                if (!empty($user->country)) {
+                    $users[$key]->country = $countries[$user->country];
+                }
+            }
+            if ($sort == "country") {  // Need to resort by full country name, not code
+                foreach ($users as $user) {
+                    $susers[$user->id] = $user->country;
+                }
+                asort($susers);
+                foreach ($susers as $key => $value) {
+                    $nusers[] = $users[$key];
+                }
+                $users = $nusers;
+            }
+
+            $table->head = array ("$firstname / $lastname", $email, $city, $country, $lastaccess, "", "", "");
+            $table->align = array ("left", "left", "left", "left", "left", "center", "center", "center");
+            $table->width = "95%";
             foreach ($users as $user) {
-                $table->data[] = array ("<A HREF=\"../user/view.php?id=$user->id&course=$site->id\">$user->firstname $user->lastname</A>",
+                if ($user->id == $USER->id or $user->username == "changeme") {
+                    $deletebutton = "";
+                } else {
+                    $deletebutton = "<a href=\"user.php?delete=$user->id\">$strdelete</a>";
+                }
+                if ($user->lastaccess) {
+                    $strlastaccess = format_time(time() - $user->lastaccess);
+                } else {
+                    $strlastaccess = get_string("never");
+                }
+                if ($user->confirmed == 0) {
+                    $confirmbutton = "<a href=\"user.php?confirmuser=$user->id\">" . get_string("confirm") . "</a>";
+                } else {
+                    $confirmbutton = "";
+                }
+                $fullname = fullname($user, true);
+                $table->data[] = array ("<a href=\"../user/view.php?id=$user->id&course=$site->id\">$fullname</a>",
                                         "$user->email",
                                         "$user->city",
-                                        $COUNTRIES[$user->country],
-                                        "<A HREF=\"../user/edit.php?id=$user->id&course=$site->id\">$stredit</A>");
+                                        "$user->country",
+                                        $strlastaccess,
+                                        "<a href=\"../user/edit.php?id=$user->id&course=$site->id\">$stredit</a>",
+                                        $deletebutton,
+                                        $confirmbutton);
             }
+
+            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);
 
-            print_heading("<A HREF=\"user.php?newuser=true\">".get_string("addnewuser")."</A>");
-        } else {
-            error("No users found!");
-            
+            print_paging_bar($usercount, $page, $perpage,
+                             "user.php?sort=$sort&dir=$dir&perpage=$perpage".
+                             "&firstinitial=$firstinitial&lastinitial=$lastinitial&search=$search&");
+
         }
+
+        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,51 @@
+<?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 (is_internal_auth()) {
+        $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=\"$CFG->wwwroot/$CFG->admin/uploaduser.php\">".get_string("uploadusers")."</a></b>",
+                               get_string("adminhelpuploadusers"));
+    }
+    $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="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbhost:</TD>
+	<TD>
+        <INPUT name=auth_dbhost TYPE=text SIZE=30 VALUE="<?php echo $config->auth_dbhost?>">
+	<?php  if (isset($err["auth_dbhost"])) formerr($err["auth_dbhost"]); ?>
+	</TD>
+    <TD>
+    <?php  print_string("auth_dbhost","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbtype:</TD>
+	<TD>
+    <?php  $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>
+    <?php  print_string("auth_dbtype","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbname:</TD>
+	<TD>
+    <INPUT name=auth_dbname TYPE=text SIZE=30 VALUE="<?php echo $config->auth_dbname?>">
+    <?php  if (isset($err["auth_dbname"]))formerr($err["auth_dbname"]); ?>
+    </TD>
+    <TD>
+    <?php  print_string("auth_dbname","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbuser:</TD>
+	<TD>
+    <INPUT name=auth_dbuser TYPE=text SIZE=30 VALUE="<?php echo $config->auth_dbuser?>">
+    <?php  if (isset($err["auth_dbuser"])) formerr($err["auth_dbuser"]); ?>
+    </TD>
+    <TD>
+    <?php  print_string("auth_dbuser","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbpass:</TD>
+	<TD>
+    <INPUT name="auth_dbpass" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_dbpass?>">
+    <?php  if (isset($err["auth_dbpass"])) formerr($err["auth_dbpass"]); ?>
+    </TD>
+    <TD>
+    <?php  print_string("auth_dbpass","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbtable:</TD>
+	<TD>
+    <INPUT name="auth_dbtable" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_dbtable?>">
+    <?php  if (isset($err["auth_dbtable"])) formerr($err["auth_dbtable"]); ?>
+    </TD>
+    <TD>
+    <?php  print_string("auth_dbtable","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbfielduser:</TD>
+	<TD>
+    <INPUT name="auth_dbfielduser" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_dbfielduser?>">
+    <?php  if (isset($err["auth_dbfielduser"])) formerr($err["auth_dbfielduser"]); ?>
+    </TD>
+    <TD>
+    <?php  print_string("auth_dbfielduser","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbfieldpass:</TD>
+	<TD>
+    <INPUT name="auth_dbfieldpass" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_dbfieldpass?>">
+    <?php  if (isset($err["auth_dbfieldpass"])) formerr($err["auth_dbfieldpass"]); ?>
+    </TD>
+    <TD>
+    <?php  print_string("auth_dbfieldpass","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP  BGCOLOR="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_dbpasstype:</TD>
+	<TD>
+    <?php  $passtype["plaintext"] = get_string("plaintext", "auth");
+       $passtype["md5"]       = get_string("md5", "auth");
+       choose_from_menu($passtype, "auth_dbpasstype", $config->auth_dbpasstype, "");
+    ?>
+      
+    </TD>
+    <TD>
+    <?php  print_string("auth_dbpasstype","auth") ?>
+    </TD>
+</TR>
+
+
+<TR>
+	<TD ALIGN=RIGHT><P><?php  print_string("firstname") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_firstname" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_firstname?>">
+    </TD>
+    <TD rowspan=12 VALIGN=CENTER>
+    <?php  print_string("auth_dbextrafields","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><?php  print_string("lastname") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_lastname" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_lastname?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><?php  print_string("email") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_email" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_email?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><?php  print_string("phone") ?> 1:</TD>
+	<TD>
+    <INPUT name="auth_user_phone1" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_phone1?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><?php  print_string("phone") ?> 2:</TD>
+	<TD>
+    <INPUT name="auth_user_phone2" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_phone2?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><?php  print_string("department") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_department" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_department?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><?php  print_string("address") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_address" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_address?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><?php  print_string("city") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_city" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_city?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><?php  print_string("country") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_country" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_country?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><?php  print_string("description") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_description" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_description?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><?php  print_string("idnumber") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_idnumber" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_idnumber?>">
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><?php  print_string("language") ?>:</TD>
+	<TD>
+    <INPUT name="auth_user_lang" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_lang?>">
+    </TD>
+</TR>
+
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><?php  print_string("instructions", "auth") ?>:</TD>
+	<TD>
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><?php  p($config->auth_instructions) ?></TEXTAREA> 
+    </TD>
+    <TD>
+    <?php  print_string("authinstructions","auth") ?>
+    <?php  helpbutton("text", get_string("helptext")) ?>
+    </TD>
+</TR>

auth/db/lib.php

@@ -0,0 +1,77 @@
+<?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' ");
+    $authdb->Close();
+
+    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,59 @@
+<?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="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_imaphost:</TD>
+	<TD>
+        <INPUT name=auth_imaphost TYPE=text SIZE=30 VALUE="<?php echo $config->auth_imaphost?>">
+	<?php  if (isset($err["auth_imaphost"])) formerr($err["auth_imaphost"]); ?>
+	</TD>
+    <TD>
+    <?php  print_string("auth_imaphost","auth") ?> 
+    <?php  print_string("auth_multiplehosts","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_imaptype:</TD>
+	<TD>
+    <?php  $imaptypes = array("imap","imapssl", "imapcert", "imaptls");
+       foreach($imaptypes as $imaptype) {
+           $imapoptions[$imaptype] = $imaptype;
+       }
+       choose_from_menu($imapoptions, "auth_imaptype", $config->auth_imaptype, "");
+    ?>
+    </TD>
+    <TD>
+    <?php  print_string("auth_imaptype","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_imapport:</TD>
+	<TD>
+    <INPUT name=auth_imapport TYPE=text SIZE=6 VALUE="<?php echo $config->auth_imapport?>">
+    <?php  if (isset($err["auth_imapport"])) formerr($err["auth_imapport"]); ?>
+    </TD>
+    <TD>
+    <?php  print_string("auth_imapport","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><?php  print_string("instructions", "auth") ?>:</TD>
+	<TD>
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><?php  p($config->auth_instructions) ?></TEXTAREA> 
+    </TD>
+    <TD>
+    <?php  print_string("authinstructions","auth") ?>
+    <?php  helpbutton("text", get_string("helptext")) ?>
+    </TD>
+</TR>

auth/imap/lib.php

@@ -0,0 +1,47 @@
+<?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;
+
+    $hosts = split(';', $CFG->auth_imaphost);   // Could be multiple hosts
+
+    foreach ($hosts as $host) {                 // Try each host in turn
+
+        $host = trim($host);
+
+        switch ($CFG->auth_imaptype) {
+            case "imapssl":
+                $host = '{'.$host.":$CFG->auth_imapport/imap/ssl}";
+            break;
+    
+            case "imapcert":
+                $host = '{'.$host.":$CFG->auth_imapport/imap/ssl/novalidate-cert}";
+            break;
+    
+            case "imaptls":
+                $host = '{'.$host.":$CFG->auth_imapport/imap/notls}";
+            break;
+    
+            default:
+                $host = '{'.$host.":$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;
+        }
+    }
+
+    return false;  // No match
+}
+
+
+?>

auth/ldap/README-LDAP

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

auth/ldap/config.html

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

auth/ldap/lib.php

@@ -0,0 +1,373 @@
+<?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) {
+        if (!empty($CFG->ldap_version)) {
+            ldap_set_option($result, LDAP_OPT_PROTOCOL_VERSION, $CFG->ldap_version);
+        }
+
+        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><?php  print_string("instructions", "auth") ?>:</TD>
+	<TD>
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><?php  p($config->auth_instructions) ?></TEXTAREA> 
+    </TD>
+    <TD>
+    <?php  print_string("authinstructions","auth") ?>
+    <?php  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,42 @@
+<?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="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_nntphost:</TD>
+	<TD>
+        <INPUT name="auth_nntphost" TYPE="text" SIZE=30 VALUE="<?php echo $config->auth_nntphost?>">
+	<?php  if (isset($err["auth_nntphost"]))  formerr($err["auth_nntphost"]); ?>
+	</TD>
+    <TD>
+    <?php  print_string("auth_nntphost","auth") ?>
+    <?php  print_string("auth_multiplehosts","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>auth_nntpport:</TD>
+	<TD>
+    <INPUT name=auth_nntpport TYPE=text SIZE=6 VALUE="<?php echo $config->auth_nntpport?>">
+    <?php  if (isset($err["auth_nntpport"])) formerr($err["auth_nntpport"]); ?>
+    </TD>
+    <TD>
+    <?php  print_string("auth_nntpport","auth") ?>
+    </TD>
+</TR>
+
+<TR VALIGN=TOP>
+	<TD ALIGN=RIGHT><P><?php  print_string("instructions", "auth") ?>:</TD>
+	<TD>
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><?php  p($config->auth_instructions) ?></TEXTAREA> 
+    </TD>
+    <TD>
+    <?php  print_string("authinstructions","auth") ?>
+    <?php  helpbutton("text", get_string("helptext")) ?>
+    </TD>
+</TR>

auth/nntp/lib.php

@@ -0,0 +1,30 @@
+<?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;
+
+    $hosts = split(';', $CFG->auth_nntphost);   // Could be multiple hosts
+
+    foreach ($hosts as $host) {                 // Try each host in turn
+        $host = '{'.trim($host).":$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;
+        }
+    }
+
+    return false;    // No match
+}
+
+
+?>

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

auth/pop3/lib.php

@@ -0,0 +1,42 @@
+<?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;
+
+    $hosts = split(';', $CFG->auth_pop3host);   // Could be multiple hosts
+
+    foreach ($hosts as $host) {                 // Try each host in turn
+
+        $host = trim($host);
+
+        switch ($CFG->auth_pop3type) {
+            case "pop3":
+                $host = '{'.$host.":$CFG->auth_pop3port/pop3}INBOX";
+            break;
+            case "pop3notls":
+                $host = '{'.$host.":$CFG->auth_pop3port/pop3/notls}INBOX";
+            break;
+            case "pop3cert":
+                $host = '{'.$host.":$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;
+        }
+    }
+
+    return false;  // No matches found
+}
+
+
+?>

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,265 @@
+STATUS $Id$
+----------
+
+This documment shows the current status of the backup/restore option.
+
+Backup:  WORKING. COMPLETED !!
+
+Restore: WORKING. COMPLETED !!
+
+========== ========== ========== ========== ========== ==========
+
+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
+           - Events.(course)....................................DONE
+           - Groups.............................................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 attendances.....................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.....(NOT EXISTS).......................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 glosaries.......................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files........................................DONE
+              x journals........................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.(NOT EXISTS)...........................DONE
+              x labels..........................................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 scheduled backups..................................DONE
+      - Build a configuration inteface..........................DONE
+      - Create the script.......................................DONE
+      - Integrate it in cron....................................DONE
+      - View logs...............................................DONE
+      - Send email..............................................DONE
+   - Select manually the desired activities to backup...........NOT EXISTS
+      - Modify the backup frontend..............................NOT EXISTS
+      - Modify the backup of course_sections and course_modules.NOT EXISTS
+      - Modify every module backuplib to work properly..........NOT EXISTS
+   - Encode every possible internal link........................DONE
+      - Links to forums.........................................DONE
+      - Links to resources......................................DONE
+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
+           - Events.(course)....................................DONE
+           - Groups.............................................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 attendances.....................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.(NOT EXISTS)...........................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 glosaries.......................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files........................................DONE
+              x journals........................................DONE
+                 + course data..................................DONE
+                 + user data....................................DONE
+                 + files.(NOT EXISTS)...........................DONE
+              x labels..........................................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................................................DONE
+   - 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
+   - Decode every possible internal link........................DONE
+      - Links to forums.........................................DONE
+         - From forums (post->message)..........................DONE
+         - From forums (forum->intro)...........................DONE
+         - From resources (resource->summary)...................DONE
+         - From resources (resource->alltext)...................DONE
+      - Links to resources......................................DONE
+         - From forums (post->message)..........................DONE
+         - From forums (forum->intro)...........................DONE
+         - From resources (resource->summary)...................DONE
+         - From resources (resource->alltext)...................DONE
+
+========== ========== ========== =========== =========== =========== ===
+
+This is all. It isn't a little thing !!!  :-)
+
+Eloy (stronk7)
+29-04-2003

backup/backup.php

@@ -0,0 +1,106 @@
+<?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");
+    require_once ("$CFG->libdir/blocklib.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)");
+    }
+
+    check_for_restricted_user($USER->username, "$CFG->wwwroot/course/view.php?id=$course->id");
+
+    //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","80M");
+
+    //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,266 @@
+<?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" action="<?php echo $ME ?>">
+<table cellpadding=5>
+<?php
+
+    //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
+
+    //Calculate the backup word
+    //Take off some characters in the filename !!
+    $takeoff = array(" ", ":", "/", "\\", "|");
+    $backup_word = str_replace($takeoff,"_",strtolower(get_string("backupfilename")));
+    //If non-translated, use "backup"
+    if (substr($backup_word,0,1) == "[") {
+        $backup_word= "backup";
+    }
+
+    //Calculate the date format string
+    $backup_date_format = str_replace(" ","_",get_string("backupnameformat"));
+    //If non-translated, use "%Y%m%d-%H%M"
+    if (substr($backup_date_format,0,1) == "[") {
+        $backup_date_format = "%%Y%%m%%d-%%H%%M";
+    }
+
+    //Calculate the shortname
+    $backup_shortname = clean_filename($course->shortname);
+    if (empty($backup_shortname) or $backup_shortname == '_' ) {
+        $backup_shortname = $course->id;
+    }
+
+    //Calculate the final backup filename
+    //The backup word
+    $backup_name = $backup_word."-";
+    //The shortname
+    $backup_name .= strtolower($backup_shortname)."-";
+    //The date format
+    $backup_name .= userdate(time(),$backup_date_format,99,false);
+    //The extension
+    $backup_name .= ".zip";
+
+    //Add as text field
+    echo "<input type=\"text\" name=\"backup_name\" size=\"40\" 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>";
+
+    //Here we check if backup_users = None. Then, we switch off every module
+    //user info, user_files, logs and exercises and workshop backups. A Warning is showed to
+    //inform the user.
+    if ($backup_users == 2) {
+        if ($allmods = get_records("modules") ) {
+            foreach ($allmods as $mod) {
+                $modname = $mod->name;
+                $var = "backup_user_info_".$modname;
+                if (isset($$var)) {
+                    $$var = 0;
+                }
+                $var = "backup_".$modname;
+                if (isset($$var)) {
+                    if ($modname == "exercise" || $modname == "workshop") {
+                        $$var = 0;
+                    }
+                }
+            }
+        $backup_user_files = 0;
+        $backup_logs = 0;
+        }
+        print_simple_box("<font color=\"red\">".get_string("backupnoneusersinfo")."</font>","center", "70%", "$THEME->cellheading", "20", "noticebox");
+        echo "<hr noshade size=\"1\">";
+    }
+
+    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 (isset($$var) && $$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("includenoneusers");
+        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="<?php  p($id) ?>">
+<input type="hidden" name=launch value="execute">
+<input type="submit" value="<?php  print_string("continue") ?>">
+<input type="submit" name=cancel value="<?php  print_string("cancel") ?>">
+</CENTER>
+</FORM>

backup/backup_execute.html

@@ -0,0 +1,345 @@
+<?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 occurred deleting old backup data");
+    }
+
+    //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) {
+            if (!$status = backup_general_info($backup_file,$preferences)) {
+                notify("An error occurred while backing up general info");
+            }
+        }
+        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) {
+            if (!$status = backup_course_start($backup_file,$preferences)) {
+                notify("An error occurred while backing up course start");
+            }
+        }
+        echo "<li>".get_string("sections");
+        //Section info
+        if ($status) {
+            if (!$status = backup_course_sections($backup_file,$preferences)) {
+                notify("An error occurred while backing up course sections");
+            }
+        }
+
+        //End course contents (close ul)
+        echo "</ul>";
+
+        echo "<li>".get_string("writinguserinfo");
+        //User info
+        if ($status) {
+            if (!$status = backup_user_info($backup_file,$preferences)) {
+                notify("An error occurred while backing up user info");
+            }
+        }
+
+        //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");
+            if (!$status = quiz_backup_question_categories($backup_file,$preferences)) {
+                notify("An error occurred while backing up quiz categories");
+            }
+        }
+        
+        //Print logs if selected
+        if ($status) {
+            if ($preferences->backup_logs) {  
+                echo "<li>".get_string("writingloginfo");
+                if (!$status = backup_log_info($backup_file,$preferences)) {
+                    notify("An error occurred while backing up log info");
+                }
+            }
+        }
+
+        //Print scales info
+        if ($status) {
+            echo "<li>".get_string("writingscalesinfo");
+            if (!$status = backup_scales_info($backup_file,$preferences)) {
+                notify("An error occurred while backing up scales");
+            }
+        }
+
+        //Print groups info
+        if ($status) {
+            echo "<li>".get_string("writinggroupsinfo");
+            if (!$status = backup_groups_info($backup_file,$preferences)) {
+                notify("An error occurred while backing up groups");
+            }
+        }
+
+        //Print events info
+        if ($status) { 
+            echo "<li>".get_string("writingeventsinfo");
+            if (!$status = backup_events_info($backup_file,$preferences)) {
+                notify("An error occurred while backing up events");
+            }
+        }
+
+        //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
+                if (!$status = backup_modules_start ($backup_file,$preferences)) {
+                    notify("An error occurred while backing up module info");
+                }
+                //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);
+                        if (!$status = backup_module($backup_file,$preferences,$module->name)) {
+                            notify("An error occurred while backing up '$module->name'");
+                        }
+                    }
+                }
+                //Close ul for module list
+                echo "</ul>";
+                //Close modules tag
+                if (!$status = backup_modules_end ($backup_file,$preferences)) {
+                    notify("An error occurred while finishing the module backups");
+                }
+            }
+        }
+
+        //Prints course end 
+        if ($status) {
+            if (!$status = backup_course_end($backup_file,$preferences)) {
+                notify("An error occurred while closing the course backup");
+            }
+        }
+        //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");
+            if (!$status = backup_copy_user_files ($preferences)) {
+                notify("An error occurred while copying user files");
+            }
+        }
+    }
+
+    //Now, if selected, copy course files
+    if ($status) {
+        if ($preferences->backup_course_files) {
+            echo "<li>".get_string("copyingcoursefiles");
+            if (!$status = backup_copy_course_files ($preferences)) {
+                notify("An error occurred while copying course files");
+            }
+        }
+    }
+
+    //Now, zip all the backup directory contents
+    if ($status) {
+        echo "<li>".get_string("zippingbackup");
+        if (!$status = backup_zip ($preferences)) {
+            notify("An error occurred while zipping the backup");
+        }
+    }
+
+    //Now, copy the zip file to course directory
+    if ($status) {
+        echo "<li>".get_string("copyingzipfile");
+        if (!$status = copy_zip_to_course_dir ($preferences)) {
+            notify("An error occurred while copying the zip file to the course directory");
+        }
+    }
+
+    //Now, clean temporary data (db and filesystem)
+    if ($status) {
+        echo "<li>".get_string("cleaningtempdata");
+        if (!$status = clean_temp_data ($preferences)) {
+            notify("An error occurred while cleaning up temporary data");
+        }
+    }
+
+    //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 ("The backup did not complete successfully", 
+               "$CFG->wwwroot/course/view.php?id=$course->id");
+    }
+
+    //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,155 @@
+<?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" action="<?php echo $ME ?>">
+<table cellpadding=5>
+<?php
+    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 (isset($$var) && $$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("none");
+        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="<?php  p($id) ?>">
+<input type="hidden" name=launch value="check">
+<input type="submit" value="<?php  print_string("continue") ?>">
+<input type="submit" name=cancel value="<?php  print_string("cancel") ?>">
+</CENTER>
+</FORM>

backup/backup_scheduled.php

@@ -0,0 +1,691 @@
+<?PHP //$Id$
+    //This file contains all the code needed to execute scheduled backups
+
+//This function is executed via moodle cron
+//It prepares all the info and execute backups as necessary
+function schedule_backup_cron() {
+
+    global $CFG;
+    
+    $status = true;
+
+    $emailpending = false;
+
+    //Check for required functions...
+    if(!function_exists('utf8_encode')) {
+        echo "        ERROR: You need to add XML support to your PHP installation!\n";
+        return true;
+    }
+
+    //Get now
+    $now = time();
+
+    //First of all, we have to see if the scheduled is active and detect
+    //that there isn't another cron running
+    echo "    Checking backup status";
+    $backup_config = backup_get_config();
+    if(!isset($backup_config->backup_sche_active) || !$backup_config->backup_sche_active) {
+        echo "...INACTIVE\n";
+        return true;
+    } else if (isset($backup_config->backup_sche_running) && $backup_config->backup_sche_running) {
+        echo "...RUNNING\n";
+        //Now check if it's a really running task or something very old looking 
+        //for info in backup_logs to unlock status as necessary
+        $timetosee = 1800;   //Half an hour looking for activity
+        $timeafter = time() - $timetosee;
+        $numofrec = count_records_select ("backup_log","time > $timeafter");
+        if (!$numofrec) {
+            $timetoseemin = $timetosee/60;
+            echo "    No activity in last ".$timetoseemin." minutes. Unlocking status\n";
+        } else {
+            echo "    Scheduled backup seems to be running. Execution delayed\n";
+            return true;
+        }
+    } else {
+        echo "...OK\n";
+        //Mark backup_sche_running
+        backup_set_config("backup_sche_running","1");
+    }
+
+    //Now we get the main admin user (we'll use his timezone, mail...)
+    echo "    Getting admin info\n";
+    $admin = get_admin();
+    if (!$admin) {
+        $status = false;
+    }
+
+    //Now we get a list of courses in the server
+    if ($status) {
+        echo "    Checking courses\n";
+        $courses = get_records("course");
+        //For each course, we check (insert, update) the backup_course table
+        //with needed data
+        foreach ($courses as $course) {
+            if ($status) {
+                echo "        $course->fullname\n";
+                //We check if the course exists in backup_course
+                $backup_course = get_record("backup_courses","courseid",$course->id);
+                //If it doesn't exist, create
+                if (!$backup_course) {
+                    $temp_backup_course->courseid = $course->id;
+                    $newid = insert_record("backup_courses",$temp_backup_course);
+                    //And get it from db
+                    $backup_course = get_record("backup_courses","id",$newid);
+                }
+                //If it doesn't exist now, error
+                if (!$backup_course) {
+                    echo "            ERROR (in backup_courses detection)\n";
+                    $status = false;
+                }
+                //Now we backup every course with nextstarttime < now
+                if ($backup_course->nextstarttime > 0 && $backup_course->nextstarttime < $now) {
+                    //Set laststarttime
+                    $starttime = time();
+                    set_field("backup_courses","laststarttime",$starttime,"courseid",$backup_course->courseid);
+                    //Launch backup
+                    $course_status = schedule_backup_launch_backup($course,$starttime);
+                    //We have to send a email because we have included at least one backup
+                    $emailpending = true;
+                    //Set lastendtime
+                    set_field("backup_courses","lastendtime",time(),"courseid",$backup_course->courseid);
+                    //Set laststatus
+                    if ($course_status) {
+                        set_field("backup_courses","laststatus","1","courseid",$backup_course->courseid);
+                    } else {
+                        set_field("backup_courses","laststatus","0","courseid",$backup_course->courseid);
+                    }
+                }
+
+                //Now, calculate next execution of the course
+                $nextstarttime = schedule_backup_next_execution ($backup_course,$backup_config,$now,$admin->timezone);
+                //Save it to db
+                set_field("backup_courses","nextstarttime",$nextstarttime,"courseid",$backup_course->courseid);
+                //Print it to screen as necessary
+                $showtime = "undefined";
+                if ($nextstarttime > 0) {
+                    $showtime = userdate($nextstarttime,"",$admin->timezone);
+                }
+                echo "            Next execution: $showtime\n";
+            }
+        }
+    }
+
+    //Delete old logs
+    if (!empty($CFG->loglifetime)) {
+        echo "    Deleting old logs\n";
+        $loglifetime = $now - ($CFG->loglifetime * 86400);
+        delete_records_select("backup_log", "laststarttime < '$loglifetime'");
+    }
+
+    //Send email to admin
+    if ($emailpending) {
+        echo "    Sending email to admin\n";
+        $message = "";
+        //Build the message text (future versions should handle html messages too!!)
+        $logs = get_records_select ("backup_log","laststarttime >= '$now'","id");
+        if ($logs) {
+            $currentcourse = 1;
+            foreach ($logs as $log) {
+                if ($currentcourse != $log->courseid) {
+                    $message .= "\n==================================================\n\n";
+                    $currentcourse = $log->courseid;
+                }
+                $message .= userdate($log->time,"%T",$admin->timezone)." ".$log->info."\n";
+            }
+        }
+        //Send the message
+        $site = get_site();
+        email_to_user($admin,$admin,"$site->shortname: ".get_string("scheduledbackupstatus"),$message);
+    }
+    
+
+    //Everything is finished stop backup_sche_running
+    backup_set_config("backup_sche_running","0");
+
+    return $status;
+}
+
+//This function executes the ENTIRE backup of a course (passed as parameter)
+//using all the scheduled backup preferences
+function schedule_backup_launch_backup($course,$starttime = 0) {
+
+    $preferences = false;
+    $status = false;
+
+    echo "            Executing backup\n";
+    schedule_backup_log($starttime,$course->id,"Start backup course $course->fullname");
+    schedule_backup_log($starttime,$course->id,"  Phase 1: Checking and counting:");
+    $preferences = schedule_backup_course_configure($course,$starttime);
+
+    if ($preferences) {
+        schedule_backup_log($starttime,$course->id,"  Phase 2: Executing and copying:");
+        $status = schedule_backup_course_execute($preferences,$starttime);
+    }
+    if ($status && $preferences) {
+        //Only if the backup_sche_keep is set
+        if ($preferences->backup_keep) {
+            schedule_backup_log($starttime,$course->id,"  Phase 3: Deleting old backup files:");
+            $status = schedule_backup_course_delete_old_files($preferences,$starttime);
+        }
+    }
+    if ($status && $preferences) {
+        echo "            End backup OK\n";
+        schedule_backup_log($starttime,$course->id,"End backup course $course->fullname - OK");
+    } else {
+        echo "            End backup with ERROR\n";
+        schedule_backup_log($starttime,$course->id,"End backup course $course->fullname - ERROR!!");
+    }
+
+    return $status && $preferences;
+}
+
+//This function saves to backup_log all the needed process info
+//to use it later.  NOTE: If $starttime = 0 no info in saved
+function schedule_backup_log($starttime,$courseid,$message) {
+
+    if ($starttime) {
+        $log->courseid = $courseid;
+        $log->time = time();
+        $log->laststarttime = $starttime;
+        $log->info = $message;
+    
+        insert_record ("backup_log",$log);
+    }
+
+}
+
+//This function returns the next future GMT time to execute the course based in the
+//configuration of the scheduled backups
+function schedule_backup_next_execution ($backup_course,$backup_config,$now,$timezone) {
+
+    $result = -1;
+
+    //Get today's midnight GMT
+    $midnight = usergetmidnight($now,$timezone);
+
+    //Get today's day of week (0=Sunday...6=Saturday)
+    $date = usergetdate($now,$timezone);
+    $dayofweek = $date['wday'];
+
+    //Get number of days (from today) to execute backups
+    $scheduled_days = substr($backup_config->backup_sche_weekdays,$dayofweek).
+                      $backup_config->backup_sche_weekdays;
+    $daysfromtoday = strpos($scheduled_days, "1");
+
+    //If some day has been found
+    if ($daysfromtoday !== false) {
+        //Calculate distance
+        $dist = ($daysfromtoday * 86400) +                     //Days distance
+                ($backup_config->backup_sche_hour*3600) +      //Hours distance
+                ($backup_config->backup_sche_minute*60);       //Minutes distance
+        $result = $midnight + $dist;
+    } 
+
+    //If that time is past, call the function recursively to obtain the next valid day
+    if ($result > 0 && $result < time()) {
+        $result = schedule_backup_next_execution ($backup_course,$backup_config,$now + 86400,$timezone);
+    }
+
+    return $result;
+}
+
+
+
+//This function implements all the needed code to prepare a course
+//to be in backup (insert temp info into backup temp tables).
+function schedule_backup_course_configure($course,$starttime = 0) {  
+
+    global $CFG;
+    
+    $status = true;
+
+    schedule_backup_log($starttime,$course->id,"    checking parameters");
+
+    //Check the required variable
+    if (empty($course->id)) {
+        $status = false;
+    }
+    //Get scheduled backup preferences
+    $backup_config =  backup_get_config();
+
+    //Checks backup_config pairs exist
+    if ($status) {
+        if (!isset($backup_config->backup_sche_modules)) {
+            $backup_config->backup_sche_modules = 1;
+        }
+        if (!isset($backup_config->backup_sche_withuserdata)) {
+            $backup_config->backup_sche_withuserdata = 1;
+        }
+        if (!isset($backup_config->backup_sche_users)) {
+            $backup_config->backup_sche_users = 1;
+        }
+        if (!isset($backup_config->backup_sche_logs)) {
+            $backup_config->backup_sche_logs = 0;
+        }
+        if (!isset($backup_config->backup_sche_userfiles)) {
+            $backup_config->backup_sche_userfiles = 1;
+        }
+        if (!isset($backup_config->backup_sche_coursefiles)) {
+            $backup_config->backup_sche_coursefiles = 1;
+        }
+        if (!isset($backup_config->backup_sche_active)) {
+            $backup_config->backup_sche_active = 0;
+        }
+        if (!isset($backup_config->backup_sche_weekdays)) {
+            $backup_config->backup_sche_weekdays = "0000000";
+        }
+        if (!isset($backup_config->backup_sche_hour)) {
+            $backup_config->backup_sche_hour = 00;
+        }
+        if (!isset($backup_config->backup_sche_minute)) {
+            $backup_config->backup_sche_minute = 00;
+        }
+        if (!isset($backup_config->backup_sche_destination)) {
+            $backup_config->backup_sche_destination = "";
+        }
+        if (!isset($backup_config->backup_sche_keep)) {
+            $backup_config->backup_sche_keep = 1;
+        }
+    }
+
+    if ($status) {
+       //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 = $backup_config->backup_sche_modules;
+                }
+                //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 = $backup_config->backup_sche_withuserdata;
+                }
+                //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;
+            }
+        }
+    }
+    
+    //Convert other parameters
+    if ($status) {
+        $preferences->backup_users = $backup_config->backup_sche_users;
+        $preferences->backup_logs = $backup_config->backup_sche_logs;
+        $preferences->backup_user_files = $backup_config->backup_sche_userfiles;
+        $preferences->backup_course_files = $backup_config->backup_sche_coursefiles;
+        $preferences->backup_course = $course->id;
+        $preferences->backup_destination = $backup_config->backup_sche_destination;
+        $preferences->backup_keep = $backup_config->backup_sche_keep;
+    }
+    
+    //Calculate the backup string
+    if ($status) {
+        schedule_backup_log($starttime,$course->id,"    calculating backup name");
+
+        //Calculate the backup word
+        //Take off some characters in the filename !!
+        $takeoff = array(" ", ":", "/", "\\", "|");
+        $backup_word = str_replace($takeoff,"_",strtolower(get_string("backupfilename")));
+        //If non-translated, use "backup"
+        if (substr($backup_word,0,1) == "[") {
+            $backup_word= "backup";
+        }
+
+        //Calculate the date format string
+        $backup_date_format = str_replace(" ","_",get_string("backupnameformat"));
+        //If non-translated, use "%Y%m%d-%H%M"
+        if (substr($backup_date_format,0,1) == "[") {
+            $backup_date_format = "%%Y%%m%%d-%%H%%M";
+        }
+
+        //Calculate the shortname
+        $backup_shortname = clean_filename($course->shortname);
+        if (empty($backup_shortname) or $backup_shortname == '_' ) {
+            $backup_shortname = $course->id;
+        }
+
+        //Calculate the final backup filename
+        //The backup word
+        $backup_name = $backup_word."-";
+        //The shortname
+        $backup_name .= strtolower($backup_shortname)."-";
+        //The date format
+        $backup_name .= userdate(time(),$backup_date_format,99,false);
+        //The extension
+        $backup_name .= ".zip";
+
+        //Calculate the string to match the keep preference
+        $keep_name = $backup_word."-";
+        //The shortname
+        $keep_name .= strtolower($backup_shortname)."-";
+ 
+        $preferences->backup_name = $backup_name;
+        $preferences->keep_name = $keep_name;
+    }
+
+    //Calculate the backup unique code to allow simultaneus backups (to define
+    //the temp-directory name and records in backup temp tables
+    if ($status) {
+        $backup_unique_code = time();
+        $preferences->backup_unique_code = $backup_unique_code;
+    }
+
+    //Calculate necesary info to backup modules
+    if ($status) {
+        schedule_backup_log($starttime,$course->id,"    calculating modules data");
+        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 (isset($$var) && $$var) {
+                    //Add hidden fields
+                    $var = "backup_".$modname;
+                    //Only if selected
+                    if ($$var == 1) {
+                        $var = "backup_user_info_".$modname;
+                        //Call the check function to show more info
+                        $modcheckbackup = $modname."_check_backup_mods";
+                        schedule_backup_log($starttime,$course->id,"      $modname");
+                        $modcheckbackup($course->id,$$var,$backup_unique_code);
+                    }
+                }
+            }
+        }
+    }
+
+    //Now calculate the users
+    if ($status) {
+        schedule_backup_log($starttime,$course->id,"    calculating users");
+        user_check_backup($course->id,$backup_unique_code,$preferences->backup_users);  
+    }
+
+    //Now calculate the logs
+    if ($status) {
+        if ($preferences->backup_logs) {
+            schedule_backup_log($starttime,$course->id,"    calculating logs");
+            log_check_backup($course->id);
+        }
+    }
+
+    //Now calculate the userfiles
+    if ($status) {
+        if ($preferences->backup_user_files) {
+            schedule_backup_log($starttime,$course->id,"    calculating user files");
+            user_files_check_backup($course->id,$preferences->backup_unique_code);
+        }
+    }
+ 
+    //Now calculate the coursefiles
+    if ($status) {
+       if ($preferences->backup_course_files) {
+            schedule_backup_log($starttime,$course->id,"    calculating course files");
+            course_files_check_backup($course->id,$preferences->backup_unique_code);
+        }
+    }
+
+    //If everything is ok, return calculated preferences
+    if ($status) {
+        $status = $preferences;
+    }
+
+    return $status;
+}
+
+//This function implements all the needed code to backup a course
+//copying it to the desired destination (default if not specified)
+function schedule_backup_course_execute($preferences,$starttime = 0) {
+
+    global $CFG;
+
+    $status = true;
+
+    //Another Info to add
+    $preferences->moodle_version = $CFG->version;
+    $preferences->moodle_release = $CFG->release;
+    $preferences->backup_version = $CFG->backup_version;
+    $preferences->backup_release = $CFG->backup_release;
+
+    //Some parts of the backup doesn't know about $preferences, so we
+    //put a copy of it inside that CFG (always global) to be able to
+    //use it. Then, when needed I search for preferences inside CFG
+    //Used to avoid some problems in full_tag() when preferences isn't
+    //set globally (i.e. in scheduled backups)
+    $CFG->backup_preferences = $preferences;
+
+    //Check for temp and backup and backup_unique_code directory
+    //Create them as needed
+    schedule_backup_log($starttime,$preferences->backup_course,"    checking temp structures");
+    $status = check_and_create_backup_dir($preferences->backup_unique_code);
+    //Empty backup dir
+    if ($status) {
+        schedule_backup_log($starttime,$preferences->backup_course,"    cleaning current dir");
+        $status = clear_backup_dir($preferences->backup_unique_code);
+    }
+
+    //Delete old_entries from backup tables
+    if ($status) {
+        schedule_backup_log($starttime,$preferences->backup_course,"    cleaning old data");
+        $status = backup_delete_old_data();
+    }
+
+    //Create the moodle.xml file
+    if ($status) {
+        schedule_backup_log($starttime,$preferences->backup_course,"    creating backup file");
+        //Obtain the xml file (create and open) and print prolog information
+        $backup_file = backup_open_xml($preferences->backup_unique_code);
+        //Prints general info about backup to file
+        if ($backup_file) {
+            schedule_backup_log($starttime,$preferences->backup_course,"      general info");
+            $status = backup_general_info($backup_file,$preferences);
+        } else {
+            $status = false;
+        }
+
+        //Prints course start (tag and general info)
+        if ($status) {
+            $status = backup_course_start($backup_file,$preferences);
+        }
+
+        //Section info
+        if ($status) {
+            schedule_backup_log($starttime,$preferences->backup_course,"      sections info");
+            $status = backup_course_sections($backup_file,$preferences);
+        }
+
+        //User info
+        if ($status) {
+            schedule_backup_log($starttime,$preferences->backup_course,"      user info");
+            $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) {
+            schedule_backup_log($starttime,$preferences->backup_course,"      categories & questions");
+            $status = quiz_backup_question_categories($backup_file,$preferences);
+        }
+        
+        //Print logs if selected
+        if ($status) {
+            if ($preferences->backup_logs) {  
+                schedule_backup_log($starttime,$preferences->backup_course,"      logs");
+                $status = backup_log_info($backup_file,$preferences);
+            }
+        }
+
+        //Print scales info
+        if ($status) {
+            schedule_backup_log($starttime,$preferences->backup_course,"      scales");
+            $status = backup_scales_info($backup_file,$preferences);
+        }
+ 
+        //Print groups info
+        if ($status) {
+            schedule_backup_log($starttime,$preferences->backup_course,"      groups");
+            $status = backup_groups_info($backup_file,$preferences);
+        }
+
+        //Print events info
+        if ($status) {
+            schedule_backup_log($starttime,$preferences->backup_course,"      events");
+            $status = backup_events_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) {
+                schedule_backup_log($starttime,$preferences->backup_course,"      modules");
+                //Start modules tag
+                $status = backup_modules_start ($backup_file,$preferences);
+                //Iterate over modules and call backup
+                foreach ($preferences->mods as $module) {
+                    if ($module->backup and $status) {
+                        schedule_backup_log($starttime,$preferences->backup_course,"        $module->name");
+                        $status = backup_module($backup_file,$preferences,$module->name);
+                    }
+                }
+                //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);
+        }
+    }
+    
+    //Now, if selected, copy user files
+    if ($status) {
+        if ($preferences->backup_user_files) {
+            schedule_backup_log($starttime,$preferences->backup_course,"    copying user files");
+            $status = backup_copy_user_files ($preferences);
+        }
+    }
+
+    //Now, if selected, copy course files
+    if ($status) {
+        if ($preferences->backup_course_files) {
+            schedule_backup_log($starttime,$preferences->backup_course,"    copying course files");
+            $status = backup_copy_course_files ($preferences);
+        }
+    }
+
+    //Now, zip all the backup directory contents
+    if ($status) {
+        schedule_backup_log($starttime,$preferences->backup_course,"    zipping files");
+        $status = backup_zip ($preferences);
+    }
+
+    //Now, copy the zip file to course directory
+    if ($status) {
+        schedule_backup_log($starttime,$preferences->backup_course,"    copying backup");
+        $status = copy_zip_to_course_dir ($preferences);
+    }
+
+    //Now, clean temporary data (db and filesystem)
+    if ($status) {
+        schedule_backup_log($starttime,$preferences->backup_course,"    cleaning temp data");
+        $status = clean_temp_data ($preferences);
+    }
+
+    //Unset CFG->backup_preferences only needed in scheduled backups
+    unset ($CFG->backup_preferences);
+
+    return $status;
+}
+
+//This function deletes old backup files when the "keep" limit has been reached
+//in the destination directory.
+function schedule_backup_course_delete_old_files($preferences,$starttime=0) {
+
+    global $CFG;
+
+    $status = true;
+
+    //Calculate the directory to check
+    $dirtocheck = "";
+    //if $preferences->backup_destination isn't empty, then check that directory
+    if (!empty($preferences->backup_destination)) {
+        $dirtocheck = $preferences->backup_destination;
+    //else calculate standard backup directory location
+    } else {
+        $dirtocheck = $CFG->dataroot."/".$preferences->backup_course."/backupdata";
+    }
+    schedule_backup_log($starttime,$preferences->backup_course,"    checking $dirtocheck");
+    echo "            Keeping backup files in $dirtocheck\n";
+
+    //Get all the files in $dirtocheck
+    $files = get_directory_list($dirtocheck,"",false);
+    //Get all matching files ($preferences->keep_name) from $files
+    $matchingfiles = array();
+    foreach ($files as $file) {
+        if (substr($file, 0, strlen($preferences->keep_name)) == $preferences->keep_name) {
+            $modifieddate = filemtime($dirtocheck."/".$file);
+            $matchingfiles[$modifieddate] = $file;
+        }
+    }
+    //Sort by key (modified date) to get the oldest first (instead of doing that by name
+    //because it could give us problems in some languages with different format names).
+    ksort($matchingfiles);
+
+    //Count matching files
+    $countmatching = count($matchingfiles);
+    schedule_backup_log($starttime,$preferences->backup_course,"        found $countmatching backup files");
+    echo "                found $countmatching backup files\n";
+    if ($preferences->backup_keep < $countmatching) {
+        schedule_backup_log($starttime,$preferences->backup_course,"        keep limit ($preferences->backup_keep) reached. Deleting old files");
+        echo "                keep limit ($preferences->backup_keep) reached. Deleting old files\n";
+        $filestodelete = $countmatching - $preferences->backup_keep;
+        $filesdeleted = 0;
+        foreach ($matchingfiles as $matchfile) {
+            if ($filesdeleted < $filestodelete) {
+                schedule_backup_log($starttime,$preferences->backup_course,"        $matchfile deleted");
+                echo "                $matchfile deleted\n";
+                $filetodelete = $dirtocheck."/".$matchfile;
+                unlink($filetodelete);
+                $filesdeleted++;
+            }
+        }
+    }
+    return $status;
+}
+
+?>

backup/config.html

@@ -0,0 +1,208 @@
+<?php 
+    //Get some strings
+
+    $yes = get_string("yes");
+    $no  = get_string("no");
+    $withuserdata = get_string("withuserdata");
+    $withoutuserdata = get_string("withoutuserdata");
+    $course = get_string("course");
+    $all = get_string("all");
+    $include = get_string("include");
+    $modules = get_string("modules");
+ 
+    //Get backup_config pairs
+    $backup_config =  backup_get_config();
+
+    //Checks backup_config pairs exist
+    if (!isset($backup_config->backup_sche_modules)) {
+        $backup_config->backup_sche_modules = 1;
+    }
+    if (!isset($backup_config->backup_sche_withuserdata)) {
+        $backup_config->backup_sche_withuserdata = 1;
+    }
+    if (!isset($backup_config->backup_sche_users)) {
+        $backup_config->backup_sche_users = 1;
+    }
+    if (!isset($backup_config->backup_sche_logs)) {
+        $backup_config->backup_sche_logs = 0;
+    }
+    if (!isset($backup_config->backup_sche_userfiles)) {
+        $backup_config->backup_sche_userfiles = 1;
+    }
+    if (!isset($backup_config->backup_sche_coursefiles)) {
+        $backup_config->backup_sche_coursefiles = 1;
+    }
+    if (!isset($backup_config->backup_sche_active)) {
+        $backup_config->backup_sche_active = 0;
+    }
+    if (!isset($backup_config->backup_sche_weekdays)) {
+        $backup_config->backup_sche_weekdays = "0000000";
+    }
+    if (!isset($backup_config->backup_sche_hour)) {
+        $backup_config->backup_sche_hour = 00;
+    }
+    if (!isset($backup_config->backup_sche_minute)) {
+        $backup_config->backup_sche_minute = 00;
+    }
+    if (!isset($backup_config->backup_sche_destination)) {
+        $backup_config->backup_sche_destination = "";
+    }
+    if (!isset($backup_config->backup_sche_keep)) {
+        $backup_config->backup_sche_keep = 1;
+    }
+
+    //print_object($backup_config);                       //Debug
+
+    //Yes/no array for use in yes/no menu
+    $yesno_array[0] = $no;
+    $yesno_array[1] = $yes;
+
+    //With user data/without user data array for use in menu
+    $withwithout_array[0] = $withoutuserdata;
+    $withwithout_array[1] = $withuserdata;
+
+    //Course/alla array for use in course/all menu
+    $courseall_array[0] = $all;
+    $courseall_array[1] = $course;
+
+    //Keep array for use in keep menu
+    $keep_array[0] = $all;
+    $keep_array[1] = "1";
+    $keep_array[2] = "2";
+    $keep_array[5] = "5";
+    $keep_array[10] = "10";
+    $keep_array[20] = "20";
+    $keep_array[30] = "30";
+    $keep_array[40] = "40";
+    $keep_array[50] = "50";
+    $keep_array[100] = "100";
+    $keep_array[200] = "200";
+    $keep_array[300] = "300";
+    $keep_array[400] = "400";
+    $keep_array[500] = "500";
+?>
+<form method="post" action="backup.php" name="form">
+
+<table cellpadding=9 cellspacing=0 >
+<tr valign=top>
+    <td colspan = 3 align=center><strong><?php print_string("settings") ?></strong></td>
+</tr>
+<tr valign=top>
+    <td align=right><p><?php print_string("includemodules") ?>:</td>
+    <td nowrap>
+    <?php choose_from_menu($yesno_array, "backup_sche_modules", $backup_config->backup_sche_modules, "") ?>
+    <?php choose_from_menu($withwithout_array, "backup_sche_withuserdata", $backup_config->backup_sche_withuserdata, "") ?>
+    </td>
+    <td>
+    <?php print_string("backupincludemoduleshelp") ?>
+    </td>
+</tr>
+<tr valign=top>
+    <td align=right><p><?php print_string("users") ?>:</td>
+    <td>
+    <?php choose_from_menu($courseall_array, "backup_sche_users", $backup_config->backup_sche_users, "") ?>
+    </td>
+    <td>
+    <?php print_string("backupusershelp") ?>
+    </td>
+</tr>
+<tr valign=top>
+    <td align=right><p><?php print_string("logs") ?>:</td>
+    <td>
+    <?php choose_from_menu($yesno_array, "backup_sche_logs", $backup_config->backup_sche_logs, "") ?>
+    </td>
+    <td>
+    <?php print_string("backuplogshelp") ?>  
+    </td>
+</tr>
+<tr valign=top>
+    <td align=right><p><?php print_string("userfiles") ?>:</td>
+    <td>
+    <?php choose_from_menu($yesno_array, "backup_sche_userfiles", $backup_config->backup_sche_userfiles, "") ?>
+    </td>
+    <td>
+    <?php print_string("backupuserfileshelp") ?>
+    </td>
+</tr>
+<tr valign=top>
+    <td align=right><p><?php print_string("coursefiles") ?>:</td>
+    <td>
+    <?php choose_from_menu($yesno_array, "backup_sche_coursefiles", $backup_config->backup_sche_coursefiles, "") ?>
+    </td>
+    <td>
+    <?php print_string("backupcoursefileshelp") ?>
+    </td>
+</tr>
+<tr valign=top>
+    <td align=right><p><?php print_string("keep") ?>:</td>
+    <td>
+    <?php
+        choose_from_menu($keep_array, "backup_sche_keep", $backup_config->backup_sche_keep, "");
+        print_string("files");
+     ?>
+    </td>
+    <td>
+    <?php print_string("backupkeephelp") ?>
+    </td>
+</tr>
+<tr valign=top>
+    <td colspan = 3 align=center><strong><?php print_string("schedule") ?></strong></td>
+</tr>
+<tr valign=top>
+    <td colspan = 3 align=center>
+        <?php print_string("active") ?>: <?php choose_from_menu($yesno_array, "backup_sche_active", $backup_config->backup_sche_active, "") ?>
+    </td>
+</tr>
+<tr>
+    <td colspan=3 align=center>
+        <?php 
+            //Get first day of week from languaje files
+            //after searching the web I haven't find a sytem to retrieve it in php from locale info
+            $firstdayofweek = get_string("firstdayofweek");
+            //If it is empty ot it is different of 1, default to 0
+            if (!isset($firstdayofweek) || $firstdayofweek != 1) {
+                $firstdayofweek = 0;
+            }
+            //Now create the GMT timestamp of a well-know sunday (02/25/2001, my 31th birthday (stronk7) !!)
+            $onesunday = gmmktime(0,0,0,2,25,2001);
+            $i = 0;
+            $day_names = "";
+            $check_names = "";
+            while ($i<7) {
+                $day_names[] = gmstrftime("%A",$onesunday + (($firstdayofweek+$i)*86400));
+                //Calculate standard day of week (0=Sunday......6=Saturday)
+                //to store info in that exact order in DB
+                $stddayofweek = ($i+$firstdayofweek) % 7;
+                //Calculate the status of the checkbox
+                if (substr($backup_config->backup_sche_weekdays,$stddayofweek,1) == "1") {
+                    $strchecked = " checked";
+                } else {
+                    $strchecked = "";
+                }
+                $check_names[] = "<input type=\"checkbox\" name=\"dayofweek_$stddayofweek\" value=\"1\"$strchecked>";
+                $i++;
+            }
+            $table->align = array("center","center","center","center","center","center","center");
+            $table->head = $day_names;
+            $table->data[] = $check_names;
+            print_table($table);
+        ?>
+    </td>
+</tr>
+<tr valign=top>
+    <td colspan = 3 align=center>
+        <?php print_string("executeat") ?>: <?php print_time_selector("backup_sche_hour","backup_sche_minute",make_timestamp(2000,1,1,$backup_config->backup_sche_hour,$backup_config->backup_sche_minute)) ?>
+    </td>
+</tr>
+<tr valign=top>
+    <td colspan = 3 align=center>
+        <?php print_string("saveto") ?>: <input name="backup_sche_destination" type="text" size="40" value="<?php p($backup_config->backup_sche_destination) ?>"><br><?php if (!empty($sche_destination_error)) { formerr($sche_destination_error); echo "<br>"; } ?><?php print_string("backupsavetohelp") ?>
+    </td>
+</tr>
+<tr>
+    <td colspan=3 align=center>
+        <input type="submit" value="<?php print_string("savechanges") ?>"></td>
+</tr>
+</table>
+
+</form>

backup/db/mysql.php

@@ -0,0 +1,112 @@
+<?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");
+    }
+
+    if ($oldversion < 2003112700 and $result) {
+        $result = execute_sql("CREATE TABLE `{$CFG->prefix}backup_config` (
+                      `id` int(10) unsigned NOT NULL auto_increment,
+                      `name` varchar(255) NOT NULL default '',
+                      `value` varchar(255) NOT NULL default '',
+                      PRIMARY KEY  (`id`),
+                      UNIQUE KEY `name` (`name`)
+                  ) TYPE=MyISAM COMMENT='To store backup configuration variables'");
+    }
+
+    if ($oldversion < 2003120800 and $result) {
+        $result = execute_sql("CREATE TABLE `{$CFG->prefix}backup_courses` (
+                      `id` int(10) unsigned NOT NULL auto_increment,
+                      `courseid` int(10) unsigned NOT NULL default '0',
+                      `laststarttime` int(10) unsigned NOT NULL default '0',
+                      `lastendtime` int(10) unsigned NOT NULL default '0',
+                      `laststatus` varchar(1) NOT NULL default '0',
+                      `nextstarttime` int(10) unsigned NOT NULL default '0',
+                      PRIMARY KEY  (`id`),
+                      UNIQUE KEY `courseid` (`courseid`)
+                  ) TYPE=MyISAM COMMENT='To store every course backup status'");
+
+        if ($result) {
+            $result = execute_sql("CREATE TABLE `{$CFG->prefix}backup_log` (    
+                          `id` int(10) unsigned NOT NULL auto_increment, 
+                          `courseid` int(10) unsigned NOT NULL default '0',
+                          `time` int(10) unsigned NOT NULL default '0',
+                          `laststarttime` int(10) unsigned NOT NULL default '0',
+                          `info` varchar(255) NOT NULL default '',
+                          PRIMARY KEY  (`id`)
+                      ) TYPE=MyISAM COMMENT='To store every course backup log info'");
+        }
+    }
+
+    //Finally, return result
+    return $result;
+
+}
+
+?>

backup/db/mysql.sql

@@ -0,0 +1,71 @@
+#
+# 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';
+# --------------------------------------------------------
+
+#
+# Table structure for table `prefix_backup_config`
+#
+
+CREATE TABLE `prefix_backup_config` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(255) NOT NULL default '',
+  `value` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `name` (`name`)
+) TYPE=MyISAM COMMENT='To store backup configuration variables';
+# --------------------------------------------------------
+
+#
+# Table structure for table `prefix_backup_courses`
+#
+
+CREATE TABLE `prefix_backup_courses` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `courseid` int(10) unsigned NOT NULL default '0',
+  `laststarttime` int(10) unsigned NOT NULL default '0',
+  `lastendtime` int(10) unsigned NOT NULL default '0',
+  `laststatus` varchar(1) NOT NULL default '0',
+  `nextstarttime` int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `courseid` (`courseid`)
+) TYPE=MyISAM COMMENT='To store every course backup status';
+
+# --------------------------------------------------------
+
+#
+# Table structure for table `prefix_backup_log`
+#
+
+CREATE TABLE `prefix_backup_log` (
+  `id` int(10) unsigned NOT NULL auto_increment, 
+  `courseid` int(10) unsigned NOT NULL default '0',
+  `time` int(10) unsigned NOT NULL default '0',
+  `laststarttime` int(10) unsigned NOT NULL default '0',
+  `info` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`id`)
+) TYPE=MyISAM COMMENT='To store every course backup log info';
+# --------------------------------------------------------

backup/db/oci8po.sql

@@ -0,0 +1,130 @@
+rem
+rem Table structure for table prefix_backup_files
+rem
+
+drop table prefix_backup_files;
+
+CREATE TABLE prefix_backup_files (
+  backup_code number(10) default '0' NOT NULL,
+  file_type varchar2(10) default '' NOT NULL,
+  path varchar2(255) default '' NOT NULL,
+  old_id number(10) default NULL,
+  new_id number(10) default NULL
+);
+
+ALTER TABLE prefix_backup_files
+  ADD CONSTRAINT pbf_pk 
+  PRIMARY KEY (backup_code,file_type,path);
+
+COMMENT on table prefix_backup_files is 'To store and recode ids to user and course files.';
+
+rem --------------------------------------------------------
+rem
+rem Table structure for table prefix_backup_ids
+rem
+
+drop table prefix_backup_ids;
+
+CREATE TABLE prefix_backup_ids (
+  backup_code number(12) default '0' NOT NULL,
+  table_name varchar2(30) default '' NOT NULL,
+  old_id number(10) default '0' NOT NULL,
+  new_id number(10) default NULL,
+  info varchar2(20)
+);
+
+ALTER TABLE prefix_backup_ids
+  ADD CONSTRAINT pbi_pk 
+  PRIMARY KEY (backup_code,table_name,old_id);
+
+COMMENT on table prefix_backup_ids is 'To store and convert ids in backup/restore';
+
+rem --------------------------------------------------------
+rem
+rem Table structure for table prefix_backup_config
+rem
+
+drop TABLE prefix_backup_config;
+
+CREATE TABLE prefix_backup_config (
+  id number(10) not null,
+  name varchar2(255) not null,
+  value varchar2(255) not null,
+  constraint pk_baco primary key (id),
+  constraint uk_baco_name unique (name)
+);
+
+COMMENT on table prefix_backup_config is 'To store backup configuration variables';
+
+drop sequence p_backup_config_seq;
+create sequence p_backup_config_seq;
+
+create or replace trigger p_backup_config_trig
+  before insert on prefix_backup_config
+  referencing new as new_row
+  for each row
+  begin
+    select p_backup_config_seq.nextval into :new_row.id from dual;
+  end;
+
+rem --------------------------------------------------------
+rem
+rem Table structure for table prefix_backup_courses
+rem
+
+drop TABLE prefix_backup_courses;
+
+CREATE TABLE prefix_backup_courses (
+    id number(10) default '0' NOT NULL,      
+    courseid number(10) default '0' NOT NULL, 
+    laststarttime number(10) default '0' NOT NULL,
+    lastendtime number(10) default '0' NOT NULL,
+    laststatus varchar2(1) default '0' NOT NULL,
+    nextstarttime number(10) default '0' NOT NULL,
+    constraint pk_bacu primary key (id),
+    constraint uk_bacu_courseid unique (courseid)
+);
+
+COMMENT on table prefix_backup_courses is 'To store every course backup status';
+
+drop sequence p_backup_courses_seq;
+create sequence p_backup_courses_seq;
+
+create or replace trigger p_backup_courses_trig
+  before insert on prefix_backup_courses
+  referencing new as new_row
+  for each row
+  begin
+    select p_backup_courses_seq.nextval into :new_row.id from dual;
+  end;
+
+rem --------------------------------------------------------
+rem
+rem Table structure for table prefix_backup_log
+rem
+
+drop TABLE prefix_backup_log;
+
+CREATE TABLE prefix_backup_log (
+    id number(10) default '0' NOT NULL,
+    courseid number(10) default '0' NOT NULL,
+    time number(10) default '0' NOT NULL,
+    laststarttime number(10) default '0' NOT NULL,
+    info varchar2(255) default '0' NOT NULL,
+    constraint pk_balo primary key (id)
+);
+
+COMMENT on table prefix_backup_log is 'To store every course backup log info';
+
+drop sequence p_backup_log_seq;
+create sequence p_backup_log_seq;
+
+create or replace trigger p_backup_log_trig
+  before insert on prefix_backup_log
+  referencing new as new_row
+  for each row
+  begin
+    select p_backup_log_seq.nextval into :new_row.id from dual;
+  end;
+
+/

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,67 @@
+# 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
+);
+
+# --------------------------------------------------------
+
+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 (
+  backup_code int8 NOT NULL default '0',
+  table_name varchar(30) NOT NULL default '',
+  old_id int8 NOT NULL default '0',
+  new_id int8 default NULL,
+  info text
+);
+
+CREATE INDEX prefix_backup_codenameid_idx ON prefix_backup_ids (backup_code,table_name,old_id);
+
+#
+# Table structure for table prefix_backup_config
+#
+
+CREATE TABLE prefix_backup_config (
+   id SERIAL PRIMARY KEY,
+   name varchar(255) UNIQUE NOT NULL default '',
+   value varchar(255) NOT NULL default ''
+);
+
+#
+# Table structure for table prefix_backup_courses
+#
+
+CREATE TABLE prefix_backup_courses (
+    id SERIAL PRIMARY KEY,
+    courseid int8 UNIQUE NOT NULL default '0',
+    laststarttime int8 NOT NULL default '0',
+    lastendtime int8 NOT NULL default '0',
+    laststatus varchar(1) NOT NULL default '0',
+    nextstarttime int8 NOT NULL default '0'
+);
+
+#
+# Table structure for table prefix_backup_log
+#
+
+CREATE TABLE prefix_backup_log (
+    id SERIAL PRIMARY KEY,
+    courseid int8 NOT NULL default '0',
+    time int8 NOT NULL default '0',
+    laststarttime int8 NOT NULL default '0',
+    info varchar(255) NOT NULL default ''
+);

backup/lib.php

@@ -0,0 +1,536 @@
+<?PHP //$Id$
+    //This file contains all the general function needed (file manipulation...)
+    //not directly part of the backup/restore utility
+
+    //Sets a name/value pair in backup_config table
+    function backup_set_config($name, $value) {
+        if (get_field("backup_config", "name", "name", $name)) {
+            return set_field("backup_config", "value", $value, "name", $name);
+        } else {
+            $config->name = $name;
+            $config->value = $value;
+            return insert_record("backup_config", $config);
+        }
+    }
+
+    //Gets all the information from backup_config table
+    function backup_get_config() {
+        $backup_config = null;
+        if ($configs = get_records("backup_config")) {
+            foreach ($configs as $config) {
+                $backup_config[$config->name] = $config->value;
+            }
+        }
+        return (object)$backup_config;
+    }
+
+    //Delete old data in backup tables (if exists)
+    //Four hours seem to be appropiate now that backup is stable
+    function backup_delete_old_data() {
+
+        global $CFG; 
+
+        //Change this if you want !!
+        $hours = 4;
+        //End change this
+        $seconds = $hours * 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) {
+
+        $results = null;
+  
+        $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) {
+
+        $results = "";
+ 
+        $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) {
+
+        global $CFG;
+
+        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);
+            umask(0000);
+            return copy($from_file,$to_file) && chmod($to_file,$CFG->directorypermissions);
+        }
+        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
+            umask(0000);
+            $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_version));
+                    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_version));
+                    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
+ 
+        $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) {
+            //Build the record
+            $rec->backup_code = $backup_unique_code;
+            $rec->table_name = $table;
+            $rec->old_id = $old_id;
+            $rec->new_id =$new_id;
+            $rec->info = $info_to_save;
+            
+            $status = insert_record ("backup_ids", $rec, false,"backup_code");
+        }
+        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 restore_decode_absolute_links(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/log.php

@@ -0,0 +1,138 @@
+<?PHP  // $Id$
+       // backup.php - allows admin to edit all configuration variables for scheduled backups
+
+    require_once("../config.php");
+    require_once("../backup/lib.php");
+
+    optional_variable($courseid);
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only an admin can use this page");
+    }
+
+    if (!$site = get_site()) {
+        error("Site isn't defined!");
+    }
+
+    //Get needed strings
+    $backuploglaststatus = get_string("backuploglaststatus");
+    $backuplogdetailed = get_string("backuplogdetailed");
+    $stradmin = get_string("administration");
+    $strconfiguration = get_string("configuration");
+    $strbackup = get_string("backup");
+    $strbackupdetails = get_string("backupdetails");
+    $strlogs = get_string("logs");
+    $strftimedatetime = get_string("strftimerecent");
+    $strftimetime = get_string("strftimetime").":%S";
+    $strerror = get_string("error");
+    $strok = get_string("ok");
+    $strcourse = get_string("course");
+    $strtimetaken = get_string("timetaken","quiz");
+    $strstatus = get_string("status");
+    $strnext = get_string("next");
+
+    //Decide when to show last execution logs or detailed logs
+    //Lastlog view
+    if (!$courseid) {
+        print_header("$site->shortname: $strconfiguration: $strbackup", $site->fullname,
+                      "<a href=\"../$CFG->admin/index.php\">$stradmin</a> -> ".
+                      "<a href=\"../$CFG->admin/configure.php\">$strconfiguration</a> -> ".
+                      "<a href=\"../$CFG->admin/backup.php\">$strbackup</a> -> ".
+                      $strlogs);
+
+        print_heading($backuploglaststatus);
+        print_simple_box_start("center", "", "$THEME->cellheading");
+        //Now, get every record from backup_courses
+        $courses = get_records("backup_courses");
+
+        if (!$courses) {
+            notify("No logs found!");
+        } else {
+            echo "<table border=0 align=center cellpadding=3 cellspacing=3>";
+            //Print table header
+            echo "<tr nowrap>";
+            echo "<td nowrap align=center><font size=3>$strcourse</font></td>";
+            echo "<td nowrap align=center colspan=3><font size=3>$strtimetaken</font></td>";
+            echo "<td nowrap align=center><font size=3>$strstatus</font></td>";
+            echo "<td nowrap align=center><font size=3>$strnext</font></td>";
+            foreach ($courses as $course) {
+                //Get the course shortname
+                $coursename = get_field ("course","fullname","id",$course->courseid);
+                if ($coursename) {
+                    echo "<tr nowrap>";
+                    echo "<td nowrap><font size=2><a href=\"log.php?courseid=$course->courseid\">".$coursename."</a></td>";
+                    echo "<td nowrap><font size=2>".userdate($course->laststarttime,$strftimedatetime)."</td>";
+                    echo "<td nowrap><font size=2> - </td>";
+                    echo "<td nowrap><font size=2>".userdate($course->lastendtime,$strftimedatetime)."</td>";
+                    if (!$course->laststatus) {
+                        echo "<td nowrap align=center><font size=2 color=red>".$strerror."</td>";
+                    } else {
+                        echo "<td nowrap align=center><font size=2 color=green>".$strok."</td>";
+                    }
+                    echo "<td nowrap><font size=2>".userdate($course->nextstarttime,$strftimedatetime)."</td>";
+                    echo "</tr>";
+                }
+            }
+            echo "</table>";
+        }
+        print_simple_box_end();
+    //Detailed View !!
+    } else {
+        print_header("$site->shortname: $strconfiguration: $strbackup", $site->fullname,
+                      "<a href=\"../$CFG->admin/index.php\">$stradmin</a> -> ".
+                      "<a href=\"../$CFG->admin/configure.php\">$strconfiguration</a> -> ".
+                      "<a href=\"../$CFG->admin/backup.php\">$strbackup</a> -> ".
+                      "<a href=\"log.php\">$strlogs</a> -> ".
+                      $strbackupdetails);
+
+        print_heading($backuplogdetailed);
+
+        $coursename = get_field("course","fullname","id","$courseid");
+        print_heading("$strcourse: $coursename");
+
+        print_simple_box_start("center", "", "$THEME->cellheading");
+        
+        //First, me get all the distinct backups for that course in backup_log
+        $executions = get_records_sql("SELECT DISTINCT laststarttime,laststarttime
+                                       FROM {$CFG->prefix}backup_log
+                                       WHERE courseid = '$courseid'
+                                       ORDER BY laststarttime DESC");
+
+        //Iterate over backup executions
+        if (!$executions) {
+            notify("No logs found!");
+        } else {
+            echo "<table border=0 align=center cellpadding=3 cellspacing=3>";
+            foreach($executions as $execution) {
+                echo "<tr nowrap>";
+                echo "<td nowrap align=center colspan=3>";
+                print_simple_box("<center>".userdate($execution->laststarttime)."</center>", "center");
+                echo "</td>";
+                echo "</tr>";
+                $logs = get_records_sql("SELECT * 
+                                         FROM {$CFG->prefix}backup_log
+                                         WHERE courseid = '$courseid'  AND
+                                               laststarttime = '$execution->laststarttime'
+                                         ORDER BY time");
+                if ($logs) {
+                    foreach ($logs as $log) {
+                        echo "<tr nowrap>";
+                        echo "<td nowrap><font size=2>".userdate($log->time,$strftimetime)."</font></td>";
+                        $log->info = str_replace("- ERROR!!","- <font color=red>ERROR!!</font>",$log->info);
+                        $log->info = str_replace("- OK","- <font color=green>OK</font>",$log->info);
+                        echo "<td nowrap><font size=2>".str_replace("  ","&nbsp;&nbsp;&nbsp;&nbsp;",$log->info)."</font></td>";
+                        echo "</tr>";
+                    }
+                }
+            }
+            echo "</table>";
+        }
+        print_simple_box_end();
+    }
+
+
+    print_footer();
+
+?>

backup/restore.php

@@ -0,0 +1,115 @@
+<?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");
+    require_once("$CFG->libdir/blocklib.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)");
+    }
+
+    check_for_restricted_user($USER->username, "$CFG->wwwroot/course/view.php?id=$course->id");
+
+    //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","80M");
+
+    //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,205 @@
+<?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;
+        if (isset($SESSION->restore)) {
+            $restore = $SESSION->restore;
+        }
+    }
+
+    //If restore session info exists, but we are posting parameters
+    //manually, this has prioriry
+    if (isset($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 (!isset($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("all","c.fullname")) {
+            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,326 @@
+<?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;
+    }
+
+    //Add info->original_wwwroot to $restore to be able to use it in all the restore process
+    //(mainly when decoding internal links)
+    $restore->original_wwwroot = $info->original_wwwroot;
+
+    //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;
+                $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") !== false) {
+                        $student_count++;
+                    } else if (strpos($record->info,"teacher") !== false) {
+                        $teacher_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 "</ul>";
+            } else {
+                notify("No users were found!");
+            }
+        }
+    }
+
+    //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 groups as needed
+    if ($status) {
+        echo "<li>".get_string("creatinggroups");
+        if (!$status = restore_create_groups($restore,$xml_file)) {
+            notify("Could not restore groups!");
+        }
+    }
+
+    //Now create events as needed
+    if ($status) {
+        echo "<li>".get_string("creatingevents");
+        if (!$status = restore_create_events($restore,$xml_file)) {
+            notify("Could not restore course events!");
+        }
+    }
+
+    //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");
+        if (!$status = restore_create_logs($restore,$xml_file)) {
+            notify("Could not restore logs!");
+        }
+    }    
+
+    //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, adjust activity events
+    if ($status) {
+        echo "<li>".get_string("refreshingevents");
+        if (!$status = restore_refresh_events($restore)) {
+            notify("Could not refresh events for activities!");
+        }
+    }
+
+    //Now, if all is OK, adjust inter-activity links
+    if ($status) {
+        echo "<li>".get_string("decodinginternallinks");
+        if (!$status = restore_decode_content_links($restore)) {
+            notify("Could not refresh events for activities!");
+        }
+    }
+
+    //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,282 @@
+<?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!");
+    }
+
+?>
+
+<SCRIPT LANGUAGE="JavaScript">
+<!--
+function selectItemInMenuByName(formId, menuName, selectIndex ) {
+    myForm = document.getElementById(formId)
+    for (i=0,n=myForm.elements.length;i<n;i++) {
+        myLen = menuName.length;
+        myName = myForm.elements[i].name;
+        myType = myForm.elements[i].type;
+        if (myName.substring(0,myLen) == menuName && myType == "select-one")
+            myForm.elements[i].options[selectIndex].selected = true;
+        }
+}
+-->
+</script>
+
+<form name="form1" id="form1" method="post" action="<?php echo $ME ?>">
+<table cellpadding=5>
+<?php
+
+    //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") ) {
+        //Print option to select/deselect every "with user info" popup. For Gustav, lol, Eloy :-)
+        echo "<tr>";
+        echo "<td colspan=\"2\" align=\"right\"><font size=\"-1\">";
+        echo get_string("userdata").":";
+        echo "<a href=\"javascript:void(0);\" onclick=\"selectItemInMenuByName('form1', 'restore_user_info_', '1');\">".
+             get_string("all")."</a>/";
+        echo "<a href=\"javascript:void(0);\" onclick=\"selectItemInMenuByName('form1', 'restore_user_info_', '0');\">".
+             get_string("none")."</a>";
+        echo "</font></td>";
+        echo "</tr>";
+        echo "<tr><td colspan=\"2\"><hr noshade size=\"1\"></td></tr>";
+        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 (isset($$exist)) {
+                if ($$exist) {
+                    //Now check that we have that module info in the backup file
+                    if (isset($info->mods[$modname]) && $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\">";
+                }
+            } 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 some user is present in the backup file
+        if ($info->backup_users == "all" or $info->backup_users == "course") {
+            //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");
+            choose_from_menu($user_options, "restore_users", $restore_users, "");
+        } else {
+            echo get_string("none");
+            echo "<input type=\"hidden\" name=\"restore_users\" value=\"2\">";
+
+        }
+        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="<?php  p($id) ?>">
+<input type="hidden" name=launch value="check">
+<input type="submit" value="<?php  print_string("continue") ?>">
+<input type="submit" name=cancel value="<?php  print_string("cancel") ?>">
+</CENTER>
+</FORM>

backup/restore_precheck.html

@@ -0,0 +1,154 @@
+<?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)
+    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);
+    }
+
+    //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");
+        if (! $status = backup_copy_file($file,$CFG->dataroot."/temp/backup/".$backup_unique_code."/".basename($file))) {
+            notify("Error copying backup file. Invalid name or bad perms.");
+        }
+    }
+
+    //Now unzip the file
+    if ($status) {
+        echo "<li>".get_string("unzippingbackup");
+        if (! $status = restore_unzip ($CFG->dataroot."/temp/backup/".$backup_unique_code."/".basename($file))) {
+            notify("Error unzipping backup file. Invalid zip 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");
+        if (! $status = restore_check_moodle_file ($xml_file)) {
+            notify("Error checking backup file. Invalid or corrupted.");
+        }
+    }
+
+    $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>";
+
+    //We compare Moodle's versions
+    if ($CFG->version < $info->backup_moodle_version && $status) {
+        $message->serverversion = $CFG->version;
+        $message->serverrelease = $CFG->release;
+        $message->backupversion = $info->backup_moodle_version;
+        $message->backuprelease = $info->backup_moodle_release;
+        print_simple_box(get_string('noticenewerbackup','',$message), "center", "70%", "$THEME->cellheading2", "20", "noticebox");
+
+    }
+
+    //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/try.php

@@ -0,0 +1,43 @@
+<?PHP //$Id$
+    require_once ("../config.php");
+    require_once ("backup_scheduled.php");
+    require_once ("lib.php");
+    require_once ("backuplib.php");
+    require_once ("$CFG->libdir/blocklib.php");
+
+    require_login();
+
+    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();
+
+    //Adjust some php variables to the execution of this script
+    ini_set("max_execution_time","3000");
+    ini_set("memory_limit","56M");
+
+    echo "<pre>\n";
+
+    $status = true;
+
+    $courses = get_records("course");
+    foreach ($courses as $course) {
+        echo "Start course ".$course->fullname;
+        $preferences = schedule_backup_course_configure($course);
+        if ($preferences && $status) {
+            $status = schedule_backup_course_execute($preferences);
+        }
+        if ($status && $preferences) {
+            echo "End course ".$course->fullname." OK\n\n";
+        } else {
+            echo "End course ".$course->fullname." FAIL\n\n";
+        }
+    }
+?>

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 = 2004052404;   // The current version is a date (YYYYMMDDXX)
+
+$backup_release = "1.3.4";  // User-friendly version number

blocks/README.txt

@@ -0,0 +1,53 @@
+-------------------------------------------------------------------------------
+CREATING NEW BLOCKS
+-------------------------------------------------------------------------------
+
+-------------------------------------------------------------------------------
+WARNING - PRELIMINARY DOCUMENTATION
+This is designed to point new block developers in the right direction. At times
+it may NOT be fully up-to-date with the source, or it may even contain some
+tiny bit of misinformation that has slipped our notice. If you encounter such a
+case, please:
+    1. Use the existing block code as reference
+    2. Come to the moodle.org forums and tell the world! :) We 'll help you!
+-------------------------------------------------------------------------------
+
+You have to derive a class that extends MoodleBlock.
+
+The derived class MUST:
+
+    * Implement a constructor that:
+        1. Sets $this->content_type (BLOCK_TYPE_LIST or BLOCK_TYPE_TEXT)
+        3. Sets $this->title
+        4. Sets $this->version
+        5. Sets $this->course equal to its only argument
+
+The derived class MAY:
+
+    * Declare that the block has a configuration interface.
+      To do so:
+
+        1. Define a method has_config() {return true;}
+        2. Define a method print_config() that prints whatever
+           configuration interface you want to have.
+        3. Define a method handle_config($data) that does what
+           is needed. $data comes straight from data_submitted().
+
+    * Limit the course formats it can be displayed in.
+      To do so:
+
+        1. Define a method applicable_formats() which returns a bitwise
+           OR of one or more COURSE_FORMAT_XXX defined constants. These
+           are defined in lib/blocklib.php.
+
+    * Select a "preferred" width which the course format will try to honor.
+      To do so:
+
+        1. Define a method preferred_width() which returns an integer.
+           This is the block's preferred width in pixels.
+
+    * Declare that the block is going to hide its header. This will result
+      in a more lightweight appearance. Ideal for announcements/notices.
+      To do so:
+
+        1. Define a method hide_header() {return true;}

blocks/activity_modules/block_activity_modules.php

@@ -0,0 +1,39 @@
+<?PHP //$Id$
+
+class CourseBlock_activity_modules extends MoodleBlock {
+    function CourseBlock_activity_modules($course) {
+        $this->title = get_string('activities');
+        $this->content_type = BLOCK_TYPE_LIST;
+        $this->course = $course;
+        $this->version = 2004041000;
+    }
+
+    function get_content() {
+        global $USER, $CFG;
+
+        // This is really NOT pretty, but let's do it simple for now...
+        global $modnamesused, $modnamesplural;
+
+        if($this->content !== NULL) {
+            return $this->content;
+        }
+
+        $this->content = New object;
+        $this->content->items = array();
+        $this->content->icons = array();
+        $this->content->footer = '';
+
+        if ($modnamesused) {
+            foreach ($modnamesused as $modname => $modfullname) {
+                if ($modname != 'label') {
+                    $this->content->items[] = '<a href="../mod/'.$modname.'/index.php?id='.$this->course->id.'">'.$modnamesplural[$modname].'</a>';
+                    $this->content->icons[] = '<img src="'.$CFG->modpixpath.'/'.$modname.'/icon.gif" height="16" width="16" alt="">';
+                }
+            }
+        }
+
+        return $this->content;
+    }
+}
+
+?>

blocks/activity_modules/db/mysql.php

@@ -0,0 +1,33 @@
+<?PHP  //$Id$
+//
+// This file keeps track of upgrades to Moodle's
+// blocks system.
+//
+// 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 activity_modules_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/activity_modules/db/postgres7.php

@@ -0,0 +1,33 @@
+<?PHP  //$Id$
+//
+// This file keeps track of upgrades to Moodle's
+// blocks system.
+//
+// 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 PostgreSQL
+
+function activity_modules_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/admin/block_admin.php

@@ -0,0 +1,110 @@
+<?PHP //$Id$
+
+class CourseBlock_admin extends MoodleBlock {
+    function CourseBlock_admin($course) {
+        $this->title = get_string('administration');
+        $this->content_type = BLOCK_TYPE_LIST;
+        $this->course = $course;
+        $this->version = 2004041000;
+    }
+    function get_content() {
+        global $USER, $CFG, $THEME;
+
+        require_once($CFG->dirroot.'/mod/forum/lib.php');
+
+        if($this->content !== NULL) {
+            return $this->content;
+        }
+
+        $this->content = New object;
+        $this->content->items = array();
+        $this->content->icons = array();
+        $this->content->footer = '';
+
+        if (isguest()) {
+            return $this->content;
+        }
+
+        if (isteacher($this->course->id)) {
+
+            $isteacheredit = isteacheredit($this->course->id);
+
+            if ($isteacheredit) {
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/edit.gif" height="16" width="16" alt="">';
+                if (isediting($this->course->id)) {
+                    $this->content->items[]='<a href="view.php?id='.$this->course->id.'&amp;edit=off">'.get_string('turneditingoff').'</a>';
+                } else {
+                    $this->content->items[]='<a href="view.php?id='.$this->course->id.'&amp;edit=on">'.get_string('turneditingon').'</a>';
+                }
+                $this->content->items[]='<a href="edit.php?id='.$this->course->id.'">'.get_string('settings').'...</a>';
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/settings.gif" height="16" width="16" alt="">';
+
+                if (iscreator() or !empty($CFG->teacherassignteachers)) {
+                    if (!$this->course->teachers) {
+                        $this->course->teachers = get_string('defaultcourseteachers');
+                    }
+                    $this->content->items[]='<a href="teacher.php?id='.$this->course->id.'">'.$this->course->teachers.'...</a>';
+                    $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/users.gif" height="16" width="16" alt="">';
+                }
+
+                if (!$this->course->students) {
+                    $this->course->students = get_string('defaultcoursestudents');
+                }
+                $this->content->items[]='<a href="student.php?id='.$this->course->id.'">'.$this->course->students.'...</a>';
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/users.gif" height="16" width="16" alt="">';
+
+                $this->content->items[]='<a href="'.$CFG->wwwroot.'/backup/backup.php?id='.$this->course->id.'">'.get_string('backup').'...</a>';
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/backup.gif" height="16" width="16" alt="">';
+
+                $this->content->items[]='<a href="'.$CFG->wwwroot.'/files/index.php?id='.$this->course->id.'&amp;wdir=/backupdata">'.get_string('restore').'...</a>';
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/restore.gif" height="16" width="16" alt="">';
+                $this->content->items[]='<a href="scales.php?id='.$this->course->id.'">'.get_string('scales').'...</a>';
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/scales.gif" height="16" width="16" alt="">';
+            }
+
+            $this->content->items[]='<a href="grades.php?id='.$this->course->id.'">'.get_string('grades').'...</a>';
+            $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/grades.gif" height="16" width="16" alt="">';
+
+            $this->content->items[]='<a href="log.php?id='.$this->course->id.'">'.get_string('logs').'...</a>';
+            $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/log.gif" height="16" width="16" alt="">';
+
+            if ($isteacheredit) {
+                $this->content->items[]='<a href="'.$CFG->wwwroot.'/files/index.php?id='.$this->course->id.'">'.get_string('files').'...</a>';
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/files.gif" height="16" width="16" alt="">';
+            }
+
+            $this->content->items[]='<a href="'.$CFG->wwwroot.'/doc/view.php?id='.$this->course->id.'&amp;file=teacher.html">'.get_string('help').'...</a>';
+            $this->content->icons[]='<img src="'.$CFG->modpixpath.'/resource/icon.gif" height="16" width="16" alt="">';
+
+            if ($teacherforum = forum_get_course_forum($this->course->id, 'teacher')) {
+                $this->content->items[]='<a href="'.$CFG->wwwroot.'/mod/forum/view.php?f='.$teacherforum->id.'">'.get_string('nameteacher', 'forum').'</a>';
+                $this->content->icons[]='<img src="'.$CFG->modpixpath.'/forum/icon.gif" height="16" width="16" alt="">';
+            }
+
+        } else if (!isguest()) {  // Students menu
+            if ($this->course->showgrades) {
+                $this->content->items[]='<a href="grade.php?id='.$this->course->id.'">'.get_string('grades').'...</a>';
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/grades.gif" height="16" width="16" alt="">';
+            }
+            if ($this->course->showreports) {
+                $this->content->items[]='<a href="user.php?id='.$this->course->id.'&amp;user='.$USER->id.'">'.get_string('activityreport').'...</a>';
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/report.gif" height="16" width="16" alt="">';
+            }
+            if (is_internal_auth()) {
+                $this->content->items[]='<a href="'.$CFG->wwwroot.'/login/change_password.php?id='.$this->course->id.'">'.get_string('changepassword').'...</a>';
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" height="16" width="16" alt="">';
+            } else if ($CFG->changepassword) {
+                $this->content->items[]='<a href="'.$CFG->changepassword.'">'.get_string('changepassword').'...</a>';
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" height="16" width="16" alt="">';
+            }
+            if ($CFG->allowunenroll) {
+                $this->content->items[]='<a href="unenrol.php?id='.$this->course->id.'">'.get_string('unenrolme', '', $this->course->shortname).'...</a>';
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" height="16" width="16" alt="">';
+            }
+        }
+
+        return $this->content;
+    }
+}
+
+?>

blocks/admin/db/mysql.php

@@ -0,0 +1,33 @@
+<?PHP  //$Id$
+//
+// This file keeps track of upgrades to Moodle's
+// blocks system.
+//
+// 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 admin_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/admin/db/postgres7.php

@@ -0,0 +1,33 @@
+<?PHP  //$Id$
+//
+// This file keeps track of upgrades to Moodle's
+// blocks system.
+//
+// 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 PostgreSQL
+
+function admin_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/calendar_month/block_calendar_month.php

@@ -0,0 +1,63 @@
+<?PHP //$Id$
+
+class CourseBlock_calendar_month extends MoodleBlock {
+    function CourseBlock_calendar_month($course) {
+        $this->title = get_string('calendar', 'calendar');
+        $this->content_type = BLOCK_TYPE_TEXT;
+        $this->course = $course;
+        $this->version = 2004052400;
+    }
+
+    function get_content() {
+        global $USER, $CFG, $SESSION;
+        optional_variable($_GET['cal_m']);
+        optional_variable($_GET['cal_y']);
+
+        require_once($CFG->dirroot.'/calendar/lib.php');
+
+        if ($this->content !== NULL) {
+            return $this->content;
+        }
+
+        $this->content = New object;
+        $this->content->text = '';
+        $this->content->footer = '';
+
+        if ($this->course === NULL) {
+            // Overrides: use no course at all
+            $courseshown = false;
+            $filtercourse = array();
+
+        } else {
+            $courseshown = $this->course->id;
+            $filtercourse = array($courseshown => 1);
+        }
+
+        // We 'll need this later
+        calendar_set_referring_course($courseshown);
+
+        // Be VERY careful with the format for default courses arguments!
+        // Correct formatting is [courseid] => 1 to be concise with moodlelib.php functions.
+
+        calendar_set_filters($courses, $group, $user, $filtercourse, $filtercourse);
+
+        if ($courseshown == 1) {
+            // For the front page
+            $this->content->text .= calendar_overlib_html();
+            $this->content->text .= calendar_top_controls('frontpage', array('m' => $_GET['cal_m'], 'y' => $_GET['cal_y']));
+            $this->content->text .= calendar_get_mini($courses, $group, $user, $_GET['cal_m'], $_GET['cal_y']);
+            // No filters for now
+
+        } else {
+            // For any other course
+            $this->content->text .= calendar_overlib_html();
+            $this->content->text .= calendar_top_controls('course', array('id' => $courseshown, 'm' => $_GET['cal_m'], 'y' => $_GET['cal_y']));
+            $this->content->text .= calendar_get_mini($courses, $group, $user, $_GET['cal_m'], $_GET['cal_y']);
+            $this->content->text .= calendar_filter_controls('course', '', $this->course);
+        }
+
+        return $this->content;
+    }
+}
+
+?>

blocks/calendar_month/db/mysql.php

@@ -0,0 +1,33 @@
+<?PHP  //$Id$
+//
+// This file keeps track of upgrades to Moodle's
+// blocks system.
+//
+// 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 calendar_month_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/calendar_month/db/postgres7.php

@@ -0,0 +1,33 @@
+<?PHP  //$Id$
+//
+// This file keeps track of upgrades to Moodle's
+// blocks system.
+//
+// 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 PostgreSQL
+
+function calendar_month_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/calendar_upcoming/block_calendar_upcoming.php

@@ -0,0 +1,55 @@
+<?PHP //$Id$
+
+class CourseBlock_calendar_upcoming extends MoodleBlock {
+    function CourseBlock_calendar_upcoming ($course) {
+        $this->title = get_string('upcomingevents', 'calendar');
+        $this->content_type = BLOCK_TYPE_TEXT;
+        $this->course = $course;
+        $this->version = 2004052400;
+    }
+
+    function get_content() {
+        global $USER, $CFG, $SESSION;
+        optional_variable($_GET['cal_m']);
+        optional_variable($_GET['cal_y']);
+
+        require_once($CFG->dirroot.'/calendar/lib.php');
+
+        if($this->content !== NULL) {
+            return $this->content;
+        }
+
+        $this->content = New object;
+        $this->content->text = '';
+        $this->content->footer = '<br /><a href="'.$CFG->wwwroot.'/calendar/view.php?view=upcoming&amp;course='.$this->course->id.'">'.get_string('gotocalendar', 'calendar').'</a>...';
+        $this->content->footer .= '<br /><a href="'.$CFG->wwwroot.'/calendar/event.php?action=new">'.get_string('newevent', 'calendar').'</a>...';
+
+        if($this->course === NULL) {
+            // Overrides: use no course at all
+            $courseshown = false;
+            $filtercourse = array();
+        }
+        else {
+            $courseshown = $this->course->id;
+            $filtercourse = array($courseshown => 1);
+        }
+
+        // We 'll need this later
+        calendar_set_referring_course($courseshown);
+
+        // Be VERY careful with the format for default courses arguments!
+        // Correct formatting is [courseid] => 1 to be concise with moodlelib.php functions.
+
+        calendar_set_filters($courses, $group, $user, $filtercourse, $filtercourse, false);
+
+        $this->content->text = calendar_get_sideblock_upcoming($courses, $group, $user, get_user_preferences('calendar_lookahead', CALENDAR_UPCOMING_DAYS), get_user_preferences('calendar_maxevents', CALENDAR_UPCOMING_MAXEVENTS));
+
+        if(empty($this->content->text)) {
+            $this->content->text = '<div style="font-size: 0.8em; text-align: center;">'.get_string('noupcomingevents', 'calendar').'</div>';
+        }
+
+        return $this->content;
+    }
+}
+
+?>

blocks/calendar_upcoming/db/mysql.php

@@ -0,0 +1,33 @@
+<?PHP  //$Id$
+//
+// This file keeps track of upgrades to Moodle's
+// blocks system.
+//
+// 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 calendar_upcoming_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/calendar_upcoming/db/postgres7.php

@@ -0,0 +1,33 @@
+<?PHP  //$Id$
+//
+// This file keeps track of upgrades to Moodle's
+// blocks system.
+//
+// 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 PostgreSQL
+
+function calendar_upcoming_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/course_list/block_course_list.php

@@ -0,0 +1,82 @@
+<?PHP //$Id$
+
+class CourseBlock_course_list extends MoodleBlock {
+    function CourseBlock_course_list ($course) {
+        $this->title = get_string('mycourses');
+        $this->content_type = BLOCK_TYPE_LIST;
+        $this->course = $course;
+        $this->version = 2004041800;
+    }
+
+    function get_content() {
+        global $THEME, $CFG, $USER;
+
+        if($this->content !== NULL) {
+            return $this->content;
+        }
+
+        $this->content = New object;
+        $this->content->items = array();
+        $this->content->icons = array();
+        $this->content->footer = '';
+
+        if (empty($THEME->custompix)) {
+            $icon  = "<img src=\"$CFG->wwwroot/pix/i/course.gif\"".
+                     " height=\"16\" width=\"16\" alt=\"".get_string("course")."\">";
+        } else {
+            $icon  = "<img src=\"$CFG->wwwroot/theme/$CFG->theme/pix/i/course.gif\"".
+                     " height=\"16\" width=\"16\" alt=\"".get_string("course")."\">";
+        }
+
+        if (isset($USER->id) and !isadmin()) {    // Just print My Courses
+            if ($courses = get_my_courses($USER->id)) {
+                foreach ($courses as $course) {
+                    if (!$course->category) {
+                        continue;
+                    }
+                    $linkcss = $course->visible ? "" : " class=\"dimmed\" ";
+                    $this->content->items[]="<a $linkcss title=\"$course->shortname\" ".
+                               "href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->fullname</a>";
+                    $this->content->icons[]=$icon;
+                }
+                $this->title = get_string('mycourses');
+                $this->content->footer = "<p><a href=\"$CFG->wwwroot/course/index.php\">".get_string("fulllistofcourses")."</a>...";
+                return $this->content;
+            }
+        }
+
+        $categories = get_categories("0");  // Parent = 0   ie top-level categories only
+        if ($categories) {   //Check we have categories
+            if (count($categories) > 1) {     // Just print top level category links
+                foreach ($categories as $category) {
+                    $linkcss = $category->visible ? "" : " class=\"dimmed\" ";
+                    $this->content->items[]="<a $linkcss href=\"$CFG->wwwroot/course/category.php?id=$category->id\">$category->name</a>";
+                    $this->content->icons[]=$icon;
+                }
+                $this->content->footer = "<p><a href=\"$CFG->wwwroot/course/\">".get_string("searchcourses")."</a>...";
+                $this->title = get_string('categories');
+            } else {                          // Just print course names of single category
+                $category = array_shift($categories);
+                $courses = get_courses($category->id);
+    
+                if ($courses) {
+                    foreach ($courses as $course) {
+                        $linkcss = $course->visible ? "" : " class=\"dimmed\" ";
+                        $this->content->items[]="<a $linkcss title=\"$course->shortname\" ".
+                                   "href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->fullname</a>";
+                        $this->content->icons[]=$icon;
+                    }
+                    $this->content->footer = "<p><a href=\"$CFG->wwwroot/course/index.php\">".get_string("fulllistofcourses")."</a>...";
+                } else {
+                    $this->content->items = array();
+                    $this->content->icons = array();
+                    $this->content->footer = get_string('nocoursesyet');
+                }
+                $this->title = get_string('courses');
+            }
+        }
+        return $this->content;
+    }
+}
+
+?>

blocks/course_list/db/mysql.php

@@ -0,0 +1,33 @@
+<?PHP  //$Id$
+//
+// This file keeps track of upgrades to Moodle's
+// blocks system.
+//
+// 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 course_list_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/course_list/db/postgres7.php

@@ -0,0 +1,33 @@
+<?PHP  //$Id$
+//
+// This file keeps track of upgrades to Moodle's
+// blocks system.
+//
+// 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 PostgreSQL
+
+function course_list_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/course_summary/block_course_summary.php

@@ -0,0 +1,29 @@
+<?PHP //$Id$
+
+class CourseBlock_course_summary extends MoodleBlock {
+    function CourseBlock_course_summary ($course) {
+        $this->title = get_string('blockname','block_course_summary');
+        $this->content_type = BLOCK_TYPE_TEXT;
+        $this->course = $course;
+        $this->version = 2004041400;
+    }
+
+    function get_content() {
+        global $USER, $CFG;
+
+        if($this->content !== NULL) {
+            return $this->content;
+        }
+
+        $this->content = New object;
+        $this->content->text = '';
+        $this->content->footer = '';
+        $this->content->text = format_text($this->course->summary, FORMAT_HTML);
+
+        return $this->content;
+    }
+
+    function hide_header() {return true;}
+}
+
+?>

blocks/course_summary/db/mysql.php

@@ -0,0 +1,33 @@
+<?PHP  //$Id$
+//
+// This file keeps track of upgrades to Moodle's
+// blocks system.
+//
+// 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 course_summary_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}