Final 1.3.5 release

for modules

admin/admin.php

@@ -102,7 +102,7 @@
             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>";
             }
@@ -136,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;".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/backup.php

@@ -3,6 +3,7 @@
 
     require_once("../config.php");
     require_once("../backup/lib.php");
+    require_once("../backup/backup_scheduled.php");
 
     require_login();
 
@@ -57,6 +58,42 @@
         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;
@@ -82,7 +119,13 @@
     echo "<br />";
 
     print_simple_box_start("center", "", "$THEME->cellheading");
-    include("$CFG->dirroot/backup/config.html");
+
+    //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

@@ -404,6 +404,21 @@
     <?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>
@@ -419,6 +434,21 @@
     <?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>
@@ -435,6 +465,28 @@
     </td>
 </tr>
 
+<tr valign=top>
+        <td align=right><p>enablerssfeeds:</td>
+        <td>
+    <?php
+       unset($options);
+       $options[0] = get_string("no");
+       $options[1] = get_string("yes");
+
+       choose_from_menu ($options, "enablerssfeeds", $config->enablerssfeeds, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php 
+        print_string("configenablerssfeeds");
+        //Check for required functions...
+        if(!function_exists('utf8_encode')) {
+            echo "<font color=\"red\"> You need to add XML support to your PHP installation.</font>";
+        } 
+    ?>
+    </td>
+</tr>
+
 <tr>
     <td colspan=3 align=center>
 	<input type="submit" value="<?php print_string("savechanges") ?>"></td>

admin/config.php

@@ -28,7 +28,7 @@
             print_header();
             foreach ($config as $name => $value) {
                 if ($name == "sessioncookie") {
-                    $value = clean_filename($value);
+                    $value = eregi_replace("[^a-zA-Z]", "", $value);
                 }
                 unset($conf);
                 $conf->name  = $name;

admin/configure.php

@@ -32,6 +32,8 @@
                            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)) {

admin/creators.php

@@ -95,7 +95,7 @@
         foreach ($creators as $creator) {
             $creatorarray[] = $creator->id;
             echo "<p align=right>".fullname($creator, true).", $creator->email &nbsp;&nbsp; ";
-                echo "<a href=\"{$_SERVER['PHP_SELF']}?remove=$creator->id\"
+                echo "<a href=\"creators.php?remove=$creator->id\"
                 title=\"$strremovecreator\"><img src=\"../pix/t/right.gif\"
                 border=0></a>";
             echo "</p>";
@@ -128,14 +128,14 @@
 
         foreach ($users as $user) {
             $fullname = fullname($user, TRUE);
-            echo "<p align=left><a href=\"{$_SERVER['PHP_SELF']}?add=$user->id\"".
+            echo "<p align=left><a href=\"creators.php?add=$user->id\"".
                    "title=\"$straddcreator\"><img src=\"../pix/t/left.gif\"".
                    "border=0></a>&nbsp;&nbsp;$fullname, $user->email";
         }
     }
 
     if ($search or $usercount > MAX_USERS_PER_PAGE) {
-        echo "<form action={$_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,10 +14,24 @@
     $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");
 
-    $USER = get_admin();
+    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";
 
@@ -112,14 +126,16 @@
     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);
+        @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")) {
+            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();
     
@@ -131,6 +147,24 @@
         }
     }
 
+    if (!empty($CFG->enablerssfeeds)) {  //Defined in admin/variables page
+        if (file_exists("$CFG->dirroot/rss/rsslib.php")) {
+            include_once("$CFG->dirroot/rss/rsslib.php");
+            echo "Running rssfeeds if required...\n";
+            flush();
+
+            if ( ! cron_rss_feeds()) {
+                echo "Something went wrong while generating rssfeeds!!!\n";
+            } else {
+                echo "Rssfeeds finished\n";
+            }
+        }
+    }
+
+    //Unset session variables and destroy it
+    @session_unset();
+    @session_destroy();
+
     echo "Cron script completed correctly\n";
 
     $difftime = microtime_diff($starttime, microtime());

admin/filters.php

@@ -10,6 +10,7 @@
     optional_variable($up);
     optional_variable($down);
 
