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

admin/admin.php

@@ -3,7 +3,7 @@
 
 	require_once("../config.php");
     
-    define("MAX_USERS_PER_PAGE", 30);
+    define("MAX_USERS_PER_PAGE", 50);
 
     optional_variable($add, "");
     optional_variable($remove, "");
@@ -40,6 +40,7 @@
         "search",
         "searchagain",
         "toomanytoshow",
+        "users",
         "searchresults"
         );
 
@@ -56,52 +57,29 @@
 
 	print_header("$site->shortname: $strassignadmins", 
                  "$site->fullname", 
-                 "<a href=\"index.php\">$stradministration</a> -> 
-                  <a href=\"{$_SERVER['PHP_SELF']}\">$strassignadmins</a>", "");
-
-/// Get all existing admins
-    $admins = get_admins();
+                 "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> -> $strassignadmins", "");
 
 /// Add an admin if one is specified
-    if ($add) {
-        $user = @get_record("user", "id", $_REQUEST['add']) or
-            error("That account (id = {$_REQUEST['add']}) doesn't exist");
-
-        if ($admins) {
-            foreach ($admins as $aa) {
-                if ($aa->id == $user->id) {
-                    error("That user is already an admin.");
-                }            
-            }
+    if (!empty($_GET['add'])) {
+        if (! add_admin($add)) {
+            error("Could not add that admin!");
         }
-
-        $admin->userid = $user->id;
-        $admin->id = insert_record("user_admins", $admin);
-        $admins[] = $user;
     }
 
 /// Remove an admin if one is specified.
-    if ($remove) {
-
-        $user = @get_record("user", "id", $_REQUEST['remove']) or 
-            error("That account (id = {$_REQUEST['remove']}) doesn't exist");
-
-        if ($admins) {
-            foreach ($admins as $key => $aa) {
-                if ($aa->id == $user->id) {
-                    /// make sure that we don't delete the primary admin
-                    /// account, so that there is always at least on admin
-                    if ($aa->id == $primaryadmin->id) {
-                        error("That user is the primary admin, and shouldn't be removed.");
-                    } else {
-                        remove_admin($user->id);
-                        unset($admins[$key]);
-                    }
-                } 
-            }
+    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>";
@@ -111,8 +89,7 @@
 /// First, show existing admins
 
     if (! $admins) { 
-        echo "<p align=center>$strnoexistingadmins</a>";
-
+        echo "<p align=center>$strnoexistingadmins</p>";
         $adminlist = "";
 
     } else {
@@ -120,12 +97,12 @@
 
         foreach ($admins as $admin) {
             $adminarray[] = $admin->id;
-            echo "<p align=right>$admin->firstname $admin->lastname,
+            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=\"{$_SERVER['PHP_SELF']}?remove=$admin->id\"
+                echo "<a href=\"admin.php?remove=$admin->id\"
                 title=\"$strremoveadmin\"><img src=\"../pix/t/right.gif\"
                 border=0></A>";
             }
@@ -146,7 +123,7 @@
         echo "<p align=center>$strnopotentialadmins</p>";
 
     } else if ($usercount > MAX_USERS_PER_PAGE) { 
-        echo "<p align=center>$strtoomanytoshow</p>";
+        echo "<p align=center>$strtoomanytoshow ($usercount) </p>";
 
     } else {
 
@@ -159,14 +136,14 @@
         }
 
         foreach ($users as $user) {
-            echo "<p align=left><a href=\"{$_SERVER['PHP_SELF']}?add=$user->id\"".
+            echo "<p align=left><a href=\"admin.php?add=$user->id\"".
                    "title=\"$straddadmin\"><img src=\"../pix/t/left.gif\"".
-                   "border=0></a>&nbsp;&nbsp;$user->firstname $user->lastname, $user->email";
+                   "border=0></a>&nbsp;&nbsp;".fullname($user).", $user->email";
         }
     }
 
     if ($search or $usercount > MAX_USERS_PER_PAGE) {
-        echo "<form action={$_SERVER['PHP_SELF']} method=post>";
+        echo "<form action=admin.php method=post>";
         echo "<input type=text name=search size=20>";
         echo "<input type=submit value=\"$searchstring\">";
         echo "</form>";

admin/auth.php

@@ -86,15 +86,16 @@
     $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> -> $strauthenticationoptions", "$focus");
+                  "<A HREF=\"index.php\">$stradministration</A> -> <a href=\"users.php\">$strusers</a> -> $strauthenticationoptions", "$focus");
 
     echo "<CENTER><P><B>";
     echo "<form TARGET=\"{$CFG->framename}\" NAME=\"authmenu\" method=\"post\" action=\"auth.php\">";
     print_string("chooseauthmethod","auth");
 
-	choose_from_menu ($options, "auth", $auth, "","top.location='auth.php?auth='+document.authmenu.auth.options[document.authmenu.auth.selectedIndex].value", "");
+	choose_from_menu ($options, "auth", $auth, "","document.location='auth.php?auth='+document.authmenu.auth.options[document.authmenu.auth.selectedIndex].value", "");
 
     echo "</B></P></CENTER>";
         
@@ -113,7 +114,7 @@
 
     require_once("$CFG->dirroot/auth/$auth/config.html");
 
-    if ($auth != "email" and $auth != "none") {
+    if ($auth != "email" and $auth != "none" and $auth != "manual") {
         echo "<tr valign=\"top\">";
 	    echo "<td align=right nowrap><p>";
         print_string("changepassword", "auth");

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

@@ -10,21 +10,6 @@
     <?php print_string("configlang") ?>
     </td>
 </tr>
-<tr valign=top>
-	<td align=right><p>langdir:</td>
-	<td>
-    <?php 
-       unset($options);
-       $options["LTR"] = get_string("langltr");
-       $options["RTL"] = get_string("langrtl");
-
-       choose_from_menu ($options, "langdir", $config->langdir, "", "", "");
-    ?>
-    </td>
-    <td>
-    <?php print_string("configlangdir") ?>
-    </td>
-</tr>
 <tr valign=top>
 	<td align=right><p>langmenu:</td>
 	<td>
@@ -58,9 +43,36 @@
     <?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 ($COUNTRIES, "country", $config->country, get_string("selectacountry"), "", "") ?>
+	<td><?php choose_from_menu (get_list_of_countries(), "country", $config->country, get_string("selectacountry"), "") ?>
 	</td>
     <td>
     <?php print_string("configcountry") ?>
@@ -165,6 +177,30 @@
     <?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>
@@ -209,6 +245,15 @@
     <?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>
@@ -300,7 +345,147 @@
     <?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>

admin/config.php

@@ -2,7 +2,6 @@
        // config.php - allows admin to edit all configuration variables
 
     require_once("../config.php");
-	require_once("../lib/countries.php");
 
 
     if ($site = get_site()) {   // If false then this is a new installation
@@ -28,6 +27,9 @@
         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;
@@ -56,22 +58,27 @@
 
     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> -> $strconfigvariables", $focus);
+                      "<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");
+        print_simple_box(get_string("configintro"), "center", "50%");
         echo "<br />";
     }
 

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

@@ -3,7 +3,7 @@
 
 	require_once("../config.php");
 
-    define("MAX_USERS_PER_PAGE", 30);
+    define("MAX_USERS_PER_PAGE", 50);
 
     optional_variable($search, "");
     optional_variable($add, "");
@@ -21,12 +21,6 @@
 
     $primaryadmin = get_admin();
 
-/// If you want any administrator to have the ability to assign admin
-/// rights, then comment out the following if statement
-    if ($primaryadmin->id != $USER->id) {
-        error("You must be the primary administrator to use this page.");
-    }
-
 /// assign all of the configurable language strings
     $stringstoload = array (
         "assigncreators",
@@ -39,7 +33,9 @@
         "removecreator",
         "search",
         "searchagain",
+        "users",
         "toomanytoshow",
+        "searchresults"
         );
 
     foreach ($stringstoload as $stringtoload){
@@ -55,46 +51,33 @@
 
 	print_header("$site->shortname: $strassigncreators", 
                  "$site->fullname", 
-                 "<a href=\"index.php\">$stradministration</a> -> 
-                  <a href=\"{$_SERVER['PHP_SELF']}\">$strassigncreators</a>", "");
+                 "<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();
 
-/// Add an creator if one is specified
-    if ($add) {
-        $user = @get_record("user", "id", $add) or
-            error("That account (id = $add) doesn't exist");
-
-        if ($creators) {
-            foreach ($creators as $aa) {
-                if ($aa->id == $user->id) {
-                    error("That user is already a creator .");
-                }            
-            }
-        }
-
-        $creator->userid = $user->id;
-        $creator->id = insert_record("user_coursecreators", $creator);
-        $creators[] = $user;
-    }
-
-/// Remove an creator if one is specified.
-    if ($remove) {
-        $user = @get_record("user", "id", $remove) or 
-            error("That account (id = $remove) doesn't exist");
-
-        if ($creators) {
-            foreach ($creators as $key => $aa) {
-                if ($aa->id == $user->id) {
-                        delete_records("user_coursecreators","userid",$user->id);
-                        unset($creators[$key]);
-                } 
-            }
-        }
-    }
-
-
 /// 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>";
@@ -111,9 +94,8 @@
         $creatorarray = array();
         foreach ($creators as $creator) {
             $creatorarray[] = $creator->id;
-            echo "<p align=right>$creator->firstname $creator->lastname,
-            $creator->email &nbsp;&nbsp; ";
-                echo "<a href=\"{$_SERVER['PHP_SELF']}?remove=$creator->id\"
+            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>";
@@ -132,7 +114,7 @@
         echo "<p align=center>$strnopotentialcreators</p>";
 
     } else if ($usercount > MAX_USERS_PER_PAGE) {
-        echo "<p align=center>$strtoomanytoshow</p>";
+        echo "<p align=center>$strtoomanytoshow ($usercount) </p>";
 
     } else {
 
@@ -145,14 +127,15 @@
         }
 
         foreach ($users as $user) {
-            echo "<p align=left><a href=\"{$_SERVER['PHP_SELF']}?add=$user->id\"".
+            $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;$user->firstname $user->lastname, $user->email";
+                   "border=0></a>&nbsp;&nbsp;$fullname, $user->email";
         }
     }
 
     if ($search or $usercount > MAX_USERS_PER_PAGE) {
-        echo "<form action={$_SERVER['PHP_SELF']} method=post>";
+        echo "<form action=creators.php method=post>";
         echo "<input type=text name=search size=20>";
         echo "<input type=submit value=\"$searchstring\">";
         echo "</form>";

admin/cron.php

@@ -14,14 +14,31 @@
     $FULLME = "cron";
 
     $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");
 
-    echo "<PRE>\n";
+    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_select("modules", "cron > 0 AND (($timenow - lastcron) > cron)")) {
         foreach ($mods as $mod) {
@@ -40,46 +57,114 @@
         }
     }
 
+/// 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
-        $longtime = $timenow - ($CFG->longtimenosee * 3600 * 24);
-        if ($users = get_users_longtimenosee($longtime)) {
-            foreach ($users as $user) {
-                if (unenrol_student($user->id)) {
-                    echo "Deleted student enrolment for $user->firstname $user->lastname ($user->id)\n";
+    if ($random100 < 20) {     // Approximately 20% of the time.
+        echo "Running clean-up tasks...\n";
+
+        /// Unenrol users who haven't logged in for $CFG->longtimenosee
+
+        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
-
-    $oneweek = $timenow - (7 * 24 * 3600);
-    if ($users = get_users_unconfirmed($oneweek)) {
-        foreach ($users as $user) {
-            if (delete_records("user", "id", $user->id)) {
-                echo "Deleted unconfirmed user for $user->firstname $user->lastname ($user->id)\n";
+    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();
 
-/// Delete old queued mail that didn't get sent within 30 minutes
-
-    $oldmailtime = $timenow - 1800;
-    delete_records_select("mail_queue", "timecreated < '$oldmailtime'");
-
-
-/// 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'");
+            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());

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/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

@@ -18,11 +18,11 @@
         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");
     }
@@ -31,27 +31,10 @@
         error("The PHP server variable 'magic_quotes_runtime' should be Off - $documentationlink");
     }
 
-    if (!ini_get_bool('magic_quotes_gpc')) {
-        error("The PHP server variable 'magic_quotes_gpc' is not turned On - $documentationlink");
-    }
-
     if (!ini_get_bool('file_uploads')) {
         error("The PHP server variable 'file_uploads' is not turned On - $documentationlink");
     }
 
-    if (!ini_get_bool('short_open_tag')) {
-        error("The PHP server variable 'short_open_tag' is not turned On - $documentationlink");
-    }
-
-
-
-/// Check that sessions are supported
-
-    if (!is_readable(ini_get('session.save_path')) and !ini_get_bool('safe_mode')) {
-        $sessionpath = ini_get('session.save_path');
-        notify("Warning: It appears your server does not support sessions (session.save_path = '$sessionpath')");
-    }
-
 
 /// Check that config.php has been edited
 
@@ -62,8 +45,8 @@
 
 /// Check settings in config.php
 
-    $dirroot = dirname(realpath("../config.php"));
-    if ($dirroot != $CFG->dirroot) {
+    $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)."\";
@@ -83,7 +66,9 @@
         $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.
 
@@ -123,7 +108,6 @@
         print_header($strdatabasesetup, $strdatabasesetup, $strdatabasesetup, "", "", false, "&nbsp;", "&nbsp;");
         if (file_exists("$CFG->libdir/db/$CFG->dbtype.sql")) {
             $db->debug = true;
-            set_time_limit(0);  // To allow slow databases to complete the long SQL
             if (modify_database("$CFG->libdir/db/$CFG->dbtype.sql")) {
                 $db->debug = false;
                 notify($strdatabasesuccess, "green");
@@ -196,7 +180,7 @@
     if ($release <> $CFG->release) {  // Update the release version
         $strcurrentrelease = get_string("currentrelease");
         print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
-        print_heading($release);
+        print_heading("Moodle $release");
         if (!set_config("release", $release)) {
             notify("ERROR: Could not update release version in database!!");
         }
@@ -209,6 +193,17 @@
     }
 
 
+/// 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") ) {
@@ -239,17 +234,32 @@
             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) {
+                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)) {
@@ -281,7 +291,7 @@
             print_heading($module->name);
             $updated_modules = true;
             $db->debug = true;
-            set_time_limit(0);  // To allow slow databases to complete the long SQL
+            @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)) {
@@ -332,56 +342,119 @@
     }
 
 /// Check for valid admin user
-    if (!iscreator()) {
-        error("You need to be an admin user or teacher to use this page.", "$CFG->wwwroot/login/index.php");
+    require_login();
+
+    if (!isadmin()) {
+        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
     }
 
 
 /// At this point everything is set up and the user is an admin, so print menu
 
     $stradministration = get_string("administration");
-    print_header("$site->shortname: $stradministration","$site->fullname: $stradministration", "$stradministration");
-    if (isadmin()) {
-        $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=\"config.php\">".get_string("configvariables")."</a></p>".
-                         "<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>".
-                         "<p><a href=\"lang.php\">".get_string("checklanguage")."</a></p>".
-                         "<p><a href=\"modules.php\">".get_string("managemodules")."</a></p>";
-		if (file_exists("$CFG->dirroot/admin/$CFG->dbtype")) {
-            $table->data[0][0] .= "<p><a href=\"$CFG->dbtype/frame.php\">".get_string("managedatabase")."</a></p>";
-		}
-		$table->data[0][1] = "<p><a href=\"../course/edit.php\">".get_string("addnewcourse")."</a></p>".
-                         "<p><a href=\"teacher.php\">".get_string("assignteachers")."</a></p>".
-                         "<p><a href=\"../course/delete.php\">".get_string("deletecourse")."</a></p>".
-                         "<p><a href=\"../course/categories.php\">".get_string("categories")."</a></p>";
-        if ($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual") {
-		    $table->data[0][2] = "<p><a href=\"user.php?newuser=true\">".get_string("addnewuser")."</a></p>";
-        }    
-        $table->data[0][2] .=  "<p><a href=\"user.php\">".get_string("edituser")."</a></p>".
-                         "<p><a href=\"admin.php\">".get_string("assignadmins")."</a></p>".
-                         "<p><a href=\"creators.php\">".get_string("assigncreators")."</a></p>".
-                         "<p><a href=\"auth.php\">".get_string("authentication")."</a></p>";
-    } else { /// user is coursecreator
-	    $table->head  = array (get_string("courses"));
-		$table->align = array ("CENTER");
-		$table->data[0][1] = "<p><a href=\"../course/edit.php\">".get_string("addnewcourse")."</a></p>".
-		  "<p><a href=\"teacher.php\">".get_string("assignteachers")."</a></p>";
-	}
-    
+    print_header("$site->shortname: $stradministration","$site->fullname", "$stradministration");
+    print_simple_box_start("center", "100%", "$THEME->cellcontent2", 20);
+    print_heading($stradministration);
+
+    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 "<br><div align=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 "</div>";
+    echo "</td>";
 
-    echo "<br><div align=center>";
+    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 "</div>";
+    echo "</td>";
+    echo "<tr></table>";
 
-    print_heading("Moodle $CFG->release ($CFG->version)", "CENTER", 1);
+    print_simple_box_end();
 
     print_footer($site);
 

admin/lang.php

@@ -3,6 +3,7 @@
     require_once("../config.php");
 
     optional_variable($mode, "");
+    optional_variable($currentfile, "moodle.php");
 
     require_login();
 
@@ -15,7 +16,8 @@
     }
 
     $stradministration = get_string("administration");
-    $strchecklanguage = get_string("checklanguage");
+    $strconfiguration = get_string("configuration");
+    $strlanguage = get_string("language");
     $strcurrentlanguage = get_string("currentlanguage");
     $strmissingstrings = get_string("missingstrings");
     $strcomparelanguage = get_string("comparelanguage");
@@ -23,26 +25,33 @@
 
     switch ($mode) {
         case "missing":
-            $navigation = "<A HREF=\"lang.php\">$strchecklanguage</A> -> $strmissingstrings";
+            $navigation = "<A HREF=\"lang.php\">$strlanguage</A> -> $strmissingstrings";
             $title = $strmissingstrings;
             break;
         case "compare":
-            $navigation = "<A HREF=\"lang.php\">$strchecklanguage</A> -> $strcomparelanguage";
+            $navigation = "<A HREF=\"lang.php\">$strlanguage</A> -> $strcomparelanguage";
             $title = $strcomparelanguage;
             break;
         default:
-            $title = $strchecklanguage;
-            $navigation = $strchecklanguage;
+            $title = $strlanguage;
+            $navigation = $strlanguage;
             break;
     }
 
     $currentlang = current_language();
 
     print_header("$site->shortname: $title", "$site->fullname",
-                 "<a href=\"index.php\">$stradministration</a> -> $navigation");
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $navigation");
 
     if (!$mode) {
-        print_heading("$strcurrentlanguage: $currentlang - ".get_string("thislanguage"));
+        $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>";
@@ -63,7 +72,7 @@
     }
 
     foreach ($stringfiles as $key => $file) {
-        if ($file == "README" or $file == "help" or $file == "docs" or $file == "fonts") {
+        if (substr($file, -4) != ".php") {
             unset($stringfiles[$key]);
         }
     }
@@ -73,8 +82,10 @@
     
         foreach ($stringfiles as $file) {
             if (!file_exists("$langdir/$file")) {
-                echo "<P><FONT COLOR=red>".get_string("filemissing", "", "$langdir/$file")."</FONT></P>";
-                continue;
+                if (!touch("$langdir/$file")) {
+                    echo "<p><font color=red>".get_string("filemissing", "", "$langdir/$file")."</font></p>";
+                    continue;
+                }
             }
     
             unset($string);
@@ -106,7 +117,7 @@
     
         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>";
+                echo "<p><font color=red>".get_string("filemissing", "", "$langdir/help/$file")."</font></p>";
                 $somethingfound = true;
                 continue;
             }
@@ -131,112 +142,118 @@
 
     } else if ($mode == "compare") {
 
-        if (isset($_POST['file'])){   // Save a file
+        if (isset($_POST['currentfile'])){   // Save a file
             $newstrings = $_POST;
-            $file = $newstrings['file'];
-            unset($newstrings['file']);
-            if (lang_save_file($langdir, $file, $newstrings)) {
-                notify(get_string("changessaved")." ($langdir/$file)");
+            unset($newstrings['currentfile']);
+            if (lang_save_file($langdir, $currentfile, $newstrings)) {
+                notify(get_string("changessaved")." ($langdir/$currentfile)", "green");
             } else {
-                error("Could not save the file '$file'!", "lang.php?mode=compare");
+                error("Could not save the file '$currentfile'!", "lang.php?mode=compare&currentfile=$currentfile");
             }
         }
 
-        print_heading($strcomparelanguage);
-        echo "<CENTER>";
-        helpbutton("langedit",$strcomparelanguage);
-        echo "</CENTER>";
+        print_heading_with_help($strcomparelanguage, "langedit");
 
+        print_simple_box_start("center", "80%");
+        echo '<center><font size="2">';
         foreach ($stringfiles as $file) {
-        
-            print_heading("$file", "LEFT", 4);
+            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();
 
-            if (!file_exists("$langdir/$file")) {
-                echo "<P><FONT COLOR=red>".get_string("filemissing", "", "$langdir/$file")."</FONT></P>";
+        
+        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/$file","r+")) {
-                $editable = true;
-                fclose($f);
-            } else {
-                $editable = false;
-                echo "<P><FONT SIZE=1>".get_string("makeeditable", "", "$langdir/$file")."</FONT></P>";
-            }
-            error_reporting(7);
-
-
-            unset($string);
-            include("$enlangdir/$file");
-            $enstring = $string;  
-            ksort($enstring);
-    
-            unset($string);
-            include("$langdir/$file");
-
-            if ($editable) {
-                echo "<FORM NAME=\"$file\" ACTION=\"lang.php\" METHOD=\"POST\">";
-            }
-            echo "<TABLE WIDTH=\"100%\" CELLPADDING=2 CELLSPACING=3 BORDER=0>";
-            foreach ($enstring as $key => $envalue) {
-                $envalue = nl2br(htmlspecialchars($envalue));
-                $envalue = preg_replace('/(\$a\-\&gt;[a-zA-Z0-9]*|\$a)/', '<b>$0</b>', $envalue);  // Make variables bold. 
-                $envalue = str_replace("%%","%",$envalue);
-
-                echo "<TR>";
-                echo "<TD WIDTH=20% BGCOLOR=\"$THEME->cellheading\" NOWRAP VALIGN=TOP>$key</TD>";
-                echo "<TD WIDTH=40% BGCOLOR=\"$THEME->cellheading\" VALIGN=TOP>$envalue</TD>";
-
-                $value = $string[$key];
-                $value = str_replace("\r","",$value);              // Bad character caused by Windows
-                $value = str_replace("\n\n\n\n\n\n","\n",$value);  // Collapse runs of blank lines
-                $value = str_replace("\n\n\n\n\n","\n",$value);
-                $value = str_replace("\n\n\n\n","\n",$value);
-                $value = str_replace("\n\n\n","\n",$value);
-                $value = str_replace("\n\n\n","\n",$value);
-                $value = str_replace("\\","",$value);              // Delete all slashes
-                $value = str_replace("%%","%",$value);
-                $value = htmlspecialchars($value);
-
-                $cellcolour = $value ? $THEME->cellcontent: $THEME->highlight;
-
-                if ($editable) {
-                    echo "<TD WIDTH=40% BGCOLOR=\"$cellcolour\" VALIGN=TOP>";
-                    if (isset($string[$key])) {
-                        $valuelen = strlen($value);
-                    } else {
-                        $valuelen = strlen($envalue);
-                    }
-                    $cols=50;
-                    if (strstr($value, "\r") or strstr($value, "\n") or $valuelen > $cols) {
-                        $rows = ceil($valuelen / $cols);
-                        echo "<TEXTAREA NAME=\"string-$key\" cols=\"$cols\" rows=\"$rows\">$value</TEXTAREA>";
-                    } else {
-                        if ($valuelen) {
-                            $cols = $valuelen + 2;
-                        }
-                        echo "<INPUT TYPE=\"TEXT\" NAME=\"string-$key\" VALUE=\"$value\" SIZE=\"$cols\"></TD>";
-                    }
-                    echo "</TD>";
-
-                } else {
-                    echo "<TD WIDTH=40% BGCOLOR=\"$cellcolour\" VALIGN=TOP>$value</TD>";
-                }
-            }
-            if ($editable) {
-                echo "<TR><TD COLSPAN=2>&nbsp;<TD>";
-                echo "    <INPUT TYPE=\"hidden\" NAME=\"file\" VALUE=\"$file\">";
-                echo "    <INPUT TYPE=\"hidden\" NAME=\"mode\" VALUE=\"compare\">";
-                echo "    <INPUT TYPE=\"submit\" NAME=\"update\" VALUE=\"".get_string("savechanges").": $file\">";
-                echo "</TD></TR>";
-            }
-            echo "</TABLE>";
-            echo "</FORM>";
         }
 
-        print_continue("lang.php");
-    
+        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();
@@ -251,7 +268,7 @@ function lang_save_file($path, $file, $strings) {
 // $file is the file to overwrite.
 // $strings is an array of strings to write
 
-    global $CFG;
+    global $CFG, $USER;
 
     error_reporting(0);
     if (!$f = fopen("$path/$file","w")) {
@@ -270,11 +287,12 @@ function lang_save_file($path, $file, $strings) {
         if ($CFG->lang != "zh_hk" and $CFG->lang != "zh_tw") {  // Some MB languages include backslash bytes
             $value = str_replace("\\","",$value);           // Delete all slashes
         }
-        $value = str_replace("$"."a", "\\$"."a", $value);   // Add slashes for $a
-        $value = str_replace("\"", "\\\\\\\"", $value);     // Add slashes for "
+        $value = str_replace("'", "\\'", $value);           // 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,"\$string['$stringname'] = '$value';\n");
         }
     }
     fwrite($f,"\n?>\n");

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

@@ -1,14 +1,16 @@
 <?PHP // $Id$
       // Allows the admin to create, delete and rename course categories
 
-	require_once("../config.php");
-	require_once("../course/lib.php");
+    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!");
     }
@@ -21,14 +23,19 @@
 /// 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=\"../$CFG->admin/index.php\">$stradministration</a> -> $strmanagemodules");
+    print_header("$site->shortname: $strmanagemodules", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> ".
+                 "<a href=\"configure.php\">$strconfiguration</a> -> $strmanagemodules");
 
     print_heading($strmanagemodules);
    
@@ -145,10 +152,10 @@
         $modpixpath = "../theme/$CFG->theme/pix/mod";
     }
 
-    $table->head  = array ($stractivitymodule, "$strhide/$strshow", $strdelete);
-    $table->align = array ("LEFT", "CENTER", "CENTER");
-    $table->wrap = array ("NOWRAP", "", "");
-    $table->size = array ("100%", "10", "10");
+    $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) {
@@ -157,6 +164,14 @@
 
         $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>";
@@ -171,7 +186,7 @@
             $visible = "";
             $class = "";
         }
-        $table->data[] = array ("<p $class>$icon $modulename</p>", $visible, $delete);
+        $table->data[] = array ("<p $class>$icon $modulename</p>", $count, $module->version, $visible, $delete, $settings);
     }
     print_table($table);
 

admin/phpinfo.php

@@ -9,14 +9,26 @@
         error("Only the admin can use this page");
     }
 
-    $stradministration = get_string("administration");
-    $site = get_site();
+    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;
+    }
 
-	print_header("$site->shortname: phpinfo", "$site->fullname", 
-                 "<a href=\"index.php\">$stradministration</a> -> phpinfo");
-
-    phpinfo();
-
-    print_footer();
+    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

@@ -2,7 +2,6 @@
        // register.php - allows admin to register their site on moodle.org
 
     include("../config.php");
-    require_once("../lib/countries.php");
 
     require_login();
 
@@ -81,7 +80,7 @@
     echo "<tr valign=top>\n";
     echo "<td align=right><p>".get_string("country").":</td>\n";
     echo "<td><p>";
-    choose_from_menu ($COUNTRIES, "country", $admin->country, get_string("selectacountry")."...", "", "");
+    choose_from_menu (get_list_of_countries(), "country", $admin->country, get_string("selectacountry")."...", "", "");
     echo "</td>\n";
     echo "</tr>\n";
 
@@ -102,7 +101,7 @@
 
     echo "<tr valign=top>\n";
     echo "<td align=right><p>".get_string("administrator").":</td>\n";
-    echo "<td><p><input size=50 type=\"text\" name=\"adminname\" value=\"$admin->firstname $admin->lastname\"></td>\n";
+    echo "<td><p><input size=50 type=\"text\" name=\"adminname\" value=\"".fullname($admin, true)."\"></td>\n";
     echo "</tr>\n";
 
     echo "<tr valign=top>\n";

admin/site.html

@@ -1,4 +1,4 @@
-<form method="post" action="site.php" name="form">
+<form method="post" action="site.php" name="form" <?php echo $onsubmit ?>>
 <table cellpadding=9 cellspacing=0 >
 <tr valign=top>
     <td align=right><P><?php print_string("fullsitename") ?>:</td>
@@ -15,20 +15,42 @@
 <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) ?><br />
-     <?php helpbutton("html", get_string("helphtml"), "moodle", true, true) ?><br />
+     <?PHP
+        helpbutton("writing", get_string("helpwriting"), "moodle", true, true);
+        echo "<br />";
+        if ($usehtmleditor) {
+           helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
+        } else {
+           helpbutton("html", get_string("helphtml"), "moodle", true, true);
+        } 
+      ?>
+      <br />
      </font>
     </td>
-    <td><textarea name=summary cols=50 rows=10 wrap=virtual><?php p($form->summary) ?></textarea>
-    <?php if (isset($err["summary"])) formerr($err["summary"]); ?>
-    </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",
@@ -43,6 +65,34 @@
         ?>
         </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="<?php print_string("savechanges") ?>"></td>
@@ -52,3 +102,9 @@
 <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

@@ -3,6 +3,7 @@
     require_once("../config.php");
 
     if ($site = get_site()) {
+        require_login();
         if (!isadmin()) {
             error("You need to be admin to edit this page");
         }
@@ -17,11 +18,13 @@
 
         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", get_string("changessaved"));
+                    redirect("$CFG->wwwroot/", get_string("changessaved"));
                 } else {
                     error("Serious Error! Could not update the site record! (id = $form->id)");
                 }
@@ -29,7 +32,7 @@
                 if ($newid = insert_record("course", $form)) {
                     $cat->name = get_string("miscellaneous");
                     if (insert_record("course_categories", $cat)) {
-                        redirect("$CFG->wwwroot/admin/index.php", get_string("changessaved"));
+                        redirect("$CFG->wwwroot/$CFG->admin/index.php", get_string("changessaved"), 1);
                     } else {
                         error("Serious Error! Could not set up a default course category!");
                     }
@@ -50,37 +53,62 @@
 
     if ($site and empty($form)) {
         $form = $site;
+        $course = $site;
         $firsttime = false;
     } else {
         $form->fullname = "";
         $form->shortname = "";
         $form->summary = "";
-        $form->newsitems = 0;
+        $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");
 
     if ($firsttime) {
         print_header();
         print_heading($strsitesettings);
-        print_simple_box(get_string("configintrosite"), "center");
+        print_simple_box(get_string("configintrosite"), "center", "50%");
         echo "<br />";
     } else {
         print_header("$site->shortname: $strsitesettings", "$site->fullname",
-                      "<A HREF=\"index.php\">$stradmin</A> -> $strsitesettings", "$focus");
+                      "<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");
     include("site.html");
     print_simple_box_end();
@@ -101,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/teacher.php

@@ -1,204 +0,0 @@
-<?PHP // $Id$
-      // Admin-only script to assign teachers to courses
-
-	require_once("../config.php");
-
-    define("MAX_USERS_PER_PAGE", 30);
-
-    optional_variable($id);         // course id
-    optional_variable($add, "");
-    optional_variable($remove, "");
-    optional_variable($search, ""); // search string
-
-    if (! $site = get_site()) {
-        redirect("$CFG->wwwroot/$CFG->admin/index.php");
-    }
-
-    require_login();
-
-    if (!iscreator()) {
-        error("You must be an administrator or course creator to use this page.");
-    }
-
-    $strassignteachers = get_string("assignteachers");
-    $stradministration = get_string("administration");
-    $strexistingteachers   = get_string("existingteachers");
-    $strnoexistingteachers = get_string("noexistingteachers");
-    $strpotentialteachers  = get_string("potentialteachers");
-    $strnopotentialteachers  = get_string("nopotentialteachers");
-    $straddteacher    = get_string("addteacher");
-    $strremoveteacher = get_string("removeteacher");
-    $strsearch        = get_string("search");
-    $strsearchresults  = get_string("searchresults");
-    $strsearchagain   = get_string("searchagain");
-    $strtoomanytoshow   = get_string("toomanytoshow");
-
-    if ($search) {
-        $searchstring = $strsearchagain;
-    } else {
-        $searchstring = $strsearch;
-    }
-
-
-    if (!$id) {
-	    print_header("$site->shortname: $strassignteachers", "$site->fullname", 
-                     "<a href=\"index.php\">$stradministration</a> -> $strassignteachers");
-        
-        $isadmin = isadmin(); /// cache value
-        $courses = get_courses();
-
-		print_heading(get_string("choosecourse"));
-		print_simple_box_start("center");
-        
-		foreach ($courses as $course) {
-		    if ($isadmin or isteacher($course->id, $USER->id)){
-			    echo "<a href=\"teacher.php?id=$course->id\">$course->fullname ($course->shortname)</a><br>\n";
-				$coursesfound = TRUE;
-			}
-		}	
-		
-        print_simple_box_end();
-        
-        if ($coursesfound == FALSE) {         
-            print_heading(get_string("nocoursesyet"));
-            print_continue("../$CFG->admin/index.php");
-        }
-
-        print_footer();
-        exit;
-    }
-
-    if (! $course = get_record("course", "id", $id)) {
-        error("Course ID was incorrect (can't find it)");
-    }
-
-
-	print_header("$site->shortname: $course->shortname: $strassignteachers", 
-                 "$site->fullname", 
-                 "<a href=\"index.php\">$stradministration</a> -> 
-                  <a href=\"teacher.php\">$strassignteachers</a> -> $course->shortname", "");
-
-    print_heading("<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->fullname ($course->shortname)</a>");
-
-
-/// Get all existing teachers for this course.
-    $teachers = get_course_teachers($course->id);
-
-/// Add a teacher if one is specified
-
-    if (!empty($add)) {
-	    if (!isteacher($course->id)){
-		    error("You must be an administrator or teacher to modify this course.");
-        }
-
-        if (! $user = get_record("user", "id", $add)) {
-            error("That teacher (id = $add) doesn't exist", "teacher.php?id=$course->id");
-        }
-
-        if (!empty($teachers)) {
-            foreach ($teachers as $tt) {
-                if ($tt->id == $user->id) {
-                    error("That user is already a teacher for this course.", "teacher.php?id=$course->id");
-                }
-            }
-        }
-
-        $teacher->userid   = $user->id;
-        $teacher->course = $course->id;
-        if (!empty($teachers)) {
-            $teacher->authority = 2;
-        } else {
-            $teacher->authority = 1;   // First teacher is the main teacher
-        }
-        $teacher->id = insert_record("user_teachers", $teacher);
-        if (empty($teacher->id)) {
-            error("Could not add that teacher to this course!");
-        }
-        $teachers[] = $user;
-    }
-
-/// Remove a teacher if one is specified.
-
-    if (!empty($remove)) {
-
-        if (!isteacher($course->id)){
-        	error("You must be an administrator or teacher to modify this course.");
-		}
-        if (! $user = get_record("user", "id", $remove)) {
-            error("That teacher (id = $remove) doesn't exist", "teacher.php?id=$course->id");
-        }
-        if (!empty($teachers)) {
-            foreach ($teachers as $key => $tt) {
-                if ($tt->id == $user->id) {
-                    remove_teacher($user->id, $course->id);
-                    unset($teachers[$key]);
-                }
-            }
-        }
-    }
-
-
-/// Print the lists of existing and potential teachers
-
-    echo "<table cellpadding=2 cellspacing=10 align=center>";
-    echo "<tr><th width=50%>$strexistingteachers</th><th width=50%>$strpotentialteachers</th></tr>";
-    echo "<tr><td width=50% nowrap valign=top>";
-
-/// First, show existing teachers for this course
-
-    if (empty($teachers)) { 
-        echo "<p align=center>$strnoexistingteachers</a>";
-        $teacherlist = "";
-
-    } else {
-        $teacherarray = array();
-        foreach ($teachers as $teacher) {
-            $teacherarray[] = $teacher->id;
-            echo "<p align=right>$teacher->firstname $teacher->lastname, $teacher->email &nbsp;&nbsp; <a href=\"teacher.php?id=$course->id&remove=$teacher->id\" title=\"$strremoveteacher\"><img src=\"../pix/t/right.gif\" border=0></a></p>";
-        }
-        $teacherlist = implode(",",$teacherarray);
-        unset($teacherarray);
-    }
-
-    echo "<td width=50% nowrap valign=top>";
-
-/// Print list of potential teachers
-
-    $usercount = get_users(false, $search, true, $teacherlist);
-
-    if ($usercount == 0) {
-        echo "<p align=center>$strnopotentialteachers</p>";
-
-    } else if ($usercount > MAX_USERS_PER_PAGE) {
-        echo "<p align=center>$strtoomanytoshow</p>";
-
-    } else {
-
-        if ($search) {
-            echo "<p align=center>($strsearchresults : $search)</p>";
-        }
-
-        if (!$users = get_users(true, $search, true, $teacherlist)) {
-            error("Could not get users!");
-        }
-
-        foreach ($users as $user) {
-            echo "<p align=left><a href=\"{$_SERVER['PHP_SELF']}?id=$course->id&add=$user->id\"".
-                   "title=\"$straddteacher\"><img src=\"../pix/t/left.gif\"".
-                   "border=0></a>&nbsp;&nbsp;$user->firstname $user->lastname, $user->email";
-        }
-    }
-
-    if ($search or $usercount > MAX_USERS_PER_PAGE) {
-        echo "<form action={$_SERVER['PHP_SELF']} method=post>";
-        echo "<input type=hidden name=id value=\"$course->id\">";
-        echo "<input type=text name=search size=20>";
-        echo "<input type=submit value=\"$searchstring\">";
-        echo "</form>";
-    }
-
-    echo "</tr></table>";
-
-    print_footer();
-
-?>

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,20 +1,25 @@
 <?PHP // $Id$
 
-	require_once("../config.php");
-	require_once("../user/lib.php");
-    require_once("../lib/countries.php");
-
-    $recordsperpage = 30;
+    require_once("../config.php");
 
     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";
@@ -94,175 +99,251 @@
 
         $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->shortname: $stredituser", $site->fullname, 
-                     "<A HREF=\"index.php\">$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");
+        }
 
-        if ($delete) {              // Delete a selected user, after confirmation
+        if ($confirmuser) {
+            if (!$user = get_record("user", "id", "$confirmuser")) {
+                error("No such user!");
+            }
+
+            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)) {
-                notice_yesno(get_string("deletecheckfull", "", "'$user->firstname $user->lastname'"),
+                $fullname = fullname($user, true);
+                notice_yesno(get_string("deletecheckfull", "", "'$fullname'"),
                      "user.php?delete=$delete&confirm=".md5($delete), "user.php");
 
                 exit;
             } else if (!$user->deleted) {
-                $user->deleted = "1";
-                $user->username = "$user->email.".time();  // Remember it just in case
-                $user->email = "";               // Clear this field to free it up
-                $user->timemodified = time();
-                if (update_record("user", $user)) {
+                unset($updateuser);
+                $updateuser->id = $user->id;
+                $updateuser->deleted = "1";
+                $updateuser->username = "$user->email.".time();  // Remember it just in case
+                $updateuser->email = "";               // Clear this field to free it up
+                $updateuser->timemodified = time();
+                if (update_record("user", $updateuser)) {
                     unenrol_student($user->id);  // From all courses
                     remove_teacher($user->id);   // From all courses
                     remove_admin($user->id);
-                    notify(get_string("deletedactivity", "", "$user->firstname $user->lastname"));
+                    notify(get_string("deletedactivity", "", fullname($user, true)) );
                 } else {
-                    notify(get_string("deletednot", "", "$user->firstname $user->lastname"));
+                    notify(get_string("deletednot", "", fullname($user, true)));
                 }
             }
         }
 
         // Carry on with the user listing
 
-
-        $columns = array("name", "email", "city", "country", "lastaccess");
+        $columns = array("firstname", "lastname", "email", "city", "country", "lastaccess");
 
         foreach ($columns as $column) {
             $string[$column] = get_string("$column");
-            $columnsort = "$column";
-            if ($column == "lastaccess") {
-                $columndir = "DESC";
+            if ($sort != $column) {
+                $columnicon = "";
+                if ($column == "lastaccess") {
+                    $columndir = "DESC";
+                } else {
+                    $columndir = "ASC";
+                }
             } else {
-                $columndir = "ASC";
-            }
-            if ($columnsort == $sort) {
-               $$column = $string[$column];
-            } else {
-               $$column = "<A HREF=\"user.php?sort=$columnsort&dir=$columndir&search=$search\">".$string[$column]."</A>";
+                $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";
         }
 
-        if (!$users = get_users_listing($sort, $dir, $page, $recordsperpage, $search)) {
-            if (!$users = get_users_listing($sort, $dir, 0, $recordsperpage)) {
-                error("No users found!");
-            } else {
-                notify(get_string("nousersmatching", "", $search));
-                $search = "";
-            }
-        }
-
+        $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) {
-            $usersearchcount = get_users(false, $search);
+        if ($search or $firstinitial or $lastinitial) {
             print_heading("$usersearchcount / $usercount ".get_string("users"));
             $usercount = $usersearchcount;
         } else {
             print_heading("$usercount ".get_string("users"));
         }
-            
-        $a->start = $page;
-        $a->end = $page + $recordsperpage;
-        if ($a->end > $usercount) {
-            $a->end = $usercount;
+
+        $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> ";
         }
-        echo "<TABLE align=center cellpadding=10><TR>";
-        echo "<TD>";
-        if ($page) {
-            $prevpage = $page - $recordsperpage;
-            if ($prevpage < 0) {
-                $prevpage = 0;
+        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> ";
             }
-            $options["dir"] = $dir;
-            $options["page"] = 0;
-            $options["sort"] = $sort;
-            $options["search"] = $search;
-            print_single_button("user.php", $options, "  <<  ");
-            echo "</TD><TD>";
-            $options["page"] = $prevpage;
-            print_single_button("user.php", $options, "  <  ");
         }
-        echo "</TD><TD>";
-        print_heading(get_string("displayingusers", "", $a));
-        echo "</TD><TD>";
-        $nextpage = $page + $recordsperpage;
-        if ($nextpage < $usercount) {
-            $options["dir"] = $dir;
-            $options["page"] = $nextpage;
-            $options["sort"] = $sort;
-            $options["search"] = $search;
-            print_single_button("user.php", $options, "  >  ");
-            echo "</TD><TD>";
-            $options["page"] = $usercount-$recordsperpage;
-            print_single_button("user.php", $options, "  >>  ");
+        echo "<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> ";
         }
-        echo "</TD></TR></TABLE>";
+        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();
 
-        foreach ($users as $key => $user) {
-            if (!empty($user->country)) {
-                $users[$key]->country = $COUNTRIES[$user->country];
+
+        if (!$users) {
+            $match = array();
+            if ($search) {
+               $match[] = $search;
             }
-        }
-        if ($sort == "country") {  // Need to resort by full country name, not code
+            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) {
-                $susers[$user->id] = $user->country;
+                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",
+                                        "$user->country",
+                                        $strlastaccess,
+                                        "<a href=\"../user/edit.php?id=$user->id&course=$site->id\">$stredit</a>",
+                                        $deletebutton,
+                                        $confirmbutton);
             }
-            asort($susers);
-            foreach ($susers as $key => $value) {
-                $nusers[] = $users[$key];
+
+            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\">";
             }
-            $users = $nusers;
+            echo "</form>";    
+            echo "</td></tr></table>";
+
+            print_table($table);
+
+            print_paging_bar($usercount, $page, $perpage,
+                             "user.php?sort=$sort&dir=$dir&perpage=$perpage".
+                             "&firstinitial=$firstinitial&lastinitial=$lastinitial&search=$search&");
+
         }
 
-        $table->head = array ($name, $email, $city, $country, $lastaccess, "", "");
-        $table->align = array ("LEFT", "LEFT", "LEFT", "LEFT", "LEFT", "CENTER", "CENTER");
-        $table->width = "95%";
-        foreach ($users as $user) {
-            if ($user->id == $USER->id or $user->username == "changeme") {
-                $deletebutton = "";
-            } else {
-                $deletebutton = "<A HREF=\"user.php?delete=$user->id\" TARGET=\"$strdeletecheck\">$strdelete</A>";
-            }
-            if ($user->lastaccess) {
-                $strlastaccess = format_time(time() - $user->lastaccess);
-            } else {
-                $strlastaccess = get_string("never");
-            }
-            $table->data[] = array ("<A HREF=\"../user/view.php?id=$user->id&course=$site->id\">$user->firstname $user->lastname</A>",
-                             "$user->email",
-                             "$user->city",
-                             "$user->country",
-                             $strlastaccess,
-                             "<A HREF=\"../user/edit.php?id=$user->id&course=$site->id\">$stredit</A>",
-                             $deletebutton);
+        if ($CFG->auth == "email" || $CFG->auth == "none" || $CFG->auth == "manual"){
+            print_heading("<a href=\"user.php?newuser=true\">".get_string("addnewuser")."</a>");
         }
 
-        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>");
-
         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/db/config.html

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

auth/db/lib.php

@@ -27,6 +27,8 @@ function auth_user_login ($username, $password) {
     $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;

auth/imap/config.html

@@ -9,21 +9,22 @@
         $config->auth_imapport = "143";
     }
 ?>
-<tr valign="top" BGCOLOR="<?=$THEME->cellheading2 ?>">
+<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="<?=$config->auth_imaphost?>">
-	<? if (isset($err["auth_imaphost"])) formerr($err["auth_imaphost"]); ?>
+        <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>
-    <? print_string("auth_imaphost","auth") ?>
+    <?php  print_string("auth_imaphost","auth") ?> 
+    <?php  print_string("auth_multiplehosts","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>auth_imaptype:</TD>
 	<TD>
-    <? $imaptypes = array("imap","imapssl", "imapcert", "imaptls");
+    <?php  $imaptypes = array("imap","imapssl", "imapcert", "imaptls");
        foreach($imaptypes as $imaptype) {
            $imapoptions[$imaptype] = $imaptype;
        }
@@ -31,28 +32,28 @@
     ?>
     </TD>
     <TD>
-    <? print_string("auth_imaptype","auth") ?>
+    <?php  print_string("auth_imaptype","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<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="<?=$config->auth_imapport?>">
-    <? if (isset($err["auth_imapport"])) formerr($err["auth_imapport"]); ?>
+    <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>
-    <? print_string("auth_imapport","auth") ?>
+    <?php  print_string("auth_imapport","auth") ?>
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("instructions", "auth") ?>:</TD>
 	<TD>
-    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA> 
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><?php  p($config->auth_instructions) ?></TEXTAREA> 
     </TD>
     <TD>
-    <? print_string("authinstructions","auth") ?>
-    <? helpbutton("text", get_string("helptext")) ?>
+    <?php  print_string("authinstructions","auth") ?>
+    <?php  helpbutton("text", get_string("helptext")) ?>
     </TD>
 </TR>

auth/imap/lib.php

@@ -7,34 +7,40 @@ function auth_user_login ($username, $password) {
 
     global $CFG;
 
-    switch ($CFG->auth_imaptype) {
-        case "imapssl":
-            $host = "{".$CFG->auth_imaphost.":$CFG->auth_imapport/imap/ssl}";
-        break;
+    $hosts = split(';', $CFG->auth_imaphost);   // Could be multiple hosts
 
-        case "imapcert":
-            $host = "{".$CFG->auth_imaphost.":$CFG->auth_imapport/imap/ssl/novalidate-cert}";
-        break;
+    foreach ($hosts as $host) {                 // Try each host in turn
 
-        case "imaptls":
-            $host = "{".$CFG->auth_imaphost.":$CFG->auth_imapport/imap/notls}";
-        break;
+        $host = trim($host);
 
-        default:
-            $host = "{".$CFG->auth_imaphost.":$CFG->auth_imapport}";
+        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;
+        }
     }
 
-    error_reporting(0);
-    $connection = imap_open($host, $username, $password, OP_HALFOPEN);
-    error_reporting($CFG->debug);   
-
-    if ($connection) {
-        imap_close($connection);
-        return true;
-
-    } else {
-        return false;
-    }
+    return false;  // No match
 }
 
 

auth/ldap/config.html

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

auth/ldap/lib.php

@@ -79,7 +79,9 @@ function auth_get_userinfo($username){
     $search_attribs = array();
   
     foreach ($attrmap as $key=>$value) {
-        array_push($search_attribs, $value);
+        if (!in_array($value, $search_attribs)) {
+            array_push($search_attribs, $value);
+        }    
     }
 
     $user_dn = auth_ldap_find_userdn($ldap_connection, $username);
@@ -93,8 +95,8 @@ function auth_get_userinfo($username){
     if ($user_info_result) {
         $user_entry = ldap_get_entries($ldap_connection, $user_info_result);
         foreach ($attrmap as $key=>$value){
-            if(isset($user_entry[0][$value][0])){
-                $result[$key]=$user_entry[0][$value][0];
+            if(isset($user_entry[0][strtolower($value)][0])){
+                $result[$key]=$user_entry[0][strtolower($value)][0];
             }
         }
     }
@@ -219,6 +221,10 @@ function auth_ldap_connect(){
     $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 {
@@ -280,11 +286,11 @@ function auth_ldap_find_userdn ($ldap_connection, $username){
 
         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.")");
+            $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.")");
+            $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);

auth/manual/config.html

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

auth/nntp/config.html

@@ -7,35 +7,36 @@
     }
 ?>
 
-<tr valign="top" BGCOLOR="<?=$THEME->cellheading2 ?>">
+<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="<?=$config->auth_nntphost?>">
-	<? if (isset($err["auth_nntphost"]))  formerr($err["auth_nntphost"]); ?>
+        <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>
-    <? print_string("auth_nntphost","auth") ?>
+    <?php  print_string("auth_nntphost","auth") ?>
+    <?php  print_string("auth_multiplehosts","auth") ?>
     </TD>
 </TR>
 
-<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
+<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="<?=$config->auth_nntpport?>">
-    <? if (isset($err["auth_nntpport"])) formerr($err["auth_nntpport"]); ?>
+    <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>
-    <? print_string("auth_nntpport","auth") ?>
+    <?php  print_string("auth_nntpport","auth") ?>
     </TD>
 </TR>
 
 <TR VALIGN=TOP>
-	<TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
+	<TD ALIGN=RIGHT><P><?php  print_string("instructions", "auth") ?>:</TD>
 	<TD>
-    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA> 
+    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><?php  p($config->auth_instructions) ?></TEXTAREA> 
     </TD>
     <TD>
-    <? print_string("authinstructions","auth") ?>
-    <? helpbutton("text", get_string("helptext")) ?>
+    <?php  print_string("authinstructions","auth") ?>
+    <?php  helpbutton("text", get_string("helptext")) ?>
     </TD>
 </TR>

auth/nntp/lib.php

@@ -8,19 +8,22 @@ function auth_user_login ($username, $password) {
 
     global $CFG;
 
-    $host = "{".$CFG->auth_nntphost.":$CFG->auth_nntpport/nntp}";
+    $hosts = split(';', $CFG->auth_nntphost);   // Could be multiple hosts
 
-    error_reporting(0);
-    $connection = imap_open($host, $username, $password, OP_HALFOPEN);
-    error_reporting($CFG->debug);   
+    foreach ($hosts as $host) {                 // Try each host in turn
+        $host = '{'.trim($host).":$CFG->auth_nntpport/nntp}";
 
-    if ($connection) {
-        imap_close($connection);
-        return true;
+        error_reporting(0);
+        $connection = imap_open($host, $username, $password, OP_HALFOPEN);
+        error_reporting($CFG->debug);   
 
-    } else {
-        return false;
+        if ($connection) {
+            imap_close($connection);
+            return true;
+        }
     }
+
+    return false;    // No match
 }
 
 

auth/pop3/config.html

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

auth/pop3/lib.php

@@ -7,26 +7,35 @@ function auth_user_login ($username, $password) {
 
     global $CFG;
 
-    switch ($CFG->auth_pop3type) {
-        case "pop3":
-            $host = "{".$CFG->auth_pop3host.":$CFG->auth_pop3port/pop3}INBOX";
-        break;
-        case "pop3cert":
-            $host = "{".$CFG->auth_pop3host.":$CFG->auth_pop3port/pop3/ssl/novalidate-cert}INBOX";
-        break;
+    $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;
+        }
     }
 
-    error_reporting(0);
-    $connection = imap_open($host, $username, $password, OP_HALFOPEN);
-    error_reporting($CFG->debug);   
-
-    if ($connection) {
-        imap_close($connection);
-        return true;
-
-    } else {
-        return false;
-    }
+    return false;  // No matches found
 }
 
 

backup/STATUS.txt

@@ -3,12 +3,9 @@ STATUS $Id$
 
 This documment shows the current status of the backup/restore option.
 
-Backup:  WORKING. COMPLETED but only assignments, resources,
-                  choices and surveys.
+Backup:  WORKING. COMPLETED !!
 
-Restore: WORKING. NOT COMPLETED. Only course, users, user_files and 
-                  course_files. No logs, mods or final checks !!!!
-                  
+Restore: WORKING. COMPLETED !!
 
 ========== ========== ========== ========== ========== ==========
 
@@ -31,9 +28,9 @@ Backup Details:
         - Delete old entries at backup startup..................DONE
              - From database....................................DONE
              - From filesystem..................................DONE
-   - Backup Items:..............................................IN PROGRESS
+   - Backup Items:..............................................DONE
         - Backup Info data......................................DONE
-        - Course................................................IN PROGRESS
+        - Course................................................DONE
            - Course Summary Data................................DONE
               x course info.....................................DONE
               x sections info...................................DONE
@@ -50,31 +47,49 @@ Backup Details:
                  - Course.......................................DONE
                  - All..........................................DONE 
            - Logs...............................................DONE
-           - Mods Info..........................................IN PROGRESS
+           - 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..........................................IN PROGRESS
-                 + course data..................................NO EXISTS
-                 + user data....................................NO EXISTS
-                 + files........................................NO EXISTS
-              x journals........................................IN PROGRESS
-                 + course data..................................NO EXISTS
-                 + user data....................................NO EXISTS
-                 + files........................................NO EXISTS
-              x peer graded assignments.........................IN PROGRESS
-                 + course data..................................NO EXISTS
-                 + user data....................................NO EXISTS
-                 + files........................................NO EXISTS
-              x quizzes.........................................IN PROGRESS
-                 + course data..................................NO EXISTS
-                 + user data....................................NO EXISTS
-                 + files........................................NO EXISTS
+              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
@@ -83,17 +98,17 @@ Backup Details:
                  + course data..................................DONE
                  + user data....................................DONE
                  + files.....(NOT EXISTS).......................DONE
-              x workshops.......................................NO EXISTS
-                 + course data..................................NO EXISTS
-                 + user data....................................NO EXISTS
-                 + files........................................NO EXISTS
+              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. PROBLEMS PCLZIP/UNZIP
-      - XML File................................................DONE. PROBLEMS PCLZIP/UNZIP
-      - moddata files...........................................DONE. PROBLEMS PCLZIP/UNZIP
-      - Course Files............................................DONE. PROBLEMS PCLZIP/UNZIP
-      - User Files..............................................DONE. PROBLEMS PCLZIP/UNZIP
+   - 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      
@@ -101,8 +116,19 @@ Backup Details:
    - Browse backup files........................................DONE
    - Download backup files......................................DONE
    - Delete backup files........................................DONE
-   - Program automatic backups..................................NO EXISTS
-
+   - 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
@@ -127,7 +153,7 @@ Restore Details:
            - About existing users...............................DONE
         - Launch Restore........................................DONE
         - Show progress.........................................DONE
-   - Restore Items:.............................................IN PROGRESS
+   - Restore Items:.............................................DONE
         - Course................................................DONE
            - Course Summary Data................................DONE
               - Course Table....................................DONE
@@ -149,49 +175,91 @@ Restore Details:
               x admins..........................................DONE
                  - None.........................................DONE
                  - Course.......................................DONE
-                 - All..........................................DONE 
-           - Mods Info..........................................NO EXISTS
-              x assignments.....................................NO EXISTS
-                 + course data..................................NO EXISTS
-                 + user data....................................NO EXISTS
-                 + files........................................NO EXISTS
-              x choices.........................................NO EXISTS
-                 + course data..................................NO EXISTS
-                 + user data....................................NO EXISTS
-                 + files........................................NO EXISTS
-              x forums..........................................NO EXISTS
-                 + course data..................................NO EXISTS
-                 + user data....................................NO EXISTS
-                 + files........................................NO EXISTS
-              x journals........................................NO EXISTS
-                 + course data..................................NO EXISTS
-                 + user data....................................NO EXISTS
-                 + files........................................NO EXISTS
-              x quizzes.........................................NO EXISTS
-                 + course data..................................NO EXISTS
-                 + user data....................................NO EXISTS
-                 + files........................................NO EXISTS
-              x resources.......................................NO EXISTS
-                 + course data..................................NO EXISTS
-                 + user data....................................NO EXISTS
-                 + files........................................NO EXISTS
-              x surveys.........................................NO EXISTS
-                 + course data..................................NO EXISTS
-                 + user data....................................NO EXISTS
-                 + files........................................NO EXISTS
+                 - 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................................................NO EXISTS
-   - Readjust instance in course_modules........................NO EXISTS
-   - Readjust modinfo in course (serialize).....................NO EXISTS
-   - Delete old entries at restore end.  .......................NO EXISTS   
-      - From database...........................................NO EXISTS
-      - From filesystem.........................................NO EXISTS
+   - 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's no a little thing !!!  :-)
+This is all. It isn't a little thing !!!  :-)
 
 Eloy (stronk7)
 29-04-2003

backup/backup.php

@@ -3,40 +3,42 @@
 
     //Define some globals for all the script
 
-    //MUST CHANGE WITH FINAL BACKUP LOCATION !! WITHOUT TRAILING SLASH !!
-    //ALL RELATIVE FROM THE LOCATION OF THE backup.php SCRIPT !!!
-
-    $moodle_home = "../../..";
-    $mods_home = "mod";
-
-    //END MUST CHANGE
-
-    //Units used
-    require_once ("$moodle_home/config.php");
-    require_once ("$moodle_home/version.php");
-    require_once ("backup_version.php");
-    require_once ("db/backup_$CFG->dbtype.php");
+    require_once ("../config.php");
     require_once ("lib.php");
     require_once ("backuplib.php");
+    require_once ("$CFG->libdir/blocklib.php");
 
-    //Optional variables    
     optional_variable($id);       // course id
+    optional_variable($cancel);
+    optional_variable($launch);
 
-    //Check login       
     require_login();
 
-    //Check admin
-    if (!isadmin()) {
-        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+    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
-    upgrade_backup_db($backup_version,$backup_release,"backup.php");
+    if ($id) {
+        $linkto = "backup.php?id=".$id;
+    } else {
+        $linkto = "backup.php";
+    }
+    upgrade_backup_db($linkto);
 
     //Get strings
     $strcoursebackup = get_string("coursebackup");
@@ -45,7 +47,7 @@
     //If no course has been selected or cancel button pressed
     if (!$id or $cancel) {
         print_header("$site->shortname: $strcoursebackup", $site->fullname,
-                     "<A HREF=\"$moodle_home/$CFG->admin/index.php\">$stradministration</A> -> $strcoursebackup");
+                     "<A HREF=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</A> -> $strcoursebackup");
 
         if ($courses = get_courses()) {
             print_heading(get_string("choosecourse"));
@@ -56,7 +58,7 @@
             print_simple_box_end();
         } else {
             print_heading(get_string("nocoursesyet"));
-            print_continue("$moodle_home/$CFG->admin/index.php");
+            print_continue("$CFG->wwwroot/$CFG->admin/index.php");
         }
         print_footer();
         exit;
@@ -66,14 +68,28 @@
     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
-    print_header("$site->shortname: $strcoursebackup", $site->fullname,
-                 "<A HREF=\"$moodle_home/$CFG->admin/index.php\">$stradministration</A> ->
-                  <A HREF=\"backup.php\">$strcoursebackup</A> -> $course->fullname ($course->shortname)");
+    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");
@@ -88,4 +104,3 @@
     print_footer();
 
 ?>
-

backup/backup_check.html

@@ -4,11 +4,17 @@
     //Check login   
     require_login();
 
-    //Check admin
-    if (!isadmin()) {
-        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+    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!");
@@ -20,7 +26,7 @@
     if ($allmods = get_records("modules") ) {
         foreach ($allmods as $mod) {
             $modname = $mod->name;
-            $modfile = "$mods_home/$modname/backuplib.php";
+            $modfile = "$CFG->dirroot/mod/$modname/backuplib.php";
             $modbackup = $modname."_backup_mods";
             $modcheckbackup = $modname."_check_backup_mods";
             if (file_exists($modfile)) {
@@ -51,7 +57,7 @@
     }
    
     if (!isset($backup_logs)) {
-        $backup_logs = 1;
+        $backup_logs = 0;
     }
 
     if (!isset($backup_user_files)) {
@@ -67,9 +73,9 @@
     }
 ?>
 
-<form name="form" method="post" <?=$onsubmit ?> action="<?=$ME ?>">
+<form name="form" method="post" action="<?php echo $ME ?>">
 <table cellpadding=5>
-<?
+<?php
 
     //Now print the Backup Name tr
     echo "<tr>";
@@ -77,21 +83,41 @@
     echo get_string("name").":";
     echo "</B></td><td>";
     //Calculate the backup string
-    $backup_name = strtolower(get_string("backup"));
+
+    //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_name,0,1) == "[") {
-        $backup_name = "backup";
+    if (substr($backup_word,0,1) == "[") {
+        $backup_word= "backup";
     }
-    //Calculate the format string
-    $backup_name_format = get_string("backupnameformat");
+
+    //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_name_format,0,1) == "[") {
-        $backup_name_format = "%%Y%%m%%d-%%H%%M";
+    if (substr($backup_date_format,0,1) == "[") {
+        $backup_date_format = "%%Y%%m%%d-%%H%%M";
     }
-    $backup_name .= "-".strtolower($course->shortname)."-".userdate(time(),$backup_name_format,99,false).".zip";
-    echo $backup_name;
-    //Add as hidden name
-    echo "<input type=\"hidden\" name=\"backup_name\" value=\"".$backup_name."\">";
+
+    //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
@@ -106,6 +132,32 @@
     //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>";
 
@@ -118,7 +170,7 @@
             $modbackup = $modname."_backup_mods";
             //If exists the lib & function
             $var = "exists_".$modname;
-            if ($$var) {
+            if (isset($$var) && $$var) {
                 //Add hidden fields
                 $var = "backup_".$modname;
                 echo "<input type=\"hidden\" name=\"".$var."\" value=\"".$$var."\">";
@@ -154,7 +206,7 @@
         echo "<td colspan=\"2\"><P><B>";
         $user_options[0] = get_string("includeallusers");
         $user_options[1] = get_string("includecourseusers");
-        ///$user_options[2] = get_string("includeneededusers");--->NOT IMPLEMENTED
+        $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."\">";
@@ -206,9 +258,9 @@
 </table>
 <BR>
 <CENTER>
-<input type="hidden" name=id     value="<? p($id) ?>">
+<input type="hidden" name=id     value="<?php  p($id) ?>">
 <input type="hidden" name=launch value="execute">
-<input type="submit" value="<? print_string("continue") ?>">
-<input type="submit" name=cancel value="<? print_string("cancel") ?>">
+<input type="submit" value="<?php  print_string("continue") ?>">
+<input type="submit" name=cancel value="<?php  print_string("cancel") ?>">
 </CENTER>
 </FORM>

backup/backup_execute.html

@@ -4,11 +4,17 @@
     //Check login   
     require_login();
 
-    //Check admin
-    if (!isadmin()) {
-        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+    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!");
@@ -20,7 +26,7 @@
     if ($allmods = get_records("modules") ) {
         foreach ($allmods as $mod) {
             $modname = $mod->name;
-            $modfile = "$mods_home/$modname/backuplib.php";
+            $modfile = "$CFG->dirroot/mod/$modname/backuplib.php";
             $modbackup = $modname."_backup_mods";
             $modcheckbackup = $modname."_check_backup_mods";
             if (file_exists($modfile)) {
@@ -60,7 +66,7 @@
     $preferences->backup_users = $backup_users;
    
     if (!isset($backup_logs)) {
-        $backup_logs = 1;
+        $backup_logs = 0;
     }
     $preferences->backup_logs = $backup_logs;
 
@@ -90,10 +96,10 @@
     $preferences->backup_unique_code = $backup_unique_code;
 
     //Another Info
-    $preferences->moodle_version = $version;
-    $preferences->moodle_release = $release;
-    $preferences->backup_version = $backup_version;
-    $preferences->backup_release = $backup_release;
+    $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!");
@@ -119,7 +125,7 @@
 
     //Check for temp and backup and backup_unique_code directory
     //Create them as needed
-    echo "<li>Creating temporary structures";
+    echo "<li>".get_string("creatingtemporarystructures");
     $status = check_and_create_backup_dir($backup_unique_code);
     //Empty dir
     if ($status) {
@@ -127,55 +133,98 @@
     }
 
     //Delete old_entries from backup tables
-    echo "<li>Deteting old data";
+    echo "<li>".get_string("deletingolddata");
     $status = backup_delete_old_data();
     if (!$status) {
-        error ("An error has ocurred");
+        error ("An error occurred deleting old backup data");
     }
 
     //Create the moodle.xml file
     if ($status) {
-        echo "<li>Creating xml file";
+        echo "<li>".get_string("creatingxmlfile");
         //Begin a new list to xml contents
         echo "<ul>";
-        echo "<li>Writing header";
+        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>Writing general info";
+        echo "<li>".get_string("writinggeneralinfo");;
         //Prints general info about backup to file
         if ($backup_file) {
-            $status = backup_general_info($backup_file,$preferences);
+            if (!$status = backup_general_info($backup_file,$preferences)) {
+                notify("An error occurred while backing up general info");
+            }
         }
-        echo "<li>Writing course data";
+        echo "<li>".get_string("writingcoursedata");
 
         //Start new ul (for course)
         echo "<ul>";
 
-        echo "<li>Course info";
+        echo "<li>".get_string("courseinfo");
         //Prints course start (tag and general info)
         if ($status) {
-            $status = backup_course_start($backup_file,$preferences);
+            if (!$status = backup_course_start($backup_file,$preferences)) {
+                notify("An error occurred while backing up course start");
+            }
         }
-        echo "<li>Sections";
+        echo "<li>".get_string("sections");
         //Section info
         if ($status) {
-            $status = backup_course_sections($backup_file,$preferences);
+            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>Writing users info";
+        echo "<li>".get_string("writinguserinfo");
         //User info
         if ($status) {
-            $status = backup_user_info($backup_file,$preferences);
+            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>Writing logs info";
-                $status = backup_log_info($backup_file,$preferences);
+                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");
             }
         }
 
@@ -191,28 +240,36 @@
             }
             //If we have to backup some module
             if ($mods_to_backup) {
-                echo "<li>Writing modules info";
+                echo "<li>".get_string("writingmoduleinfo");
                 //Start modules tag
-                $status = backup_modules_start ($backup_file,$preferences);
+                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 backupa
+                //Iterate over modules and call backup
                 foreach ($preferences->mods as $module) {
                     if ($module->backup and $status) {
-                        echo "<li>".$module->name;
-                        $status = backup_module($backup_file,$preferences,$module->name);
+                        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
-                $status = backup_modules_end ($backup_file,$preferences);
+                if (!$status = backup_modules_end ($backup_file,$preferences)) {
+                    notify("An error occurred while finishing the module backups");
+                }
             }
         }
 
         //Prints course end 
         if ($status) {
-            $status = backup_course_end($backup_file,$preferences);
+            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) {
@@ -226,39 +283,45 @@
     //Now, if selected, copy user files
     if ($status) {
         if ($preferences->backup_user_files) {
-            echo "<li>Copying user files";
-            $status = backup_copy_user_files ($preferences);
+            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>Copying course files";
-            $status = backup_copy_course_files ($preferences);
+            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>Zipping backup";
-        $status = backup_zip ($preferences,$moodle_home);
+        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>Copying zip file";
-        $status = copy_zip_to_course_dir ($preferences);
+        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>Cleaning up temp data";
-        $status = clean_temp_data ($preferences); 
-    }
-
-    if (!$status) {
-        error ("An error has ocurred");
+        echo "<li>".get_string("cleaningtempdata");
+        if (!$status = clean_temp_data ($preferences)) {
+            notify("An error occurred while cleaning up temporary data");
+        }
     }
 
     //Ends th main ul
@@ -269,9 +332,14 @@
 
     //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($moodle_home."/files/index.php?id=".$preferences->backup_course."&wdir=/".get_string("backupdir"));    
+    print_continue("$CFG->wwwroot/files/index.php?id=".$preferences->backup_course."&wdir=/backupdata");    
 
 ?>

backup/backup_form.html

@@ -4,9 +4,14 @@
     //Check login   
     require_login();
 
-    //Check admin
-    if (!isadmin()) {
-        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+    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
@@ -20,7 +25,7 @@
     if ($allmods = get_records("modules") ) {
         foreach ($allmods as $mod) {
             $modname = $mod->name;
-            $modfile = "$mods_home/$modname/backuplib.php";
+            $modfile = "$CFG->dirroot/mod/$modname/backuplib.php";
             $modbackup = $modname."_backup_mods";
             $modcheckbackup = $modname."_check_backup_mods";
             if (file_exists($modfile)) {
@@ -51,7 +56,7 @@
     }
    
     if (!isset($backup_logs)) {
-        $backup_logs = 1;
+        $backup_logs = 0;
     }
 
     if (!isset($backup_user_files)) {
@@ -68,16 +73,16 @@
 
 ?>
 
-<form name="form" method="post" <?=$onsubmit ?> action="<?=$ME ?>">
+<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 ($$var) {
+            if (isset($$var) && $$var) {
                 //Print the full tr
                 echo "<tr>";
                 echo "<td align=\"right\"><P><B>";
@@ -104,7 +109,7 @@
         echo "</td><td>";
         $user_options[0] = get_string("all");
         $user_options[1] = get_string("course");
-        //$user_options[2] = get_string("needed");-->NOT IMPLEMENTED
+        $user_options[2] = get_string("none");
         choose_from_menu($user_options, "backup_users", $backup_users, "");
         echo "</td></tr>";
 
@@ -142,9 +147,9 @@
 </table>
 <BR>
 <CENTER>
-<input type="hidden" name=id     value="<? p($id) ?>">
+<input type="hidden" name=id     value="<?php  p($id) ?>">
 <input type="hidden" name=launch value="check">
-<input type="submit" value="<? print_string("continue") ?>">
-<input type="submit" name=cancel value="<? print_string("cancel") ?>">
+<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/backup_version.php

@@ -1,10 +0,0 @@
-<?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 = 2003052000;   // The current version is a date (YYYYMMDDXX)
-
-$backup_release = "0.2.1 alpha";  // User-friendly version number

backup/backuplib.php

@@ -32,60 +32,85 @@
     //Return an array of info (name,value)
     function user_check_backup($course,$backup_unique_code,$backup_users) {
         //$backup_users=0-->all
-        //              1-->course
-        //              2-->needed-->NOT IMPLEMEMTED
+        //              1-->course (needed + enrolled)
+        //              2-->none
 
         global $CFG;
         global $db;
 
         $count_users = 0;
-        
-        //Select all users from user
-        $users = get_records ("user");
-        //Iterate over users putting their roles
-        foreach ($users as $user) {
-               $user->info = "";
-            //Is Admin in tables (not is_admin()) !!
-            if (record_exists("user_admins","userid",$user->id)) {
-                $user->info .= "admin";
-                $user->role_admin = true;
-            }
-            //Is Course Creator in tables (not is_coursecreator()) !!
-            if (record_exists("user_coursecreators","userid",$user->id)) {
-                $user->info .= "coursecreator";
-                $user->role_coursecreator = true;
-            }
-            //Is Teacher in tables (not is_teacher()) !!
-            if (record_exists("user_teachers","course",$course,"userid",$user->id)) {
-                $user->info .= "teacher";
-                $user->role_teacher = true;
-            }
-            //Is Student in tables (not is_student()) !!
-            if (record_exists("user_students","course",$course,"userid",$user->id)) {
-                $user->info .= "student";
-                $user->role_student = true;
-            }
-            //Now create the backup_id record
-            $backupids_rec->backup_code = $backup_unique_code;
-            $backupids_rec->table_name = "user";
-            $backupids_rec->old_id = $user->id;
-            $backupids_rec->info = $user->info;
 
-            //Insert the record id. backup_users decide it.
-            //When all users
-            if ($backup_users == 0) { 
-                $status = insert_record("backup_ids",$backupids_rec,false);
-                $count_users++;
-            //When course users
-            } else if ($backup_users == 1) {
-                 //Only if user has any role
-                if ($backupids_rec->info) {
-                    $status = insert_record("backup_ids",$backupids_rec,false);
-                    $count_users++;
+        //If we've selected none, simply return 0
+        if ($backup_users == 0 or $backup_users == 1) {
+        
+            //Calculate needed users (calling every xxxx_get_participants function + scales users)
+            $needed_users = backup_get_needed_users($course);
+
+            //Calculate enrolled users (students + teachers)
+            $enrolled_users = backup_get_enrolled_users($course);
+
+            //Calculate all users (every record in users table)
+            $all_users = backup_get_all_users();
+
+            //Calculate course users (needed + enrolled)
+            //First, needed
+            $course_users = $needed_users;
+        
+            //Now, enrolled
+            if ($enrolled_users) {
+                foreach ($enrolled_users as $enrolled_user) {
+                    $course_users[$enrolled_user->id]->id = $enrolled_user->id; 
                 }
             }
-        }
+       
+            //Now, depending of parameters, create $backupable_users
+            if ($backup_users == 0) {
+                $backupable_users = $all_users;
+            } else {
+                $backupable_users = $course_users;
+            }
+
+            //If we have backupable users
+            if ($backupable_users) {
+                //Iterate over users putting their roles
+                foreach ($backupable_users as $backupable_user) {
+                    $backupable_user->info = "";
+                    //Is Admin in tables (not is_admin()) !!
+                    if (record_exists("user_admins","userid",$backupable_user->id)) {
+                        $backupable_user->info .= "admin";
+                    }
+                    //Is Course Creator in tables (not is_coursecreator()) !!
+                    if (record_exists("user_coursecreators","userid",$backupable_user->id)) {
+                        $backupable_user->info .= "coursecreator";
+                    }
+                    //Is Teacher in tables (not is_teacher()) !!
+                    if (record_exists("user_teachers","course",$course,"userid",$backupable_user->id)) {
+                        $backupable_user->info .= "teacher";
+                    }
+                    //Is Student in tables (not is_student()) !!
+                    if (record_exists("user_students","course",$course,"userid",$backupable_user->id)) {
+                        $backupable_user->info .= "student";
+                    }
+                    //Is needed user (exists in needed_users) 
+                    if (isset($needed_users[$backupable_user->id])) {
+                        $backupable_user->info .= "needed";
+                    }
+                    //Now create the backup_id record
+                    $backupids_rec->backup_code = $backup_unique_code;
+                    $backupids_rec->table_name = "user";
+                    $backupids_rec->old_id = $backupable_user->id;
+                    $backupids_rec->info = $backupable_user->info;
         
+                    //Insert the record id. backup_users decide it.
+                    //When all users
+                    $status = insert_record("backup_ids",$backupids_rec,false,"backup_code");
+                    $count_users++;
+                }
+                //Do some output     
+                backup_flush(30);
+            }
+        }
+
         //Prepare Info
         //Gets the user data
         $info[0][0] = get_string("users");
@@ -94,23 +119,130 @@
         return $info;
     }
 
+    //Returns every needed user (participant) in a course
+    //It uses the xxxx_get_participants() function
+    //plus users needed to backup scales.
+    //WARNING: It returns only NEEDED users, not every 
+    //   every student and teacher in the course, so it
+    //must be merged with backup_get_enrrolled_users !!
+
+    function backup_get_needed_users ($courseid) {
+        
+        global $CFG, $THEME;
+
+        $result = false;
+
+        $course_modules = get_records_sql ("SELECT cm.id, m.name, cm.instance
+                                            FROM {$CFG->prefix}modules m,
+                                                 {$CFG->prefix}course_modules cm
+                                            WHERE m.id = cm.module and
+                                                  cm.course = '$courseid'");
+
+        if ($course_modules) {
+            //Iterate over each module
+            foreach ($course_modules as $course_module) {
+                $modlib = "$CFG->dirroot/mod/$course_module->name/lib.php";
+                $modgetparticipants = $course_module->name."_get_participants";
+                if (file_exists($modlib)) {
+                    include_once($modlib);
+                    if (function_exists($modgetparticipants)) {
+                        $module_participants = $modgetparticipants($course_module->instance);
+                        //Add them to result
+                        if ($module_participants) {
+                            foreach ($module_participants as $module_participant) {
+                                $result[$module_participant->id]->id = $module_participant->id; 
+                            }
+                        }
+                    }
+                 }            
+            }
+        }
+
+        //Now, add scales users (from site and course scales)
+        //Get users
+        $scaleusers = get_records_sql("SELECT DISTINCT userid,userid
+                                       FROM {$CFG->prefix}scale
+                                       WHERE courseid = '0' or courseid = '$courseid'");
+        //Add scale users to results
+        if ($scaleusers) {
+            foreach ($scaleusers as $scaleuser) {
+                //If userid != 0
+                if ($scaleuser->userid != 0) {
+                    $result[$scaleuser->userid]->id = $scaleuser->userid;
+                }
+            }
+        }
+    
+        return $result;
+
+    }
+
+    //Returns every enrolled user (student and teacher) in a course
+
+    function backup_get_enrolled_users ($courseid) {
+
+        global $CFG;
+
+        $result = false;
+        
+        //Get teachers
+        $teachers = get_records_sql("SELECT DISTINCT userid,userid
+                     FROM {$CFG->prefix}user_teachers
+                     WHERE course = '$courseid'");
+        //Get students
+        $students = get_records_sql("SELECT DISTINCT userid,userid
+                     FROM {$CFG->prefix}user_students
+                     WHERE course = '$courseid'");
+        //Add teachers
+        if ($teachers) {
+            foreach ($teachers as $teacher) {
+                $result[$teacher->userid]->id = $teacher->userid;
+            }
+        }
+        //Add students
+        if ($students) {
+            foreach ($students as $student) {
+                $result[$student->userid]->id = $student->userid;
+            }
+        }
+
+        return $result;
+    }
+
+    //Returns all users (every record in users table)
+
+    function backup_get_all_users() {
+
+        global $CFG;
+
+        $result = false;
+
+        //Get users
+        $users = get_records_sql("SELECT DISTINCT id,id
+                                  FROM {$CFG->prefix}user");
+        //Add users
+        if ($users) {
+            foreach ($users as $user) {
+                $result[$user->id]->id = $user->id;
+            }
+        }
+
+        return $result;
+    }
+
     //Calculate the number of log entries to backup
     //Return an array of info (name,value)
     function log_check_backup($course) {
 
         global $CFG;
 
-        //Execute the insert
-        $status = execute_sql($sql_insert,false);
+        //Now execute the count
+        $ids = count_records("log","course",$course);
 
-        //Now execute the select
-        $ids = get_records_sql("SELECT DISTINCT l.id,l.course
-                                FROM {$CFG->prefix}log l
-                                WHERE l.course = '$course'");
         //Gets the user data
         $info[0][0] = get_string("logs");
         if ($ids) {
-            $info[0][1] = count($ids);
+            $info[0][1] = $ids;
         } else {
             $info[0][1] = 0;
         }
@@ -138,11 +270,19 @@
                 } else {
                    $tok = "";
                 }
-                //Insert them into backup_files
-                $status = execute_sql("INSERT INTO {$CFG->prefix}backup_files
-                                           (backup_code, file_type, path, old_id)
-                                       VALUES
-                                           ('$backup_unique_code','user','$dir','$userid')",false);
+                //Look it is a backupable user
+                $data = get_record ("backup_ids","backup_code","$backup_unique_code",
+                                                 "table_name","user",
+                                                 "old_id",$userid);
+                if ($data) {
+                    //Insert them into backup_files
+                    $status = execute_sql("INSERT INTO {$CFG->prefix}backup_files
+                                               (backup_code, file_type, path, old_id)
+                                           VALUES
+                                               ('$backup_unique_code','user','$dir','$userid')",false);
+                }
+                //Do some output
+                backup_flush(30);
             }
         }
 
@@ -163,7 +303,7 @@
     }
 
     //Calculate the number of course files to backup
-    //under $CFG->dataroot/$course, except $CFG->moddata, and get_string("backupdir)
+    //under $CFG->dataroot/$course, except $CFG->moddata, and backupdata
     //and put them (their path) in backup_ids
     //Return an array of info (name,value)
     function course_files_check_backup($course,$backup_unique_code) {
@@ -174,16 +314,18 @@
         //Check if directory exists
         if (is_dir($rootdir)) {
             $coursedirs = get_directory_list($rootdir,$CFG->moddata);
-            $backupdir = get_string("backupdir");
+            $backupdata_dir = "backupdata";
             foreach ($coursedirs as $dir) {
-                //Check it isn't backupdir
-                if (strpos($dir,$backupdir)!==0) {
+                //Check it isn't backupdata_dir
+                if (strpos($dir,$backupdata_dir)!==0) {
                     //Insert them into backup_files
                     $status = execute_sql("INSERT INTO {$CFG->prefix}backup_files
                                                   (backup_code, file_type, path)
                                            VALUES
                                               ('$backup_unique_code','course','$dir')",false);
                 }
+            //Do some output
+            backup_flush(30);
             }
         }
 
@@ -289,12 +431,14 @@
     
     //Return the start tag, the contents and the end tag
     function full_tag($tag,$level=0,$endline=true,$content,$to_utf=true) {
+        //Here we encode absolute links
+        $content = backup_encode_absolute_links($content);
         $st = start_tag($tag,$level,$endline);
         $co="";
         if ($to_utf) {
-            $co = utf8_encode(htmlspecialchars($content));
+            $co = preg_replace("/\r\n|\r/", "\n", utf8_encode(htmlspecialchars($content)));
         } else {
-            $co = htmlspecialchars($content);
+            $co = preg_replace("/\r\n|\r/", "\n", htmlspecialchars($content));
         }
         $et = end_tag($tag,0,true);
         return $st.$co.$et;
@@ -318,6 +462,8 @@
         fwrite ($bf,full_tag("BACKUP_RELEASE",2,false,$preferences->backup_release));
         //The date
         fwrite ($bf,full_tag("DATE",2,false,$preferences->backup_unique_code));
+        //The original site wwwroot
+        fwrite ($bf,full_tag("ORIGINAL_WWWROOT",2,false,$CFG->wwwroot));
         //Te includes tag
         fwrite ($bf,start_tag("DETAILS",2,true));
         //Now, go to mod element of preferences to print its status
@@ -343,8 +489,10 @@
         //The user in backup
         if ($preferences->backup_users == 1) {
             fwrite ($bf,full_tag("USERS",3,false,"course"));
-        } else {
+        } else if ($preferences->backup_users == 0) {
             fwrite ($bf,full_tag("USERS",3,false,"all"));
+        } else {
+            fwrite ($bf,full_tag("USERS",3,false,"none"));
         }
         //The logs in backup
         if ($preferences->backup_logs == 1) {
@@ -411,16 +559,25 @@
             fwrite ($bf,full_tag("SHORTNAME",3,false,$course->shortname));
             fwrite ($bf,full_tag("SUMMARY",3,false,$course->summary));
             fwrite ($bf,full_tag("FORMAT",3,false,$course->format));
+            fwrite ($bf,full_tag("SHOWGRADES",3,false,$course->showgrades));
+            fwrite ($bf,full_tag("BLOCKINFO",3,false,blocks_get_block_names($course->blockinfo)));
             fwrite ($bf,full_tag("NEWSITEMS",3,false,$course->newsitems));
             fwrite ($bf,full_tag("TEACHER",3,false,$course->teacher));
             fwrite ($bf,full_tag("TEACHERS",3,false,$course->teachers));
             fwrite ($bf,full_tag("STUDENT",3,false,$course->student));
             fwrite ($bf,full_tag("STUDENTS",3,false,$course->students));
             fwrite ($bf,full_tag("GUEST",3,false,$course->guest));
-            fwrite ($bf,full_tag("STARDATE",3,false,$course->stardate));
+            fwrite ($bf,full_tag("STARTDATE",3,false,$course->startdate));
             fwrite ($bf,full_tag("NUMSECTIONS",3,false,$course->numsections));
-            fwrite ($bf,full_tag("SHOWRECENT",3,false,$course->showrecent));
+            //fwrite ($bf,full_tag("SHOWRECENT",3,false,$course->showrecent));    INFO: This is out in 1.3
+            fwrite ($bf,full_tag("MAXBYTES",3,false,$course->maxbytes));
+            fwrite ($bf,full_tag("SHOWREPORTS",3,false,$course->showreports));
+            fwrite ($bf,full_tag("GROUPMODE",3,false,$course->groupmode));
+            fwrite ($bf,full_tag("GROUPMODEFORCE",3,false,$course->groupmodeforce));
+            fwrite ($bf,full_tag("LANG",3,false,$course->lang));
             fwrite ($bf,full_tag("MARKER",3,false,$course->marker));
+            fwrite ($bf,full_tag("VISIBLE",3,false,$course->visible));
+            fwrite ($bf,full_tag("HIDDENSECTIONS",3,false,$course->hiddensections));
             fwrite ($bf,full_tag("TIMECREATED",3,false,$course->timecreated));
             $status = fwrite ($bf,full_tag("TIMEMODIFIED",3,false,$course->timemodified));
             //Print header end
@@ -516,7 +673,9 @@
                fwrite ($bf,full_tag("ADDED",6,false,$course_module[$tok]->added));
                fwrite ($bf,full_tag("DELETED",6,false,$course_module[$tok]->deleted));
                fwrite ($bf,full_tag("SCORE",6,false,$course_module[$tok]->score));
+               fwrite ($bf,full_tag("INDENT",6,false,$course_module[$tok]->indent));
                fwrite ($bf,full_tag("VISIBLE",6,false,$course_module[$tok]->visible));
+               fwrite ($bf,full_tag("GROUPMODE",6,false,$course_module[$tok]->groupmode));
                fwrite ($bf,end_tag("MOD",5,true));
             }
            //check for next
@@ -549,6 +708,7 @@
         if ($users) {
             //Begin Users tag
             fwrite ($bf,start_tag("USERS",2,true));
+            $counter = 0;
             //With every user
             foreach ($users as $user) {
                 //Get user data from table
@@ -565,6 +725,7 @@
                 fwrite ($bf,full_tag("FIRSTNAME",4,false,$user_data->firstname));
                 fwrite ($bf,full_tag("LASTNAME",4,false,$user_data->lastname));
                 fwrite ($bf,full_tag("EMAIL",4,false,$user_data->email));
+                fwrite ($bf,full_tag("EMAILSTOP",4,false,$user_data->emailstop));
                 fwrite ($bf,full_tag("ICQ",4,false,$user_data->icq));
                 fwrite ($bf,full_tag("PHONE1",4,false,$user_data->phone1));
                 fwrite ($bf,full_tag("PHONE2",4,false,$user_data->phone2));
@@ -595,10 +756,12 @@
                 $user->iscoursecreator = strpos($user->info,"coursecreator");
                 $user->isteacher = strpos($user->info,"teacher");
                 $user->isstudent = strpos($user->info,"student");
+                $user->isneeded = strpos($user->info,"needed");
                 if ($user->isadmin!==false or 
                     $user->iscoursecreator!==false or 
                     $user->isteacher!==false or 
-                    $user->isstudent!==false) {
+                    $user->isstudent!==false or
+                    $user->isneeded!==false) {
                     //Begin ROLES tag
                     fwrite ($bf,start_tag("ROLES",4,true));
                     //PRINT ROLE INFO
@@ -630,6 +793,9 @@
                         $tea = get_record("user_teachers","userid",$user->old_id,"course",$preferences->backup_course);
                         fwrite ($bf,full_tag("AUTHORITY",6,false,$tea->authority));
                         fwrite ($bf,full_tag("TEA_ROLE",6,false,$tea->role));
+                        fwrite ($bf,full_tag("EDITALL",6,false,$tea->editall));
+                        fwrite ($bf,full_tag("TIMEMODIFIED",6,false,$tea->timemodified));
+                        fwrite ($bf,full_tag("TIMEACCESS",6,false,$tea->timeaccess));
                         //Print ROLE end
                         fwrite ($bf,end_tag("ROLE",5,true));   
                     }
@@ -644,22 +810,56 @@
                         fwrite ($bf,full_tag("TIMESTART",6,false,$stu->timestart));
                         fwrite ($bf,full_tag("TIMEEND",6,false,$stu->timeend));
                         fwrite ($bf,full_tag("TIME",6,false,$stu->time));
+                        fwrite ($bf,full_tag("TIMEACCESS",6,false,$stu->timeaccess));
                         //Print ROLE end
                         fwrite ($bf,end_tag("ROLE",5,true));   
                     }
-
+                    //Needed
+                    if ($user->isneeded!==false) {
+                        //Print ROLE start
+                        fwrite ($bf,start_tag("ROLE",5,true));
+                        //Print Role info
+                        fwrite ($bf,full_tag("TYPE",6,false,"needed"));
+                        //Print ROLE end
+                        fwrite ($bf,end_tag("ROLE",5,true));
+                    }
 
                     //End ROLES tag
                     fwrite ($bf,end_tag("ROLES",4,true));
+ 
+                    //Check if we have user_preferences to backup
+                    if ($preferences_data = get_records("user_preferences","userid",$user->old_id)) {
+                        //Start USER_PREFERENCES tag
+                        fwrite ($bf,start_tag("USER_PREFERENCES",4,true));
+                        //Write each user_preference
+                        foreach ($preferences_data as $user_preference) {
+                            fwrite ($bf,start_tag("USER_PREFERENCE",5,true));
+                            fwrite ($bf,full_tag("NAME",6,false,$user_preference->name));
+                            fwrite ($bf,full_tag("VALUE",6,false,$user_preference->value));
+                            fwrite ($bf,end_tag("USER_PREFERENCE",5,true));
+                        }
+                        //End USER_PREFERENCES tag
+                        fwrite ($bf,end_tag("USER_PREFERENCES",4,true));
+                    }
+                    
                 }
                 //End User tag
                 fwrite ($bf,end_tag("USER",3,true));
+                //Do some output
+                $counter++;
+                if ($counter % 10 == 0) {
+                    echo ".";   
+                    if ($counter % 200 == 0) {
+                        echo "<br>";
+                    }
+                    backup_flush(300);
+                }
             }
             //End Users tag
             fwrite ($bf,end_tag("USERS",2,true));
         } else {
-            //There isn't users. Impossible !!
-            $status = false;
+            // There aren't any users.
+            $status = true;
         }
 
         return $status;
@@ -669,44 +869,235 @@
     function backup_log_info($bf,$preferences) {
 
         global $CFG;
+
+        //Number of records to get in every chunk
+        $recordset_size = 1000;
   
         $status = true;
+ 
+        //Counter, points to current record
+        $counter = 0;
 
-        $logs = get_records ("log","course",$preferences->backup_course,"time");
+        //Count records
+        $count_logs = count_records("log","course",$preferences->backup_course);
 
-        //We have logs
-        if ($logs) {
-            //Pring logs header
+        //Pring logs header
+        if ($count_logs > 0 ) {
             fwrite ($bf,start_tag("LOGS",2,true));
-            //Iterate 
-            foreach ($logs as $log) {
-                //See if it is a valid module to backup
-                if ($log->module == "course" or 
-                    $log->module == "user" or
-                    $preferences->mods[$log->module]->backup == 1) {
-                    //Begin log tag
-                     fwrite ($bf,start_tag("LOG",3,true));
+        }
+        while ($counter < $count_logs) {
+            //Get a chunk of records
+            $logs = get_records ("log","course",$preferences->backup_course,"time","*",$counter,$recordset_size);
 
-                    //Output log tag
-                    fwrite ($bf,full_tag("ID",4,false,$log->id));
-                    fwrite ($bf,full_tag("TIME",4,false,$log->time));
-                    fwrite ($bf,full_tag("USERID",4,false,$log->userid));
-                    fwrite ($bf,full_tag("IP",4,false,$log->ip));
-                    fwrite ($bf,full_tag("MODULE",4,false,$log->module));
-                    fwrite ($bf,full_tag("ACTION",4,false,$log->action));
-                    fwrite ($bf,full_tag("URL",4,false,$log->url));
-                    fwrite ($bf,full_tag("INFO",4,false,$log->info));
-
-                    //End log tag
-                     fwrite ($bf,end_tag("LOG",3,true));
+            //We have logs
+            if ($logs) {
+                //Iterate 
+                foreach ($logs as $log) {
+                    //See if it is a valid module to backup
+                    if ($log->module == "course" or 
+                        $log->module == "user" or
+                        $preferences->mods[$log->module]->backup == 1) {
+                        //Begin log tag
+                         fwrite ($bf,start_tag("LOG",3,true));
+    
+                        //Output log tag
+                        fwrite ($bf,full_tag("ID",4,false,$log->id));
+                        fwrite ($bf,full_tag("TIME",4,false,$log->time));
+                        fwrite ($bf,full_tag("USERID",4,false,$log->userid));
+                        fwrite ($bf,full_tag("IP",4,false,$log->ip));
+                        fwrite ($bf,full_tag("MODULE",4,false,$log->module));
+                        fwrite ($bf,full_tag("CMID",4,false,$log->cmid));
+                        fwrite ($bf,full_tag("ACTION",4,false,$log->action));
+                        fwrite ($bf,full_tag("URL",4,false,$log->url));
+                        fwrite ($bf,full_tag("INFO",4,false,$log->info));
+    
+                        //End log tag
+                         fwrite ($bf,end_tag("LOG",3,true));
+                    }
+                    //Do some output
+                    $counter++;
+                    if ($counter % 10 == 0) {
+                        echo ".";
+                        if ($counter % 200 == 0) {
+                            echo "<br>";
+                        }
+                        backup_flush(300);
+                    }
                 }
             }
-            //End logs tag
+        }
+        //End logs tag
+        if ($count_logs > 0 ) {
             $status = fwrite ($bf,end_tag("LOGS",2,true));
         }
         return $status;
     }
 
+
+    //Backup scales info (common and course scales)
+    function backup_scales_info($bf,$preferences) {
+
+        global $CFG;
+
+        $status = true;
+
+        //Counter, points to current record
+        $counter = 0;
+
+        //Get scales (common and course scales)
+        $scales = get_records_sql("SELECT id, courseid, userid, name, scale, description, timemodified
+                                   FROM {$CFG->prefix}scale
+                                   WHERE courseid = '0' or courseid = $preferences->backup_course");
+
+        //Copy only used scales to $backupscales. They will be in backup (unused no). See Bug 1223.
+        $backupscales = array();
+        if ($scales) {
+            foreach ($scales as $scale) {
+                if (course_scale_used($preferences->backup_course, $scale->id)) {
+                    $backupscales[] = $scale;
+                }
+            }
+        }
+
+        //Pring scales header
+        if ($backupscales) {
+            //Pring scales header
+            fwrite ($bf,start_tag("SCALES",2,true));
+            //Iterate
+            foreach ($backupscales as $scale) {
+                //Begin scale tag
+                fwrite ($bf,start_tag("SCALE",3,true));
+                //Output scale tag
+                fwrite ($bf,full_tag("ID",4,false,$scale->id));
+                fwrite ($bf,full_tag("COURSEID",4,false,$scale->courseid));
+                fwrite ($bf,full_tag("USERID",4,false,$scale->userid));
+                fwrite ($bf,full_tag("NAME",4,false,$scale->name));
+                fwrite ($bf,full_tag("SCALETEXT",4,false,$scale->scale));
+                fwrite ($bf,full_tag("DESCRIPTION",4,false,$scale->description));
+                fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$scale->timemodified));
+                //End scale tag
+                fwrite ($bf,end_tag("SCALE",3,true));
+            }
+            //End scales tag
+            $status = fwrite ($bf,end_tag("SCALES",2,true));
+        }
+        return $status;
+    }
+
+    //Backup events info (course events)
+    function backup_events_info($bf,$preferences) {
+
+        global $CFG;
+
+        $status = true;
+
+        //Counter, points to current record
+        $counter = 0;
+
+        //Get events (course events)
+        $events = get_records_select("event","courseid='$preferences->backup_course' AND instance='0'","id");
+
+        //Pring events header
+        if ($events) {
+            //Pring events header
+            fwrite ($bf,start_tag("EVENTS",2,true));
+            //Iterate
+            foreach ($events as $event) {
+                //Begin event tag
+                fwrite ($bf,start_tag("EVENT",3,true));
+                //Output event tag
+                fwrite ($bf,full_tag("ID",4,false,$event->id));
+                fwrite ($bf,full_tag("NAME",4,false,$event->name));
+                fwrite ($bf,full_tag("DESCRIPTION",4,false,$event->description));
+                fwrite ($bf,full_tag("FORMAT",4,false,$event->format));
+                fwrite ($bf,full_tag("GROUPID",4,false,$event->groupid));
+                fwrite ($bf,full_tag("USERID",4,false,$event->userid));
+                fwrite ($bf,full_tag("EVENTTYPE",4,false,$event->eventtype));
+                fwrite ($bf,full_tag("TIMESTART",4,false,$event->timestart));
+                fwrite ($bf,full_tag("TIMEDURATION",4,false,$event->timeduration));
+                fwrite ($bf,full_tag("VISIBLE",4,false,$event->visible));
+                fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$event->timemodified));
+                //End event tag
+                fwrite ($bf,end_tag("EVENT",3,true));
+            }
+            //End events tag
+            $status = fwrite ($bf,end_tag("EVENTS",2,true));
+        }
+        return $status;
+    }
+
+    //Backup groups info
+    function backup_groups_info($bf,$preferences) {
+    
+        global $CFG;
+
+        $status = true;
+        $status2 = true;
+
+        //Get groups 
+        $groups = get_records("groups","courseid",$preferences->backup_course);
+
+        //Pring groups header
+        if ($groups) {
+            //Pring groups header
+            fwrite ($bf,start_tag("GROUPS",2,true));
+            //Iterate
+            foreach ($groups as $group) {
+                //Begin group tag
+                fwrite ($bf,start_tag("GROUP",3,true));
+                //Output group contents
+                fwrite ($bf,full_tag("ID",4,false,$group->id));
+                fwrite ($bf,full_tag("COURSEID",4,false,$group->courseid));
+                fwrite ($bf,full_tag("NAME",4,false,$group->name));
+                fwrite ($bf,full_tag("DESCRIPTION",4,false,$group->description));
+                fwrite ($bf,full_tag("LANG",4,false,$group->lang));
+                fwrite ($bf,full_tag("PICTURE",4,false,$group->picture));
+                fwrite ($bf,full_tag("HIDEPICTURE",4,false,$group->hidepicture));
+                fwrite ($bf,full_tag("TIMECREATED",4,false,$group->timecreated));
+                fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$group->timemodified));
+                
+                //Now, backup groups_members
+                $status2 = backup_groups_members_info($bf,$preferences,$group->id);
+
+                //End group tag
+                fwrite ($bf,end_tag("GROUP",3,true));
+            }
+            //End groups tag
+            $status = fwrite ($bf,end_tag("GROUPS",2,true));
+        }
+        return ($status && $status2);
+    }
+
+    //Backup groups_members info
+    function backup_groups_members_info($bf,$preferences,$groupid) {
+  
+        global $CFG;
+        
+        $status = true;
+
+        //Get groups_members
+        $groups_members = get_records("groups_members","groupid",$groupid);
+        
+        //Pring groups_members header
+        if ($groups_members) {
+            //Pring groups_members header
+            fwrite ($bf,start_tag("MEMBERS",4,true));
+            //Iterate
+            foreach ($groups_members as $group_member) {
+                //Begin group_member tag
+                fwrite ($bf,start_tag("MEMBER",5,true));
+                //Output group_member contents
+                fwrite ($bf,full_tag("USERID",6,false,$group_member->userid));
+                fwrite ($bf,full_tag("TIMEADDED",6,false,$group_member->timeadded));
+                //End group_member tag
+                fwrite ($bf,end_tag("MEMBER",5,true));
+            }
+            //End groups_members tag
+            $status = fwrite ($bf,end_tag("MEMBERS",4,true));
+        }
+        return $status;
+    }
+
     //Start the modules tag
     function backup_modules_start ($bf,$preferences) {
       
@@ -741,6 +1132,49 @@
         
     }
 
+    //This function encode things to make backup multi-site fully functional
+    //It does this conversions:
+    // - $CFG->wwwroot/file.php/courseid ------------------> $@FILEPHP@$ (slasharguments links)
+    // - $CFG->wwwroot/file.php?file=/courseid ------------> $@FILEPHP@$ (non-slasharguments links)
+    // - Every module xxxx_encode_content_links() is executed too
+    //
+    function backup_encode_absolute_links($content) {
+
+        global $CFG,$preferences;
+
+        //Check if preferences is ok. If it isn't set, we are 
+        //in a scheduled_backup to we are able to get a copy
+        //from CFG->backup_preferences
+        if (!isset($preferences)) {
+            $mypreferences = $CFG->backup_preferences;
+        } else {
+            //We are in manual backups so global preferences must exist!!
+            $mypreferences = $preferences;
+        }
+
+        //First, we check for every call to file.php inside the course
+        $search = array($CFG->wwwroot.'/file.php/'.$mypreferences->backup_course,
+                        $CFG->wwwroot.'/file.php?file=/'.$mypreferences->backup_course);
+
+        $replace = array('$@FILEPHP@$','$@FILEPHP@$');
+
+        $result = str_replace($search,$replace,$content);
+
+        foreach ($mypreferences->mods as $name => $info) {
+            //Check if the xxxx_encode_content_links exists
+            $function_name = $name."_encode_content_links";
+            if (function_exists($function_name)) {
+                $result = $function_name($result,$mypreferences);
+            }
+        }
+
+        if ($result != $content && $CFG->debug>7) {                                  //Debug
+            echo "<br><hr>".$content."<br>changed to<br>".$result."<hr><br>";        //Debug
+        }                                                                            //Debug
+
+        return $result;
+    }
+
     //This function copies all the needed files under the "users" directory to the "user_files"
     //directory under temp/backup
     function backup_copy_user_files ($preferences) {
@@ -790,13 +1224,13 @@
         //in temp/backup/$backup_code  dir
         $status = check_and_create_course_files_dir($preferences->backup_unique_code);
 
-        //Now iterate over files and directories except $CFG->moddata and get_string("backupdir") to be
+        //Now iterate over files and directories except $CFG->moddata and backupdata to be
         //copied to backup
 
         $rootdir = $CFG->dataroot."/".$preferences->backup_course;
 
         $name_moddata = $CFG->moddata;
-        $name_backupdata = get_string("backupdir");
+        $name_backupdata = "backupdata";
         //Check if directory exists
         if (is_dir($rootdir)) {
             $list = list_directories_and_files ($rootdir);
@@ -818,7 +1252,7 @@
     //The zipped file is created in the backup directory and named with
     //the "oficial" name of the backup
     //It uses "pclzip" if available or system "zip" (unix only)
-    function backup_zip ($preferences,$moodle_home) {
+    function backup_zip ($preferences) {
     
         global $CFG;
 
@@ -832,31 +1266,42 @@
         $filelist = list_directories_and_files ($basedir);
 
         if (empty($CFG->zip)) {    // Use built-in php-based zip function
+            //echo "<br>Using pclzip";                                    //Debug
             $files = array();
             foreach ($filelist as $file) {
                 //If directory, append "/"
-                if (is_dir($basedir."/".$file)) {
-                    $file = $file."/";
-                }
+                //Commented. Not needed wit version 2.0 of pclzip !!
+                //if (is_dir($basedir."/".$file)) {
+                //    $file = $file."/";
+                //}
                 //Include into array
+                //echo "<br>Adding file/dir ".$file;                       //Debug
                 $files[] = $basedir."/".$file;
             }
-            include_once($moodle_home."/lib/pclzip/pclzip.lib.php");
+            include_once("$CFG->dirroot/lib/pclzip/pclzip.lib.php");
+            //include_once("$CFG->dirroot/lib/pclzip/pclerror.lib.php");   //Debug
+            //include_once("$CFG->dirroot/lib/pclzip/pcltrace.lib.php");   //Debug
+            //PclTraceOn(2);                                               //Debug
             $archive = new PclZip("$basedir/$name");
             if (($list = $archive->create($files,PCLZIP_OPT_REMOVE_PATH,$basedir)) == 0) {
                 error($archive->errorInfo(true));
                 $status = false;
             } 
+            //PclTraceDisplay();                                           //Debug
+            //PclTraceOff();                                               //Debug
         } else {                   // Use external zip program
+            //echo "<br>Using external zip";                               //Debug
             $files = "";
             foreach ($filelist as $file) {
                 $files .= basename($file);
                 $files .= " ";
             }
             $command = "cd $basedir ; $CFG->zip -r $name $files";
+            //echo "<br>Executing command: ".$command;                     //Debug
             $status = Exec($command);
         }
 
+        //echo "<br>Status: ".$status;                                     //Debug
         return $status;
 
     } 
@@ -866,13 +1311,42 @@
     
         global $CFG;
 
-        //Backup zip file name
+        $status = true;
+
+        //Define zip location (from)
         $from_zip_file = $CFG->dataroot."/temp/backup/".$preferences->backup_unique_code."/".$preferences->backup_name;
-        $to_zip_file = $CFG->dataroot."/".$preferences->backup_course."/".get_string("backupdir")."/".$preferences->backup_name;
-   
-        //Check to directory
-        $status = check_dir_exists(dirname($to_zip_file),true);
-       
+
+        //Initialise $to_zip_file
+        $to_zip_file="";
+
+        //If $preferences->backup_destination isn't empty, then copy to custom directory
+        if (!empty($preferences->backup_destination)) {
+            $to_zip_file = $preferences->backup_destination."/".$preferences->backup_name;
+        } else {
+            //Define zip destination (course dir)
+            $to_zip_file = $CFG->dataroot."/".$preferences->backup_course;
+    
+            //echo "<p>From: ".$from_zip_file."<br>";                                              //Debug
+    
+            //echo "<p>Checking: ".$to_zip_file."<br>";                                          //Debug
+    
+            //Checks course dir exists
+            $status = check_dir_exists($to_zip_file,true);
+    
+            //Define zip destination (backup dir)
+            $to_zip_file = $to_zip_file."/backupdata";
+    
+            //echo "<p>Checking: ".$to_zip_file."<br>";                                          //Debug
+    
+            //Checks backup dir exists
+            $status = check_dir_exists($to_zip_file,true);
+
+            //Define zip destination (zip file)
+            $to_zip_file = $to_zip_file."/".$preferences->backup_name;
+        }
+
+        //echo "<p>To: ".$to_zip_file."<br>";                                              //Debug
+
         //Copy zip file
         if ($status) {
             $status = backup_copy_file ($from_zip_file,$to_zip_file);

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

@@ -1,69 +0,0 @@
-<?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");
-    } 
-
-    //Finally, return result
-    return $result;
-
-}
-
-?>

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

@@ -2,16 +2,38 @@
     //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)
-    //Two days seems to be apropiate
+    //Four hours seem to be appropiate now that backup is stable
     function backup_delete_old_data() {
 
         global $CFG; 
 
         //Change this if you want !!
-        $days = 2;
+        $hours = 4;
         //End change this
-        $seconds = $days * 24 * 60 * 60;
+        $seconds = $hours * 60 * 60;
         $delete_from = time()-$seconds;
         //Now delete from tables
         $status = execute_sql("DELETE FROM {$CFG->prefix}backup_ids
@@ -38,7 +60,7 @@
         foreach ($list as $file) {
             $file_path = $CFG->dataroot."/temp/backup/".$file;
             $moddate = filemtime($file_path);
-            if ($status and $moddate < $delete_from) {
+            if ($status && $moddate < $delete_from) {
                 //If directory, recurse
                 if (is_dir($file_path)) {
                     $status = delete_dir_contents($file_path);
@@ -92,36 +114,63 @@
     }
 
     //Function to delete all the directory contents recursively
-    //Copied from admin/delete.php
-    function delete_dir_contents ($rootdir) {
+    //it supports a excluded dit too
+    //Copied from the web !!
+    function delete_dir_contents ($dir,$excludeddir="") {
 
-        $dir = opendir($rootdir);
+        $slash = "/";
 
-        $status = true;
+        // Create arrays to store files and directories
+        $dir_files      = array();
+        $dir_subdirs    = array();
 
-        while ($file = readdir($dir)) {
-            if ($file != "." and $file != "..") {
-                $fullfile = "$rootdir/$file";
-                if (filetype($fullfile) == "dir") {
-                    delete_dir_contents($fullfile);
-                    if (!rmdir($fullfile)) {
-                        $status = false;
-                    }
-                } else {
-                    if (!unlink("$fullfile")) {
-                        $status = false;
-                    }
+        // 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;
                 }
             }
         }
-        closedir($dir);
- 
-        return $status;
 
+        // Close directory
+        closedir($handle);
+
+        // Success, every thing is gone return true
+        return true;
     }
 
     //Function to clear (empty) the contents of the backup_dir
-    //Copied from admin/delete.php
     function clear_backup_dir($backup_unique_code) {
   
         global $CFG; 
@@ -157,6 +206,8 @@
     //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)) {
@@ -174,6 +225,8 @@
     //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)) {
@@ -225,22 +278,33 @@
     //Little modifications done
   
     function backup_copy_file ($from_file,$to_file) {
+
+        global $CFG;
+
         if (is_file($from_file)) {
-            $perms=fileperms($from_file);
-            return copy($from_file,$to_file) && chmod($to_file,$perms);
+            //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)) {
-            mkdir($to_file);
-            chmod("$to_file",0777);
+            //echo "<br>Creating ".$to_file;                                //Debug
+            umask(0000);
+            $status = mkdir($to_file,$CFG->directorypermissions);
         }
         $dir = opendir($from_file);
         while ($file=readdir($dir)) {
@@ -256,72 +320,113 @@
     // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
     // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-    //This function upgrades, if necesary, the backup-restore tables
-    //It's called from backup.php and restore.php
-    function upgrade_backup_db($updgradeto,$backup_release,$continueto) {
-    
-        global $CFG,$db;
 
-        //Check backup_version
-        if ($CFG->backup_version) {
-            if ($updgradeto > $CFG->backup_version) {  // upgrade
-                $a->oldversion = $CFG->backup_version;
-                $a->newversion = $updgradeto;
-                $strdatabasechecking = get_string("databasechecking", "", $a);
-                $strdatabasesuccess  = get_string("databasesuccess");
-                print_header($strdatabasechecking, $strdatabasechecking, $strdatabasechecking);
-                print_heading($strdatabasechecking);
-                $db->debug=true;
-                if (backup_upgrade($a->oldversion)) {
-                    $db->debug=false;
-                    if (set_config("backup_version", $a->newversion)) {
-                        notify($strdatabasesuccess, "green");
-                        notify("You are running Backup/Recovery version ".$backup_release,"black");
-                        print_continue($continueto);
-                        die;
-                    } else {
-                        notify("Upgrade failed!  (Could not update version in config table)");
-                        die;
-                    }
-                } else {
-                    $db->debug=false;
-                    notify("Upgrade failed!  See backup_version.php");
-                    die;
-                }
-            } else if ($updgradeto < $CFG->backup_version) {
-                notify("WARNING!!!  The code you are using is OLDER than the version that made these databases!");
-            }
-        //Not exists. Starting installation
-        } else {
-            $strdatabaseupgrades = get_string("databaseupgrades");
-            print_header($strdatabaseupgrades, $strdatabaseupgrades, $strdatabaseupgrades);
+    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
     
-            if (set_config("backup_version", "2003010100")) {
-                print_heading("You are currently going to install the needed structures to Backup/Recover");
-                print_continue($continue_to);
-                die;
+        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);
 
-        $status = execute_sql("INSERT INTO {$CFG->prefix}backup_ids
-                                   (backup_code, table_name, old_id, new_id, info)
-                               VALUES 
-                                   ($backup_unique_code, '$table', '$old_id', '$new_id', '$info')",false);
+        //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;
@@ -336,16 +441,96 @@
     }
 
     //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/mod/assignment/backuplib.php

@@ -1,171 +0,0 @@
-<?PHP //$Id$
-    //This php script contains all the stuff to backup/restore
-    //assignment mods
-
-    //This is the "graphical" structure of the assignment mod:
-    //
-    //                     assignment
-    //                    (CL,pk->id)             
-    //                        |
-    //                        |
-    //                        |
-    //                 assignment_submisions 
-    //           (UL,pk->id, fk->assignment,files)
-    //
-    // Meaning: pk->primary key field of the table
-    //          fk->foreign key to link with parent
-    //          nt->nested field (recursive data)
-    //          CL->course level info
-    //          UL->user level info
-    //          files->table may have files)
-    //
-    //-----------------------------------------------------------
-
-    //This function executes all the backup procedure about this mod
-    function assignment_backup_mods($bf,$preferences) {
-
-        global $CFG;
-
-        $status = true;
-
-        //Iterate over assignment table
-        $assignments = get_records ("assignment","course",$preferences->backup_course,"id");
-        if ($assignments) {
-            foreach ($assignments as $assignment) {
-                //Start mod
-                fwrite ($bf,start_tag("MOD",3,true));
-                //Print assignment data
-                fwrite ($bf,full_tag("ID",4,false,$assignment->id));
-                fwrite ($bf,full_tag("MODTYPE",4,false,"assignment"));
-                fwrite ($bf,full_tag("NAME",4,false,$assignment->name));
-                fwrite ($bf,full_tag("DESCRIPTION",4,false,$assignment->description));
-                fwrite ($bf,full_tag("FORMAT",4,false,$assignment->format));
-                fwrite ($bf,full_tag("RESUBMIT",4,false,$assignment->resubmit));
-                fwrite ($bf,full_tag("TYPE",4,false,$assignment->type));
-                fwrite ($bf,full_tag("MAXBYTES",4,false,$assignment->maxbytes));
-                fwrite ($bf,full_tag("TIMEDUE",4,false,$assignment->timedue));
-                fwrite ($bf,full_tag("GRADE",4,false,$assignment->grade));
-                fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$assignment->timemodified));
-                //if we've selected to backup users info, then execute backup_assignment_submisions
-                if ($preferences->mods["assignment"]->userinfo) {
-                    $status = backup_assignment_submissions($bf,$preferences,$assignment->id);
-                }
-                //End mod
-                $status =fwrite ($bf,end_tag("MOD",3,true));
-            }
-        }
-        //if we've selected to backup users info, then backup files too
-        if ($preferences->mods["assignment"]->userinfo) {
-            $status = backup_assignment_files($bf,$preferences);
-        }
-        return $status;  
-    }
-
-    //Backup assignment_submissions contents (executed from assignment_backup_mods)
-    function backup_assignment_submissions ($bf,$preferences,$assignment) {
-
-        global $CFG;
-
-        $status = true;
-
-        $assignment_submissions = get_records("assignment_submissions","assignment",$assignment,"id");
-        //If there is submissions
-        if ($assignment_submissions) {
-            //Write start tag
-            $status =fwrite ($bf,start_tag("SUBMISSIONS",4,true));
-            //Iterate over each submission
-            foreach ($assignment_submissions as $ass_sub) {
-                //Start submission
-                $status =fwrite ($bf,start_tag("SUBMISSION",5,true));
-                //Print submission contents
-                fwrite ($bf,full_tag("ID",6,false,$ass_sub->id));       
-                fwrite ($bf,full_tag("USERID",6,false,$ass_sub->userid));       
-                fwrite ($bf,full_tag("TIMECREATED",6,false,$ass_sub->timecreated));       
-                fwrite ($bf,full_tag("TIMEMODIFIED",6,false,$ass_sub->timemodified));       
-                fwrite ($bf,full_tag("NUMFILES",6,false,$ass_sub->numfiles));       
-                fwrite ($bf,full_tag("GRADE",6,false,$ass_sub->grade));       
-                fwrite ($bf,full_tag("COMMENT",6,false,$ass_sub->comment));       
-                fwrite ($bf,full_tag("TEACHER",6,false,$ass_sub->teacher));       
-                fwrite ($bf,full_tag("TIMEMARKED",6,false,$ass_sub->timemarked));       
-                fwrite ($bf,full_tag("MAILED",6,false,$ass_sub->mailed));       
-                //End submission
-                $status =fwrite ($bf,end_tag("SUBMISSION",5,true));
-            }
-            //Write end tag
-            $status =fwrite ($bf,end_tag("SUBMISSIONS",4,true));
-        }
-        return $status;
-    }
-
-    //Backup assignment files because we've selected to backup user info
-    //and files are user info's level
-    function backup_assignment_files($bf,$preferences) {
-
-        global $CFG;
-       
-        $status = true;
-
-        //First we check to moddata exists and create it as necessary
-        //in temp/backup/$backup_code  dir
-        $status = check_and_create_moddata_dir($preferences->backup_unique_code);
-        //Now copy the assignment dir
-        if ($status) {
-            $status = backup_copy_file($CFG->dataroot."/".$preferences->backup_course."/".$CFG->moddata."/assignment",
-                                       $CFG->dataroot."/temp/backup/".$preferences->backup_unique_code."/moddata/assignment");
-        }
-
-        return $status;
-
-    } 
-
-    //Return an array of info (name,value)
-    function assignment_check_backup_mods($course,$user_data=false,$backup_unique_code) {
-        //First the course data
-        $info[0][0] = get_string("modulenameplural","assignment");
-        if ($ids = assignment_ids ($course)) {
-            $info[0][1] = count($ids);
-        } else {
-            $info[0][1] = 0;
-        }
-
-        //Now, if requested, the user_data
-        if ($user_data) {
-            $info[1][0] = get_string("submissions","assignment");
-            if ($ids = assignment_submission_ids_by_course ($course)) { 
-                $info[1][1] = count($ids);
-            } else {
-                $info[1][1] = 0;
-            }
-        }
-        return $info;
-    }
-
-
-
-
-
-
-    // INTERNAL FUNCTIONS. BASED IN THE MOD STRUCTURE
-
-    //Returns an array of assignments id 
-    function assignment_ids ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT a.id, a.course
-                                 FROM {$CFG->prefix}assignment a
-                                 WHERE a.course = '$course'");
-    }
-    
-    //Returns an array of assignment_submissions id
-    function assignment_submission_ids_by_course ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT s.id , s.assignment
-                                 FROM {$CFG->prefix}assignment_submissions s,
-                                      {$CFG->prefix}assignment a
-                                 WHERE a.course = '$course' AND
-                                       s.assignment = a.id");
-    }
-?>

backup/mod/assignment/restorelib.php

@@ -1,64 +0,0 @@
-<?PHP //$Id$
-    //This php script contains all the stuff to backup/restore
-    //assignment mods
-
-    //This is the "graphical" structure of the assignment mod:
-    //
-    //                     assignment
-    //                    (CL,pk->id)             
-    //                        |
-    //                        |
-    //                        |
-    //                 assignment_submisions 
-    //           (UL,pk->id, fk->assignment,files)
-    //
-    // Meaning: pk->primary key field of the table
-    //          fk->foreign key to link with parent
-    //          nt->nested field (recursive data)
-    //          CL->course level info
-    //          UL->user level info
-    //          files->table may have files)
-    //
-    //-----------------------------------------------------------
-
-    //This function executes all the backup procedure about this mod
-    function assignment_restore_mods($bf,$preferences) {
-
-        global $CFG;
-
-        $status = true;
-
-        //Iterate over assignment table
-        $assignments = get_records ("assignment","course",$preferences->backup_course,"id");
-        if ($assignments) {
-            foreach ($assignments as $assignment) {
-                //Start mod
-                fwrite ($bf,start_tag("MOD",3,true));
-                //Print assignment data
-                fwrite ($bf,full_tag("ID",4,false,$assignment->id));
-                fwrite ($bf,full_tag("MODTYPE",4,false,"assignment"));
-                fwrite ($bf,full_tag("NAME",4,false,$assignment->name));
-                fwrite ($bf,full_tag("DESCRIPTION",4,false,$assignment->description));
-                fwrite ($bf,full_tag("FORMAT",4,false,$assignment->format));
-                fwrite ($bf,full_tag("RESUBMIT",4,false,$assignment->resubmit));
-                fwrite ($bf,full_tag("TYPE",4,false,$assignment->type));
-                fwrite ($bf,full_tag("MAXBYTES",4,false,$assignment->maxbytes));
-                fwrite ($bf,full_tag("TIMEDUE",4,false,$assignment->timedue));
-                fwrite ($bf,full_tag("GRADE",4,false,$assignment->grade));
-                fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$assignment->timemodified));
-                //if we've selected to backup users info, then execute backup_assignment_submisions
-                if ($preferences->mods["assignment"]->userinfo) {
-                    $status = backup_assignment_submissions($bf,$preferences,$assignment->id);
-                }
-                //End mod
-                $status =fwrite ($bf,end_tag("MOD",3,true));
-            }
-        }
-        //if we've selected to backup users info, then backup files too
-        if ($preferences->mods["assignment"]->userinfo) {
-            $status = backup_assignment_files($bf,$preferences);
-        }
-        return $status;  
-    }
-
-?>

backup/mod/choice/backuplib.php

@@ -1,141 +0,0 @@
-<?PHP //$Id$
-    //This php script contains all the stuff to backup/restore
-    //choice mods
-
-    //This is the "graphical" structure of the choice mod:
-    //
-    //                      choice                                      
-    //                    (CL,pk->id)
-    //                        |
-    //                        |
-    //                        |
-    //                   choice_answers 
-    //               (UL,pk->id, fk->choice)     
-    //
-    // Meaning: pk->primary key field of the table
-    //          fk->foreign key to link with parent
-    //          nt->nested field (recursive data)
-    //          CL->course level info
-    //          UL->user level info
-    //          files->table may have files)
-    //
-    //-----------------------------------------------------------
-
-    function choice_backup_mods($bf,$preferences) {
-        
-        global $CFG;
-
-        $status = true;
-
-        //Iterate over choice table
-        $choices = get_records ("choice","course",$preferences->backup_course,"id");
-        if ($choices) {
-            foreach ($choices as $choice) {
-                //Start mod
-                fwrite ($bf,start_tag("MOD",3,true));
-                //Print choice data
-                fwrite ($bf,full_tag("ID",4,false,$choice->id));
-                fwrite ($bf,full_tag("MODTYPE",4,false,"choice"));
-                fwrite ($bf,full_tag("NAME",4,false,$choice->name));
-                fwrite ($bf,full_tag("TEXT",4,false,$choice->text));
-                fwrite ($bf,full_tag("FORMAT",4,false,$choice->format));
-                fwrite ($bf,full_tag("ANSWER1",4,false,$choice->answer1));
-                fwrite ($bf,full_tag("ANSWER2",4,false,$choice->answer2));
-                fwrite ($bf,full_tag("ANSWER3",4,false,$choice->answer3));
-                fwrite ($bf,full_tag("ANSWER4",4,false,$choice->answer4));
-                fwrite ($bf,full_tag("ANSWER5",4,false,$choice->answer5));
-                fwrite ($bf,full_tag("ANSWER6",4,false,$choice->answer6));
-                fwrite ($bf,full_tag("PUBLISH",4,false,$choice->publish));
-                fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$choice->timemodified));
-                //if we've selected to backup users info, then execute backup_choice_answers
-                if ($preferences->mods["choice"]->userinfo) {
-                    $status = backup_choice_answers($bf,$preferences,$choice->id);
-                }
-                //End mod
-                $status =fwrite ($bf,end_tag("MOD",3,true));
-            }
-        }
-        return $status;
-    }
-
-    //Backup choice_answers contents (executed from choice_backup_mods)
-    function backup_choice_answers ($bf,$preferences,$choice) {
-
-        global $CFG;
-
-        $status = true;
-
-        $choice_answers = get_records("choice_answers","choice",$choice,"id");
-        //If there is submissions
-        if ($choice_answers) {
-            //Write start tag
-            $status =fwrite ($bf,start_tag("ANSWERS",4,true));
-            //Iterate over each answer
-            foreach ($choice_answers as $cho_ans) {
-                //Start answer
-                $status =fwrite ($bf,start_tag("ANSWER",5,true));
-                //Print submission contents
-                fwrite ($bf,full_tag("ID",6,false,$cho_ans->id));
-                fwrite ($bf,full_tag("USERID",6,false,$cho_ans->userid));
-                fwrite ($bf,full_tag("CHOICE_ANSWER",6,false,$cho_ans->answer));
-                fwrite ($bf,full_tag("TIMEMODIFIED",6,false,$cho_ans->timemodified));
-                //End answer
-                $status =fwrite ($bf,end_tag("ANSWER",5,true));
-            }
-            //Write end tag
-            $status =fwrite ($bf,end_tag("ANSWERS",4,true));
-        }
-        return $status;
-    }
-   
-   ////Return an array of info (name,value)
-   function choice_check_backup_mods($course,$user_data=false,$backup_unique_code) {
-        //First the course data
-        $info[0][0] = get_string("modulenameplural","choice");
-        if ($ids = choice_ids ($course)) {
-            $info[0][1] = count($ids);
-        } else {
-            $info[0][1] = 0;
-        }
-
-        //Now, if requested, the user_data
-        if ($user_data) {
-            $info[1][0] = get_string("responses","choice");
-            if ($ids = choice_answer_ids_by_course ($course)) {
-                $info[1][1] = count($ids);
-            } else {
-                $info[1][1] = 0;
-            }
-        }
-        return $info;
-    }
-
-
-
-
-
-
-    // INTERNAL FUNCTIONS. BASED IN THE MOD STRUCTURE
-
-    //Returns an array of choices id
-    function choice_ids ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT a.id, a.course
-                                 FROM {$CFG->prefix}choice a
-                                 WHERE a.course = '$course'");
-    }
-   
-    //Returns an array of choice_answers id
-    function choice_answer_ids_by_course ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT s.id , s.choice
-                                 FROM {$CFG->prefix}choice_answers s,
-                                      {$CFG->prefix}choice a
-                                 WHERE a.course = '$course' AND
-                                       s.choice = a.id");
-    }
-?>

backup/mod/choice/restorelib.php

@@ -1,61 +0,0 @@
-<?PHP //$Id$
-    //This php script contains all the stuff to backup/restore
-    //choice mods
-
-    //This is the "graphical" structure of the choice mod:
-    //
-    //                      choice                                      
-    //                    (CL,pk->id)
-    //                        |
-    //                        |
-    //                        |
-    //                   choice_answers 
-    //               (UL,pk->id, fk->choice)     
-    //
-    // Meaning: pk->primary key field of the table
-    //          fk->foreign key to link with parent
-    //          nt->nested field (recursive data)
-    //          CL->course level info
-    //          UL->user level info
-    //          files->table may have files)
-    //
-    //-----------------------------------------------------------
-
-    function choice_restore_mods($bf,$preferences) {
-        
-        global $CFG;
-
-        $status = true;
-
-        //Iterate over choice table
-        $choices = get_records ("choice","course",$preferences->backup_course,"id");
-        if ($choices) {
-            foreach ($choices as $choice) {
-                //Start mod
-                fwrite ($bf,start_tag("MOD",3,true));
-                //Print choice data
-                fwrite ($bf,full_tag("ID",4,false,$choice->id));
-                fwrite ($bf,full_tag("MODTYPE",4,false,"choice"));
-                fwrite ($bf,full_tag("NAME",4,false,$choice->name));
-                fwrite ($bf,full_tag("TEXT",4,false,$choice->text));
-                fwrite ($bf,full_tag("FORMAT",4,false,$choice->format));
-                fwrite ($bf,full_tag("ANSWER1",4,false,$choice->answer1));
-                fwrite ($bf,full_tag("ANSWER2",4,false,$choice->answer2));
-                fwrite ($bf,full_tag("ANSWER3",4,false,$choice->answer3));
-                fwrite ($bf,full_tag("ANSWER4",4,false,$choice->answer4));
-                fwrite ($bf,full_tag("ANSWER5",4,false,$choice->answer5));
-                fwrite ($bf,full_tag("ANSWER6",4,false,$choice->answer6));
-                fwrite ($bf,full_tag("PUBLISH",4,false,$choice->publish));
-                fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$choice->timemodified));
-                //if we've selected to backup users info, then execute backup_choice_answers
-                if ($preferences->mods["choice"]->userinfo) {
-                    $status = backup_choice_answers($bf,$preferences,$choice->id);
-                }
-                //End mod
-                $status =fwrite ($bf,end_tag("MOD",3,true));
-            }
-        }
-        return $status;
-    }
-
-?>

backup/mod/forum/backuplib.php

@@ -1,152 +0,0 @@
-<?PHP //$Id$
-    //This php script contains all the stuff to backup/restore
-    //forum mods
-
-    //This is the "graphical" structure of the forum mod:
-    //
-    //                           forum                                      
-    //                        (CL,pk->id)
-    //                            |
-    //             -----------------------------------        
-    //             |                                 |
-    //        subscriptions                    forum_discussions
-    //    (UL,pk->id, fk->forum)             (UL,pk->id, fk->forum)
-    //                                               |
-    //                                               |
-    //                                               |
-    //                                           forum_posts
-    //                             (UL,pk->id,fk->discussion,nt->parent,files) 
-    //                                               |
-    //                                               |
-    //                                               |
-    //                                          forum_ratings
-    //                                      (UL,pk->id,fk->post)
-    //
-    // Meaning: pk->primary key field of the table
-    //          fk->foreign key to link with parent
-    //          nt->nested field (recursive data)
-    //          CL->course level info
-    //          UL->user level info
-    //          files->table may have files)
-    //
-    //-----------------------------------------------------------
-
-    function forum_backup_mods() {
-        print "hola";
-    }
-
-   ////Return an array of info (name,value)
-   function NO_forum_check_backup_mods($course,$user_data=false,$backup_unique_code) {
-        //First the course data
-        $info[0][0] = get_string("modulenameplural","forum");
-        if ($ids = forum_ids ($course)) {
-            $info[0][1] = count($ids);
-        } else {
-            $info[0][1] = 0;
-        }
-
-        //Now, if requested, the user_data
-        if ($user_data) {
-            //Subscriptions
-            $info[1][0] = get_string("subscriptions","forum");
-            if ($ids = forum_subscription_ids_by_course ($course)) {
-                $info[1][1] = count($ids);
-            } else {
-                $info[1][1] = 0;
-            }
-            //Discussions
-            $info[2][0] = get_string("discussions","forum");
-            if ($ids = forum_discussion_ids_by_course ($course)) {
-                $info[2][1] = count($ids);
-            } else {
-                $info[2][1] = 0;
-            }
-            //Posts
-            $info[3][0] = get_string("posts","forum");
-            if ($ids = forum_post_ids_by_course ($course)) {
-                $info[3][1] = count($ids);
-            } else {
-                $info[3][1] = 0;
-            }
-            //Ratings
-            $info[4][0] = get_string("ratings","forum");
-            if ($ids = forum_rating_ids_by_course ($course)) {
-                $info[4][1] = count($ids);
-            } else {
-                $info[4][1] = 0;
-            }
-        }
-        return $info;
-    }
-
-
-
-
-
-
-    // INTERNAL FUNCTIONS. BASED IN THE MOD STRUCTURE
-
-    //Returns an array of forums id
-    function forum_ids ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT a.id, a.course
-                                 FROM {$CFG->prefix}forum a
-                                 WHERE a.course = '$course'");
-    }
-
-    //Returns an array of forum subscriptions id
-    function forum_subscription_ids_by_course ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT s.id , s.forum
-                                 FROM {$CFG->prefix}forum_subscriptions s,
-                                      {$CFG->prefix}forum a
-                                 WHERE a.course = '$course' AND
-                                       s.forum = a.id");
-    }
-
-    //Returns an array of forum discussions id
-    function forum_discussion_ids_by_course ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT s.id , s.forum      
-                                 FROM {$CFG->prefix}forum_discussions s,    
-                                      {$CFG->prefix}forum a 
-                                 WHERE a.course = '$course' AND
-                                       s.forum = a.id"); 
-    }
-
-    //Returns an array of forum posts id
-    function forum_post_ids_by_course ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT p.id , p.discussion, s.forum
-                                 FROM {$CFG->prefix}forum_posts p,
-                                      {$CFG->prefix}forum_discussions s,
-                                      {$CFG->prefix}forum a
-                                 WHERE a.course = '$course' AND
-                                       s.forum = a.id AND
-                                       p.discussion = s.id");
-    }
-
-    //Returns an array of ratings posts id      
-    function forum_rating_ids_by_course ($course) {      
-
-        global $CFG;
-
-        return get_records_sql ("SELECT r.id, r.post, p.discussion, s.forum
-                                 FROM {$CFG->prefix}forum_ratings r,
-                                      {$CFG->prefix}forum_posts p,
-                                      {$CFG->prefix}forum_discussions s,
-                                      {$CFG->prefix}forum a    
-                                 WHERE a.course = '$course' AND
-                                       s.forum = a.id AND   
-                                       p.discussion = s.id AND
-                                       r.post = p.id");
-    }
-?>

backup/mod/journal/backuplib.php

@@ -1,78 +0,0 @@
-<?PHP //$Id$
-    //This php script contains all the stuff to backup/restore
-    //journal mods
-
-    //This is the "graphical" structure of the journal mod:
-    //
-    //                      journal                                      
-    //                    (CL,pk->id)
-    //                        |
-    //                        |
-    //                        |
-    //                   journal_entries 
-    //               (UL,pk->id, fk->journal)     
-    //
-    // Meaning: pk->primary key field of the table
-    //          fk->foreign key to link with parent
-    //          nt->nested field (recursive data)
-    //          CL->course level info
-    //          UL->user level info
-    //          files->table may have files)
-    //
-    //-----------------------------------------------------------
-
-    function journal_backup_mods($course,$user_data=false,$backup_unique_code) {
-        print "hola";
-    }
-   
-   ////Return an array of info (name,value)
-   function NO_journal_check_backup_mods($course,$user_data=false,$backup_unique_code) {
-        //First the course data
-        $info[0][0] = get_string("modulenameplural","journal");
-        if ($ids = journal_ids ($course)) {
-            $info[0][1] = count($ids);
-        } else {
-            $info[0][1] = 0;
-        }
-
-        //Now, if requested, the user_data
-        if ($user_data) {
-            $info[1][0] = get_string("entries","journal");
-            if ($ids = journal_entry_ids_by_course ($course)) {
-                $info[1][1] = count($ids);
-            } else {
-                $info[1][1] = 0;
-            }
-        }
-        return $info;
-    }
-
-
-
-
-
-
-    // INTERNAL FUNCTIONS. BASED IN THE MOD STRUCTURE
-
-    //Returns an array of journals id
-    function journal_ids ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT a.id, a.course
-                                 FROM {$CFG->prefix}journal a
-                                 WHERE a.course = '$course'");
-    }
-   
-    //Returns an array of journal entries id
-    function journal_entry_ids_by_course ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT s.id , s.journal
-                                 FROM {$CFG->prefix}journal_entries s,
-                                      {$CFG->prefix}journal a
-                                 WHERE a.course = '$course' AND
-                                       s.journal = a.id");
-    }
-?>

backup/mod/pgassignment/backuplib.php

@@ -1,125 +0,0 @@
-<?PHP //$Id$
-    //This php script contains all the stuff to backup/restore
-    //pgassignment mods
-
-    //This is the "graphical" structure of the pgassignment mod:
-    //
-    //                        pgassignment                                      
-    //                        (CL,pk->id)
-    //                            |
-    //             -----------------------------------        
-    //             |                                 |
-    //     pgassignment_elements            pgassignment_submissions
-    //  (CL,pk->id, fk->pgassignment)   (UL,pk->id, fk->pgassignment,files)
-    //                                               |
-    //                                               |
-    //                                               |
-    //                                       pgasignments_grades
-    //                                  (UL,pk->id,fk->submission) 
-    //
-    // Meaning: pk->primary key field of the table
-    //          fk->foreign key to link with parent
-    //          nt->nested field (recursive data)
-    //          CL->course level info
-    //          UL->user level info
-    //          files->table may have files)
-    //
-    //-----------------------------------------------------------
-
-    function NO_pgassignment_backup_mods($course,$user_data=false,$backup_unique_code) {
-        print "hola";
-    }
-
-   ////Return an array of info (name,value)
-   function pgassignment_check_backup_mods($course,$user_data=false,$backup_unique_code) {
-        //First the course data
-        $info[0][0] = get_string("modulenameplural","pgassignment");
-        if ($ids = pgassignment_ids ($course)) {
-            $info[0][1] = count($ids);
-        } else {
-            $info[0][1] = 0;
-        }
-        //Elements
-        $info[1][0] = get_string("elements","pgassignment");
-        if ($ids = pgassignment_element_ids_by_course ($course)) { 
-            $info[1][1] = count($ids);
-        } else {
-            $info[1][1] = 0;
-        }
-
-        //Now, if requested, the user_data
-        if ($user_data) {
-            //Submissions
-            $info[2][0] = get_string("submissions","pgassignment");
-            if ($ids = pgassignment_submission_ids_by_course ($course)) {
-                $info[2][1] = count($ids);
-            } else {
-                $info[2][1] = 0;
-            }
-            //Grades
-            $info[3][0] = get_string("grades","pgassignment");
-            if ($ids = pgassignment_grade_ids_by_course ($course)) {
-                $info[3][1] = count($ids);
-            } else {
-                $info[3][1] = 0;
-            }
-        }
-        return $info;
-    }
-
-
-
-
-
-
-    // INTERNAL FUNCTIONS. BASED IN THE MOD STRUCTURE
-
-    //Returns an array of pgassignments id
-    function pgassignment_ids ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT a.id, a.course
-                                 FROM {$CFG->prefix}pgassignment a
-                                 WHERE a.course = '$course'");
-    }
-
-    //Returns an array of pgassignment elements id
-    function pgassignment_element_ids_by_course ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT s.id , s.pgassignment
-                                 FROM {$CFG->prefix}pgassignment_elements s,
-                                      {$CFG->prefix}pgassignment a
-                                 WHERE a.course = '$course' AND
-                                       s.pgassignment = a.id");
-    }
-
-    //Returns an array of pgassignment submissions id
-    function pgassignment_submission_ids_by_course ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT s.id , s.pgassignment
-                                 FROM {$CFG->prefix}pgassignment_submissions s,
-                                      {$CFG->prefix}pgassignment a
-                                 WHERE a.course = '$course' AND
-                                       s.pgassignment = a.id");
-    }
-
-    //Returns an array of pgassignment grades id
-    function pgassignment_grade_ids_by_course ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT g.id , g.submission, s.pgassignment
-                                 FROM {$CFG->prefix}pgassignment_grades g,
-                                      {$CFG->prefix}pgassignment_submissions s,
-                                      {$CFG->prefix}pgassignment a
-                                 WHERE a.course = '$course' AND
-                                       s.pgassignment = a.id AND
-                                       g.submission = s.id");
-    }
-
-?>

backup/mod/quiz/backuplib.php

@@ -1,148 +0,0 @@
-<?PHP //$Id$
-    //This php script contains all the stuff to backup/restore
-    //quiz mods
-
-   //To see, put your terminal to 132cc
-
-    //This is the "graphical" structure of the quiz mod:
-    //
-    //                           quiz                                                      quiz_categories
-    //                        (CL,pk->id)                                                   (CL,pk->id)
-    //                            |                                                              |
-    //             -----------------------------------------------                               |
-    //             |                        |                    |                               |
-    //             |                        |                    |                               |
-    //             |                        |                    |                               |
-    //        quiz_attemps           quiz_grades         quiz_question_grades                    |
-    //   (UL,pk->id, fk->quiz)   (UL,pk->id,fk->quiz)    (UL,pk->id,fk->quiz)                    |
-    //             |                                              |                              |
-    //             |                                              |                              |
-    //             |                                              |                              |
-    //       quiz_responses                                       |                        quiz_questions     
-    //  (UL,pk->id, fk->attempt)----------------------------------------------------(CL,pk->id,fk->category,files)
-    //                                                                                           |
-    //                                                                                           |
-    //                                                                                           |
-    //             ------------------------------------------------------------------------------------------------------
-    //             |                         |                        |                |    
-    //             |                         |                        |                |
-    //             |                         |                        |                |           quiz_randomsamatch
-    //       quiz_truefalse           quiz_shortanswer         quiz_multichoice        |---------(CL,pl->id,fk->question)
-    //  (CL,pl->id,fk->question)  (CL,pl->id,fk->question)  (CL,pl->id,fk->question)   |
-    //             .                         .                        .                |
-    //             .                         .                        .                |
-    //             .                         .                        .                |               quiz_match
-    //             ....................................................                |---------(CL,pl->id,fk->question)
-    //                                       .                                         |                    .
-    //                                       .                                         |                    .
-    //                                       .                                         |                    .
-    //                                    quiz_answers                                 |              quiz_match_sub
-    //                             (CL,pk->id,fk->question)----------------------------|---------(CL,pl->id,fk->question) 
-    // 
-    // Meaning: pk->primary key field of the table
-    //          fk->foreign key to link with parent
-    //          nt->nested field (recursive data)
-    //          CL->course level info
-    //          UL->user level info
-    //          files->table may have files
-    //
-    //-----------------------------------------------------------
-
-    //THIS MOD BACKUP NEEDS TO USE THE mdl_backup_ids TABLE
-
-    function quiz_backup_mods($course,$user_data=false,$backup_unique_code) {
-        print "hola";
-    }
-
-   ////Return an array of info (name,value)
-   function NO_quiz_check_backup_mods($course,$user_data=false,$backup_unique_code) {
-        //Deletes data from mdl_backup_ids (categories section)
-        delete_category_ids ($backup_unique_code);
-        //Create date into mdl_backup_ids (categories section)
-        insert_category_ids ($course,$backup_unique_code);
-        //First the course data
-        $info[0][0] = get_string("modulenameplural","quiz");
-        if ($ids = quiz_ids ($course)) {
-            $info[0][1] = count($ids);
-        } else {
-            $info[0][1] = 0;
-        }
-        //Categories
-        $info[1][0] = get_string("categories","quiz");
-        if ($ids = quiz_category_ids_by_backup ($backup_unique_code)) {
-            $info[1][1] = count($ids);
-        } else {
-            $info[1][1] = 0;
-        }
-        //Questions
-        $info[2][0] = get_string("questions","quiz");
-        if ($ids = quiz_question_ids_by_backup ($backup_unique_code)) {
-            $info[2][1] = count($ids);
-        } else {
-            $info[2][1] = 0;
-        }
-
-        //Now, if requested, the user_data
-        if ($user_data) {
-            //Grades 
-            $info[3][0] = get_string("grades","quiz"); 
-            if ($ids = quiz_grade_ids_by_course ($course)) { 
-                $info[3][1] = count($ids);
-            } else {
-                $info[3][1] = 0;
-            }
-        }
-
-        return $info;
-    }
-
-
-
-
-
-
-    // INTERNAL FUNCTIONS. BASED IN THE MOD STRUCTURE
-
-    //Returns an array of quiz id
-    function quiz_ids ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT a.id, a.course
-                                 FROM {$CFG->prefix}quiz a
-                                 WHERE a.course = '$course'");
-    }
-
-    //Returns an array of categories id
-    function quiz_category_ids_by_backup ($backup_unique_code) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT a.old_id, a.backup_code
-                                 FROM {$CFG->prefix}backup_ids a
-                                 WHERE a.backup_code = '$backup_unique_code'");
-    }
-
-    function quiz_question_ids_by_backup ($backup_unique_code) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT q.id, q.category
-                                 FROM {$CFG->prefix}backup_ids a,
-                                      {$CFG->prefix}quiz_questions q
-                                 WHERE a.backup_code = '$backup_unique_code' and
-                                       q.category = a.old_id");
-    }
-
-    function quiz_grade_ids_by_course ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT g.id, g.quiz 
-                                 FROM {$CFG->prefix}quiz a,
-                                      {$CFG->prefix}quiz_grades g
-                                 WHERE a.course = '$course' and
-                                       g.quiz = a.id");
-    }
-
-?>

backup/mod/resource/backuplib.php

@@ -1,77 +0,0 @@
-<?PHP //$Id$
-    //This php script contains all the stuff to backup/restore
-    //resource mods
-
-    //This is the "graphical" structure of the resource mod:
-    //
-    //                     resource                                      
-    //                 (CL,pk->id,files)
-    //
-    // Meaning: pk->primary key field of the table
-    //          fk->foreign key to link with parent
-    //          nt->nested field (recursive data)
-    //          CL->course level info
-    //          UL->user level info
-    //          files->table may have files)
-    //
-    //-----------------------------------------------------------
-
-    //This function executes all the backup procedure about this mod
-    function resource_backup_mods($bf,$preferences) {
-        global $CFG;
-
-        $status = true; 
-
-        ////Iterate over resource table
-        $resources = get_records ("resource","course",$preferences->backup_course,"id");
-        if ($resources) {
-            foreach ($resources as $resource) {
-                //Start mod
-                fwrite ($bf,start_tag("MOD",3,true));
-                //Print assignment data
-                fwrite ($bf,full_tag("ID",4,false,$resource->id));
-                fwrite ($bf,full_tag("MODTYPE",4,false,"resource"));
-                fwrite ($bf,full_tag("NAME",4,false,$resource->name));
-                fwrite ($bf,full_tag("TYPE",4,false,$resource->type));
-                fwrite ($bf,full_tag("REFERENCE",4,false,$resource->reference));
-                fwrite ($bf,full_tag("SUMMARY",4,false,$resource->summary));
-                fwrite ($bf,full_tag("ALLTEXT",4,false,$resource->alltext));
-                fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$resource->timemodified));
-                //End mod
-                $status = fwrite ($bf,end_tag("MOD",3,true));
-            }
-        }
-        return $status;
-    }
-   
-   ////Return an array of info (name,value)
-   function resource_check_backup_mods($course,$user_data=false,$backup_unique_code) {
-        //First the course data
-        $info[0][0] = get_string("modulenameplural","resource");
-        if ($ids = resource_ids ($course)) {
-            $info[0][1] = count($ids);
-        } else {
-            $info[0][1] = 0;
-        }
-
-        return $info;
-    }
-
-
-
-
-
-
-    // INTERNAL FUNCTIONS. BASED IN THE MOD STRUCTURE
-
-    //Returns an array of resources id
-    function resource_ids ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT a.id, a.course
-                                 FROM {$CFG->prefix}resource a
-                                 WHERE a.course = '$course'");
-    }
-   
-?>

backup/mod/resource/restorelib.php

@@ -1,47 +0,0 @@
-<?PHP //$Id$
-    //This php script contains all the stuff to backup/restore
-    //resource mods
-
-    //This is the "graphical" structure of the resource mod:
-    //
-    //                     resource                                      
-    //                 (CL,pk->id,files)
-    //
-    // Meaning: pk->primary key field of the table
-    //          fk->foreign key to link with parent
-    //          nt->nested field (recursive data)
-    //          CL->course level info
-    //          UL->user level info
-    //          files->table may have files)
-    //
-    //-----------------------------------------------------------
-
-    //This function executes all the restore procedure about this mod
-    function resource_restore_mods($bf,$preferences) {
-        global $CFG;
-
-        $status = true; 
-
-        ////Iterate over resource table
-        $resources = get_records ("resource","course",$preferences->backup_course,"id");
-        if ($resources) {
-            foreach ($resources as $resource) {
-                //Start mod
-                fwrite ($bf,start_tag("MOD",3,true));
-                //Print assignment data
-                fwrite ($bf,full_tag("ID",4,false,$resource->id));
-                fwrite ($bf,full_tag("MODTYPE",4,false,"resource"));
-                fwrite ($bf,full_tag("NAME",4,false,$resource->name));
-                fwrite ($bf,full_tag("TYPE",4,false,$resource->type));
-                fwrite ($bf,full_tag("REFERENCE",4,false,$resource->reference));
-                fwrite ($bf,full_tag("SUMMARY",4,false,$resource->summary));
-                fwrite ($bf,full_tag("ALLTEXT",4,false,$resource->alltext));
-                fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$resource->timemodified));
-                //End mod
-                $status = fwrite ($bf,end_tag("MOD",3,true));
-            }
-        }
-        return $status;
-    }
-   
-?>

backup/mod/survey/backuplib.php

@@ -1,174 +0,0 @@
-<?PHP //$Id$
-    //This php script contains all the stuff to backup/restore
-    //survey mods
-
-    //This is the "graphical" structure of the survey mod:
-    //                                                    --------------------
-    //                           survey                   | survey_questions |
-    //                        (CL,pk->id)                 |(CL,pk->id,?????) |
-    //                            |                       --------------------
-    //                            |
-    //             -----------------------------------        
-    //             |                                 |
-    //        survey_analysis                   survey_answers
-    //    (UL,pk->id, fk->survey)           (UL,pk->id, fk->survey)
-    //
-    // Meaning: pk->primary key field of the table
-    //          fk->foreign key to link with parent
-    //          nt->nested field (recursive data)
-    //          CL->course level info
-    //          UL->user level info
-    //          files->table may have files)
-    //
-    //-----------------------------------------------------------
-
-    function survey_backup_mods($bf,$preferences) {
-
-        global $CFG;
-
-        $status = true;
-
-        //Iterate over survey table
-        $surveys = get_records ("survey","course",$preferences->backup_course,"id");
-        if ($surveys) {
-            foreach ($surveys as $survey) {
-                //Start mod
-                fwrite ($bf,start_tag("MOD",3,true));
-                //Print choice data
-                fwrite ($bf,full_tag("ID",4,false,$survey->id));
-                fwrite ($bf,full_tag("MODTYPE",4,false,"survey"));
-                fwrite ($bf,full_tag("TEMPLATE",4,false,$survey->template));
-                fwrite ($bf,full_tag("DAYS",4,false,$survey->days));
-                fwrite ($bf,full_tag("TIMECREATED",4,false,$survey->timecreated));
-                fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$survey->timemodified));
-                fwrite ($bf,full_tag("NAME",4,false,$survey->name));
-                fwrite ($bf,full_tag("INTRO",4,false,$survey->intro));
-                fwrite ($bf,full_tag("QUESTIONS",4,false,$survey->questions));
-
-                //if we've selected to backup users info, then execute backup_survey_answers and
-                //backup_survey_analysis
-                if ($preferences->mods["survey"]->userinfo) {
-                    $status = backup_survey_answers($bf,$preferences,$survey->id);
-                    $status = backup_survey_analysis($bf,$preferences,$survey->id);
-                }
-                //End mod
-                $status =fwrite ($bf,end_tag("MOD",3,true));
-            }
-        }
-        return $status;
-    }
-
-    //Backup survey_answers contents (executed from survey_backup_mods)
-    function backup_survey_answers ($bf,$preferences,$survey) {
-
-        global $CFG;
-
-        $status = true;
-
-        $survey_answers = get_records("survey_answers","survey",$survey,"id");
-        //If there is answers
-        if ($survey_answers) {
-            //Write start tag
-            $status =fwrite ($bf,start_tag("ANSWERS",4,true));
-            //Iterate over each answer
-            foreach ($survey_answers as $sur_ans) {
-                //Start answer
-                $status =fwrite ($bf,start_tag("ANSWER",5,true));
-                //Print survey_answers contents
-                fwrite ($bf,full_tag("ID",6,false,$sur_ans->id));
-                fwrite ($bf,full_tag("USERID",6,false,$sur_ans->userid));
-                fwrite ($bf,full_tag("QUESTION",6,false,$sur_ans->question));
-                fwrite ($bf,full_tag("TIME",6,false,$sur_ans->time));
-                fwrite ($bf,full_tag("ANSWER1",6,false,$sur_ans->answer1));
-                fwrite ($bf,full_tag("ANSWER2",6,false,$sur_ans->answer2));
-                //End answer
-                $status =fwrite ($bf,end_tag("ANSWER",5,true));
-            }
-            //Write end tag
-            $status =fwrite ($bf,end_tag("ANSWERS",4,true));
-        }
-        return $status;
-    }
-
-    //Backup survey_analysis contents (executed from survey_backup_mods)
-    function backup_survey_analysis ($bf,$preferences,$survey) {
-
-        global $CFG;
-
-        $status = true;
-
-        $survey_analysis = get_records("survey_analysis","survey",$survey,"id");
-        //If there is analysis
-        if ($survey_analysis) {
-            //Write start tag
-            $status =fwrite ($bf,start_tag("ANALYSIS",4,true));
-            //Iterate over each analysis
-            foreach ($survey_analysis as $sur_ana) {
-                //Start answer
-                $status =fwrite ($bf,start_tag("ANALYS",5,true));
-                //Print survey_analysis contents
-                fwrite ($bf,full_tag("ID",6,false,$sur_ana->id));
-                fwrite ($bf,full_tag("USERID",6,false,$sur_ana->userid));
-                fwrite ($bf,full_tag("NOTES",6,false,$sur_ana->notes));
-                //End answer
-                $status =fwrite ($bf,end_tag("ANALYS",5,true));
-            }
-            //Write end tag
-            $status =fwrite ($bf,end_tag("ANALYSIS",4,true));
-        }
-        return $status;
-    }
-
-    ////Return an array of info (name,value)
-   function survey_check_backup_mods($course,$user_data=false,$backup_unique_code) {
-       //First the course data
-       $info[0][0] = get_string("modulenameplural","survey");
-       if ($ids = survey_ids ($course)) {
-           $info[0][1] = count($ids);
-       } else {
-           $info[0][1] = 0;
-       }
-
-        //Now, if requested, the user_data
-        if ($user_data) {
-            //Subscriptions
-            $info[1][0] = get_string("answers","survey");
-            if ($ids = survey_answer_ids_by_course ($course)) {
-                $info[1][1] = count($ids);
-            } else {
-                $info[1][1] = 0;
-            }
-        }
-        return $info;
-    }
-
-
-
-
-
-
-    // INTERNAL FUNCTIONS. BASED IN THE MOD STRUCTURE
-
-    //Returns an array of surveys id
-    function survey_ids ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT a.id, a.course
-                                 FROM {$CFG->prefix}survey a
-                                 WHERE a.course = '$course'");
-    }
-
-    //Returns an array of survey answer id
-    function survey_answer_ids_by_course ($course) {
-
-        global $CFG;
-
-        return get_records_sql ("SELECT s.id , s.survey
-                                 FROM {$CFG->prefix}survey_answers s,
-                                      {$CFG->prefix}forum a
-                                 WHERE a.course = '$course' AND
-                                       s.survey = a.id");
-    }
-
-?>

backup/restore.php

@@ -3,40 +3,48 @@
 
     //Define some globals for all the script
 
-    //MUST CHANGE WITH FINAL BACKUP LOCATION !! WITHOUT TRAILING SLASH !!
-    //ALL RELATIVE FROM THE LOCATION OF THE restore.php SCRIPT !!!
-
-    $moodle_home = "../../..";
-    $mods_home = "mod";
-
-    //END MUST CHANGE
-
     //Units used
-    require_once ("$moodle_home/config.php");
-    require_once ("$moodle_home/version.php");
-    require_once ("backup_version.php");
-    require_once ("db/backup_$CFG->dbtype.php");
+    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();
 
-    //Check admin
-    if (!isadmin()) {
-        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+    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
-    upgrade_backup_db($backup_version,$backup_release,"restore.php");
+    if ($file) {
+        $linkto = "restore.php?id=".$id."&file=".$file;
+    } else {
+        $linkto = "restore.php";
+    }
+    upgrade_backup_db($linkto);
 
     //Get strings
     $strcourserestore = get_string("courserestore");
@@ -45,9 +53,9 @@
     //If no file has been selected from the FileManager, inform and end
     if (!$file) {
         print_header("$site->shortname: $strcourserestore", $site->fullname,
-                     "<A HREF=\"$moodle_home/$CFG->admin/index.php\">$stradministration</A> -> $strcourserestore");
+                     "<A HREF=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</A> -> $strcourserestore");
         print_heading(get_string("nofilesselected"));
-        print_continue("$moodle_home/$CFG->admin/index.php");
+        print_continue("$CFG->wwwroot/$CFG->admin/index.php");
         print_footer();
         exit;
     }
@@ -55,21 +63,39 @@
     //If cancel has been selected, inform and end
     if ($cancel) {
         print_header("$site->shortname: $strcourserestore", $site->fullname,
-                     "<A HREF=\"$moodle_home/$CFG->admin/index.php\">$stradministration</A> -> $strcourserestore");
+                     "<A HREF=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</A> -> $strcourserestore");
         print_heading(get_string("restorecancelled"));
-        print_continue("$moodle_home/$CFG->admin/index.php");
+        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
-    print_header("$site->shortname: $strcourserestore", $site->fullname,
-                 "<A HREF=\"$moodle_home/$CFG->admin/index.php\">$stradministration</A> ->
-                  $strcourserestore -> ".basename($file));
+    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) {
@@ -87,4 +113,3 @@
     print_footer();
 
 ?>
-

backup/restore_check.html

@@ -9,12 +9,14 @@
     if ($SESSION) {
         $info = $SESSION->info;
         $course_header = $SESSION->course_header;
-        $restore = $SESSION->restore;
+        if (isset($SESSION->restore)) {
+            $restore = $SESSION->restore;
+        }
     }
 
     //If restore session info exists, but we are posting parameters
     //manually, this has prioriry
-    if ($restore and isset($restore_restoreto)) {
+    if (isset($restore) and isset($restore_restoreto)) {
         unset($restore);
     }
 
@@ -29,7 +31,7 @@
     //If the restore object doesn't exist, we are going
     //to check every variable individually and create it
 
-    if (!$restore) {
+    if (!isset($restore)) {
         //Check that we have all we need
         //backup_unique_code
         require_variable($backup_unique_code);
@@ -98,8 +100,14 @@
     require_login();
 
     //Check admin
-    if (!isadmin()) {
-        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+    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
@@ -108,24 +116,51 @@
     }
  
     //Depending the selected restoreto:
-    //    0-Existing course: Select the destination course and launch the check again.
-    //    1-New course: Create the restore object (checking everything) and launch the execute.
+    // 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.
 
-    //Select course
-    if (($restore->restoreto == 0) and ($restore->course_id == 0)) {
-        if ($courses = get_courses()) {
+    //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&file=$file\">$course->fullname ($course->shortname)</A><BR>";
+                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("$moodle_home/$CFG->admin/index.php");
+            print_continue("$CFG->wwwroot/$CFG->admin/index.php");
         }
     //Checks everything and execute restore
-    } else if ((($restore->restoreto == 0) and ($restore->course_id != 0)) or ($restore->restoreto == 1)) {
+    } 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.
@@ -149,11 +184,10 @@
             //Print the continue button to execute the restore NOW !!!!
             //All is prepared !!!
             echo "<CENTER>";
-            echo get_string("presscontinuetolaunchrestore");
-            echo "<br>";
             $hidden["launch"]             = "execute";
             $hidden["file"]               =  $file;
-            print_single_button("restore.php", $hidden, get_string("continue"),"post");
+            $hidden["id"]                 =  $id;
+            print_single_button("restore.php", $hidden, get_string("restorecoursenow"),"post");
             echo "</CENTER>";
         } else {
             //Show error

backup/restore_execute.html

@@ -10,12 +10,22 @@
         $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 (!isadmin()) {
-        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+    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
@@ -23,6 +33,19 @@
         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>";
@@ -39,9 +62,11 @@
     //If we've selected to restore into new course
     //create it (course)
     //Saving conversion id variables into backup_tables
-    if ($restore->restoreto ==1) {
-        echo "<li>Creating new course";
-        $status = restore_create_new_course($restore,&$course_header);
+    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>";
@@ -54,23 +79,52 @@
     } else {
         $course = get_record("course","id",$restore->course_id);
         if ($course) {
-            echo "<li>Using existing course"; 
+            echo "<li>".get_string("usingexistingcourse"); 
             echo "<ul>";
-            echo "<li>From: ".$course_header->course_fullname." (".$course_header->course_shortname.")";
-            echo "<li>To: ".$course->fullname." (".$course->shortname.")";
+            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) {
-        if ($restore->restoreto == 1) {
-            echo "<li>Creating sections";
-            $status = restore_create_sections($restore,$xml_file);
-        } else if ($restore->restoreto == 0) {
-            echo "<li>Checking sections";
-            $status = restore_create_sections($restore,$xml_file);
+        //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;
         }
     }
@@ -78,11 +132,13 @@
 
     //Now create users as needed 
     if ($status and ($restore->users == 0 or $restore->users == 1)) {
-        echo "<li>Creating users";
-        $status = restore_create_users($restore,$xml_file);
+        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, info from {$CFG->prefix}backup_ids
+            $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
@@ -91,94 +147,165 @@
                 $exists_count = 0;
                 $student_count = 0;
                 $teacher_count = 0;
-                $coursecreator_count = 0;
-                $admin_count = 0;
-                $other_count = 0;
+                $counter = 0;
                 //Iterate, filling counters
                 foreach ($recs as $rec) {
-                    if (strpos($rec->info,"new") !== false) {
+                    //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($rec->info,"exists") !== false) {
+                    if (strpos($record->info,"exists") !== false) {
                         $exists_count++;
                     }
-                    if (strpos($rec->info,"admin")) {
-                        $admin_count++;
-                    } else if (strpos($rec->info,"coursecreator")) {
-                        $coursecreator_count++;
-                    } else if (strpos($rec->info,"teacher")) {
-                    $teacher_count++;
-                    } else if (strpos($rec->info,"student")) {
+                    if (strpos($record->info,"student") !== false) {
                         $student_count++;
-                    } else if ($rec->info == "new" or $rec->info == "exists") {
-                        $other_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 " (new: ".$new_count.", existing: ".$exists_count.")";
+                echo " (".get_string("new").": ".$new_count.", ".get_string("existing").": ".$exists_count.")";
                 echo "<ul>";
-                echo "<li>Students: ".$student_count;
-                echo "<li>Teachers: ".$teacher_count;
-                echo "<li>Course Creators: ".$coursecreator_count;
-                echo "<li>Admins: ".$admin_count;
-                echo "<li>Other: ".$other_count;
+                echo "<li>".get_string("students").": ".$student_count;
+                echo "<li>".get_string("teachers").": ".$teacher_count;
                 echo "</ul>";
             } else {
-                //Something is wrong. There is no users !!
-                $status = false;
+                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>Copying User Files";
-        $status = restore_user_files($restore);
+        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>User Zones: ".$status;
+            echo "<li>".get_string("userzones").": ".$status;
             echo "</ul>";
         }
     }
 
     //Now create course files as needed
     if ($status and ($restore->course_files)) {
-        echo "<li>Copying Course Files";
-        $status = restore_course_files($restore);
+        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>Main Files/Folders: ".$status;
+            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>Creating Log Entries <b>(not implemented)</b>. Execute after everything...";
+        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, update course modinfo field !!
+    //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>";
@@ -189,7 +316,11 @@
     echo "</table>";
 
     if (!$status) {
-        error ("An error has ocurred");
+        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

@@ -22,8 +22,14 @@
     require_login();
 
     //Check admin
-    if (!isadmin()) {
-        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+    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
@@ -36,7 +42,7 @@
     if ($allmods = get_records("modules") ) {
         foreach ($allmods as $mod) {
             $modname = $mod->name;
-            $modfile = "$mods_home/$modname/restorelib.php";
+            $modfile = "$CFG->dirroot/mod/$modname/restorelib.php";
             $modrestore = $modname."_restore_mods";
             if (file_exists($modfile)) {
                include_once($modfile);
@@ -78,7 +84,12 @@
     }
 
     if (!isset($restore_restoreto)) {
-        $restore_restoreto = 1;
+        if (isteacheredit($id) and !isadmin()) {
+            $restore_restoreto = 1;
+        }
+        if (isadmin()) {
+            $restore_restoreto = 2;
+        }
     }
 
     if ($count == 0) {
@@ -87,9 +98,24 @@
 
 ?>
 
-<form name="form" method="post" <?=$onsubmit ?> action="<?=$ME ?>">
+<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
@@ -97,14 +123,32 @@
     echo "<td align=\"right\"><P><b>";
     echo get_string("restoreto").":</b>";
     echo "</td><td>";
-    $restore_restoreto_options[0] = get_string("existingcourse");
-    $restore_restoreto_options[1] = get_string("newcourse"); 
+    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";
@@ -112,29 +156,35 @@
             $exist = "exists_".$modname;
             $restore_var = "restore_".$modname;
             $user_info_var = "restore_user_info_".$modname;
-            if ($$exist) {
-                //Now check that we have that module info in the backup file
-                if ($info->mods[$modname]->backup == "true") {
-                    //Print the full tr
-                    echo "<tr>";
-                    echo "<td align=\"right\"><P><B>";
-                    echo get_string("include")." ". get_string("modulenameplural",$modname).":";
-                    echo "</td><td>";
-                    $restore_options[0] = get_string("no"); 
-                    $restore_options[1] = get_string("yes");
-                    choose_from_menu($restore_options, $restore_var, $$restore_var, "");
-                    //If backup contains user data, then show menu, else fix it to
-                    //without user data
-                    if ($info->mods[$modname]->userinfo == "true") {
-                        $restore_user_options[0] = get_string("withoutuserdata"); 
-                        $restore_user_options[1] = get_string("withuserdata");
-                        choose_from_menu($restore_user_options, $user_info_var, $$user_info_var, "");
+            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 haven't userdata
-                        echo get_string("withoutuserdata");
+                        //Module isn't restorable
+                        echo "<input type=\"hidden\" name=\"$restore_var\" value=\"0\">";
                         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\">";
@@ -154,14 +204,20 @@
         echo "<td align=\"right\"><P><B>";
         echo get_string("users").":";
         echo "</td><td>";
-        //If all users are in the backup file
-        if ($info->backup_users == "all") {
-            $user_options[0] = get_string("all");
+        //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\">";
+
         }
-        $user_options[1] = get_string("course");
-        $user_options[2] = get_string("none");
-        //$user_options[2] = get_string("needed");-->NOT IMPLEMENTED
-        choose_from_menu($user_options, "restore_users", $restore_users, "");
         echo "</td></tr>";
 
         //Now print the Logs tr
@@ -218,9 +274,9 @@
 </table>
 <BR>
 <CENTER>
-<input type="hidden" name=id     value="<? p($id) ?>">
+<input type="hidden" name=id     value="<?php  p($id) ?>">
 <input type="hidden" name=launch value="check">
-<input type="submit" value="<? print_string("continue") ?>">
-<input type="submit" name=cancel value="<? print_string("cancel") ?>">
+<input type="submit" value="<?php  print_string("continue") ?>">
+<input type="submit" name=cancel value="<?php  print_string("cancel") ?>">
 </CENTER>
 </FORM>

backup/restore_precheck.html

@@ -13,8 +13,14 @@
     require_login();
  
     //Check admin
-    if (!isadmin()) {
-        error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
+    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
@@ -46,35 +52,42 @@
     $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) {
-        echo "<li>Creating temp dir";
         $status = clear_backup_dir($backup_unique_code);
     }
 
     //Now delete old data and directories under dataroot/temp/backup
     if ($status) {   
-        echo "<li>Cleaning old data";
+        echo "<li>".get_string("deletingolddata");
         $status = backup_delete_old_data();
     }
   
     //Now copy he zip file to dataroot/temp/backup/backup_unique_code
     if ($status) {
-        $status = backup_copy_file($file,$CFG->dataroot."/temp/backup/".$backup_unique_code."/".basename($file));
+        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>Retrieving backup file";
-        $status = restore_unzip ($CFG->dataroot."/temp/backup/".$backup_unique_code."/".basename($file),$moodle_home);
+        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>Checking backup file";
-        $status = restore_check_moodle_file ($xml_file);
+        echo "<li>".get_string("checkingbackup");
+        if (! $status = restore_check_moodle_file ($xml_file)) {
+            notify("Error checking backup file. Invalid or corrupted.");
+        }
     }
 
     $info = "";
@@ -82,7 +95,7 @@
 
     //Now read the info tag (all)
     if ($status) {
-        echo "<li>Reading info from file";
+        echo "<li>".get_string("readinginfofrombackup");
         //Reading info from file
         $info = restore_read_xml_info ($xml_file);
         //Reading course_header from file
@@ -96,6 +109,16 @@
     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
@@ -119,6 +142,7 @@
         $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>";
     }

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;
+}