+    require_login();
 
     if (!isadmin()) {
         error("Only administrators can use this page!");
@@ -51,8 +52,8 @@
         $plugins = get_list_of_plugins($filterlocation);
         foreach ($plugins as $key => $plugin) {
             if (is_readable("$CFG->dirroot/$filterlocation/$plugin/filter.php")) {
-                $name = get_string("filtername", $plugin);
-                if ($name == "[[filtername]]") {
+                $name = trim(get_string("filtername", $plugin));
+                if (empty($name) or $name == "[[filtername]]") {
                     $name = $plugin;
                 }
                 $allfilters["$filterlocation/$plugin"] = $name;

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");
     }
@@ -36,15 +36,6 @@
     }
 
 
-
-/// Check that sessions are supported
-
-    if (!is_readable(ini_get('session.save_path')) and !ini_get_bool('safe_mode')) {
-        $sessionpath = ini_get('session.save_path');
-        notify("Warning: It appears your server does not support sessions (session.save_path = '$sessionpath')");
-    }
-
-
 /// Check that config.php has been edited
 
     if ($CFG->wwwroot == "http://example.com/moodle") {
@@ -77,7 +68,7 @@
 
 /// Turn off time limits, sometimes upgrades can be slow.
 
-    set_time_limit(0);
+    @set_time_limit(0);
 
 /// Check if the main tables have been installed yet or not.
 
@@ -203,11 +194,16 @@
 
 
 /// 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") ) {
@@ -295,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)) {
@@ -346,6 +342,8 @@
     }
 
 /// Check for valid admin user
+    require_login();
+
     if (!isadmin()) {
         error("You need to be an admin user to use this page.", "$CFG->wwwroot/login/index.php");
     }
@@ -381,6 +379,8 @@
                     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)) {

admin/lang.php

@@ -205,25 +205,24 @@
             $envalue = str_replace("%%","%",$envalue);
             $envalue = str_replace("\\","",$envalue);              // Delete all slashes
 
-            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>";
+            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 = 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 = 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 = htmlspecialchars($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>";
+                echo "<td width=40% bgcolor=\"$cellcolour\" valign=top>\n";
                 if (isset($string[$key])) {
                     $valuelen = strlen($value);
                 } else {
@@ -232,17 +231,17 @@
                 $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>";
+                    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>";
+                echo "</TD>\n";
 
             } else {
-                echo "<td width=40% bgcolor=\"$cellcolour\" valign=top>$value</td>";
+                echo "<td width=40% bgcolor=\"$cellcolour\" valign=top>$value</td>\n";
             }
         }
         if ($editable) {

admin/modules.php

@@ -9,6 +9,8 @@
     optional_variable($delete);
     optional_variable($confirm);
 
+    require_login();
+
     if (!isadmin()) {
         error("Only administrators can use this page!");
     }

admin/site.html

@@ -27,7 +27,7 @@
       <br />
      </font>
     </td>
-    <td><?php  print_textarea($usehtmleditor, 10, 50, 600, 400, "summary", $form->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>

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");
         }

admin/upgradelogs.php

@@ -20,7 +20,7 @@
 
 /// Turn off time limits, sometimes upgrades can be slow.
 
-    set_time_limit(0);
+    @set_time_limit(0);
 
 
 /// Print header

admin/uploaduser.php

@@ -30,6 +30,18 @@
     $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
 
@@ -88,7 +100,7 @@
 			  "group5" =>1);
 
         // --- get header (field names) ---
-        $header = split("\,", fgets($fp,1024));
+        $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
@@ -111,11 +123,12 @@
             foreach ($optionalDefaults as $key => $value) {
                 $user->$key = addslashes($adminuser->$key);
             }
-           //Note: commas within a field should be encoded as &#44
-            $line = split("\,", fgets($fp,1024));
+           //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('/\&\#44/',',',trim($value));
+                $record[$header[$key]] = preg_replace($csv_encode,$csv_delimiter2,trim($value));
             }
             if ($record[$header[0]]) {
                 // add a new user to the database

admin/user.php

@@ -181,11 +181,11 @@
                     $columndir = "ASC";
                 }
             } else {
-                $columndir = $dir == "asc" ? "desc":"asc";
+                $columndir = $dir == "ASC" ? "DESC":"ASC";
                 if ($column == "lastaccess") {
-                    $columnicon = $dir == "asc" ? "up":"down";
+                    $columnicon = $dir == "ASC" ? "up":"down";
                 } else {
-                    $columnicon = $dir == "asc" ? "down":"up";
+                    $columnicon = $dir == "ASC" ? "down":"up";
                 }
                 $columnicon = " <img src=\"$CFG->pixpath/t/$columnicon.gif\" />";
 

auth/ldap/config.html

@@ -17,6 +17,9 @@
     if (!isset($config->ldap_bind_pw)) {
         $config->ldap_bind_pw = "";
     }
+    if (empty($config->ldap_version)) {
+        $config->ldap_version  = "2";
+    }
 ?>
 <tr valign="top" BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>ldap_host_url:</TD>
@@ -29,6 +32,21 @@
     </TD>
 </TR>
 
+<tr valign="top" BGCOLOR="<?php echo $THEME->cellheading2 ?>">
+	<TD ALIGN=RIGHT><P>ldap_version:</TD>
+	<TD>
+    <?php
+       $versions[2] = "2";
+       $versions[3] = "3";
+       choose_from_menu($versions, "ldap_version", $config->ldap_version, "");
+	   if (isset($err["ldap_version"])) formerr($err["ldap_version"]); 
+    ?>
+	</TD>
+    <TD>
+    <?php  print_string("auth_ldap_version","auth") ?>
+    </TD>
+</TR>
+
 <TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
 	<TD ALIGN=RIGHT><P>ldap_contexts:</TD>
 	<TD>

auth/ldap/lib.php

@@ -221,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 {

backup/STATUS.txt

@@ -116,17 +116,19 @@ Backup Details:
    - Browse backup files........................................DONE
    - Download backup files......................................DONE
    - Delete backup files........................................DONE
-   - Program scheduled backups..................................IN PROGRESS
+   - Program scheduled backups..................................DONE
       - Build a configuration inteface..........................DONE
       - Create the script.......................................DONE
       - Integrate it in cron....................................DONE
-      - View logs...............................................IN PROGRESS
+      - 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
@@ -243,6 +245,17 @@ Restore Details:
       - 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
 
 ========== ========== ========== =========== =========== =========== ===
 

backup/backup.php

@@ -6,6 +6,7 @@
     require_once ("../config.php");
     require_once ("lib.php");
     require_once ("backuplib.php");
+    require_once ("$CFG->libdir/blocklib.php");
 
     optional_variable($id);       // course id
     optional_variable($cancel);
@@ -87,7 +88,7 @@
 
     //Adjust some php variables to the execution of this script
     ini_set("max_execution_time","3000");
-    ini_set("memory_limit","56M");
+    ini_set("memory_limit","80M");
 
     //Call the form, depending the step we are
     if (!$launch) {

backup/backup_check.html

@@ -132,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>";
 
@@ -180,6 +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("includenoneusers");
         echo "<li>".$user_options[$backup_users]."<P>";
         //Add as hidden name
         echo "<input type=\"hidden\" name=\"backup_users\" value=\"".$backup_users."\">";

backup/backup_form.html

@@ -14,7 +14,6 @@
         }
     }
 
-
     //Check site
     if (!$site = get_site()) {
         error("Site not found!");
@@ -110,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>";
 

backup/backup_scheduled.php

@@ -11,6 +11,12 @@ function schedule_backup_cron() {
 
     $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();
 
@@ -462,18 +468,26 @@ function schedule_backup_course_execute($preferences,$starttime = 0) {
     $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 dir
+    //Empty backup dir
     if ($status) {
-        schedule_backup_log($starttime,$preferences->backup_course,"    cleaning old data");
+        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();
     }
 
@@ -612,6 +626,9 @@ function schedule_backup_course_execute($preferences,$starttime = 0) {
         $status = clean_temp_data ($preferences);
     }
 
+    //Unset CFG->backup_preferences only needed in scheduled backups
+    unset ($CFG->backup_preferences);
+
     return $status;
 }
 

backup/backuplib.php

@@ -33,79 +33,84 @@
     function user_check_backup($course,$backup_unique_code,$backup_users) {
         //$backup_users=0-->all
         //              1-->course (needed + enrolled)
+        //              2-->none
 
         global $CFG;
         global $db;
 
         $count_users = 0;
+
+        //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 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 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 all users (every record in users table)
+            $all_users = backup_get_all_users();
 
-        //Calculate course users (needed + enrolled)
-        //First, needed
-        $course_users = $needed_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, 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;
+            //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);
+            }
         }
 
-        //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");
@@ -123,7 +128,7 @@
 
     function backup_get_needed_users ($courseid) {
         
-        global $CFG;
+        global $CFG, $THEME;
 
         $result = false;
 
@@ -426,6 +431,8 @@
     
     //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) {
@@ -455,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
@@ -480,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) {
@@ -549,6 +560,7 @@
             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));
@@ -557,7 +569,7 @@
             fwrite ($bf,full_tag("GUEST",3,false,$course->guest));
             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));
@@ -565,6 +577,7 @@
             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
@@ -935,13 +948,23 @@
         $scales = get_records_sql("SELECT id, courseid, userid, name, scale, description, timemodified
                                    FROM {$CFG->prefix}scale
                                    WHERE courseid = '0' or courseid = $preferences->backup_course");
-      
-        //Pring scales header
+
+        //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 ($scales as $scale) {
+            foreach ($backupscales as $scale) {
                 //Begin scale tag
                 fwrite ($bf,start_tag("SCALE",3,true));
                 //Output scale tag
@@ -986,11 +1009,13 @@
                 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));
@@ -1107,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) {

backup/config.html

@@ -163,13 +163,13 @@
             if (!isset($firstdayofweek) || $firstdayofweek != 1) {
                 $firstdayofweek = 0;
             }
-            //Now create the timestamp of a well-know sunday (02/25/2001, my 31th birthday (stronk7) !!)
-            $onesunday = make_timestamp(2001,2,25);
+            //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[] = strftime("%A",$onesunday + (($firstdayofweek+$i)*86400));
+                $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;

backup/lib.php

@@ -25,15 +25,15 @@
     }
 
     //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
@@ -339,7 +339,7 @@
                 $db->debug = false;
                 if (set_config("backup_version", $backup_version) and set_config("backup_release", $backup_release)) {
                     notify(get_string("databasesuccess"), "green");
-                    notify(get_string("databaseupgradebackups", "", $backup_release));
+                    notify(get_string("databaseupgradebackups", "", $backup_version));
                     print_continue($continueto);
                     exit;
                 } else {
@@ -362,7 +362,7 @@
                 $db->debug=false;
                 if (set_config("backup_version", $backup_version) and set_config("backup_release", $backup_release)) {
                     notify(get_string("databasesuccess"), "green");
-                    notify(get_string("databaseupgradebackups", "", $backup_release));
+                    notify(get_string("databaseupgradebackups", "", $backup_version));
                     print_continue($continueto);
                     exit;
                 } else {
@@ -481,7 +481,7 @@
     //This function is used to add slashes and decode from UTF-8
     //It's used intensivelly when restoring modules and saving them in db
     function backup_todb ($data) {
-        return addslashes(utf8_decode($data));
+        return restore_decode_absolute_links(addslashes(utf8_decode($data)));
     }
 
     //This function is used to check that every necessary function to 

backup/log.php

@@ -37,9 +37,9 @@
     //Lastlog view
     if (!$courseid) {
         print_header("$site->shortname: $strconfiguration: $strbackup", $site->fullname,
-                      "<a href=\"../admin/index.php\">$stradmin</a> -> ".
-                      "<a href=\"../admin/configure.php\">$strconfiguration</a> -> ".
-                      "<a href=\"../admin/backup.php\">$strbackup</a> -> ".
+                      "<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);
@@ -81,9 +81,9 @@
     //Detailed View !!
     } else {
         print_header("$site->shortname: $strconfiguration: $strbackup", $site->fullname,
-                      "<a href=\"../admin/index.php\">$stradmin</a> -> ".
-                      "<a href=\"../admin/configure.php\">$strconfiguration</a> -> ".
-                      "<a href=\"../admin/backup.php\">$strbackup</a> -> ".
+                      "<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);
 

backup/restore.php

@@ -9,6 +9,7 @@
     require_once ("../course/lib.php");
     require_once ("lib.php");
     require_once ("restorelib.php");
+    require_once("$CFG->libdir/blocklib.php");
 
     //Optional
     optional_variable($id);
@@ -94,7 +95,7 @@
     
     //Adjust some php variables to the execution of this script
     ini_set("max_execution_time","3000");
-    ini_set("memory_limit","56M");
+    ini_set("memory_limit","80M");
 
     //Call the form, depending the step we are
     if (!$launch) {

backup/restore_execute.html

@@ -10,6 +10,10 @@
         $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();
 
@@ -267,6 +271,22 @@
         }
     }
 
+    //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

backup/restore_form.html

@@ -98,7 +98,22 @@
 
 ?>
 
-<form name="form" method="post" action="<?php echo $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
 
@@ -123,6 +138,17 @@
     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";
@@ -178,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

backup/restore_precheck.html

@@ -52,10 +52,10 @@
     $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>".get_string("creatingtemporarystructures");
         $status = clear_backup_dir($backup_unique_code);
     }
 
@@ -68,20 +68,26 @@
     //Now copy he zip file to dataroot/temp/backup/backup_unique_code
     if ($status) {
         echo "<li>".get_string("copyingzipfile");
-        $status = backup_copy_file($file,$CFG->dataroot."/temp/backup/".$backup_unique_code."/".basename($file));
+        if (! $status = backup_copy_file($file,$CFG->dataroot."/temp/backup/".$backup_unique_code."/".basename($file))) {
+            notify("Error copying backup file. Invalid name or bad perms.");
+        }
     }
 
     //Now unzip the file
     if ($status) {
         echo "<li>".get_string("unzippingbackup");
-        $status = restore_unzip ($CFG->dataroot."/temp/backup/".$backup_unique_code."/".basename($file));
+        if (! $status = restore_unzip ($CFG->dataroot."/temp/backup/".$backup_unique_code."/".basename($file))) {
+            notify("Error unzipping backup file. Invalid zip file.");
+        }
     }
 
     //Now check for the moodle.xml file
     if ($status) {
         $xml_file  = $CFG->dataroot."/temp/backup/".$backup_unique_code."/moodle.xml";
         echo "<li>".get_string("checkingbackup");
-        $status = restore_check_moodle_file ($xml_file);
+        if (! $status = restore_check_moodle_file ($xml_file)) {
+            notify("Error checking backup file. Invalid or corrupted.");
+        }
     }
 
     $info = "";
@@ -103,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

backup/restorelib.php

@@ -52,6 +52,207 @@
         return $status;  
     }   
 
+    //This function iterates over all modules in backup file, searching for a
+    //MODNAME_refresh_events() to execute. Perhaps it should ve moved to central Moodle...
+    function restore_refresh_events($restore) {
+   
+        global $CFG;
+        $status = true;
+        
+        //Take all modules in backup
+        $modules = $restore->mods;
+        //Iterate
+        foreach($modules as $name => $module) {
+            //Only if the module is being restored
+            if ($module->restore == 1) {
+                //Include module library
+                include_once("$CFG->dirroot/mod/$name/lib.php");
+                //If module_refresh_events exists
+                $function_name = $name."_refresh_events";
+                if (function_exists($function_name)) {
+                    $status = $function_name($restore->course_id);
+                }
+            }
+        }
+        return $status;
+    }
+
+    //This function makes all the necessary calls to xxxx_decode_content_links_caller()
+    //function in each module, passing them the desired contents to be decoded
+    //from backup format to destination site/course in order to mantain inter-activities
+    //working in the backup/restore process
+    function restore_decode_content_links($restore) {
+
+        global $CFG;
+
+        $status = true;
+
+        echo "<ul>";
+        foreach ($restore->mods as $name => $info) {
+            //If the module is being restored
+            if ($info->restore == 1) {
+                //Check if the xxxx_decode_content_links_caller exists
+                $function_name = $name."_decode_content_links_caller";
+                if (function_exists($function_name)) {
+                    echo "<li>".get_string ("to")." ".get_string("modulenameplural",$name);
+                    $status = $function_name($restore);
+                }
+            }
+        }
+
+        //Now I'm going to decode to their new location all the links in wiki texts
+        //having the syntax " modulename:moduleid".
+        echo "<li>wiki";
+        $status = restore_decode_wiki_texts($restore);
+
+        echo "</ul>";
+
+        return $status;
+    }
+
+    //This function search for some wiki texts in differenct parts of Moodle to
+    //decode them to their new ids.
+    function restore_decode_wiki_texts($restore) {
+
+        global $CFG;
+
+        $status = true;
+
+        echo "<ul>";
+
+        if (file_exists("$CFG->dirroot/mod/resource/lib.php")) {
+            include_once("$CFG->dirroot/mod/resource/lib.php");
+        }
+
+        $formatwiki = FORMAT_WIKI;
+        $typewiki = WIKITEXT;
+ 
+        //FORUM: Decode every POST (message) in the course
+        //Check we are restoring forums
+        if ($restore->mods['forum']->restore == 1) {
+            echo "<li>".get_string("from")." ".get_string("modulenameplural","forum");
+            //Get all course posts being restored
+            if ($posts = get_records_sql ("SELECT p.id, p.message
+                                       FROM {$CFG->prefix}forum_posts p,
+                                            {$CFG->prefix}forum_discussions d,
+                                            {$CFG->prefix}backup_ids b
+                                       WHERE d.course = $restore->course_id AND
+                                             p.discussion = d.id AND
+                                             p.format = $formatwiki AND
+                                             b.backup_code = $restore->backup_unique_code AND
+                                             b.table_name = 'forum_posts' AND
+                                             b.new_id = p.id")) {
+                //Iterate over each post->message
+                $i = 0;   //Counter to send some output to the browser to avoid timeouts
+                foreach ($posts as $post) {
+                    //Increment counter
+                    $i++;
+                    $content = $post->message;
+                    //Decode it 
+                    $result = restore_decode_wiki_content($content,$restore);
+
+                    if ($result != $content) {
+                        //Update record
+                        $post->message = addslashes($result);
+                        $status = update_record("forum_posts",$post);
+                        if ($CFG->debug>7) {
+                            echo "<br><hr>".$content."<br>changed to</br>".$result."<hr><br>";
+                        }
+                    }
+                    //Do some output
+                    if (($i+1) % 5 == 0) {
+                        echo ".";
+                        if (($i+1) % 100 == 0) {
+                            echo "<br>";
+                        }
+                        backup_flush(300);
+                    }
+                }
+            }
+        }
+
+        //RESOURCE: Decode every RESOURCE (alltext) in the coure
+
+        //Check we are restoring resources
+        if ($restore->mods['resource']->restore == 1) {
+            echo "<li>".get_string("from")." ".get_string("modulenameplural","resource");
+            //Get all course resources of type=8 WIKITEXT being restored
+            if ($resources = get_records_sql ("SELECT r.id, r.alltext
+                                       FROM {$CFG->prefix}resource r,
+                                            {$CFG->prefix}backup_ids b
+                                       WHERE r.course = $restore->course_id AND
+                                             r.type = $typewiki AND
+                                             b.backup_code = $restore->backup_unique_code AND
+                                             b.table_name = 'resource' AND
+                                             b.new_id = r.id")) {
+                //Iterate over each resource->alltext
+                $i = 0;   //Counter to send some output to the browser to avoid timeouts
+                foreach ($resources as $resource) {
+                    //Increment counter
+                    $i++;
+                    $content = $resource->alltext;
+                    //Decode it
+                    $result = restore_decode_wiki_content($content,$restore);
+                    if ($result != $content) {
+                        //Update record
+                        $resource->alltext = addslashes($result);
+                        $status = update_record("resource",$resource);
+                        if ($CFG->debug>7) {
+                            echo "<br><hr>".$content."<br>changed to</br>".$result."<hr><br>";
+                        }
+                    }
+                    //Do some output
+                    if (($i+1) % 5 == 0) {
+                        echo ".";
+                        if (($i+1) % 100 == 0) {
+                            echo "<br>";
+                        }
+                        backup_flush(300);
+                    }
+                }
+            }
+        }
+        echo "</ul>";
+
+        return $status;
+
+    }
+
+    //This function receives a wiki text in the restore process and
+    //return it with every link to modules " modulename:moduleid"
+    //converted if possible. See the space before modulename!!
+    function restore_decode_wiki_content($content,$restore) {
+
+        global $CFG;
+        
+        $result = $content;
+        
+        $searchstring='/ ([a-zA-Z]+):([0-9]+)\(([^)]+)\)/';
+        //We look for it
+        preg_match_all($searchstring,$content,$foundset);
+        //If found, then we are going to look for its new id (in backup tables)
+        if ($foundset[0]) { 
+            //print_object($foundset);                                     //Debug
+            //Iterate over foundset[2]. They are the old_ids               
+            foreach($foundset[2] as $old_id) {
+                //We get the needed variables here (course id)
+                $rec = backup_getid($restore->backup_unique_code,"course_modules",$old_id);
+                //Personalize the searchstring
+                $searchstring='/ ([a-zA-Z]+):'.$old_id.'\(([^)]+)\)/';
+                //If it is a link to this course, update the link to its new location
+                if($rec->new_id) {
+                    //Now replace it
+                    $result= preg_replace($searchstring,' $1:'.$rec->new_id.'($2)',$result);
+                } else {
+                    //It's a foreign link so redirect it to its original URL
+                    $result= preg_replace($searchstring,$restore->original_wwwroot.'/mod/$1/view.php?id='.$old_id.'($2)',$result);
+                }
+            }
+        }
+        return $result;
+    }
+
+
     //This function read the xml file and store it data from the info zone in an object
     function restore_read_xml_info ($xml_file) {
 
@@ -335,9 +536,10 @@
             $course->password = addslashes($course_header->course_password);
             $course->fullname = addslashes($course_header->course_fullname);
             $course->shortname = addslashes($course_header->course_shortname);
-            $course->summary = addslashes($course_header->course_summary);
+            $course->summary = restore_decode_absolute_links(addslashes($course_header->course_summary));
             $course->format = addslashes($course_header->course_format);
             $course->showgrades = addslashes($course_header->course_showgrades);
+            $course->blockinfo = addslashes($course_header->blockinfo);
             $course->newsitems = addslashes($course_header->course_newsitems);
             $course->teacher = addslashes($course_header->course_teacher);
             $course->teachers = addslashes($course_header->course_teachers);
@@ -346,7 +548,7 @@
             $course->guest = addslashes($course_header->course_guest);
             $course->startdate = addslashes($course_header->course_startdate);
             $course->numsections = addslashes($course_header->course_numsections);
-            $course->showrecent = addslashes($course_header->course_showrecent);
+            //$course->showrecent = addslashes($course_header->course_showrecent);   INFO: This is out in 1.3
             $course->maxbytes = addslashes($course_header->course_maxbytes);
             $course->showreports = addslashes($course_header->course_showreports);
             $course->groupmode = addslashes($course_header->course_groupmode);
@@ -354,8 +556,23 @@
             $course->lang = addslashes($course_header->course_lang);
             $course->marker = addslashes($course_header->course_marker);
             $course->visible = addslashes($course_header->course_visible);
+            $course->hiddensections = addslashes($course_header->course_hiddensections);
             $course->timecreated = addslashes($course_header->course_timecreated);
             $course->timemodified = addslashes($course_header->course_timemodified);
+            //Adjust blockinfo field.
+            //If the info doesn't exist in backup, we create defaults, else we recode it 
+            //to current site blocks.
+            if (!$course->blockinfo) {
+                //Create blockinfo default content
+                if ($course->format == "social") {
+                    $course->blockinfo = blocks_get_default_blocks (NULL,"participants,search_forums,calendar_month,calendar_upcoming,social_activities,recent_activity,admin,course_list");
+                } else {
+                    //For topics and weeks formats (default built in the function)
+                    $course->blockinfo = blocks_get_default_blocks();
+                }
+            } else {
+                $course->blockinfo = blocks_get_block_ids($course->blockinfo);
+            }
             //Now insert the record
             $newid = insert_record("course",$course);
             if ($newid) {
@@ -397,7 +614,7 @@
                 $sequence = "";
                 $section->course = $restore->course_id;
                 $section->section = $sect->number;
-                $section->summary = addslashes($sect->summary);
+                $section->summary = restore_decode_absolute_links(addslashes($sect->summary));
                 $section->visible = $sect->visible;
                 $section->sequence = "";
                 //Now calculate the section's newid
@@ -587,7 +804,7 @@
                     $user->address = addslashes($user->address);
                     $user->city = addslashes($user->city);
                     $user->url = addslashes($user->url);
-                    $user->description = addslashes($user->description);
+                    $user->description = restore_decode_absolute_links(addslashes($user->description));
                     //We are going to create the user
                     //The structure is exactly as we need
                     $newid = insert_record ("user",$user);
@@ -979,6 +1196,7 @@
                         //Now build the EVENT record structure
                         $eve->name = backup_todb($info['EVENT']['#']['NAME']['0']['#']);
                         $eve->description = backup_todb($info['EVENT']['#']['DESCRIPTION']['0']['#']);
+                        $eve->format = backup_todb($info['EVENT']['#']['FORMAT']['0']['#']);
                         $eve->courseid = $restore->course_id;
                         $eve->groupid = backup_todb($info['EVENT']['#']['GROUPID']['0']['#']);
                         $eve->userid = backup_todb($info['EVENT']['#']['USERID']['0']['#']);
@@ -987,12 +1205,12 @@
                         $eve->eventtype = backup_todb($info['EVENT']['#']['EVENTTYPE']['0']['#']);
                         $eve->timestart = backup_todb($info['EVENT']['#']['TIMESTART']['0']['#']);
                         $eve->timeduration = backup_todb($info['EVENT']['#']['TIMEDURATION']['0']['#']);
+                        $eve->visible = backup_todb($info['EVENT']['#']['VISIBLE']['0']['#']);
                         $eve->timemodified = backup_todb($info['EVENT']['#']['TIMEMODIFIED']['0']['#']);
 
-
                         //Now search if that event exists (by description and timestart field) in
                         //restore->course_id course 
-                        $eve_db = get_record("event","courseid",$restore->course_id,"description",$eve->description,"timestart",$eve->timestart);
+                        $eve_db = get_record("event","courseid",$eve->courseid,"description",$eve->description,"timestart",$eve->timestart);
                         //If it doesn't exist, create
                         if (!$eve_db) {
                             $create_event = true;
@@ -1012,6 +1230,9 @@
                             $group = backup_getid($restore->backup_unique_code,"group",$eve->groupid);
                             if ($group) {
                                 $eve->groupid = $group->new_id;
+                            } else {
+                                //Assign it to group 0
+                                $eve->groupid = 0;
                             }
 
                             //The structure is equal to the db, so insert the event
@@ -1034,6 +1255,40 @@
         return $status;
     }
 
+    //This function decode things to make restore multi-site fully functional
+    //It does this conversions:
+    //    - $@FILEPHP@$ ---|------------> $CFG->wwwroot/file.php/courseid (slasharguments on)
+    //                     |------------> $CFG->wwwroot/file.php?file=/courseid (slasharguments off)
+    //
+    //Note: Inter-activities linking is being implemented as a final
+    //step in the restore execution, because we need to have it 
+    //finished to know all the oldid, newid equivaleces
+    function restore_decode_absolute_links($content) {
+                                     
+        global $CFG,$restore;    
+
+        //Now decode wwwroot and file.php calls
+        $search = array ("$@FILEPHP@$");
+
+        //Check for the status of the slasharguments config variable
+        $slash = $CFG->slasharguments;
+        
+        //Build the replace string as needed
+        if ($slash == 1) {
+            $replace = array ($CFG->wwwroot."/file.php/".$restore->course_id);
+        } else {
+            $replace = array ($CFG->wwwroot."/file.php?file=/".$restore->course_id);
+        }
+    
+        $result = str_replace($search,$replace,$content);
+
+        if ($result != $content && $CFG->debug>7) {                                  //Debug
+            echo "<br><hr>".$content."<br>changed to<br>".$result."<hr><br>";        //Debug
+        }                                                                            //Debug
+
+        return $result;
+    }
+
     //This function restores the userfiles from the temp (user_files) directory to the
     //dataroot/users directory
     function restore_user_files($restore) {
@@ -1849,6 +2104,9 @@
                         case "DATE":
                             $this->info->backup_date = $this->getContents();
                             break;
+                        case "ORIGINAL_WWWROOT":
+                            $this->info->original_wwwroot = $this->getContents();
+                            break;
                     }
                 }
                 if ($this->tree[3] == "DETAILS") {
@@ -1928,6 +2186,9 @@
                         case "SHOWGRADES":
                             $this->info->course_showgrades = $this->getContents();
                             break;
+                        case "BLOCKINFO":
+                            $this->info->blockinfo = $this->getContents();
+                            break;
                         case "NEWSITEMS":
                             $this->info->course_newsitems = $this->getContents();
                             break;
@@ -1952,9 +2213,9 @@
                         case "NUMSECTIONS":
                             $this->info->course_numsections = $this->getContents();
                             break;
-                        case "SHOWRECENT":
-                            $this->info->course_showrecent = $this->getContents();
-                            break;
+                        //case "SHOWRECENT":                                          INFO: This is out in 1.3
+                        //    $this->info->course_showrecent = $this->getContents();
+                        //    break;
                         case "MAXBYTES":
                             $this->info->course_maxbytes = $this->getContents();
                             break;
@@ -1976,6 +2237,9 @@
                         case "VISIBLE":
                             $this->info->course_visible = $this->getContents();
                             break;
+                        case "HIDDENSECTIONS":
+                            $this->info->course_hiddensections = $this->getContents();
+                            break;
                         case "TIMECREATED":
                             $this->info->course_timecreated = $this->getContents();
                             break;

backup/try.php

@@ -1,8 +1,9 @@
-<?php
+<?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();
 

backup/version.php

@@ -5,6 +5,6 @@
 // database (backup_version) to determine whether upgrades should
 // be performed (see db/backup_*.php)
 
-$backup_version = 2004032000;   // The current version is a date (YYYYMMDDXX)
+$backup_version = 2004052404;   // The current version is a date (YYYYMMDDXX)
 
-$backup_release = "1.2";  // User-friendly version number
+$backup_release = "1.3.4";  // User-friendly version number

blocks/README.txt

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

blocks/activity_modules/block_activity_modules.php

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

blocks/activity_modules/db/mysql.php

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

blocks/activity_modules/db/postgres7.php

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

blocks/admin/block_admin.php

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

blocks/admin/db/mysql.php

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

blocks/admin/db/postgres7.php

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

blocks/calendar_month/block_calendar_month.php

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

blocks/calendar_month/db/mysql.php

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

blocks/calendar_month/db/postgres7.php

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

blocks/calendar_upcoming/block_calendar_upcoming.php

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

blocks/calendar_upcoming/db/mysql.php

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

blocks/calendar_upcoming/db/postgres7.php

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

blocks/course_list/block_course_list.php

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

blocks/course_list/db/mysql.php

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

blocks/course_list/db/postgres7.php

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

blocks/course_summary/block_course_summary.php

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

blocks/course_summary/db/mysql.php

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

blocks/course_summary/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_summary_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/db/mysql.php

@@ -0,0 +1,43 @@
+<?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 blocks_upgrade($oldversion=0) {
+
+global $CFG;
+    
+    $result = true;
+    
+    if ($oldversion < 2004041000 and $result) {
+        $result = execute_sql("CREATE TABLE `{$CFG->prefix}blocks` (
+                        `id` int(10) unsigned NOT NULL auto_increment,
+                        `name` varchar(40) NOT NULL default '',
+                        `version` int(10) NOT NULL default '0',
+                        `cron` int(10) unsigned NOT NULL default '0',
+                        `lastcron` int(10) unsigned NOT NULL default '0',
+                        `visible` tinyint(1) NOT NULL default '1',
+                        PRIMARY KEY (`id`)
+                     ) 
+                     COMMENT = 'To register and update all the available blocks'");
+    }
+
+    //Finally, return result
+    return $result;
+}
+?>

blocks/db/mysql.sql

@@ -0,0 +1,15 @@
+# $Id$
+# 
+# Table structure for table `blocks`
+# 
+
+CREATE TABLE `prefix_blocks` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(40) NOT NULL default '',
+  `version` int(10) NOT NULL default '0',
+  `cron` int(10) unsigned NOT NULL default '0',
+  `lastcron` int(10) unsigned NOT NULL default '0',
+  `visible` tinyint(1) NOT NULL default '1',
+  PRIMARY KEY  (`id`)
+) TYPE=MyISAM;
+# --------------------------------------------------------

blocks/db/postgres7.php

@@ -0,0 +1,45 @@
+<?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 blocks_upgrade($oldversion=0) {
+
+global $CFG;
+    
+    $result = true;
+    
+    if ($oldversion < 2004041000 and $result) {
+        $result = execute_sql("
+                                CREATE TABLE {$CFG->prefix}blocks 
+                                (
+              				    id SERIAL8 PRIMARY KEY,
+  			            	    name varchar(40) NOT NULL default '',
+  				                version INT8 NOT NULL default '0',
+  				                cron INT8  NOT NULL default '0',
+  				                lastcron INT8  NOT NULL default '0',
+  				                visible int NOT NULL default '1'
+                                )
+			                    ") ;
+
+    }
+
+    //Finally, return result
+    return $result;
+}
+?>

blocks/db/postgres7.sql

@@ -0,0 +1,14 @@
+# $Id$
+# 
+# Table structure for table blocks
+# 
+
+CREATE TABLE prefix_blocks (
+  id SERIAL8 PRIMARY KEY,
+  name varchar(40) NOT NULL default '',
+  version INT8 NOT NULL default '0',
+  cron INT8  NOT NULL default '0',
+  lastcron INT8  NOT NULL default '0',
+  visible int NOT NULL default '1'
+) ;
+# --------------------------------------------------------

blocks/moodleblock.class.php

@@ -0,0 +1,268 @@
+<?php  // $Id$
+
+define('BLOCK_TYPE_LIST',    1);
+define('BLOCK_TYPE_TEXT',    2);
+define('BLOCK_TYPE_NUKE',    3);
+
+class MoodleBlock {
+    var $str;
+    var $title = NULL;
+    var $course = NULL;
+    var $content_type = NULL;
+    var $content = NULL;
+    var $edit_controls = NULL;
+    var $version = NULL;
+
+    function name() {
+        // Returns the block name, as present in the class name,
+        // the database, the block directory, etc etc.
+        static $myname;
+        if($myname === NULL) {
+            $myname = strtolower(get_class($this));
+            $myname = substr($myname, strpos($myname, '_') + 1);
+        }
+        return $myname;
+    }
+
+    function get_content() {
+        // This should be implemented by the derived class.
+        return NULL;
+    }
+    function get_title() {
+        // Intentionally doesn't check if a title is set, for _test_self()
+        return $this->title;
+    }
+    function get_content_type() {
+        // Intentionally doesn't check if a content_type is set, for _test_self()
+        return $this->content_type;
+    }
+    function get_version() {
+        // Intentionally doesn't check if a version is set, for _test_self()
+        return $this->version;
+    }
+    function get_header() {
+        // Intentionally doesn't check if a header is set, for _test_self()
+        return $this->header;
+    }
+    function refresh_content() {
+        // Nothing special here, depends on content()
+        $this->content = NULL;
+        return $this->get_content();
+    }
+    function print_block() {
+        // Wrap the title in a floating DIV, in case we have edit controls to display
+        // These controls will always be wrapped on a right-floating DIV
+        $title = '<div style="float: left;">'.$this->title.'</div>';
+        if($this->edit_controls !== NULL) {
+            $title .= $this->edit_controls;
+        }
+
+        $this->get_content();
+        if(!isset($this->content->footer)) {
+            $this->content->footer = '';
+        }
+
+        switch($this->content_type) {
+            case BLOCK_TYPE_NUKE:
+            case BLOCK_TYPE_TEXT:
+                if(empty($this->content->text) && empty($this->content->footer)) {
+                    break;
+                }
+                if ($this->edit_controls !== NULL || !$this->hide_header()) {
+                    print_side_block($title, $this->content->text, NULL, NULL, $this->content->footer);
+                } else {
+                    print_side_block(NULL, $this->content->text, NULL, NULL, $this->content->footer);
+                }
+            break;
+            case BLOCK_TYPE_LIST:
+                if(empty($this->content->items) && empty($this->content->footer)) {
+                    break;
+                }
+                if ($this->edit_controls !== NULL || !$this->hide_header()) {
+                    print_side_block($title, '', $this->content->items, $this->content->icons, $this->content->footer);
+                } else {
+                    print_side_block(NULL, '', $this->content->items, $this->content->icons, $this->content->footer);
+                }
+            break;
+        }
+    }
+    function print_shadow() {
+        $title = '<div style="float: left;">'.$this->title.'</div>';
+        if($this->edit_controls !== NULL) {
+            $title .= $this->edit_controls;
+        }
+        print_side_block($title, '&nbsp;', NULL, NULL, '');
+    }
+    function add_edit_controls($options, $blockid) {
+        global $CFG, $THEME;
+
+        // The block may be disabled
+        $blockid = intval($blockid);
+        $enabled = $blockid > 0;
+        $blockid = abs($blockid);
+
+        if (!isset($this->str)) {
+            $this->str->delete    = get_string('delete');
+            $this->str->moveup    = get_string('moveup');
+            $this->str->movedown  = get_string('movedown');
+            $this->str->moveright = get_string('moveright');
+            $this->str->moveleft  = get_string('moveleft');
+            $this->str->hide      = get_string('hide');
+            $this->str->show      = get_string('show');
+        }
+
+        $path = $CFG->wwwroot.'/course';
+
+        if (empty($THEME->custompix)) {
+            $pixpath = $path.'/../pix';
+        } else {
+            $pixpath = $path.'/../theme/'.$CFG->theme.'/pix';
+        }
+
+        $movebuttons = '<div style="float: right;">';
+
+        if($enabled) {
+            $icon = '/t/hide.gif';
+            $title = $this->str->hide;
+        }
+        else {
+            $icon = '/t/show.gif';
+            $title = $this->str->show;
+        }
+
+        $movebuttons .= '<a style="margin-right: 10px;" title="'.$title.'" href="'.$path.'/view.php?id='.$this->course->id.'&amp;blockaction=toggle&amp;blockid='.$blockid.'">' .
+                        '<img src="'.$pixpath.$icon.'" /></a>';
+
+        $movebuttons .= '<a style="margin-right: 10px;" title="'.$this->str->delete.'" href="'.$path.'/view.php?id='.$this->course->id.'&amp;blockaction=delete&amp;blockid='.$blockid.'">' .
+                        '<img src="'.$pixpath.'/t/delete.gif" /></a>';
+
+        if ($options & BLOCK_MOVE_LEFT) {
+            $movebuttons .= '<a style="margin-right: 3px;" title="'.$this->str->moveleft.'" href="'.$path.'/view.php?id='.$this->course->id.'&amp;blockaction=moveside&amp;blockid='.$blockid.'">' .
+                            '<img src="'.$pixpath.'/t/left.gif" /></a>';
+        }
+        if ($options & BLOCK_MOVE_UP) {
+            $movebuttons .= '<a style="margin-right: 3px;" title="'.$this->str->moveup.'" href="'.$path.'/view.php?id='.$this->course->id.'&amp;blockaction=moveup&amp;blockid='.$blockid.'">' .
+                            '<img src="'.$pixpath.'/t/up.gif" /></a>';
+        }
+        if ($options & BLOCK_MOVE_DOWN) {
+            $movebuttons .= '<a style="margin-right: 3px;" title="'.$this->str->movedown.'" href="'.$path.'/view.php?id='.$this->course->id.'&amp;blockaction=movedown&amp;blockid='.$blockid.'">' .
+                            '<img src="'.$pixpath.'/t/down.gif" /></a>';
+        }
+        if ($options & BLOCK_MOVE_RIGHT) {
+            $movebuttons .= '<a style="margin-right: 3px;" title="'.$this->str->moveright.'" href="'.$path.'/view.php?id='.$this->course->id.'&amp;blockaction=moveside&amp;blockid='.$blockid.'">' .
+                            '<img src="'.$pixpath.'/t/right.gif" /></a>';
+        }
+
+        $movebuttons .= '</div>';
+        $this->edit_controls = $movebuttons;
+    }
+
+    function _self_test() {
+        // Tests if this block has been implemented correctly.
+        // Also, $errors isn't used right now
+        $errors = array();
+
+        $correct = true;
+        if($this->get_title() === NULL) {
+            $errors[] = 'title_not_set';
+            $correct = false;
+        }
+        if(!in_array($this->get_content_type(), array(BLOCK_TYPE_LIST, BLOCK_TYPE_TEXT, BLOCK_TYPE_NUKE))) {
+            $errors[] = 'invalid_content_type';
+            $correct = false;
+        }
+        if($this->get_content() === NULL) {
+            $errors[] = 'content_not_set';
+            $correct = false;
+        }
+        if($this->get_version() === NULL) {
+            $errors[] = 'version_not_set';
+            $correct = false;
+        }
+        $allformats = COURSE_FORMAT_WEEKS | COURSE_FORMAT_TOPICS | COURSE_FORMAT_SOCIAL;
+        if(!($this->applicable_formats() & $allformats)) {
+            $errors[] = 'no_course_formats';
+            $correct = false;
+        }
+        $width = $this->preferred_width();
+        if(!is_int($width) || $width <= 0) {
+            $errors[] = 'invalid_width';
+            $correct = false;
+        }
+        return $correct;
+    }
+
+    function has_config() {
+        return false;
+    }
+    function print_config() {
+        // This does nothing, it's here to prevent errors from
+        // derived classes if they implement has_config() but not print_config()
+    }
+    function handle_config() {
+        // This does nothing, it's here to prevent errors from
+        // derived classes if they implement has_config() but not handle_config()
+    }
+    function applicable_formats() {
+        // Default case: the block can be used in all course types
+        return COURSE_FORMAT_WEEKS | COURSE_FORMAT_TOPICS | COURSE_FORMAT_SOCIAL;
+    }
+    function preferred_width() {
+        // Default case: the block wants to be 180 pixels wide
+        return 180;
+    }
+    function hide_header() {
+        //Default, false--> the header is showed
+        return false;
+    }
+    function html_attributes() {
+        // Default case: we want no extra attributes
+        return false;
+    }
+}
+
+class MoodleBlock_Nuke extends MoodleBlock {
+    function get_content() {
+
+        if($this->content !== NULL) {
+            return $this->content;
+        }
+
+        global $CFG;
+        $this->content = &New stdClass;
+
+        // This whole thing begs to be written for PHP >= 4.3.0 using glob();
+        $dir = $CFG->dirroot.'/blocks/'.$this->name().'/nuke/';
+        if($dh = @opendir($dir)) {
+            while (($file = readdir($dh)) !== false) {
+                $regs = array();
+                if(ereg('^block\-(.*)\.php$', $file, $regs)) {
+                    // Found it! Let's prepare the environment...
+
+                    $oldvals = array();
+                    if(isset($GLOBALS['admin'])) {
+                        $oldvals['admin'] = $GLOBALS['admin'];
+                    }
+
+                    $GLOBALS['admin'] = isteacher($this->course->id);
+                    @include($dir.$file);
+
+                    foreach($oldvals as $key => $val) {
+                        $GLOBALS[$key] = $val;
+                    }
+
+                    // We should have $content set now
+                    if(!isset($content)) {
+                        return NULL;
+                    }
+                    return $this->content->text = $content;
+                }
+            }
+        }
+
+        // If we reached here, we couldn't find the nuke block for some reason
+        return $this->content->text = get_string('blockmissingnuke');
+    }
+}
+
+?>

blocks/news_items/block_news_items.php

@@ -0,0 +1,38 @@
+<?PHP //$Id$
+
+class CourseBlock_news_items extends MoodleBlock {
+    function CourseBlock_news_items ($course) {
+        $this->title = get_string('latestnews');
+        $this->content_type = BLOCK_TYPE_TEXT;
+        $this->course = $course;
+        $this->version = 2004041200;
+    }
+
+    function get_content() {
+        global $CFG;
+
+        if($this->content !== NULL) {
+            return $this->content;
+        }
+
+        require_once($CFG->dirroot.'/course/lib.php');
+
+        $this->content = New object;
+        $this->content->text = '';
+        $this->content->footer = '';
+
+        if ($this->course->newsitems) {
+            $news = forum_get_course_forum($this->course->id, 'news');
+            // Slightly hacky way to do it but...
+            ob_start();
+            echo '<font size="-2">';
+            forum_print_latest_discussions($news->id, $this->course->newsitems, "minimal", "", get_current_group($this->course->id));
+            echo '</font>';
+            $this->content->text = ob_get_contents();
+            ob_end_clean();
+        }
+        return $this->content;
+    }
+}
+
+?>

blocks/news_items/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 news_items_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/news_items/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 news_items_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/online_users/block_online_users.php

@@ -0,0 +1,138 @@
+<?PHP //$Id$
+
+class CourseBlock_online_users extends MoodleBlock {
+    function CourseBlock_online_users ($course) {
+        $this->title = get_string('blockname','block_online_users');
+        $this->content_type = BLOCK_TYPE_TEXT;
+        $this->course = $course;
+        $this->version = 2004041800;
+    }
+
+    function has_config() {return true;}
+
+    function print_config() {
+        global $CFG, $THEME;
+        print_simple_box_start('center', '', $THEME->cellheading);
+        include($CFG->dirroot.'/blocks/'.$this->name().'/config.html');
+        print_simple_box_end();
+        return true;
+    }
+    function handle_config($config) {
+        foreach ($config as $name => $value) {
+            set_config($name, $value);
+        }
+        return true;
+    }
+
+    function get_content() {
+        global $USER, $CFG;
+
+        $timetoshowusers = 300; //Seconds default
+
+        if (isset($CFG->block_online_users_timetosee)) {
+            $timetoshowusers = $CFG->block_online_users_timetosee * 60;
+        }
+
+        if($this->content !== NULL) {
+            return $this->content;
+        }
+
+        $this->content = New object;
+        $this->content->text = '';
+        $this->content->footer = '';
+
+        //Calculate if we are in separate groups
+        $isseparategroups = ($this->course->groupmode == SEPARATEGROUPS and $this->course->groupmodeforce and
+                             !isteacheredit($this->course->id));
+
+        //Get the user current group
+        $currentgroup = $isseparategroups ? get_current_group($this->course->id) : NULL;
+
+        $groupmembers = "";
+        $select = "";
+
+        //Add this to the SQL to show only group users
+        if ($currentgroup !== NULL) {
+            $groupmembers = ", {$CFG->prefix}groups_members gm ";
+            $select .= " AND u.id = gm.userid AND gm.groupid = '$currentgroup'";
+        }
+
+        $timefrom = time()-$timetoshowusers;
+
+        $students = get_records_sql("SELECT u.id, u.username, u.firstname, u.lastname, u.picture, s.timeaccess
+                                     FROM {$CFG->prefix}user u,
+                                          {$CFG->prefix}user_students s
+                                          $groupmembers
+                                     WHERE u.id = s.userid and
+                                           s.course = {$this->course->id} and
+                                           s.timeaccess > $timefrom $select ORDER BY s.timeaccess DESC");
+
+        $teachers = get_records_sql("SELECT u.id, u.username, u.firstname, u.lastname, u.picture, s.timeaccess
+                                     FROM {$CFG->prefix}user u,
+                                          {$CFG->prefix}user_teachers s
+                                          $groupmembers
+                                     WHERE u.id = s.userid and
+                                           s.course = {$this->course->id} and
+                                           s.timeaccess > $timefrom $select ORDER BY s.timeaccess DESC");
+
+        if ($teachers || $students) {
+            if ($students) {
+                foreach ($students as $student) {
+                    $student->fullname = fullname($student);
+                    $users[$student->id] = $student;
+                }
+            }
+            if ($teachers) {
+                foreach ($teachers as $teacher) {
+                    $teacher->fullname = '<b>'.fullname($teacher).'</b>';
+                    $users[$teacher->id] = $teacher;
+                }
+            }
+        } else {
+            $users = null;
+        }
+
+        //Calculate minutes
+        $minutes  = floor($timetoshowusers/60);
+
+        $this->content->text = "<font size=\"-2\"><div align=center>(".get_string("periodnminutes","block_online_users",$minutes).")</div></font>";
+
+        //Now, we have in users, the list of users to show
+        //Because they are online
+        if ($users !== null) {
+            foreach ($users as $user) {
+                $this->content->text .= '<div style="text-align: left; font-size: 0.75em; padding-top: 5px;">';
+                $timeago = format_time(time() - $user->timeaccess);
+                if ($user->picture==0) {
+                    $this->content->text .= '<img src="'.$CFG->pixpath.'/i/user.gif" style="height: 16px; width=16px; vertical-align: middle;" alt=""> ';
+                } else {
+                    if ($CFG->slasharguments) {
+                        $imgtag = '<img src="'.$CFG->wwwroot.'/user/pix.php/'.$user->id.'/f2.jpg" style="height: 16px; width=16px; vertical-align: middle;" alt=""> ';
+                    } else {
+                        $imgtag = '<img src="'.$CFG->wwwroot.'/user/pix.php?file=/'.$user->id.'/f2.jpg" style="height: 16px; width=16px; vertical-align: middle;" alt=""> ';
+                    }
+                    $this->content->text .= $imgtag;
+                }
+                $this->content->text .= '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$this->course->id.'" title="'.$timeago.'">'.$user->fullname.'</a></div>';
+            }
+/*
+                $table->align = array("right","left");
+                $table->cellpadding = 1;
+                $table->cellspacing = 1;
+                $table->data[] = array("<img src=\"$CFG->pixpath/i/user.gif\" height=16 width=16 alt=\"\">",$user->fullname);
+            }
+            // Slightly hacky way to do it but...
+            ob_start();
+            print_table($table);
+            //$this->content->text .= "<br>".ob_get_contents();
+            ob_end_clean();
+*/
+        } else {
+            $this->content->text .= "<font size=\"-1\"><p align=center>".get_string("none")."</p></font>";
+        }
+
+        return $this->content;
+    }
+}
+
+?>

blocks/online_users/config.html

@@ -0,0 +1,24 @@
+<form method="post" action="block.php">
+
+<table cellpadding="9" cellspacing="0">
+<tr valign="top">
+	<td align="right"><p>block_online_users_timetosee:</td>
+	<td>
+	<input name="block" type="hidden" value="<?php echo intval($_REQUEST['block']); ?>" />
+    <input name="block_online_users_timetosee" type="text" size="5" value="<?php if(isset($CFG->block_online_users_timetosee)) {
+                                                                               p($CFG->block_online_users_timetosee);
+                                                                           } else {
+                                                                               p(5);
+                                                                           } ?>" />
+    </td>
+    <td>
+    <?php print_string("configtimetosee", "block_online_users") ?>
+    </td>
+</tr>
+<tr>
+    <td colspan="3" align="center">
+	<input type="submit" value="<?php print_string("savechanges") ?>"></td>
+</tr>
+</table>
+
+</form>

blocks/online_users/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 online_users_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/online_users/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 online_users_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/participants/block_participants.php

@@ -0,0 +1,54 @@
+<?PHP //$Id$
+
+class CourseBlock_participants extends MoodleBlock {
+    function CourseBlock_participants ($course) {
+        $this->title = get_string('people');
+        $this->content_type = BLOCK_TYPE_LIST;
+        $this->course = $course;
+        $this->version = 2004041800;
+    }
+
+    function get_content() {
+        global $USER, $CFG;
+
+        if($this->content !== NULL) {
+            return $this->content;
+        }
+
+        $this->content = New object;
+        $this->content->items = array();
+        $this->content->icons = array();
+        $this->content->footer = '';
+
+        $strgroups   = get_string('groups');
+        $strgroupmy  = get_string('groupmy');
+
+        $this->content->items[]='<a title="'.get_string('listofallpeople').'" href="../user/index.php?id='.$this->course->id.'">'.get_string('participants').'</a>';
+        $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/users.gif" height="16" width="16" alt="">';
+
+        if ($this->course->groupmode or !$this->course->groupmodeforce) {
+            if ($this->course->groupmode == VISIBLEGROUPS or isteacheredit($this->course->id)) {
+                $this->content->items[]='<a title="'.$strgroups.'" href="groups.php?id='.$this->course->id.'">'.$strgroups.'</a>';
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/group.gif" height="16" width="16" alt="">';
+            } else if ($this->course->groupmode == SEPARATEGROUPS and $this->course->groupmodeforce) {
+                // Show nothing
+            } else if ($currentgroup = get_current_group($this->course->id)) {
+                $this->content->items[]='<a title="'.$strgroupmy.'" href="group.php?id='.$this->course->id.'">'.$strgroupmy.'</a>';
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/group.gif" height="16" width="16" alt="">';
+            }
+        }
+
+        $fullname = fullname($USER, true);
+        $editmyprofile = '<a title="'.$fullname.'" href="../user/edit.php?id='.$USER->id.'&amp;course='.$this->course->id.'">'.get_string('editmyprofile').'</a>';
+        if ($USER->description) {
+            $this->content->items[]= $editmyprofile;
+        } else {
+            $this->content->items[]= $editmyprofile." <blink>*</blink>";
+        }
+        $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" height="16" width="16" alt="">';
+
+        return $this->content;
+    }
+}
+
+?>

blocks/participants/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 participants_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/participants/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 participants_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/recent_activity/block_recent_activity.php

@@ -0,0 +1,31 @@
+<?PHP //$Id$
+
+class CourseBlock_recent_activity extends MoodleBlock {
+    function CourseBlock_recent_activity ($course) {
+        $this->title = get_string('recentactivity');
+        $this->content_type = BLOCK_TYPE_TEXT;
+        $this->course = $course;
+        $this->version = 2004042900;
+    }
+
+    function get_content() {
+
+        if($this->content !== NULL) {
+            return $this->content;
+        }
+
+        $this->content = New object;
+        $this->content->text = '';
+        $this->content->footer = '';
+
+        // Slightly hacky way to do it but...
+        ob_start();
+        print_recent_activity($this->course);
+        $this->content->text = ob_get_contents();
+        ob_end_clean();
+
+        return $this->content;
+    }
+}
+
+?>

blocks/recent_activity/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 recent_activity_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/recent_activity/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 recent_activity_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/search_forums/block_search_forums.php

@@ -0,0 +1,31 @@
+<?PHP //$Id$
+
+class CourseBlock_search_forums extends MoodleBlock {
+    function CourseBlock_search_forums ($course) {
+        $this->title = get_string('search', 'forum');
+        $this->content_type = BLOCK_TYPE_TEXT;
+        $this->course = $course;
+        $this->version = 2004041000;
+    }
+
+    function get_content() {
+        global $USER, $CFG, $SESSION;
+        optional_variable($_GET['cal_m']);
+        optional_variable($_GET['cal_y']);
+
+        if($this->content !== NULL) {
+            return $this->content;
+        }
+
+        $this->content = New object;
+        $this->content->text = '';
+        $this->content->footer = '';
+
+        $form = forum_print_search_form($this->course, '', true);
+        $this->content->text = '<div align="center">'.$form.'</div>';
+
+        return $this->content;
+    }
+}
+
+?>

blocks/search_forums/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 search_forums_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/search_forums/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 search_forums_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004041000 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}

blocks/section_links/block_section_links.php

@@ -0,0 +1,83 @@
+<?PHP //$Id$
+
+class CourseBlock_section_links extends MoodleBlock {
+
+    function CourseBlock_section_links ($course) {
+        if ($course->format == 'topics') {
+            $this->title = get_string('topics', 'block_section_links');
+        }
+        else if ($course->format == 'weeks') {
+            $this->title = get_string('weeks', 'block_section_links');
+        }
+        else {
+            $this->title = get_string('blockname', 'block_section_links');
+        }
+        $this->content_type = BLOCK_TYPE_TEXT;
+        $this->course = $course;
+        $this->version = 2004052800;
+    }
+
+    function applicable_formats() {
+        return (COURSE_FORMAT_WEEKS | COURSE_FORMAT_TOPICS);
+    }
+
+    function get_content() {
+        global $CFG, $USER;
+
+        $highlight = 0;
+
+        if($this->content !== NULL) {
+            return $this->content;
+        }
+
+        if ($this->course->format == 'weeks') {
+            $highlight = ceil((time()-$this->course->startdate)/604800);
+            $linktext = get_string('jumptocurrentweek', 'block_section_links');
+            $sectionname = 'week';
+        }
+        else if ($this->course->format == 'topics') {
+            $highlight = $this->course->marker;
+            $linktext = get_string('jumptocurrenttopic', 'block_section_links');
+            $sectionname = 'topic';
+        }
+        $inc = 1;
+        if ($this->course->numsections > 22) {
+            $inc = 2;
+        }
+        if ($this->course->numsections > 40) {
+            $inc = 5;
+        }
+        $courseid = $this->course->id;
+        if ($display = get_field('course_display', 'display', 'course', $courseid, 'userid', $USER->id)) {
+            $link = "$CFG->wwwroot/course/view.php?id=$courseid&amp;$sectionname=";
+        } else {
+            $link = '#';
+        }
+        $text = '<font size=-1>';
+        for ($i = $inc; $i <= $this->course->numsections; $i += $inc) {
+            $isvisible = get_field('course_sections', 'visible', 'course', $this->course->id, 'section', $i);
+            if (!$isvisible and !isteacher($this->course->id)) {
+                continue;
+            }
+            $style = ($isvisible) ? '' : ' class="dimmed"';
+            if ($i == $highlight) {
+                $text .= "<a href=\"$link$i\"$style><b>$i</b></a> ";
+            } else {
+                $text .= "<a href=\"$link$i\"$style>$i</a> ";
+            }
+        }
+        if ($highlight) {
+            $isvisible = get_field('course_sections', 'visible', 'course', $this->course->id, 'section', $highlight);
+            if ($isvisible or isteacher($this->course->id)) {
+                $style = ($isvisible) ? '' : ' class="dimmed"';
+                $text .= "<br><a href=\"$link$highlight\"$style>$linktext</a>";
+            }
+        }
+
+        $this->content = New stdClass;
+        $this->content->footer = '';
+        $this->content->text = $text;
+        return $this->content;
+    }
+}
+?>

blocks/section_links/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 section_links_upgrade($oldversion=0) {
+
+    global $CFG;
+    
+    $result = true;
+
+    if ($oldversion < 2004050500 and $result) {
+        $result = true; //Nothing to do
+    }
+
+    //Finally, return result
+    return $result;
+}