Bumping to 1.6.2 for releasing

Merged fix from HEAD
added support to hyphen and tilde in CMIIdentifier
2006-09-12 16:05:51 +00:00 · 2006-09-12 14:28:04 +00:00 · 2006-09-12 08:46:23 +00:00 · 2006-09-12 02:48:41 +00:00 · 2006-09-11 09:05:35 +00:00 · 2006-09-11 08:28:49 +00:00
537 changed files with 45488 additions and 8926 deletions
@@ -26,7 +26,6 @@
    if ($config = data_submitted()) {

        $config = (array)$config;
-        validate_form($config, $err);

        // extract and sanitize the auth key explicitly
        $modules = get_list_of_plugins("auth");
@@ -36,6 +35,14 @@
            notify("Error defining the authentication method");
        }

+        // load the auth plugin library
+        require_once("{$CFG->dirroot}/auth/$auth/lib.php");
+
+        $err = array();
+        if (function_exists('auth_validate_form')) {
+            auth_validate_form($config, $err);
+        }
+
        if (count($err) == 0) {
            foreach ($config as $name => $value) {
                if (preg_match('/^pluginconfig_(.+?)$/', $name, $matches)) {
@@ -233,14 +240,6 @@

 /// Functions /////////////////////////////////////////////////////////////////

-function validate_form(&$form, &$err) {
-
-   // if (empty($form->fullname))
-   //     $err["fullname"] = get_string("missingsitename");
-
-    return;
-}
-
 //
 // Good enough for most auth plugins
 // but some may want a custom one if they are offering
@@ -60,7 +60,7 @@
    
    // $CFG->pagepath is used to generate the body and id attributes for the body tag
    // of the page. It is also used to generate the link to the Moodle Docs for this view.
-    $CFG->pagepath = 'block/' . $strblockname . '/config';
+    $CFG->pagepath = 'block/' . $block->name() . '/config';
    
    print_header($site->shortname.': '.$strblockname.": $strconfiguration", $site->fullname,
                  "<a href=\"index.php\">$stradmin</a> -> ".
@@ -156,7 +156,7 @@

    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'multiple', 'delete', 'settings'));
    $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strmultiple, $strdelete, $strsettings));
-    $table->define_baseurl($CFG->wwwroot.'/admin/blocks.php');
+    $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');

    $table->set_attribute('cellspacing', '0');
    $table->set_attribute('id', 'blocks');
@@ -218,7 +218,7 @@
        
        $table->define_columns(array('block', 'delete'));
        $table->define_headers(array($strname, $strdelete));
-        $table->define_baseurl($CFG->wwwroot.'/admin/blocks.php');
+        $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
    
        $table->set_attribute('cellspacing', '0');
        $table->set_attribute('id', 'incompatible');
@@ -3,6 +3,8 @@

    require_once('../config.php');

+    $installing = optional_param('installing', 0, PARAM_BOOL);
+
    $focus = '';

    if ($site = get_site()) {   // If false then this is a new installation
@@ -34,7 +36,7 @@
        if (count($err) == 0) {
            foreach ($config as $name => $value) {
                if ($name == "sessioncookie") {
-                    $value = eregi_replace("[^a-zA-Z]", "", $value);
+                    $value = eregi_replace("[^a-zA-Z0-9_]", "", $value);
                }
                if ($name == "defaultallowedmodules") {
                    $value = implode(',',$value);
@@ -46,7 +48,10 @@
                        $value = implode(',',$value);
                    }
                }
-                unset($conf);
+                if ($name == "locale") {
+                    $value = trim($value);
+                }
+                $conf = new object();
                $conf->name  = $name;
                $conf->value = $value;
                if ($current = get_record('config', 'name', $name)) {
@@ -60,8 +65,16 @@
                    }
                }
            }
-            redirect('index.php', get_string('changessaved'), 1);
-            exit;
+            if ($installing) {
+                print_header();
+                notify(get_string('changessaved'), 'notifysuccess');
+                print_continue('index.php');
+                exit;
+            } else {
+                // the following redirect was randomly breaking upgrades because it did double redirects,
+                // we must not use it during install/upgrade
+                redirect('index.php', get_string('changessaved'), 1);
+            }

        } else {
            foreach ($err as $key => $value) {
@@ -74,9 +87,6 @@

    if (empty($config)) {
        $config = $CFG;
-        if (!$config->locale = get_field('config', 'value', 'name', 'locale')) {
-            $config->locale = $CFG->lang;
-        }
    }

    $sesskey = !empty($USER->id) ? $USER->sesskey : '';
@@ -143,6 +153,7 @@

    }
    echo '<center>';
+    echo '<input type="hidden" name="installing" value="'.$installing.'" />';
    echo '<input type="hidden" name="sesskey" value="'.$sesskey.'" />';
    echo '<input type="submit" value="'.get_string('savechanges').'" />';
    echo '</center>';
@@ -69,7 +69,7 @@ class configvar {

 /// debug
    unset($options);
-    $options[7]  = $strno;
+    $options[5]  = $strno;
    $options[15] = $stryes;

    $misc['debug'] = new configvar (get_string('configdebug', 'admin'),
@@ -157,8 +157,8 @@ class configvarrss extends configvar {

 /// slasharguments
    unset($options);
-    $options[0] = "file.php?file=/pic.jpg";
-    $options[1] = "file.php/pic.jpg";
+    $options[0] = "file.php?file=/1/pic.jpg";
+    $options[1] = "file.php/1/pic.jpg";

    $operatingsystem['slasharguments'] = new configvar (get_string('configslasharguments', 'admin'),
        choose_from_menu ($options, 'slasharguments', $config->slasharguments, '', '', '', true) );
@@ -312,17 +312,20 @@ class configvarrss extends configvar {
 /// language menu
    $interface['langcache'] = new configvar ( get_string('configlangcache', 'admin'),
        choose_from_menu($noyesoptions, 'langcache', $config->langcache, '', '', '', true) );
-        
+
 /// locale
    $interface['locale'] = new configvar ( get_string('configlocale', 'admin'),
-        '<input name="locale" type="text" size="10" value="'.s($config->locale).'" alt="locale" />' );
+        '<input name="locale" type="text" size="15" value="'.s($config->locale).'" alt="locale" />' );

 /// docroot
    $interface['docroot'] = new configvar ( get_string('configdocroot', 'admin'),
        '<input name="docroot" type="text" size="60" value="'.s($config->docroot).'" alt="docroot" />' );

+/// doctonewwindow
+    $interface['doctonewwindow'] = new configvar ( get_string('configdoctonewwindow', 'admin'),
+        choose_from_menu($noyesoptions, 'doctonewwindow', $config->doctonewwindow, '', '', '', true) );
+
 /// timezone
-    
    $interface['timezone'] = new configvar ( get_string('configtimezone', 'admin'),
        choose_from_menu (get_list_of_timezones(), 'timezone', $config->timezone, get_string('serverlocaltime'), '', '99', true ) );

@@ -447,6 +450,9 @@ class configvarrss extends configvar {
    $security['notifyloginthreshold'] = new configvar (get_string('confignotifyloginthreshold', 'admin'),
        choose_from_menu($options, 'notifyloginthreshold', $config->notifyloginthreshold, '', '', '', true) );

+    $security['protectusernames'] = new configvar (get_string('configprotectusernames', 'admin'),
+        choose_from_menu($noyesoptions, 'protectusernames', $config->protectusernames, '', '', '', true) );
+
 /// secureforms
    $security['secureforms'] = new configvar (get_string('configsecureforms', 'admin'),
        choose_from_menu ($noyesoptions, 'secureforms', $config->secureforms, '', '', '', true) );
@@ -588,6 +594,7 @@ class configvarrss extends configvar {
    }
    
 /// enable stats
+if (empty($CFG->disablestatsprocessing)) {
    $stats['enablestats'] = new configvar (get_string('configenablestats','admin'),
        choose_from_menu($noyesoptions, 'enablestats', $config->enablestats, '', '', '', true) );

@@ -633,7 +640,7 @@ class configvarrss extends configvar {

    $stats['statsuserthreshold'] = new configvar (get_string('configstatsuserthreshold','admin'),
      '<input type="text" name="statsuserthreshold" size="4" value="'.$config->statsuserthreshold.'" />');
-                                              
+}                                        

 ////////////////////////////////////////////////////////////////////

@@ -646,6 +653,8 @@ class configvarrss extends configvar {
    $configvars['permissions']     = $permissions;
    $configvars['requestedcourse'] = $reqcourse;
    $configvars['misc']            = $misc;
+if (empty($CFG->disablestatsprocessing)) {
    $configvars['stats']           = $stats;
+}

 ?>
@@ -0,0 +1,42 @@
+<?php // $Id$
+
+    require_once('../config.php');
+
+    require_login();
+
+    if (!isadmin()) {
+        error("Only admins can access this page");
+    }
+
+    if (!$site = get_site()) {
+        redirect("index.php");
+    }
+
+    $stradministration = get_string("administration");
+    $strcourses        = get_string("courses");
+
+    print_header("$site->shortname: $stradministration: $strcourses", "$site->fullname", 
+                 "<a href=\"index.php\">$stradministration</a> -> $strcourses");
+
+    print_heading($strcourses);
+
+    $table->align = array ("right", "left");
+
+    $table->data[] = array('<b><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.get_string("managecourses")."</a></b>",
+                           get_string("adminhelpcourses"));
+    $table->data[] = array("<b><a href=\"enrol.php?sesskey=$USER->sesskey\">".get_string("enrolmentplugins")."</a></b>",
+                           get_string("adminhelpenrolments"));
+    $table->data[] = array("<b><a href=\"../course/index.php?edit=off&amp;sesskey=$USER->sesskey\">".get_string("assignstudents")."</a></b>",
+                           get_string("adminhelpassignstudents"));
+    $table->data[] = array("<b><a href=\"../course/index.php?edit=on&amp;sesskey=$USER->sesskey\">".get_string("assignteachers")."</a></b>",
+                           get_string("adminhelpassignteachers")." <img src=\"../pix/t/user.gif\" height=\"11\" width=\"11\" alt=\"\" />");
+    $table->data[] = array("<b><a href=\"creators.php?sesskey=$USER->sesskey\">".get_string("assigncreators")."</a></b>",
+                           get_string("adminhelpassigncreators"));
+    $table->data[] = array("<b><a href=\"admin.php?sesskey=$USER->sesskey\">".get_string("assignadmins")."</a></b>",
+                           get_string("adminhelpassignadmins"));
+
+    print_table($table);
+
+    print_footer($site);
+
+?>
@@ -64,9 +64,6 @@
          ?>
         </select>
         <br />
-         <script type="text/javascript">
-            function
-         </script>
         <input type="text" name="searchtext" size="30" value="<?php p($searchtext) ?>" 
                  onFocus ="document.creatorsform.add.disabled=true;
                            document.creatorsform.remove.disabled=true;
@@ -26,7 +26,7 @@
        chdir(dirname($_SERVER['argv'][0]));
    }

-    require_once("../config.php");
+    require_once(dirname(__FILE__) . '/../config.php');
    require_once($CFG->dirroot.'/lib/adminlib.php');

    if (!$alreadyadmin = isadmin()) {
@@ -42,11 +42,23 @@
    //unset test cookie, user must login again anyway
    setcookie('MoodleSessionTest'.$CFG->sessioncookie, '', time() - 3600, '/');

+/// switch to site language and locale
+	if (!empty($CFG->courselang)) {
+        unset ($CFG->courselang);
+	}
+    if (!empty($SESSION->lang)) {
+        unset ($SESSION->lang);
+    }
+    $USER->lang = '';
+    moodle_setlocale();
+
+/// send mime type and encoding
+    @header('Content-Type: text/plain; charset='.current_charset());
+
 /// Start output log

    $timenow  = time();

-    mtrace("<pre>");
    mtrace("Server Time: ".date('r',$timenow)."\n\n");

 /// Run all cron jobs for each module
@@ -262,7 +274,7 @@
        unset($enrol);
    }

-    if (!empty($CFG->enablestats)) {
+    if (!empty($CFG->enablestats) and empty($CFG->disablestatsprocessing)) {

        // check we're not before our runtime
        $timetocheck = strtotime("$CFG->statsruntimestarthour:$CFG->statsruntimestartminute today");
@@ -57,10 +57,12 @@
    $strmoodleversion = get_string('moodleversion');
    $strupdate = get_string('updatecomponent', 'admin');
    $strupwards = get_string('upwards', 'admin');
+    $strmisc = get_string('miscellaneous');

 /// Print the header stuff
    print_header("$SITE->shortname: $strenvironment", $SITE->fullname,
-                 "<a href=\"index.php\">$stradmin</a> -> ".$strenvironment);
+                 "<a href=\"index.php\">$stradmin</a> -> <a href=\"misc.php\">$strmisc</a> -> "
+                 .$strenvironment);

 /// Print the component download link
    echo '<div class="reportlink"><a href="environment.php?action=updatecomponent&amp;sesskey='.$USER->sesskey.'">'.$strupdate.'</a></div>';
@@ -34,4 +34,30 @@
      </PHP_EXTENSION>
    </PHP_EXTENSIONS>
  </MOODLE>
+  <MOODLE version="1.7">
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="4.1.16">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+        <BYPASS function="bypass_mysql416_reqs" message="mysql416bypassed" />
+      </VENDOR>
+      <VENDOR name="postgres" version="7.4" />
+      <VENDOR name="mssql" version="8.0" />
+      <VENDOR name="oracle" version="9.0" />
+    </DATABASE>
+    <PHP version="4.3.0" level="required" />
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iconvrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+    </PHP_EXTENSIONS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -188,10 +188,15 @@
    // construct the flexible table ready to display
    $table = new flexible_table(FILTER_TABLE);
    $table->define_columns(array('name', 'hideshow', 'order', 'settings'));
+    $table->column_style('hideshow', 'text-align', 'center');
+    $table->column_style('order', 'text-align', 'center');
+    $table->column_style('settings', 'text-align', 'center');
    $table->define_headers(array($txt->name, $txt->hideshow, $txt->updown, $txt->settings));
-    $table->define_baseurl("$CFG->wwwroot/admin/filters.php");
+    $table->define_baseurl("$CFG->wwwroot/$CFG->admin/filters.php");
    $table->set_attribute('id', 'blocks');
    $table->set_attribute('class', 'flexible generaltable generalbox');
+    $table->set_attribute('style', 'margin:auto;');
+    $table->set_attribute('cellpadding', '5');
    $table->setup();

    // iterate through filters adding to display table
@@ -202,13 +207,13 @@
        // get hide/show link
        if (in_array($path, $activefilters)) {
            $hideshow = "<a href=\"$myurl&amp;action=hide&amp;filterpath=$upath\">";
-            $hideshow .= "<img src=\"$img/hide.gif\" alt=\"hide\" /></a>";
+            $hideshow .= "<img src=\"{$CFG->pixpath}/i/hide.gif\" height=\"16\" width=\"16\" alt=\"hide\" /></a>";
            $hidden = false;
            $displayname = "<span>$name</span>";
        }
        else {
            $hideshow = "<a href=\"$myurl&amp;action=show&amp;filterpath=$upath\">";
-            $hideshow .= "<img src=\"$img/show.gif\" alt=\"show\" /></a>";
+            $hideshow .= "<img src=\"{$CFG->pixpath}/i/show.gif\" height=\"16\" width=\"16\" alt=\"show\" /></a>";
            $hidden = true;
            $displayname = "<span class=\"dimmed_text\">$name</span>";
        }
@@ -1,14 +1,23 @@
 <?php  // $Id$

+    ob_start(); //for whitespace test
    require_once('../config.php');

+	// extra whitespace test - intentionally breaks cookieless mode
+	$extraws = '';
+    while (true) {
+        $extraws .= ob_get_contents();
+        if (!@ob_end_clean()) { //
+            break;
+        }
+    }
+
    define('SEVERITY_NOTICE',      'notice');
    define('SEVERITY_ANNOYANCE',   'annoyance');
    define('SEVERITY_SIGNIFICANT', 'significant');
    define('SEVERITY_CRITICAL',    'critical');

-    $resetsesserrorcounter = optional_param('resetsesserrorcounter', 0, PARAM_BOOL);
-    $solution              = optional_param('solution', 0, PARAM_SAFEDIR); //in fact it is class name alhanumeric and _
+    $solution = optional_param('solution', 0, PARAM_SAFEDIR); //in fact it is class name alhanumeric and _

    require_login();
    if (!isadmin()) {
@@ -18,9 +27,11 @@
    $site = get_site();
    $stradmin         = get_string('administration');
    $strhealthcenter  = get_string('healthcenter');
+    $strmisc          = get_string('miscellaneous');

    print_header($site->shortname.': '.$strhealthcenter, $site->fullname,
-                  '<a href="index.php">'.$stradmin.'</a> -> '.$strhealthcenter);
+                  '<a href="index.php">'.$stradmin.'</a> -> <a href="misc.php">'.$strmisc.'</a> ->'.
+                  $strhealthcenter);

 echo <<<STYLES
 <style type="text/css">
@@ -216,18 +227,13 @@ class problem_000001 extends problem_base {

 class problem_000002 extends problem_base {
    function title() {
-        return 'Extra characters at the end of config.php';
+        return 'Extra characters at the end of config.php or other library function';
    }
    function exists() {
-        // [pj] When the requirements are raised to PHP 4.3.0 this will be file_get_contents()
-        if($fp = @fopen('../config.php', 'r')) {
-            $contents = fread($fp, 16384); // 16K should be enough
-            $ending = substr($contents, -2);
-            unset($contents);
-            if($ending == '?>') {
-                return false;
-            }
-            fclose($fp);
+        global $extraws;
+
+        if($extraws === '') {
+            return false;
        }
        return true;
    }
@@ -235,11 +241,11 @@ class problem_000002 extends problem_base {
        return SEVERITY_SIGNIFICANT;
    }
    function description() {
-        return 'Your Moodle configuration file, config.php, contains some characters after the closing PHP tag (?>). This could cause Moodle to exhibit several kinds of problems and should be fixed.';
+        return 'Your Moodle configuration file config.php or another library file, contains some characters after the closing PHP tag (?>). This causes Moodle to exhibit several kinds of problems (such as broken downloaded files) and must be fixed.';
    }
    function solution() {
        global $CFG;
-        return 'You need to edit <strong>'.$CFG->dirroot.'/config.php</strong> and remove all characters (including spaces and returns) after the ending ?> tag. These two characters should be the very last in that file.';
+        return 'You need to edit <strong>'.$CFG->dirroot.'/config.php</strong> and remove all characters (including spaces and returns) after the ending ?> tag. These two characters should be the very last in that file. The extra trailing whitespace may be also present in other PHP files that are included from lib/setup.php.';
    }
 }

@@ -350,24 +356,41 @@ class problem_000008 extends problem_base {
        return 'PHP: memory_limit cannot be controlled by Moodle';
    }
    function exists() {
-        $memlimit = @ini_get('memory_limit');
-        if(empty($memlimit)) {
+        $oldmemlimit = @ini_get('memory_limit');
+        if(empty($oldmemlimit)) {
            // PHP not compiled with memory limits, this means that it's
-            // probably limited to 8M so we have a problem...
-            return true;
+            // probably limited to 8M or in case of Windows not at all.
+            // We can ignore it for now - there is not much to test anyway
+            // TODO: add manual test that fills memory??
+            return false;
        }
-        // Otherwise, raise_memory_limit in setup.php will do the trick
+        $oldmemlimit = get_real_size($oldmemlimit);
+        //now lets change the memory limit to something unique below 128M==134217728
+        @ini_set('memory_limit', 134217720);
+        $testmemlimit = get_real_size(@ini_get('memory_limit'));
+        //verify the change had any effect at all
+        if ($oldmemlimit == $testmemlimit) {
+            //memory limit can not be changed - is it big enough then?
+            if ($oldmemlimit < get_real_size('128M')) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        @ini_set('memory_limit', $oldmemlimit);
        return false;
    }
    function severity() {
-        return SEVERITY_ANNOYANCE;
+        return SEVERITY_NOTICE;
    }
    function description() {
-        return 'The settings for PHP on your server do not allow a script to request more memory during its execution. This means that most likely there is a hard limit of 8MB for each script. It is possible that certain operations within Moodle will require more than this amount in order to complete successfully, especially if there are lots of data to be processed. Therefore, it is recommended that you contact your server administrator to address this issue.';
+        return 'The settings for PHP on your server do not allow a script to request more memory during its execution. '.
+               'This means that there is a hard limit of '.@ini_get('memory_limit').' for each script. '.
+               'It is possible that certain operations within Moodle will require more than this amount in order '.
+               'to complete successfully, especially if there are lots of data to be processed.';
    }
    function solution() {
-        global $CFG;
-        return 'We need a good solution here. Enabling memory limit control means recompiling PHP... maybe this should be SEVERITY_NOTICE instead of SEVERITY_ANNOYANCE?';
+        return 'It is recommended that you contact your web server administrator to address this issue.';
    }
 }

@@ -421,7 +444,7 @@ class problem_000010 extends problem_base {
            $desc .= '<li>slasharguments are enabled in Moodle configuration</li>';   
        }
        if ($this->status() == -1) {
-            $desc .= '<li>can not run automatic test, you can verify it <a href="'.$CFG->wwwroot.'/file.php/testslasharguments" target="_blank">here</a></li>';
+            $desc .= '<li>can not run automatic test, you can verify it <a href="'.$CFG->wwwroot.'/file.php/testslasharguments" target="_blank">here</a> manually</li>';
        } else if ($this->status() == 0) {
            $desc .= '<li>slashargument test <strong>failed</strong>, please check server configuration</li>';
        } else {
@@ -462,13 +485,13 @@ class problem_000010 extends problem_base {
    function status() {
        global $CFG;
        $handle = @fopen($CFG->wwwroot.'/file.php?file=/testslasharguments', "r");
-        $contents = trim(@fread($handle, 7));
+        $contents = @trim(fread($handle, 10));
        @fclose($handle);
        if ($contents != 'test -1') {
            return -1;
        }
        $handle = @fopen($CFG->wwwroot.'/file.php/testslasharguments', "r");
-        $contents = trim(@fread($handle, 6));
+        $contents = trim(@fread($handle, 10));
        @fclose($handle);
        switch ($contents) {
            case 'test 1': return 1;
@@ -499,7 +522,7 @@ class problem_000011 extends problem_base {
    }
    function solution() {
        global $CFG;
-        if (!empty($resetsesserrorcounter)) {
+        if (optional_param('resetsesserrorcounter', 0, PARAM_BOOL)) {
            if (get_field('config', 'name', 'name', 'session_error_counter')) {
                delete_records('config', 'name', 'session_error_counter');
            }
@@ -535,6 +558,7 @@ class problem_00000x extends problem_base {
 TODO:

    session.save_path -- it doesn't really matter because we are already IN a session, right?
+    detect unsupported characters in $CFG->wwwroot - see bug Bug #6091 - relative vs absolute path during backup/restore process

 */

@@ -5,20 +5,28 @@
        header('Location: ../install.php');
        die;
    }
-   
+
+/// Check that PHP is of a sufficient version
+/// Moved here because older versions do not allow while(@ob_end_clean());
+    if (version_compare(phpversion(), "4.3.0") < 0) {
+        $phpversion = phpversion();
+        echo "Sorry, Moodle requires PHP 4.3.0 or later (currently using version $phpversion)";
+        die;
+    }
+
+/// Turn off time limits and try to flush everything all the time, sometimes upgrades can be slow.
+
+    @set_time_limit(0);
+    @ob_implicit_flush(true);
+    while(@ob_end_clean()); // ob_end_flush prevents sending of headers
+
+
    require_once('../config.php');
    include_once($CFG->dirroot.'/lib/adminlib.php');  // Contains various admin-only functions

    $id             = optional_param('id', '', PARAM_ALPHANUM);
    $confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
    $agreelicence = optional_param('agreelicence',0, PARAM_BOOL);
-/// Check that PHP is of a sufficient version
-
-    if (!check_php_version("4.1.0")) { //TODO: should we bump it up to 4.3.0??
-        $phpversion = phpversion();
-        print_heading("Sorry, Moodle requires PHP 4.1.0 or later (currently using version $phpversion)");
-        die;
-    }


 /// Check some PHP server settings
@@ -68,13 +76,6 @@
        $CFG->version = "";
    }

-/// Turn off time limits and try to flush everything all the time, sometimes upgrades can be slow.
-
-    @set_time_limit(0);
-    @ob_implicit_flush(true);
-    @ob_end_flush();
- 
-
 /// Check if the main tables have been installed yet or not.

    if (! $tables = $db->Metatables() ) {    // No tables yet at all.
@@ -221,7 +222,7 @@
 /// If any new configurations were found then send to the config page to check

    if (!empty($configchange)) {
-        redirect("config.php");
+        redirect("config.php?installing=1");
    }

 /// Find and check all main modules and load them up or upgrade them if necessary
@@ -322,6 +323,9 @@
        print_simple_box(get_string('globalsquoteswarning', 'admin'), 'center', '60%');
    }

+    if (is_dataroot_insecure()) {
+        print_simple_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'center', '60%');
+    }

 /// If no recently cron run
    $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
@@ -399,38 +403,44 @@
    $userdata .= '<div class="adminlink"><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/uploaduser.php?sesskey='.$USER->sesskey.'">'.
                 get_string('uploadusers').'</a> - <span class="explanation">'.get_string('adminhelpuploadusers').'</span></div>';

-    $userdata .= '<hr /><div class="adminlink"><a href="enrol.php?sesskey='.$USER->sesskey.'">'.get_string('enrolmentplugins').
-                 '</a> - <span class="explanation">'.get_string('adminhelpenrolments').'</span></div>';
-    $userdata .= '<div class="adminlink"><a href="../course/index.php?edit=off&amp;sesskey='.$USER->sesskey.'">'.
-                 get_string('assignstudents').'</a> - <span class="explanation">'.get_string('adminhelpassignstudents').'</span></div>';
-
-    $userdata .= '<div class="adminlink"><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.
-                 get_string('assignteachers').'</a> - <span class="explanation">'.get_string('adminhelpassignteachers').
-                 ' <img src="../pix/t/user.gif" height="11" width="11" alt="" /></span></div>';
-    $userdata .= '<div class="adminlink"><a href="creators.php?sesskey='.$USER->sesskey.'">'.get_string('assigncreators').
-                 '</a> - <span class="explanation">'.get_string('adminhelpassigncreators').'</span></div>';
-    $userdata .= '<div class="adminlink"><a href="admin.php?sesskey='.$USER->sesskey.'">'.get_string('assignadmins').
-                 '</a> - <span class="explanation">'.get_string('adminhelpassignadmins').'</span></div>';
-
    $table->data[] = array('<strong><a href="users.php">'.get_string('users').'</a></strong>', $userdata);

-    $table->data[] = array('<strong><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.get_string('courses').'</a></strong>',
-                           '<div class="explanation">'.get_string('adminhelpcourses').'</div>');
-    $table->data[] = array('<strong><a href="../files/index.php?id='.$site->id.'">'.get_string('sitefiles').'</a></strong>',
-                           '<div class="explanation">'.get_string('adminhelpsitefiles').'</div>');
-    $table->data[] = array('<strong><a href="stickyblocks.php">'.get_string('stickyblocks','admin').'</a></strong>',
-                           '<div class="explanation">'.get_string('adminhelpstickyblocks').'</div>');
-    $table->data[] = array('<strong><a href="report.php">'.get_string('reports').'</a></strong>', 
-                           '<div class="explanation">'.get_string('adminhelpreports').'</div>');
-    $table->data[] = array('<strong><a href="environment.php">'.get_string('environment','admin').'</a></strong>',
-                           '<div class="explanation">'.get_string('adminhelpenvironment').'</div>');
+    $coursedata = '<div class="adminlink"><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.get_string('managecourses').
+                 '</a> - <span class="explanation">'.get_string('adminhelpcourses').'</span></div>';
+    $coursedata .= '<div class="adminlink"><a href="enrol.php?sesskey='.$USER->sesskey.'">'.get_string('enrolmentplugins').
+                 '</a> - <span class="explanation">'.get_string('adminhelpenrolments').'</span></div>';
+    $coursedata .= '<div class="adminlink"><a href="../course/index.php?edit=off&amp;sesskey='.$USER->sesskey.'">'.
+                 get_string('assignstudents').'</a> - <span class="explanation">'.get_string('adminhelpassignstudents').'</span></div>';
+    $coursedata .= '<div class="adminlink"><a href="../course/index.php?edit=on&amp;sesskey='.$USER->sesskey.'">'.
+                 get_string('assignteachers').'</a> - <span class="explanation">'.get_string('adminhelpassignteachers').
+                 ' <img src="../pix/t/user.gif" height="11" width="11" alt="" /></span></div>';
+    $coursedata .= '<div class="adminlink"><a href="creators.php?sesskey='.$USER->sesskey.'">'.get_string('assigncreators').
+                 '</a> - <span class="explanation">'.get_string('adminhelpassigncreators').'</span></div>';
+    $coursedata .= '<div class="adminlink"><a href="admin.php?sesskey='.$USER->sesskey.'">'.get_string('assignadmins').
+                 '</a> - <span class="explanation">'.get_string('adminhelpassignadmins').'</span></div>';

+    $table->data[] = array('<strong><a href="courses.php">'.get_string('courses').'</a></strong>', $coursedata);
+
+    $miscdata = '<div class="adminlink"><a href="../files/index.php?id='.$site->id.'">'.get_string('sitefiles').
+                 '</a> - <span class="explanation">'.get_string('adminhelpsitefiles').'</span></div>';
+    $miscdata .= '<div class="adminlink"><a href="stickyblocks.php">'.get_string('stickyblocks','admin').
+                 '</a> - <span class="explanation">'.get_string('adminhelpstickyblocks').'</span></div>';
+    $miscdata .= '<div class="adminlink"><a href="report.php">'.get_string('reports').
+                 '</a> - <span class="explanation">'.get_string('adminhelpreports').'</span></div>';
+//to be enabled later
+/*    $miscdata .= '<div class="adminlink"><a href="health.php">'.get_string('healthcenter').
+                 '</a> - <span class="explanation">'.get_string('adminhelphealthcenter').'</span></div>';*/
+    $miscdata .= '<div class="adminlink"><a href="environment.php">'.get_string('environment', 'admin').
+                 '</a> - <span class="explanation">'.get_string('adminhelpenvironment').'</span></div>';
 /// Optional stuff
    if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
-        $table->data[] = array("<strong><a href=\"$CFG->dbtype/frame.php\">".get_string('managedatabase').'</a></strong>',
-                               '<div class="explanation">'.get_string('adminhelpmanagedatabase').'</div>');
+        $miscdata .= '<div class="adminlink"><a href="'.$CFG->dbtype.'/frame.php">'.get_string('managedatabase').
+        			 '</a> - <span class="explanation">'.get_string('adminhelpmanagedatabase').'</span></div>';
    }

+    $table->data[] = array('<strong><a href="misc.php">'.get_string('miscellaneous').'</a></strong>', $miscdata);
+
+
 /// Hooks for Matt Oquists contrib code for repositories and portfolio.  
 /// The eventual official versions may not look like this
    if (isset($CFG->portfolio) && file_exists("$CFG->dirroot/$CFG->portfolio")) {
@@ -1,9 +1,59 @@
 <?PHP // $Id$
+    /**
+    * Display the admin/language menu and process strings translation.
+    *
+    * CHANGES
+    *
+    * 2006/06/08 mudrd8mz
+    * 1) Fixed bug 5745 reported by Harry Smith so now can edit en_utf8_local pack
+    * 2) More notification messages included
+    *
+    * 2006/05/30 mudrd8mz
+    * Merged with version by Mitsuhiro Yoshida - display icon links instead of text links
+    * (I have changed the position of arrow icons to not to be so close each other)
+    *
+    * 2006/05/19 mudrd8mz
+    * A lot of changes to support translation of *_utf8_local langugage packs. Needs testing
+    *
+    * 2006/05/16 mudrd8mz
+    * 1) LANG_DEFAULT_FILE can be now set. moodle.php used to be opened automatically.
+    *    As it was (and still is) one of the biggest files it usually took a long time to load the page
+    *    even if you just want to choose the file to translate.
+    * 2) added links from "missing" to "compare" mode page
+    * 3) english strings are now key-sorted in "missing" mode
+    * 4) list of files with missing strings is now displayed at the top of "missing" page
+    *
+    * 2006/05/14 mudrd8mz Improvements of lang.php,v 1.65 2006/04/10 22:15:57 stronk7 Exp 
+    *  1) "go to first missing string" link can be displayed (see LANG_DISPLAY_MISSING_LINKS)
+    *  2) "go to next missing" link can be displayed (see LANG_DISPLAY_MISSING_LINKS)
+    *  3) submit button may be repeated (see LANG_SUBMIT_REPEAT*)
+    *  4) added (empty) "summary" attribute for the <table>'s
+    *  5) added error_reporting(E_ALL ^ E_NOTICE); in "compare" mode (even in debug environment
+    *     we know that missing keys are missing strings here, not bugs ;-)
+    */

    require_once('../config.php');

+    define('LANG_SUBMIT_REPEAT', 1);            // repeat displaying submit button?
+    define('LANG_SUBMIT_REPEAT_EVERY', 20);     // if so, after how many lines?
+    define('LANG_DISPLAY_MISSING_LINKS', 1);    // display "go to first/next missing string" links?
+    define('LANG_DEFAULT_FILE', '');            // default file to translate. Empty allowed
+    define('LANG_LINK_MISSING_STRINGS', 1);     // create links from "missing" page to "compare" page?
+    define('LANG_DEFAULT_USELOCAL', 0);         // should *_utf8_local be used by default?
+
    $mode        = optional_param('mode', '', PARAM_ALPHA);
-    $currentfile = optional_param('currentfile', 'moodle.php', PARAM_FILE);
+    $currentfile = optional_param('currentfile', LANG_DEFAULT_FILE, PARAM_FILE);
+    $uselocal    = optional_param('uselocal', -1, PARAM_INT);
+
+    if ($uselocal == -1) {
+        if (isset($SESSION->langtranslateintolocal)) {
+            $uselocal = $SESSION->langtranslateintolocal;
+        } else {
+            $uselocal = LANG_DEFAULT_USELOCAL;
+        }
+    } else {
+        $SESSION->langtranslateintolocal = $uselocal;
+    }

    require_login();

@@ -23,9 +73,30 @@
    $streditstrings = get_string("editstrings", 'admin');
    $stredithelpdocs = get_string("edithelpdocs", 'admin');
    $strthislanguage = get_string("thislanguage");
+    $strgotofirst = get_string('gotofirstmissing','admin');
+    $strfilestoredin = get_string('langstorein', 'admin');
+    $strfilestoredinhelp = get_string('langstoreinhelp', 'admin');
+    $strswitchlangdirbtn = get_string('langstoreswitch', 'admin');
+    $strchoosefiletoedit = get_string('langchoosefile', 'admin');
+    $streditennotallowed = get_string('langnoeditenglish', 'admin');
+    $strfilecreated = get_string('langfilecreated', 'admin');

+    // FIXME / TODO
+    // remove following lines after adding string into proper english lang pack
+    $strgotofirst = 'go to first missing string';
+    $strfilestoredin = 'Save file into folder :';
+    $strfilestoredinhelp = 'Where the file will be stored';
+    $strswitchlangdirbtn = 'switch';
+    $strchoosefiletoedit = 'Choose file to edit from the box above';
+    $streditennotallowed = 'Language en_utf8 cannot be edited with this page - switch to local';
+    $strfilecreated = 'New file created';
+
+    $currentlang = current_language();
+    
    switch ($mode) {
        case "missing":
+            // Missing array keys are not bugs here but missing strings
+            error_reporting(E_ALL ^ E_NOTICE);
            $navigation = "<a href=\"lang.php\">$strlanguage</a> -> $strmissingstrings";
            $title = $strmissingstrings;
            $button = '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
@@ -46,7 +117,6 @@
            break;
    }

-    $currentlang = current_language();

    print_header("$site->shortname: $title", "$site->fullname",
                 "<a href=\"index.php\">$stradministration</a> -> ".
@@ -55,7 +125,7 @@

    if (!$mode) {
        print_simple_box_start('center','80%');
-        echo '<table align="center" width="100%"><tr><td width="50%" align="center">';
+        echo '<table summary="" align="center" width="100%"><tr><td width="50%" align="center">';
        print_string('managelang','admin');
        echo '</td><td align="center" width="50%">';
        print_string('editlang','admin');
@@ -65,7 +135,7 @@
        echo '</td><td>';
        $currlang = current_language();
        $langs = get_list_of_languages();
-        echo "<table align=\"center\"><tr><td align=\"right\">";
+        echo "<table summary=\"\" align=\"center\"><tr><td align=\"right\">";
        echo "<b>$strcurrentlanguage:</b>";
        echo "</td><td>";
        echo popup_form ("$CFG->wwwroot/$CFG->admin/lang.php?lang=", $langs, "chooselang", $currlang, "", "", "", true);
@@ -84,8 +154,13 @@

    // Get a list of all the root files in the English directory

-    $langdir = "$CFG->dataroot/lang/$currentlang";
    $enlangdir = "$CFG->dirroot/lang/en_utf8";
+    if ($currentlang == 'en_utf8') {
+        $langdir = $enlangdir;
+    } else {
+        $langdir = "$CFG->dataroot/lang/$currentlang";
+    }
+    $locallangdir = "$CFG->dataroot/lang/{$currentlang}_local";

    if (! $stringfiles = get_directory_list($enlangdir, "", false)) {
        error("Could not find English language pack!");
@@ -105,20 +180,31 @@
            error ('to edit this language pack, you need to put it in '.$CFG->dataroot.'/lang');
        }

+        // Following variables store the HTML output to be echo-ed
+        $m = '';
+        $o = '';
+
        // For each file, check that a counterpart exists, then check all the strings
        foreach ($stringfiles as $file) {
            unset($string);
            include("$enlangdir/$file");
            $enstring = $string;  
+
+            ksort($enstring);
            
            unset($string);

            if (file_exists("$langdir/$file")) {
                include("$langdir/$file");
+                $fileismissing = 0;
            } else {
-                notify(get_string("filemissing", "", "$langdir/$file"));
+                $fileismissing = 1;
+                // notify(get_string("filemissing", "", "$langdir/$file"));
+                $o .= '<div class="notifyproblem" align="center">'.get_string("filemissing", "", "$langdir/$file").'</div><br />';
                $string = array();
            }
+
+            $missingcounter = 0;
    
            $first = true;
            foreach ($enstring as $key => $value) {
@@ -127,18 +213,39 @@
                    $value = str_replace("$"."a", "\\$"."a", $value);
                    $value = str_replace("%%","%",$value);
                    if ($first) {
-                        echo "<p><b>".get_string("stringsnotset","","$langdir/$file")."</b></p><pre>";
+                        $m .= "<a href=\"lang.php?mode=missing#$file\">$file";
+                        $m .= $fileismissing ? '*' : '';
+                        $m .= '</a> &nbsp; ';
+                        $o .= "<p><a name=\"$file\"></a><b>".get_string("stringsnotset","","$langdir/$file")."</b></p><pre>";
                        $first = false;
                        $somethingfound = true;
                    }
-                    echo "$"."string['$key'] = \"$value\";<br />";
+                    $missingcounter++;
+                    if (LANG_LINK_MISSING_STRINGS) {
+                        $missinglinkstart = "<a href=\"lang.php?mode=compare&amp;currentfile=$file#missing$missingcounter\">";
+                        $missinglinkend = '</a>';
+                    } else {
+                        $missinglinkstart = '';
+                        $missinglinkend = '';
+                    }
+                    $o .= "$"."string['".$missinglinkstart.$key.$missinglinkend."'] = \"$value\";<br />";
                }
            }
            if (!$first) {
-                echo '</pre><hr />';
+                $o .= '</pre><hr />';
            }
        }
  
+        if ($m <> '') {
+            echo '<br />';
+            print_simple_box_start("center", "80%");
+            echo '<center><font size="2">';
+            echo $m;
+            echo '</font></center>';
+            print_simple_box_end();
+        }
+        echo $o;
+
        if (! $files = get_directory_list("$CFG->dirroot/lang/en_utf8/help", "CVS")) {
            error("Could not find English language help files!");
        }
@@ -169,12 +276,26 @@
        }

    } else if ($mode == "compare") {
-
-        if (!file_exists($langdir)) {
-            error ('to edit this language pack, you need to put it in '.$CFG->dataroot.'/lang');
+   
+        if (!$uselocal && !file_exists($langdir)) {
+            if (!lang_make_directory($langdir)) {
+                error('ERROR: Could not create directory '.$langdir);
+            } else {
+                echo '<div class="notifysuccess" align="center">Created directory '.
+                                                     $langdir .'</div>'."<br />\n";
+            }
        }
-
-
+        if ($uselocal && !file_exists($locallangdir)) {
+            if (!lang_make_directory($locallangdir)) {
+                echo '<div class="notifyproblem" align="center">ERROR: Could not create directory '.
+                                     $locallangdir .'</div>'."<br />\n";
+                $uselocal = 0;
+            } else {
+                echo '<div class="notifysuccess" align="center">Created directory '.
+                                                     $locallangdir .'</div>'."<br />\n";
+            }
+        }
+        
        if (isset($_POST['currentfile'])){   // Save a file
            if (!confirm_sesskey()) {
                error(get_string('confirmsesskeybad', 'error'));
@@ -188,12 +309,28 @@
            }
            
            unset($newstrings['currentfile']);
-            if (lang_save_file($langdir, $currentfile, $newstrings)) {
-                notify(get_string("changessaved")." ($langdir/$currentfile)", "green");
+
+            if ($uselocal) {
+                include("$langdir/$currentfile");
+                if (isset($string)) {
+                    $packstring = $string;
+                } else {
+                    $packstring = array();
+                }
+                unset($string);
+                $saveinto = $locallangdir;
            } else {
-                error("Could not save the file '$currentfile'!", "lang.php?mode=compare&amp;currentfile=$currentfile");
+                $packstring = array();  
+                $saveinto = $langdir;
            }
-        }
+            
+            if (lang_save_file($saveinto, $currentfile, $newstrings, $uselocal, $packstring)) {
+                notify(get_string("changessaved")." ($saveinto/$currentfile)", "green");
+            } else {
+                error("Could not save the file '$saveinto/$currentfile'!", "lang.php?mode=compare&amp;currentfile=$currentfile");
+            }
+            unset($packstring);
+        } 

        print_heading_with_help($streditstrings, "langedit");

@@ -209,133 +346,213 @@
        echo '</font></center>';
        print_simple_box_end();

-        
-        print_heading("$currentfile", "center", 4);

-        if (!file_exists("$langdir/$currentfile")) {
-            if (!touch("$langdir/$currentfile")) {
-                echo "<p><font color=\"red\">".get_string("filemissing", "", "$langdir/$currentfile")."</font></p>";
-                continue;
+        print_simple_box_start("center", "80%");
+        echo '<center>'.$strfilestoredin.' <strong>';
+        echo $uselocal ? "{$currentlang}_local" : $currentlang;
+        echo '</strong> ';
+        helpbutton('langswitchstorage', $strfilestoredinhelp, 'moodle');
+        
+        echo '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
+             '<input type="hidden" name="mode" value="compare" />'.
+             '<input type="hidden" name="currentfile" value="'.$currentfile.'" />'.
+             '<input type="hidden" name="uselocal" value="'.(1 - $uselocal % 2).'" />'.
+             '<input type="submit" value="'.$strswitchlangdirbtn.'" />'.
+             '</form></center>';
+        print_simple_box_end();
+       
+        if ($currentfile <> '') {
+            $saveto = $uselocal ? $locallangdir : $langdir;
+            error_reporting(0);
+            if (!file_exists("$saveto/$currentfile")) {
+                if (!@touch("$saveto/$currentfile")) {
+                    print_heading(get_string("filemissing", "", "$saveto/$currentfile"), "center", 4, "error");
+                } else {
+                    print_heading($strfilecreated, "center", 4, "notifysuccess");
+                }
+            }
+            if ($currentlang == "en_utf8" && !$uselocal) {
+                $editable = false;
+                print_heading($streditennotallowed, 'center', 4);
+            } elseif ($f = fopen("$saveto/$currentfile","r+")) {
+                $editable = true;
+                fclose($f);
+            } else {
+                $editable = false;
+                echo "<p><font size=\"1\">".get_string("makeeditable", "", "$saveto/$currentfile")."</font></p>";
+            }
+            error_reporting($CFG->debug);
+            
+            print_heading("$currentfile", "center", 4);
+            if (LANG_DISPLAY_MISSING_LINKS && $editable) {
+                print_heading('<a href="#missing1">'.$strgotofirst.'</a>', "center", 4);
            }
-        }

-        error_reporting(0);
-        if ($f = fopen("$langdir/$currentfile","r+") && ($currentlang != "en_utf8")) {
-            $editable = true;
-            fclose($f);
-        } else {
-            $editable = false;
-            echo "<p><font size=\"1\">".get_string("makeeditable", "", "$langdir/$currentfile")."</font></p>";
-        }
-        ///added code here to prevent en_utf8 being edited
-        
-        error_reporting(7);
+            unset($string);
+            include("$enlangdir/$currentfile");
+            $enstring = $string;  
+            if ($currentlang != 'en' and $currentfile == 'moodle.php') {
+                $enstring['thislanguage'] = "<< TRANSLATORS: Specify the name of your language here.  If possible use Unicode Numeric Character References >>";
+                $enstring['thischarset'] = "<< TRANSLATORS: Specify the character set of your language here. Note that all text created while this language is active will be stored using this character set, so don't change it once you have set it. Example: iso-8859-1 >>";
+                $enstring['thisdirection'] = "<< TRANSLATORS: This string specifies the direction of your text, either left-to-right or right-to-left.  Insert either 'ltr' or 'rtl' here. >>";
+                $enstring['parentlanguage'] = "<< TRANSLATORS: If your language has a Parent Language that Moodle should use when strings are missing from your language pack, then specify the code for it here.  If you leave this blank then English will be used.  Example: nl >>";
+            }
+            ksort($enstring);

+            unset($string);

-        unset($string);
-        include("$enlangdir/$currentfile");
-        $enstring = $string;  
-        if ($currentlang != 'en' and $currentfile == 'moodle.php') {
-            $enstring['thislanguage'] = "<< TRANSLATORS: Specify the name of your language here.  If possible use Unicode Numeric Character References >>";
-            $enstring['thischarset'] = "<< TRANSLATORS: Specify the character set of your language here. Note that all text created while this language is active will be stored using this character set, so don't change it once you have set it. Example: iso-8859-1 >>";
-            $enstring['thisdirection'] = "<< TRANSLATORS: This string specifies the direction of your text, either left-to-right or right-to-left.  Insert either 'ltr' or 'rtl' here. >>";
-            $enstring['parentlanguage'] = "<< TRANSLATORS: If your language has a Parent Language that Moodle should use when strings are missing from your language pack, then specify the code for it here.  If you leave this blank then English will be used.  Example: nl >>";
-        }
-        ksort($enstring);
-
-        unset($string);
-        include("$langdir/$currentfile");
-
-        if ($editable) {
-            echo "<form name=\"$currentfile\" action=\"lang.php\" method=\"post\">";
-        }
-        echo "<table width=\"100%\" cellpadding=\"2\" cellspacing=\"3\" border=\"0\" class=\"generalbox\">";
-        foreach ($enstring as $key => $envalue) {
-            $envalue = nl2br(htmlspecialchars($envalue));
-            $envalue = preg_replace('/(\$a\-\&gt;[a-zA-Z0-9]*|\$a)/', '<b>$0</b>', $envalue);  // Make variables bold. 
-            $envalue = str_replace("%%","%",$envalue);
-            $envalue = str_replace("\\","",$envalue);              // Delete all slashes
-
-            echo "\n\n".'<tr>';
-            echo '<td dir="ltr" lang="en" width="20%" nowrap="nowrap" valign="top">'.$key.'</td>'."\n";
-            echo '<td dir="ltr" lang="en" width="40%" valign="top">'.$envalue.'</td>'."\n";
-
-            $value = $string[$key];
-            $value = str_replace("\r","",$value);              // Bad character caused by Windows
-            $value = preg_replace("/\n{3,}/", "\n\n", $value); // Collapse runs of blank lines
-            $value = trim($value, "\n");                       // Delete leading/trailing lines
-            $value = str_replace("\\","",$value);              // Delete all slashes
-            $value = str_replace("%%","%",$value);
-            $value = str_replace("<","&lt;",$value);
-            $value = str_replace(">","&gt;",$value);
-            $value = str_replace('"',"&quot;",$value);
-
-            $cellcolour = $value ? '': 'class="highlight"';
+            @include("$locallangdir/$currentfile");
+            $localstring = isset($string) ? $string : array();
+            unset($string);
+            
+            @include("$langdir/$currentfile");

            if ($editable) {
-                echo '<td width="40%" '.$cellcolour.' valign="top">'."\n";
-                if (isset($string[$key])) {
-                    $valuelen = strlen($value);
-                } else {
-                    $valuelen = strlen($envalue);
-                }
-                $cols=50;
-                if (strstr($value, "\r") or strstr($value, "\n") or $valuelen > $cols) {
-                    $rows = ceil($valuelen / $cols);
-                    echo '<textarea name="stringXXX'.lang_form_string_key($key).'" cols="'.$cols.'" rows="'.$rows.'">'.$value.'</textarea>'."\n";
-                } else {
-                    if ($valuelen) {
-                        $cols = $valuelen + 2;
-                    }
-                    echo '<input type="text" name="stringXXX'.lang_form_string_key($key).'" value="'.$value.'" size="'.$cols.'" />';
-                }
-                echo '</td>';
-
-            } else {
-                echo '<td width="40%" bgcolor="'.$cellcolour.'" valign="top">'.$value.'</td>';
+                echo "<form name=\"$currentfile\" action=\"lang.php\" method=\"post\">";
            }
-        }
-        if ($editable) {
-            echo '<tr><td colspan="2">&nbsp;<td><br />';
-            echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
-            echo '    <input type="hidden" name="currentfile" value="'.$currentfile.'" />';
-            echo '    <input type="hidden" name="mode" value="compare" />';
-            echo '    <input type="submit" name="update" value="'.get_string('savechanges').': '.$currentfile.'" />';
-            echo '</td></tr>';
-        }
-        echo '</table>';
-        echo '</form>'; 
+            echo "<table summary=\"\" width=\"100%\" cellpadding=\"2\" cellspacing=\"3\" border=\"0\" class=\"generalbox\">";
+            $linescounter = 0;
+            $missingcounter = 0;
+            foreach ($enstring as $key => $envalue) {
+                $linescounter++ ;
+                if (LANG_SUBMIT_REPEAT &&  $editable && $linescounter % LANG_SUBMIT_REPEAT_EVERY == 0) {
+                    echo '<tr><td colspan="2">&nbsp;<td><br />';
+                    echo '    <input type="submit" name="update" value="'.get_string('savechanges').': '.$currentfile.'" />';
+                    echo '<br />&nbsp;</td></tr>';
+                }
+                $envalue = nl2br(htmlspecialchars($envalue));
+                $envalue = preg_replace('/(\$a\-\&gt;[a-zA-Z0-9]*|\$a)/', '<b>$0</b>', $envalue);  // Make variables bold. 
+                $envalue = str_replace("%%","%",$envalue);
+                $envalue = str_replace("\\","",$envalue);              // Delete all slashes

+                echo "\n\n".'<tr>';
+                echo '<td dir="ltr" lang="en" width="20%" nowrap="nowrap" valign="top">'.$key.'</td>'."\n";
+                echo '<td dir="ltr" lang="en" width="40%" valign="top">'.$envalue.'</td>'."\n";
+
+                // Missing array keys are not bugs here but missing strings
+                error_reporting(E_ALL ^ E_NOTICE);
+                if ($uselocal) {
+                    $value = lang_fix_value_from_file($localstring[$key]);
+                    $value2 = lang_fix_value_from_file($string[$key]);
+                    if ($value == '') {
+                        $value = $value2;
+                    }
+                } else {
+                    $value = lang_fix_value_from_file($string[$key]);
+                    $value2 = lang_fix_value_from_file($localstring[$key]);
+                }
+                error_reporting($CFG->debug);
+
+                // Color highlighting:
+                // red #ef6868 - translation missing in both system and local pack
+                // yellow #feff7f - translation missing in system pack but is translated in local
+                // green #AAFFAA - translation present in both system and local but is different
+                if (!$value) {
+                    if (!$value2) {
+                        $cellcolour = 'style="background-color: #ef6868"'; // TODO: replace by CSS class
+                    } else {
+                        $cellcolour = 'style="background-color: #feff7f"'; // TODO: replace by CSS class
+                    }
+                    $missingcounter++;
+                    if (LANG_DISPLAY_MISSING_LINKS) {
+                        $missingtarget = '<a name="missing'.$missingcounter.'"></a>';
+                        $missingnext = '<a href="#missing'.($missingcounter+1).'">'.
+                        '<img src="' . $CFG->pixpath . '/t/down.gif" height="11" width="11" border="0" alt="" /></a>';
+                        $missingprev = '<a href="#missing'.($missingcounter-1).'">'.
+                        '<img src="' . $CFG->pixpath . '/t/up.gif" height="11" width="11" border="0" alt="" /></a>';
+                    } else {
+                        $missingtarget = '';
+                        $missingnext = '';
+                        $missingprev = '';
+                    }
+                } else {
+                    if ($value <> $value2 && $value2 <> '') {
+                        $cellcolour = 'style="background-color: #AAFFAA"'; // TODO: replace by CSS class
+                    } else {
+                        $cellcolour = '';
+                    }
+                    $missingtarget = '';
+                    $missingnext = '';
+                    $missingprev = '';
+                }
+
+                if ($editable) {
+                    echo '<td width="40%" '.$cellcolour.' valign="top">'. $missingprev . $missingtarget."\n";
+                    if (isset($string[$key])) {
+                        $valuelen = strlen($value);
+                    } else {
+                        $valuelen = strlen($envalue);
+                    }
+                    $cols=50;
+                    if (strstr($value, "\r") or strstr($value, "\n") or $valuelen > $cols) {
+                        $rows = ceil($valuelen / $cols);
+                        echo '<textarea name="stringXXX'.lang_form_string_key($key).'" cols="'.$cols.'" rows="'.$rows.'">'.$value.'</textarea>'."\n";
+                    } else {
+                        if ($valuelen) {
+                            $cols = $valuelen + 5;
+                        }
+                        echo '<input type="text" name="stringXXX'.lang_form_string_key($key).'" value="'.$value.'" size="'.$cols.'" />';
+                    }
+                    if ($value2 <> '' && $value <> $value2) {
+                        echo '<br /><span style="font-size:small">'.$value2.'</span>';
+                    }
+                    echo $missingnext . '</td>';
+
+                } else {
+                    echo '<td width="40%" bgcolor="'.$cellcolour.'" valign="top">'.$value.'</td>';
+                }
+            }
+            if ($editable) {
+                echo '<tr><td colspan="2">&nbsp;<td><br />';
+                echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
+                echo '    <input type="hidden" name="currentfile" value="'.$currentfile.'" />';
+                echo '    <input type="hidden" name="mode" value="compare" />';
+                echo '    <input type="submit" name="update" value="'.get_string('savechanges').': '.$currentfile.'" />';
+                echo '</td></tr>';
+            }
+            echo '</table>';
+            echo '</form>'; 
+
+        } else {
+            // no $currentfile specified
+            print_heading($strchoosefiletoedit, "center", 4);
+        }
    }

    print_footer();

 //////////////////////////////////////////////////////////////////////

-function lang_save_file($path, $file, $strings) {
-// Thanks to Petri Asikainen for the original version of code 
-// used to save language files.
-//
-// $path is a full pathname to the file
-// $file is the file to overwrite.
-// $strings is an array of strings to write
-
+/**
+ * Save language translation file.
+ *
+ * Thanks to Petri Asikainen for the original version of code 
+ * used to save language files.
+ *
+ * @uses $CFG
+ * @uses $USER
+ * @param string $path Full pathname to the directory to use
+ * @param string $file File to overwrite
+ * @param array $strings Array of strings to write
+ * @param bool $local Should *_local version be saved?
+ * @param array $packstrings Array of default langpack strings (needed if $local)
+ * @return bool Created successfully?
+ */ 
+function lang_save_file($path, $file, $strings, $local, $packstrings) {
    global $CFG, $USER;
-
-    error_reporting(0);
-    if (!$f = fopen("$path/$file","w")) {
+    if (!$f = @fopen("$path/$file","w")) {
        return false;
    }
-    error_reporting(7);
-

    fwrite($f, "<?PHP // \$Id\$ \n");
-    fwrite($f, "      // $file - created with Moodle $CFG->release ($CFG->version)\n\n\n");
-
+    fwrite($f, "      // $file - created with Moodle $CFG->release ($CFG->version)\n");
+    if ($local) {
+        fwrite($f, "      // local modifications from $CFG->wwwroot\n");
+    }
+    fwrite($f, "\n\n");
    ksort($strings);
-
    foreach ($strings as $key => $value) {
-        list($id, $stringname) = explode('XXX',$key);
+        @list($id, $stringname) = explode('XXX',$key);
        if ($CFG->lang != "zh_hk" and $CFG->lang != "zh_tw") {  // Some MB languages include backslash bytes
            $value = str_replace("\\","",$value);           // Delete all slashes
        }
@@ -343,16 +560,55 @@ function lang_save_file($path, $file, $strings) {
        $value = str_replace('"', "\\\"", $value);          // Add slashes for "
        $value = str_replace("%","%%",$value);              // Escape % characters
        $value = str_replace("\r", "",$value);              // Remove linefeed characters
+        $value = trim($value);                              // Delete leading/trailing white space
        if ($id == "string" and $value != ""){
-            fwrite($f,"\$string['$stringname'] = '$value';\n");
+            if ((!$local) || (lang_fix_value_from_file($packstrings[$stringname]) <> lang_fix_value_from_file($value))) {
+                fwrite($f,"\$string['$stringname'] = '$value';\n");
+            }
        }
    }
    fwrite($f,"\n?>\n");
    fclose($f);
-
    return true;
 }

+/**
+ * Fix value of string to translate.
+ *
+ * @param string $value Original string from the file
+ * @return string Fixed value
+ */
+function lang_fix_value_from_file($value='') {
+    $value = str_replace("\r","",$value);              // Bad character caused by Windows
+    $value = preg_replace("/\n{3,}/", "\n\n", $value); // Collapse runs of blank lines
+    $value = trim($value);                             // Delete leading/trailing white space
+    $value = str_replace("\\","",$value);              // Delete all slashes
+    $value = str_replace("%%","%",$value);
+    $value = str_replace("<","&lt;",$value);
+    $value = str_replace(">","&gt;",$value);
+    $value = str_replace('"',"&quot;",$value);
+    return $value;
+}
+
+/**
+ * Try and create a new language directory.
+ *
+ * @uses $CFG
+ * @param string $directory  directory name under $CFG->dataroot/lang eg cs_utf8_local
+ * @return string|false Returns full path to directory if successful, false if not
+ */
+function lang_make_directory($dir, $shownotices=true) {
+    global $CFG;
+    umask(0000);
+    if (! file_exists($dir)) {
+        if (! @mkdir($dir, $CFG->directorypermissions)) {
+            return false;
+        }
+        //@chmod($dir, $CFG->directorypermissions);  // Just in case mkdir didn't do it
+    }
+    return $dir;
+}
+


 /// Following functions are required because '.' in form input names
@@ -362,7 +618,6 @@ function lang_form_string_key($keyfromfile) {
    return str_replace('.', '##46#', $keyfromfile);  /// Derived from &#46, the ascii value for a period.
 }

-
 function lang_file_string_key($keyfromform) {
    return str_replace('##46#', '.', $keyfromform);
 }
@@ -186,7 +186,7 @@ $langdir/$currentfile")."</font></p>";

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

    print_heading($strmanagemodules);
   
-    $courseaffected = false;
+    $coursesaffected = false;
    

 /// If data submitted, then process and store.
@@ -149,10 +149,10 @@

    foreach ($modules as $module) {
        $strmodulename = get_string("modulename", "$module->name");
-	// Deal with modules which are lacking the language string
-	if ($strmodulename == '[[modulename]]') {
-	    $strmodulename = $module->name;
-	}
+        // Deal with modules which are lacking the language string
+        if ($strmodulename == '[[modulename]]') {
+            $strmodulename = $module->name;
+        }
        $modulebyname[$strmodulename] = $module;
    }
    ksort($modulebyname);
@@ -9,9 +9,11 @@

    $stradmin = get_string('administration');
    $strreports = get_string('reports');
+    $strmisc = get_string('miscellaneous');

    print_header($strreports, $strreports,
-                 '<a href="index.php">'.$stradmin.'</a> -> '.$strreports);
+                 '<a href="index.php">'.$stradmin.'</a> -> <a href="misc.php">'.$strmisc.'</a> ->'.
+                 $strreports);

    $directories = get_list_of_plugins('admin/report');

@@ -23,7 +23,7 @@
    $strreports = get_string('reports');
    $strcourseoverview = get_string('courseoverview');

-    $strnav = '<a href="'.$CFG->wwwroot.'/admin/index.php">'.get_string('administration').'</a> -> <a href="'.$CFG->wwwroot.'/admin/report.php">'.$strreports.'</a> -> '.$strcourseoverview;
+    $strnav = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/index.php">'.get_string('administration').'</a> -> <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/report.php">'.$strreports.'</a> -> '.$strcourseoverview;
    
    $reportoptions = stats_get_report_options($course->id,STATS_MODE_RANKED);

@@ -75,10 +75,10 @@
        $courses = get_records_sql($sql);

        if (empty($courses)) {
-            error(get_string('statsnodata'),$CFG->wwwroot.'/admin/report/courseoverview/index.php');
+            error(get_string('statsnodata'),$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/index.php');
        }

-        echo '<center><img src="'.$CFG->wwwroot.'/admin/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></center>';
+        echo '<center><img src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></center>';
        
        $table = new object();
        $table->align = array('left','center','center','center');
@@ -93,12 +93,13 @@
        foreach  ($courses as $c) {
            $a = array();
            $a[] = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$c->courseid.'">'.get_field('course','shortname','id',$c->courseid).'</a>';
-            $a[] = print_numeric_value($c->line1);
+
+            $a[] = $c->line1;
            if (isset($c->line2)) {
-                $a[] = print_numeric_value($c->line2);
+                $a[] = $c->line2;
            }
            if (isset($c->line3)) {
-                $a[] = print_numeric_value($c->line3);
+                $a[] = $c->line3;
            }
            $table->data[] = $a;
        }
@@ -107,12 +108,4 @@
    
    print_footer();

-function print_numeric_value($value) {
-    list($whole, $decimals) = split ('[.,]', $value, 2);
-    if (intval($decimals) > 0)
-        return number_format($value,2,".",",");
-    else
-        return $value;
-}
-
 ?>
@@ -5,7 +5,53 @@
    }

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

@@ -28,7 +28,7 @@
    $courses = get_records_sql($sql);
    
    if (empty($courses)) {
-        error(get_string('statsnodata'),$CFG->wwwroot.'/admin/report/course/index.php');
+        error(get_string('statsnodata'),$CFG->wwwroot.'/'.$CFG->admin.'/report/course/index.php');
    }
    

@@ -0,0 +1,63 @@
+<?php  // $Id$
+
+    require_once('../../../config.php');
+    require_once($CFG->dirroot.'/lib/statslib.php');
+    require_once($CFG->dirroot.'/course/report/stats/lib.php');
+
+    if (empty($CFG->enablestats)) {
+        error("Stats is not enabled.");
+    }
+
+    $courseid = required_param('course', PARAM_INT);
+    $report   = optional_param('report', 0, PARAM_INT);
+    $time     = optional_param('time', 0, PARAM_INT);
+    $mode     = optional_param('mode', STATS_MODE_GENERAL, PARAM_INT);
+    $userid   = optional_param('userid', 0, PARAM_INT);
+
+    if ($report == STATS_REPORT_USER_LOGINS) {
+        $courseid = SITEID; //override
+    }
+
+    if ($mode == STATS_MODE_RANKED) {
+        redirect($CFG->wwwroot.'/'.$CFG->admin.'/report.php?time='.$time);
+    }
+
+    if (!$course = get_record("course","id",$courseid)) {
+        error("That's an invalid course id");
+    }
+
+    if (!empty($userid)) {
+        if (!$user = get_record('user','id',$userid)) {
+            error("That's an invalid user id");
+        }
+    }
+
+    require_login();
+    if (!isteacher($course->id)) {
+        error("You need to be a teacher to use this page");
+    }
+
+    add_to_log($course->id, "course", "report stats", "report/stats/index.php?course=$course->id", $course->id); 
+
+    stats_check_uptodate($course->id);
+    
+    
+    $strreports = get_string("reports");
+    $strstats = get_string('stats');
+
+    $menu = report_stats_mode_menu($course, $mode, $time);
+
+
+    $crumb = "<a href=\"{$CFG->wwwroot}/admin\">".get_string('administration')."</a> ->
+              <a href=\"{$CFG->wwwroot}/admin/report.php\">$strreports</a> ->
+              $strstats";
+
+    print_header("$course->shortname: $strstats", "$course->fullname", 
+                  $crumb, '', '', true, '&nbsp', $menu);
+    
+    
+    require_once($CFG->dirroot.'/course/report/stats/report.php');
+    
+    print_footer();
+
+?>
@@ -0,0 +1,16 @@
+<?php  //$Id$
+
+    if (!defined('MOODLE_INTERNAL')) {
+        die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+    }
+    
+    if (!empty($CFG->enablestats)) {
+        echo '<p style="text-align:center;">';
+        echo '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/stats/index.php?course='.$course->id.'">'.get_string('stats').'</a>';
+        echo '</p>';
+        $statsstatus = stats_check_uptodate($course->id);
+        if ($statsstatus !== NULL) {
+            notify ($statsstatus);
+        }
+    }
+?>
@@ -33,26 +33,46 @@
          <table width="100%" cellpadding="0" cellspacing="0" border="0">
            <tr>
        <?php
+           $coursecount = (count_records('course') <= FRONTPAGECOURSELIMIT);
           $options = array(FRONTPAGENEWS           =>  get_string("frontpagenews"),
                            FRONTPAGECOURSELIST     =>  get_string("frontpagecourselist"),
                            FRONTPAGECATEGORYNAMES  =>  get_string("frontpagecategorynames"),
+                            FRONTPAGECATEGORYCOMBO  =>  get_string("frontpagecategorycombo"),
                            );
-           $values = array(get_string('hide'), get_string('order1', 'admin'), get_string('order2', 'admin'));
+           $values = array(get_string('hide'), get_string('order1', 'admin'), get_string('order2', 'admin'), get_string('order3', 'admin'), get_string('order4', 'admin'));
           $seq = array_flip(explode(',',$form->frontpage));
           foreach ($seq as $k => $s) {
               $seq[$k]++;
           }
-           if (count_records("course") > 200) {
-               unset($options[FRONTPAGECOURSELIST]);
-               if (isset($seq[FRONTPAGECOURSELIST])) {
-                   $form->frontpage = 2;
-               }
-           } else {
-               $values[] = get_string('order3', 'admin');
+           if (!$coursecount and isset($seq[FRONTPAGECOURSELIST])) {
+               unset($seq[FRONTPAGECOURSELIST]); //disable course list option when too many course present
           }
+
+           foreach ($options as $key => $option) {
+               $disabled = (!$coursecount and ($key == FRONTPAGECOURSELIST));
+               echo "<td>$option<br />";
+               choose_from_menu ($values, "frontpage[$key]", isset($seq[$key])?$seq[$key]:0, '', '', 0, false, $disabled);
+               echo '</td>';
+           }
+        ?>
+            </tr>
+          </table>
+        </td>
+</tr>
+<tr valign="top">
+        <td align="right"><?php print_string("frontpageformatloggedin") ?>:</td>
+        <td>
+          <table width="100%" cellpadding="0" cellspacing="0" border="0">
+            <tr>
+        <?php
+           $seq = array_flip(explode(',',$form->frontpageloggedin));
+           foreach ($seq as $k => $s) {
+               $seq[$k]++;
+           }
+
           foreach ($options as $key => $option) {
               echo "<td>$option<br />";
-               choose_from_menu ($values, "frontpage[$key]", isset($seq[$key])?$seq[$key]:0, "");
+               choose_from_menu ($values, "frontpageloggedin[$key]", isset($seq[$key])?$seq[$key]:0, '');
               echo '</td>';
           }
        ?>
@@ -37,6 +37,13 @@
                $form->numsections = 1;    // Force the topic display for this format
            }

+            $form->frontpageloggedin = array_flip($form->frontpageloggedin);
+            unset($form->frontpageloggedin[0]);
+            $form->frontpageloggedin = array_flip($form->frontpageloggedin);
+            asort($form->frontpageloggedin);
+            $form->frontpageloggedin = implode(',',array_flip($form->frontpageloggedin));
+            set_config("frontpageloggedin", $form->frontpageloggedin);
+
            $form->timemodified = time();

            if ($form->id) {
@@ -98,12 +105,18 @@

    if (isset($CFG->frontpage)) {
        $form->frontpage = $CFG->frontpage;
-
    } else {
        $form->frontpage = FRONTPAGECOURSELIST;  // Show course list by default
        set_config("frontpage", $form->frontpage);
    }

+    if (isset($CFG->frontpageloggedin)) {
+        $form->frontpageloggedin = $CFG->frontpageloggedin;
+    } else {
+        $form->frontpageloggedin = $form->frontpage;
+        set_config("frontpageloggedin", $form->frontpageloggedin);
+    }
+
    $stradmin = get_string("administration");
    $strconfiguration = get_string("configuration");
    $strsitesettings = get_string("sitesettings");
@@ -34,7 +34,8 @@
    $strheading = get_string('adminhelpstickyblocks');
    
    print_header($strtitle,$strtitle,'<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/index.php">'.
-                 get_string('admin').'</a> -> '.$strtitle);
+                 get_string('admin').'</a> -> <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/misc.php">'.
+                 get_string('miscellaneous').'</a> ->'.$strtitle);

    echo '<table border="0" cellpadding="3" cellspacing="0" width="100%" id="layout-table">';
    echo '<tr valign="top">';
@@ -62,7 +63,7 @@
    echo '<td valign="top" width="*" id="middle-column">';
    print_simple_box_start('center');
    print_heading($strheading);
-    echo '<form method="post" action="'.$CFG->wwwroot.'/admin/stickyblocks.php">'
+    echo '<form method="post" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/stickyblocks.php">'
        .'<p align="center">'.get_string('stickyblockspagetype','admin').': ';
    choose_from_menu($options,'pt',$pt,'choose','this.form.submit();');
    echo '</p></form>';
@@ -2,6 +2,7 @@

    require_once('../config.php');
    require_once($CFG->dirroot.'/mod/forum/lib.php');
+    require_once($CFG->libdir.'/adminlib.php');

    $confirm = optional_param('confirm', 0, PARAM_BOOL);

@@ -24,27 +24,15 @@

    $table->data[] = array("<b><a href=\"auth.php?sesskey=$USER->sesskey\">".get_string("authentication")."</a></b>",
                           get_string("adminhelpauthentication"));
-
    $table->data[] = array("<b><a href=\"user.php\">".get_string("edituser")."</a></b>",
                           get_string("adminhelpedituser"));
    $table->data[] = array("<b><a href=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true&amp;sesskey=$USER->sesskey\">".get_string("addnewuser")."</a></b>",
                               get_string("adminhelpaddnewuser"));
    $table->data[] = array("<b><a href=\"$CFG->wwwroot/$CFG->admin/uploaduser.php?sesskey=$USER->sesskey\">".get_string("uploadusers")."</a></b>",
                               get_string("adminhelpuploadusers"));
-    $table->data[] = array('', '<hr />');
-    $table->data[] = array("<b><a href=\"enrol.php?sesskey=$USER->sesskey\">".get_string("enrolmentplugins")."</a></b>",
-                           get_string("adminhelpenrolments"));
-    $table->data[] = array("<b><a href=\"../course/index.php?edit=off&amp;sesskey=$USER->sesskey\">".get_string("assignstudents")."</a></b>",
-                           get_string("adminhelpassignstudents"));
-    $table->data[] = array("<b><a href=\"../course/index.php?edit=on&amp;sesskey=$USER->sesskey\">".get_string("assignteachers")."</a></b>",
-                           get_string("adminhelpassignteachers")." <img src=\"../pix/t/user.gif\" height=\"11\" width=\"11\" alt=\"\" />");
-    $table->data[] = array("<b><a href=\"creators.php?sesskey=$USER->sesskey\">".get_string("assigncreators")."</a></b>",
-                           get_string("adminhelpassigncreators"));
-    $table->data[] = array("<b><a href=\"admin.php?sesskey=$USER->sesskey\">".get_string("assignadmins")."</a></b>",
-                           get_string("adminhelpassignadmins"));

    print_table($table);
-    
+
    print_footer($site);

 ?>
@@ -1,12 +1,54 @@
 <?php //$Id$
+
 ///dummy field names are used to help adding and dropping indexes. There's only 1 case now, in scorm_scoes_track

    require_once('../config.php');
    require_once($CFG->libdir.'/adminlib.php');
    require_once($CFG->libdir.'/environmentlib.php');
-
+    require_once($CFG->dirroot.'/course/lib.php');
    require_login();

+	// decalre once
+	global $enc;
+	
+	$customlang = array();
+	
+	$enc = array('af' => 'iso-8859-1', 'ar' => 'windows-1256', 'be' => 'windows-1251', 'bg' => 'windows-1251', 'bs' => 'windows-1250', 'ca' => 'iso-8859-1', 'cs' => 'iso-8859-2', 'da' => 'iso-8859-1', 'de' => 'iso-8859-1', 'de_du' => 'iso-8859-1', 'de_utf8' => 'utf-8', 'el' => 'windows-1253', 'en' => 'iso-8859-1', 'en_ja' => 'euc-jp', 'en_us' => 'iso-8859-1', 'en_utf8' => 'utf-8', 'es' => 'iso-8859-1', 'es_ar' => 'iso-8859-1', 'es_es' => 'iso-8859-1', 'es_mx' => 'iso-8859-1', 'et' => 'iso-8859-1', 'eu' => 'iso-8859-1', 'fa' => 'windows-1256', 'fa_utf8' => 'utf-8', 'fi' => 'iso-8859-1', 'fil' => 'iso-8859-15', 'fr' => 'iso-8859-1', 'fr_ca' => 'iso-8859-15', 'ga' => 'iso-8859-1', 'gl' => 'iso-8859-1', 'he' => 'ISO-8859-8-I', 'he_utf8' => 'utf-8', 'hi' => 'iso-8859-1', 'hr' => 'windows-1250', 'hr_utf8' => 'utf-8', 'hu' => 'iso-8859-2', 'id' => 'iso-8859-1', 'is' => 'iso-8859-1', 'it' => 'iso-8859-1', 'ja' => 'EUC-JP', 'ja_utf8' => 'UTF-8', 'ka_utf8' => 'UTF-8', 'km_utf8' => 'UTF-8', 'kn_utf8' => 'utf-8', 'ko' => 'EUC-KR', 'ko_utf8' => 'UTF-8', 'lt' => 'windows-1257', 'lv' => 'ISO-8859-4', 'mi_nt' => 'iso-8859-1', 'mi_tn_utf8' => 'utf-8', 'ms' => 'iso-8859-1', 'nl' => 'iso-8859-1', 'nn' => 'iso-8859-1', 'no' => 'iso-8859-1', 'no_gr' => 'iso-8859-1', 'pl' => 'iso-8859-2', 'pt' => 'iso-8859-1', 'pt_br' => 'iso-8859-1', 'ro' => 'iso-8859-2', 'ru' => 'windows-1251', 'sk' => 'iso-8859-2', 'sl' => 'iso-8859-2', 'sl_utf8' => 'utf-8', 'so' => 'iso-8859-1', 'sq' => 'iso-8859-1', 'sr_utf8' => 'utf-8', 'sv' => 'iso-8859-1', 'th' => 'TIS-620', 'th_utf8' => 'UTF-8', 'tl' => 'iso-8859-15', 'tl_utf8' => 'UTF-8', 'tr' => 'iso-8859-9', 'uk' => 'windows-1251', 'vi_utf8' => 'UTF-8', 'zh_cn' => 'GB18030', 'zh_cn_utf8' => 'UTF-8', 'zh_tw' => 'Big5', 'zh_tw_utf8' => 'UTF-8');
+	
+	/**************************************
+	 * Custom lang pack handling 		  *
+	 **************************************/
+	
+	// scan list of langs, including customs packs
+	$langs = get_list_of_languages();
+	
+	// foreach lang
+	foreach ($langs as $lang => $lang1) {
+	  
+		if (in_array($lang, array_keys($enc))) {
+		  	// if already in array, ignore
+			continue;  
+		}
+		
+		// if this lang has got a charset	
+		
+		if ($result = get_string_from_file('thischarset',$CFG->dirroot.'/lang/'.$lang.'/moodle.php', "\$resultstring")) {
+			eval($result);	
+			$enc[$lang] = $resultstring;		
+		} else if ($result = get_string_from_file('parentlanguage',$CFG->dirroot.'/lang/'.$lang.'/moodle.php',"\$resultstring")) {
+		// else if there's a parent lang we can use
+		    eval($result);
+		  	$enc[$lang] = $enc[$resultstring];  
+		} else {
+		 	notify ('unknown lang pack detected '.$lang); 
+		}
+
+	}	
+	
+	/**************************************
+	 * End custom lang pack handling      *
+	 **************************************/
+
    if (!isadmin()) {
        error('Only admins can access this page');
    }
@@ -47,7 +89,7 @@
        print_heading('db unicode migration has been completed!');
        unlink($filename);    //no longer in maintenance mode
        @require_logout();
-        print_continue($CFG->wwwroot.'/admin/langimport.php');
+        print_continue($CFG->wwwroot.'/'.$CFG->admin.'/langimport.php');
    }

    //else if $migrate
@@ -107,7 +149,6 @@
            }

            //print the "i-know-what-lang-to-use" menu
-            $enc = array('af' => 'iso-8859-1', 'ar' => 'windows-1256', 'be' => 'windows-1251', 'bg' => 'windows-1251', 'bs' => 'windows-1250', 'ca' => 'iso-8859-1', 'cs' => 'iso-8859-2', 'da' => 'iso-8859-1', 'de' => 'iso-8859-1', 'de_du' => 'iso-8859-1', 'de_utf8' => 'utf-8', 'el' => 'windows-1253', 'en' => 'iso-8859-1', 'en_ja' => 'euc-jp', 'en_us' => 'iso-8859-1', 'en_utf8' => 'utf-8', 'es' => 'iso-8859-1', 'es_ar' => 'iso-8859-1', 'es_es' => 'iso-8859-1', 'es_mx' => 'iso-8859-1', 'et' => 'iso-8859-1', 'eu' => 'iso-8859-1', 'fa' => 'windows-1256', 'fa_utf8' => 'utf-8', 'fi' => 'iso-8859-1', 'fil' => 'iso-8859-15', 'fr' => 'iso-8859-1', 'fr_ca' => 'iso-8859-15', 'ga' => 'iso-8859-1', 'gl' => 'iso-8859-1', 'he' => 'ISO-8859-8-I', 'he_utf8' => 'utf-8', 'hi' => 'iso-8859-1', 'hr' => 'windows-1250', 'hr_utf8' => 'utf-8', 'hu' => 'iso-8859-2', 'id' => 'iso-8859-1', 'it' => 'iso-8859-1', 'ja' => 'EUC-JP', 'ja_utf8' => 'UTF-8', 'ka_utf8' => 'UTF-8', 'km_utf8' => 'UTF-8', 'kn_utf8' => 'utf-8', 'ko' => 'EUC-KR', 'ko_utf8' => 'UTF-8', 'lt' => 'windows-1257', 'lv' => 'ISO-8859-4', 'mi_nt' => 'iso-8859-1', 'mi_tn_utf8' => 'utf-8', 'ms' => 'iso-8859-1', 'nl' => 'iso-8859-1', 'nn' => 'iso-8859-1', 'no' => 'iso-8859-1', 'no_gr' => 'iso-8859-1', 'pl' => 'iso-8859-2', 'pt' => 'iso-8859-1', 'pt_br' => 'iso-8859-1', 'ro' => 'iso-8859-2', 'ru' => 'windows-1251', 'sk' => 'iso-8859-2', 'sl' => 'iso-8859-2', 'sl_utf8' => 'utf-8', 'so' => 'iso-8859-1', 'sq' => 'iso-8859-1', 'sr_utf8' => 'utf-8', 'sv' => 'iso-8859-1', 'th' => 'TIS-620', 'th_utf8' => 'UTF-8', 'tl' => 'iso-8859-15', 'tl_utf8' => 'UTF-8', 'tr' => 'iso-8859-9', 'uk' => 'windows-1251', 'vi_utf8' => 'UTF-8', 'zh_cn' => 'GB18030', 'zh_cn_utf8' => 'UTF-8', 'zh_tw' => 'Big5', 'zh_tw_utf8' => 'UTF-8');

            echo '<br />The whole site is in this encoding: (leave blank if you are not sure)';
            echo '<select name="globallang"><option value="">I am not sure</option>';
@@ -178,8 +219,12 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
 							  //mtrace() and return 0. (showing the current 
 							  //table/field/recordid)

-    global $db, $CFG, $dbtablename, $fieldname, $record;
+    global $db, $CFG, $dbtablename, $fieldname, $record, $processedrecords;
    $debug = ($CFG->debug > 7);
+
+     //echo date("H:i:s");
+    
+    ignore_user_abort(false); // see bug report 5352. This should kill this thread as soon as user aborts.
    
    @set_time_limit(0);
    @ob_implicit_flush(true);
@@ -191,8 +236,22 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here

    $ignoretables = array();    //list of tables to ignore, optional
    
+    //one gigantic array to hold all db table information read from all the migrate2utf8.xml file.
+    require_once($CFG->dirroot.'/lib/xmlize.php');
+    $xmls = utf_get_xml(1);
+    $tablestoconvert = 0; // total number of tables to convert
+    foreach ($xmls as $xml) {    ///foreach xml file, we must get a list of tables
+        $dbtables = $xml['DBMIGRATION']['#']['TABLES'][0]['#']['TABLE'];    //real db tables
+        foreach ($dbtables as $dbtable) {
+            $tablestoconvert++;
+        }
+    }
+    // progress bar handling
+    // first let's find out how many tables there are
+    
    $done = 0;
-    print_progress($done, 158, 5, 1);
+    print_progress($done, $tablestoconvert, 5, 1);
+    
    
    $textlib = textlib_get_instance();    //only 1 reference

@@ -279,18 +338,10 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
        $crash->table = $crashdata[0];
        $crash->field = $crashdata[1];
        $crash->record = $crashdata[2];
-		
-        print_heading('Resume information :');
-        echo '<br>Resuming from @ table : '.$crash->table;
-        echo '<br>Resuming from @ field : '.$crash->field;
-        echo '<br>Resuming from @ record : '.$crash->record;
+
+        notify("Resuming migration from: $crash->table / .$crash->field, Record: $crash->record");
    }

-    require_once($CFG->dirroot.'/lib/xmlize.php');
-
-    //one gigantic array to hold all db table information read from all the migrate2utf8.xml file.
-    $xmls = utf_get_xml(1);
-
    /************************************************************************
     * Now we got all our tables in order                                   *
     ************************************************************************/
@@ -302,7 +353,7 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
        foreach ($dbtables as $dbtable) {

            $done++;
-            print_progress($done, 158, 5, 1);
+            print_progress($done, $tablestoconvert, 5, 1);
            
            $dbtablename = $dbtable['@']['name'];

@@ -315,6 +366,7 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
            }

            if ($crash && ($dbtablename != $crash->table)) {  //resuming from crash
+                $done++; // need to update progress bar
                continue;
            }

@@ -322,348 +374,372 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
                print_heading("<br><b>Processsing db table ".$dbtablename.'...</b>');
            }

-            if (!empty($dbtable['#']) && ($fields = $dbtable['#']['FIELDS'][0]['#']['FIELD']) and (!in_array($dbtablename, $ignoretables))) {
+            /**********************************************************
+             * This is the by pass structure. It allows us to process *
+             * tables on row basis instead of column/field basis      *
+             * It relies on a single function in migrate2utf8.php     *
+             **********************************************************/

-                $colnames = array();
-                $coltypes = array();    //array to hold all column types for the table
-                $collengths = array();    //array to hold all column lengths for the table
-                $defaults = array();    //array to hold defaults, if any
-                //reset holders
-                $addindexarray = array();
-                $adduniqueindexarray = array();
-                $addprimaryarray = array();
+            /// first, check to see if there's a function for the whole table. By pass point (1)
+            if (file_exists($CFG->dirroot.'/'.$dir.'/db/migrate2utf8.php')) {
+                require_once($CFG->dirroot.'/'.$dir.'/db/migrate2utf8.php');
+                // this is a function to process table on role basis, e.g. user table in moodorg
+                $tablefunction = 'migrate2utf8_'.$dbtablename;
+            }
+            if ($CFG->dbtype=='mysql' && function_exists($tablefunction)) {
+                $tablefunction($dbtable['#']['FIELDS'][0]['#']['FIELD'], $crash, $debug, $maxrecords, $done, $tablestoconvert); // execute it.
+            } else {

-                foreach ($fields as $field){
+            /******************************************************
+             * No function for converting whole table, we proceed *
+             ******************************************************/
+             
+                if (!empty($dbtable['#']) && ($fields = $dbtable['#']['FIELDS'][0]['#']['FIELD']) and (!in_array($dbtablename, $ignoretables))) {

-                    //if in crash state, and field name is not the same as crash field name
+                    $colnames = array();
+                    $coltypes = array();    //array to hold all column types for the table
+                    $collengths = array();    //array to hold all column lengths for the table
+                    $defaults = array();    //array to hold defaults, if any
+                    //reset holders
+                    $addindexarray = array();
+                    $adduniqueindexarray = array();
+                    $addprimaryarray = array();

-                    $fieldname = isset($field['@']['name'])?$field['@']['name']:"";
-                    $method = isset($field['@']['method'])?$field['@']['method']:"";
-                    $type = isset($field['@']['type'])?$field['@']['type']:"";
-                    $length = isset($field['@']['length'])?$field['@']['length']:"";
+                    foreach ($fields as $field){

-                    if ($crash && ($crash->field != $fieldname)) {
-                        continue;
-                    }
+                        //if in crash state, and field name is not the same as crash field name

-                    $dropindex = isset($field['@']['dropindex'])?$field['@']['dropindex']:"";
-                    $addindex = isset($field['@']['addindex'])?$field['@']['addindex']:"";
-                    $adduniqueindex = isset($field['@']['adduniqueindex'])?$field['@']['adduniqueindex']:"";
+                        $fieldname = isset($field['@']['name'])?$field['@']['name']:"";
+                        $method = isset($field['@']['method'])?$field['@']['method']:"";
+                        $type = isset($field['@']['type'])?$field['@']['type']:"";
+                        $length = isset($field['@']['length'])?$field['@']['length']:"";

-                    $dropprimary = isset($field['@']['dropprimary'])?$field['@']['dropprimary']:"";
-                    $addprimary = isset($field['@']['addprimary'])?$field['@']['addprimary']:"";
-                    $default = isset($field['@']['default'])?"'".$field['@']['default']."'":"''";
-
-                    if ($fieldname != 'dummy') {
-                        $colnames[] = $fieldname;
-                        $coltypes[] = $type;
-                        $collengths[]= $length;
-                    }
-
-                    if ($debug) {
-                        echo "<br>--><b>processing db field ".$fieldname.'</b>';
-                        echo "<br>---><b>method ".$method.'</b>';
-                    }
-
-
-                    if ($CFG->dbtype == 'mysql') {
-
-                        /* Drop the index, because with index on, you can't change it to longblob */
-
-                        if ($dropindex){    //drop index if index is varchar, text etc type
-                            $SQL = 'ALTER TABLE '.$prefix.$dbtablename.' DROP INDEX '.$dropindex.';';
-                            $SQL1 = 'ALTER TABLE '.$prefix.$dbtablename.' DROP INDEX '.$CFG->prefix.$dropindex.';'; // see bug 5205
-                            if ($debug) {
-                                $db->debug=999;
-                            }
-                            execute_sql($SQL, false); // see bug 5205
-                            execute_sql($SQL1, false); // see bug 5205
-
-                            if ($debug) {
-                                $db->debug=0;
-                            }
-                        } else if ($dropprimary) {    // drop primary key
-                            $SQL = 'ALTER TABLE '.$prefix.$dbtablename.' DROP PRIMARY KEY;';
-                            if ($debug) {
-                                $db->debug=999;
-                            }
-                            execute_sql($SQL, $debug);
-                            if ($debug) {
-                                $db->debug=0;
-                            }
+                        if ($crash && ($crash->field != $fieldname)) {
+                            continue;
                        }

-                        /* Change to longblob, serves 2 purposes:
-                           1. column loses encoding, so when we finally change it to unicode,
-                              mysql does not do a double convertion
-                           2. longblobs puts no limit (ok, not really but it's large enough)
-                              to handle most of the problems such as in bug 5194
-                        */
-                           
-                        $SQL = 'ALTER TABLE '.$prefix.$dbtablename;
-                        $SQL.= ' CHANGE '.$fieldname.' '.$fieldname.' LONGBLOB';
+                        $dropindex = isset($field['@']['dropindex'])?$field['@']['dropindex']:"";
+                        $addindex = isset($field['@']['addindex'])?$field['@']['addindex']:"";
+                        $adduniqueindex = isset($field['@']['adduniqueindex'])?$field['@']['adduniqueindex']:"";
+
+                        $dropprimary = isset($field['@']['dropprimary'])?$field['@']['dropprimary']:"";
+                        $addprimary = isset($field['@']['addprimary'])?$field['@']['addprimary']:"";
+                        $default = isset($field['@']['default'])?"'".$field['@']['default']."'":"''";

-                        /*
-                        if ($length > 0) {
-                            $SQL.='('.$length.') ';
-                        }
-                        $SQL .= ' CHARACTER SET binary NOT NULL DEFAULT '.$default.';';
-                        */
-                        if ($debug) {
-                            $db->debug=999;
-                        }
                        if ($fieldname != 'dummy') {
-                            execute_sql($SQL, $debug);
+                            $colnames[] = $fieldname;
+                            $coltypes[] = $type;
+                            $collengths[]= $length;
                        }
+
                        if ($debug) {
-                            $db->debug=0;
+                            echo "<br>--><b>processing db field ".$fieldname.'</b>';
+                            echo "<br>---><b>method ".$method.'</b>';
                        }
-                        
-                    }

-                    $patterns[]='/RECORDID/';    //for preg_replace
-                    $patterns[]='/\{\$CFG\-\>prefix\}/i';    //same here

-                    if ($method == 'PLAIN_SQL_UPDATE') {
-                        $sqldetectuser = $field['#']['SQL_DETECT_USER'][0]['#'];
-                        $sqldetectcourse = $field['#']['SQL_DETECT_COURSE'][0]['#'];
-                    }
-                    else if ($method == 'PHP_FUNCTION') {
-                        $phpfunction = 'migrate2utf8_'.$dbtablename.'_'.$fieldname;
-                    }
-                    
-                    ///get the total number of records for this field
-                    
-                    // could not use count_records because it addes prefix to adodb_logsql
-                    $totalrecords = count_records_sql("select count(*) from {$prefix}$dbtablename");
-                    $counter = 0;
-                    $recordsetsize = 4;
+                        if ($CFG->dbtype == 'mysql') {

-                    if ($crash) {    //if resuming from crash
-                        //find the number of records with id smaller than the crash id
-                        $indexSQL = 'SELECT COUNT(*) FROM '.$prefix.$dbtablename.' WHERE id < '.$crash->record;
-                        $counter = count_records_sql($indexSQL);
-                    }
+                            /* Drop the index, because with index on, you can't change it to longblob */

-                    if ($debug) {
-                        echo "<br>Total number of records is ..".$totalrecords;
-                        echo "<br/>Counter is $counter";
-                    }
-                    
+                            if ($dropindex){    //drop index if index is varchar, text etc type
+                                $SQL = 'ALTER TABLE '.$prefix.$dbtablename.' DROP INDEX '.$dropindex.';';
+                                $SQL1 = 'ALTER TABLE '.$prefix.$dbtablename.' DROP INDEX '.$CFG->prefix.$dropindex.';'; // see bug 5205
+                                if ($debug) {
+                                    $db->debug=999;
+                                }
+                                execute_sql($SQL, false); // see bug 5205
+                                execute_sql($SQL1, false); // see bug 5205

-                    /**************************
-                     * converting each record *
-                     **************************/
-                    while(($counter < $totalrecords) and ($fieldname !='dummy') and ($method!='NO_CONV')) {    //while there is still something
-                        $SQL = 'SELECT * FROM '.$prefix.$dbtablename.' ORDER BY id ASC '.sql_paging_limit($counter, $recordsetsize);
-                        if ($records = get_records_sql($SQL)) {
-                            foreach ($records as $record) {
+                                if ($debug) {
+                                    $db->debug=0;
+                                }
+                            } else if ($dropprimary) {    // drop primary key
+                                $SQL = 'ALTER TABLE '.$prefix.$dbtablename.' DROP PRIMARY KEY;';
+                                if ($debug) {
+                                    $db->debug=999;
+                                }
+                                execute_sql($SQL, $debug);
+                                if ($debug) {
+                                    $db->debug=0;
+                                }
+                            }

-                                //if we are up this far, either no crash, or crash with same table, field name.
-                                if ($crash){
-                                    if ($crash->record != $record->id) {    //might set to < just in case record is deleted
-                                        continue;
-                                    } else {
-                                        $crash = 0;
-                                        print_heading('recovering from '.$dbtablename.'--'.$fieldname.'--'.$record->id);
+                            /* Change to longblob, serves 2 purposes:
+                               1. column loses encoding, so when we finally change it to unicode,
+                                  mysql does not do a double convertion
+                               2. longblobs puts no limit (ok, not really but it's large enough)
+                                  to handle most of the problems such as in bug 5194
+                            */
+
+                            $SQL = 'ALTER TABLE '.$prefix.$dbtablename;
+                            $SQL.= ' CHANGE '.$fieldname.' '.$fieldname.' LONGBLOB';
+
+                            /*
+                            if ($length > 0) {
+                                $SQL.='('.$length.') ';
+                            }
+                            $SQL .= ' CHARACTER SET binary NOT NULL DEFAULT '.$default.';';
+                            */
+                            if ($debug) {
+                                $db->debug=999;
+                            }
+                            if ($fieldname != 'dummy') {
+                                execute_sql($SQL, $debug);
+                            }
+                            if ($debug) {
+                                $db->debug=0;
+                            }
+
+                        }
+
+                        $patterns[]='/RECORDID/';    //for preg_replace
+                        $patterns[]='/\{\$CFG\-\>prefix\}/i';    //same here
+
+                        if ($method == 'PLAIN_SQL_UPDATE') {
+                            $sqldetectuser = $field['#']['SQL_DETECT_USER'][0]['#'];
+                            $sqldetectcourse = $field['#']['SQL_DETECT_COURSE'][0]['#'];
+                        }
+                        else if ($method == 'PHP_FUNCTION') {
+                            $phpfunction = 'migrate2utf8_'.$dbtablename.'_'.$fieldname;
+                        }
+
+                        ///get the total number of records for this field
+
+                        // could not use count_records because it addes prefix to adodb_logsql
+                        $totalrecords = count_records_sql("select count(*) from {$prefix}$dbtablename");
+                        $counter = 0;
+                        $recordsetsize = 50;
+
+                        if ($crash) {    //if resuming from crash
+                            //find the number of records with id smaller than the crash id
+                            $indexSQL = 'SELECT COUNT(*) FROM '.$prefix.$dbtablename.' WHERE id < '.$crash->record;
+                            $counter = count_records_sql($indexSQL);
+                        }
+
+                        if ($debug) {
+                            echo "<br>Total number of records is ..".$totalrecords;
+                            echo "<br/>Counter is $counter";
+                        }
+
+
+                        /**************************
+                         * converting each record *
+                         **************************/
+                        while(($counter < $totalrecords) and ($fieldname !='dummy') and ($method!='NO_CONV')) {    //while there is still something
+                            $SQL = 'SELECT * FROM '.$prefix.$dbtablename.' ORDER BY id ASC '.sql_paging_limit($counter, $recordsetsize);
+                            if ($records = get_records_sql($SQL)) {
+                                foreach ($records as $record) {
+
+                                    //if we are up this far, either no crash, or crash with same table, field name.
+                                    if ($crash){
+                                        if ($crash->record != $record->id) {    //might set to < just in case record is deleted
+                                            continue;
+                                        } else {
+                                            $crash = 0;
+                                        }
+                                    }
+
+                                    $migrationconfig = get_record('config','name','dbmigration');
+                                    $migrationconfig->name = 'dbmigration';
+                                    $migrationconfig->value = $dbtablename.'##'.$fieldname.'##'.$record->id;
+                                    update_record('config',$migrationconfig);
+
+                                    $replacements = array();    //manual refresh
+                                    $replacements[] = $record->id;
+                                    $replacements[] = $prefix;
+
+                                    if (!empty($record->{$fieldname})) {    //only update if not empty
+                                        switch ($method){
+                                            case 'PLAIN_SQL_UPDATE':    //use the 2 statements to update
+
+                                                if ($debug) {
+                                                    $db->debug=999;
+                                                }
+
+                                                //if global lang is set, we just use that
+
+                                                if ($globallang) {
+                                                    $fromenc = $globallang;
+                                                } else {
+                                                    $userid = get_record_sql(preg_replace($patterns, $replacements, $sqldetectuser));
+                                                    $courseid = get_record_sql(preg_replace($patterns, $replacements, $sqldetectcourse));
+
+                                                    $sitelang   = $CFG->lang;
+                                                    $courselang = get_course_lang(isset($courseid->course)?$courseid->course:1);
+                                                    $userlang   = get_user_lang(isset($userid->userid)?$userid->userid:1);
+
+                                                    $fromenc = get_original_encoding($sitelang, $courselang, $userlang);
+                                                }
+
+                                                //only update if non utf8
+                                                if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) {
+                                                    $result = utfconvert($record->{$fieldname}, $fromenc);
+                                                    $newrecord = new object;
+                                                    $newrecord->id = $record->id;
+                                                    $newrecord->{$fieldname} = $result;
+                                                    migrate2utf8_update_record($dbtablename,$newrecord);
+                                                }
+                                                if ($debug) {
+                                                    $db->debug=0;
+                                                }
+                                            break;
+
+                                            case 'PHP_FUNCTION':    //use the default php function to execute
+                                                if ($debug) {
+                                                    $db->debug=999;
+                                                }
+                                                require_once($CFG->dirroot.'/'.$dir.'/db/migrate2utf8.php');
+                                                $phpfunction($record->id);
+                                                if ($debug) {
+                                                    $db->debug=0;
+                                                }
+                                            break;
+
+                                            default:    //no_conv, don't do anything ;-)
+                                            break;
+                                        }
+                                    }
+                                    $counter++;
+                                    if ($maxrecords) {
+                                        if ($processedrecords == $maxrecords) {
+                                            notify($maxrecords.' records processed. Migration Process halted');
+                                            print_continue('utfdbmigrate.php?confirm=1&amp;maxrecords='.$maxrecords.'&amp;sesskey='.sesskey());
+                                            print_footer();
+                                            die();
+                                        }
+                                    }
+
+                                    $processedrecords++;
+                                    //print some output once in a while
+                                    if (($processedrecords) % 1000 == 0) {
+                                        print_progress($done, $tablestoconvert, 5, 1,
+                                                       'Processing: '.$dbtablename.'/'.$fieldname.' ');
                                    }
                                }
-
-                                $migrationconfig = get_record('config','name','dbmigration');
-                                $migrationconfig->name = 'dbmigration';
-                                $migrationconfig->value = $dbtablename.'##'.$fieldname.'##'.$record->id;
-                                update_record('config',$migrationconfig);
-
-                                $replacements = array();    //manual refresh
-                                $replacements[] = $record->id;
-                                $replacements[] = $prefix;
-
-                                switch ($method){
-                                    case 'PLAIN_SQL_UPDATE':    //use the 2 statements to update
-
-                                        if (!empty($record->{$fieldname})) {    //only update if not empty
-                                            if ($debug) {
-                                                $db->debug=999;
-                                            }
-                                            
-                                            //if global lang is set, we just use that
-                                            
-                                            if ($globallang) {
-                                                $fromenc = $globallang;
-                                            } else {
-                                                $userid = get_record_sql(preg_replace($patterns, $replacements, $sqldetectuser));
-                                                $courseid = get_record_sql(preg_replace($patterns, $replacements, $sqldetectcourse));
-
-                                                $sitelang   = $CFG->lang;
-                                                $courselang = get_course_lang(isset($courseid->course)?$courseid->course:1);
-                                                $userlang   = get_user_lang(isset($userid->userid)?$userid->userid:1);
-
-                                                $fromenc = get_original_encoding($sitelang, $courselang, $userlang);
-                                            }
-
-                                            //only update if non utf8
-                                            if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) {
-                                                $result = utfconvert($record->{$fieldname}, $fromenc);
-                                                $newrecord = new object;
-                                                $newrecord->id = $record->id;
-                                                $newrecord->{$fieldname} = $result;
-                                                migrate2utf8_update_record($dbtablename,$newrecord);
-                                            }
-                                            if ($debug) {
-                                                $db->debug=0;
-                                            }
-                                        }
-                                          
-                                    break;
-
-                                    case 'PHP_FUNCTION':    //use the default php function to execute
-                                        if ($debug) {
-                                            $db->debug=999;
-                                        }
-                                        require_once($CFG->dirroot.'/'.$dir.'/db/migrate2utf8.php');
-                                        $phpfunction($record->id);
-                                        if ($debug) {
-                                            $db->debug=0;
-                                        }
-                                    break;
-
-                                    default:    //no_conv, don't do anything ;-)
-                                    break;
-                                }
-                                $counter++;
-                                if ($maxrecords) {
-                                    if ($processedrecords == $maxrecords) {
-                                        notify($maxrecords.' records processed. Migration Process halted');
-                                        print_continue('utfdbmigrate.php?confirm=1&amp;maxrecords='.$maxrecords.'&amp;sesskey='.sesskey());
-                                        print_footer();
-                                        die();
-                                    } 
-                                }
-                                
-                                $processedrecords++;
-                                //print some output once in a while
-                                if (($processedrecords) % 5000 == 0) {
-                                    echo 'Processing...'.$dbtablename.'...'.$fieldname.'...'.$record->id;
+                            }else {
+                                if ($debug) {
+                                    notify('no records found!');
                                }
                            }
-                        }else {
+                        }   //close the while loop
+
+                        /********************
+                         * Drop index here **
+                         ********************/
+
+                        if ($CFG->dbtype == 'mysql') {
+
+                            /*********************************
+                             * Change column encoding 2 phase*
+                             *********************************/
+
+                            /*
+                            $SQL = 'ALTER TABLE '.$CFG->prefix.$dbtablename;
+                            $SQL.= ' CHANGE '.$fieldname.' '.$fieldname.' LONGTEXT';
+                           // if ($length > 0) {
+                           //     $SQL.='('.$length.') ';
+                           // }
+                            $SQL .= ' CHARACTER SET binary NOT NULL DEFAULT '.$default.';';
                            if ($debug) {
-                                notify('no records found!');
+                                $db->debug=999;
+                            }
+                            if ($fieldname != 'dummy') {
+                                execute_sql($SQL, $debug);
+                            }
+                            if ($debug) {
+                                $db->debug=0;
+                            }*/
+                            //phase 2
+                            $SQL = 'ALTER TABLE '.$prefix.$dbtablename;
+                            $SQL.= ' CHANGE '.$fieldname.' '.$fieldname.' '.$type;
+                            if ($length > 0) {
+                                $SQL.='('.$length.') ';
+                            }
+                            $SQL.=' CHARACTER SET utf8 NOT NULL DEFAULT '.$default.';';
+                            if ($debug) {
+                                $db->debug=999;
+                            }
+                            if ($fieldname != 'dummy') {
+                                execute_sql($SQL, $debug);
+                            }
+                            if ($debug) {
+                                $db->debug=0;
+                            }
+                            /********************************************
+                             * build an array to add index back together*
+                             ********************************************/
+                            if ($addindex){
+                                $addindexarray[] = $addindex;
+                            } else if ($adduniqueindex) {
+                                $adduniqueindexarray[] = $adduniqueindex;
+                            } else if ($addprimary) {
+                                $addprimaryarray[] = $addprimary;
+                            }
+
+                        } else {
+
+                        //posgresql code here
+                        //No we don't need to do anything here
+
+                        }
+
+                    }
+
+                    /********************************
+                     * Adding the index back        *
+                     ********************************/
+                    $alter = 0;
+
+                    if ($CFG->dbtype=='mysql'){
+                        $SQL = 'ALTER TABLE '.$prefix.$dbtablename;
+
+                        if (!empty($addindexarray)) {
+                            foreach ($addindexarray as $aidx){
+                                $SQL .= ' ADD INDEX '.$aidx.',';
+                                $alter++;
                            }
                        }
-                    }   //close the while loop

-                    /********************
-                     * Drop index here **
-                     ********************/
+                        if (!empty($adduniqueindexarray)) {
+                            foreach ($adduniqueindexarray as $auidx){
+                                $SQL .= ' ADD UNIQUE INDEX '.$auidx.',';
+                                $alter++;
+                            }
+                        }

-                    if ($CFG->dbtype == 'mysql') {
+                        if (!empty($addprimaryarray)) {
+                            foreach ($addprimaryarray as $apm){
+                                $SQL .= ' ADD PRIMARY KEY '.$apm.',';
+                                $alter++;
+                            }
+                        }

-                        /*********************************
-                         * Change column encoding 2 phase*
-                         *********************************/
-                         
-                        /*
-                        $SQL = 'ALTER TABLE '.$CFG->prefix.$dbtablename;
-                        $SQL.= ' CHANGE '.$fieldname.' '.$fieldname.' LONGTEXT';
-                       // if ($length > 0) {
-                       //     $SQL.='('.$length.') ';
-                       // }
-                        $SQL .= ' CHARACTER SET binary NOT NULL DEFAULT '.$default.';';
-                        if ($debug) {
-                            $db->debug=999;
-                        }
-                        if ($fieldname != 'dummy') {
-                            execute_sql($SQL, $debug);
-                        }
-                        if ($debug) {
-                            $db->debug=0;
-                        }*/
-                        //phase 2
-                        $SQL = 'ALTER TABLE '.$prefix.$dbtablename;
-                        $SQL.= ' CHANGE '.$fieldname.' '.$fieldname.' '.$type;
-                        if ($length > 0) {
-                            $SQL.='('.$length.') ';
-                        }
-                        $SQL.=' CHARACTER SET utf8 NOT NULL DEFAULT '.$default.';';
-                        if ($debug) {
-                            $db->debug=999;
-                        }
-                        if ($fieldname != 'dummy') {
-                            execute_sql($SQL, $debug);
-                        }
-                        if ($debug) {
-                            $db->debug=0;
-                        }
-                        /********************************************
-                         * build an array to add index back together*
-                         ********************************************/
-                        if ($addindex){
-                            $addindexarray[] = $addindex;
-                        } else if ($adduniqueindex) {
-                            $adduniqueindexarray[] = $adduniqueindex;
-                        } else if ($addprimary) {
-                            $addprimaryarray[] = $addprimary;
-                        }
+                        $SQL = rtrim($SQL, ', ');
+                        $SQL.=';';

                    } else {
+                      ///posgresql code here
+                      ///No we don't need to do anything here

-                    //posgresql code here
-                    //No we don't need to do anything here
-                    
                    }

-                }
-                
-                /********************************
-                 * Adding the index back        *
-                 ********************************/
-                $alter = 0;
-
-                if ($CFG->dbtype=='mysql'){
-                    $SQL = 'ALTER TABLE '.$prefix.$dbtablename;
-
-                    if (!empty($addindexarray)) {
-                        foreach ($addindexarray as $aidx){
-                            $SQL .= ' ADD INDEX '.$aidx.',';
-                            $alter++;
+                    if ($alter) {
+                        if ($debug) {
+                            $db->debug=999;
+                        }
+                        execute_sql($SQL, $debug);
+                        if ($debug) {
+                            $db->debug=0;
                        }
                    }

-                    if (!empty($adduniqueindexarray)) {
-                        foreach ($adduniqueindexarray as $auidx){
-                            $SQL .= ' ADD UNIQUE INDEX '.$auidx.',';
-                            $alter++;
-                        }
-                    }
-
-                    if (!empty($addprimaryarray)) {
-                        foreach ($addprimaryarray as $apm){
-                            $SQL .= ' ADD PRIMARY KEY '.$apm.',';
-                            $alter++;
-                        }
-                    }
-
-                    $SQL = rtrim($SQL, ', ');
-                    $SQL.=';';
-
-                } else {
-                  ///posgresql code here
-                  ///No we don't need to do anything here
-
-                }
-
-                if ($alter) {
-                    if ($debug) {
-                        $db->debug=999;
-                    }
-                    execute_sql($SQL, $debug);
-                    if ($debug) {
-                        $db->debug=0;
-                    }
-                }
-
-            }    //if there are fields
+                } //if there are fields
+            
+            
+            } /// Point 1 - bypass should end here.
+            
+            
            /************************************
             * now we modify the table encoding *
             ************************************/
@@ -723,8 +799,8 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
    }

    //finish the javascript bar
-    $done=159;
-    print_progress($done, 158, 5, 1);
+    $done = $tablestoconvert;
+    print_progress($done, $tablestoconvert, 5, 1);
    
    //prints the list of langs used in this site
    print_simple_box_start('center','50%');
@@ -737,7 +813,7 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
            echo $lang.', ';
        }
    }
-    echo '</b><br/><a href="'.$CFG->wwwroot.'/admin/langimport.php">Language Import Utility</a></div>';
+    echo '</b><br/><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/langimport.php">Language Import Utility</a></div>';
    print_simple_box_end();
    delete_records('config','name','langsused');

@@ -756,7 +832,8 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here

    //set the final flag
    migrate2utf8_set_config('unicodedb','true');    //this is the main flag for unicode db
-    
+
+     //echo date("H:i:s");
 }


@@ -809,7 +886,7 @@ function get_main_teacher_lang($courseid) {

 function get_original_encoding($sitelang, $courselang, $userlang){

-    global $CFG;
+    global $CFG, $enc;

    $lang = '';
    if ($courselang) {
@@ -825,8 +902,6 @@ function get_original_encoding($sitelang, $courselang, $userlang){
        error ('no language found!');
    }

-    $enc = array('af' => 'iso-8859-1', 'ar' => 'windows-1256', 'be' => 'windows-1251', 'bg' => 'windows-1251', 'bs' => 'windows-1250', 'ca' => 'iso-8859-1', 'cs' => 'iso-8859-2', 'da' => 'iso-8859-1', 'de' => 'iso-8859-1', 'de_du' => 'iso-8859-1', 'de_utf8' => 'utf-8', 'el' => 'windows-1253', 'en' => 'iso-8859-1', 'en_ja' => 'euc-jp', 'en_us' => 'iso-8859-1', 'en_utf8' => 'utf-8', 'es' => 'iso-8859-1', 'es_ar' => 'iso-8859-1', 'es_es' => 'iso-8859-1', 'es_mx' => 'iso-8859-1', 'et' => 'iso-8859-1', 'eu' => 'iso-8859-1', 'fa' => 'windows-1256', 'fa_utf8' => 'utf-8', 'fi' => 'iso-8859-1', 'fil' => 'iso-8859-15', 'fr' => 'iso-8859-1', 'fr_ca' => 'iso-8859-15', 'ga' => 'iso-8859-1', 'gl' => 'iso-8859-1', 'he' => 'ISO-8859-8-I', 'he_utf8' => 'utf-8', 'hi' => 'iso-8859-1', 'hr' => 'windows-1250', 'hr_utf8' => 'utf-8', 'hu' => 'iso-8859-2', 'id' => 'iso-8859-1', 'it' => 'iso-8859-1', 'ja' => 'EUC-JP', 'ja_utf8' => 'UTF-8', 'ka_utf8' => 'UTF-8', 'km_utf8' => 'UTF-8', 'kn_utf8' => 'utf-8', 'ko' => 'EUC-KR', 'ko_utf8' => 'UTF-8', 'lt' => 'windows-1257', 'lv' => 'ISO-8859-4', 'mi_nt' => 'iso-8859-1', 'mi_tn_utf8' => 'utf-8', 'ms' => 'iso-8859-1', 'nl' => 'iso-8859-1', 'nn' => 'iso-8859-1', 'no' => 'iso-8859-1', 'no_gr' => 'iso-8859-1', 'pl' => 'iso-8859-2', 'pt' => 'iso-8859-1', 'pt_br' => 'iso-8859-1', 'ro' => 'iso-8859-2', 'ru' => 'windows-1251', 'sk' => 'iso-8859-2', 'sl' => 'iso-8859-2', 'sl_utf8' => 'utf-8', 'so' => 'iso-8859-1', 'sq' => 'iso-8859-1', 'sr_utf8' => 'utf-8', 'sv' => 'iso-8859-1', 'th' => 'TIS-620', 'th_utf8' => 'UTF-8', 'tl' => 'iso-8859-15', 'tl_utf8' => 'UTF-8', 'tr' => 'iso-8859-9', 'uk' => 'windows-1251', 'vi_utf8' => 'UTF-8', 'zh_cn' => 'GB18030', 'zh_cn_utf8' => 'UTF-8', 'zh_tw' => 'Big5', 'zh_tw_utf8' => 'UTF-8');
-
    if ($enc[$lang]) {
        return $enc[$lang];
    } else {
@@ -862,7 +937,7 @@ function log_the_problem_somewhere() {  //Eloy: Nice function, perhaps we could
    }
 }

-//only this function should be used during db migraton, because of addslashes at the end of the convertion
+// only this function should be used during db migraton, because of addslashes at the end of the convertion
 function utfconvert($string, $enc, $slash=true) {
    global $textlib;
    if ($result = $textlib->convert($string, $enc)) {
@@ -1020,7 +1095,7 @@ function utf_get_xml ($mode=0) { // if mode is 1, do not perform check for scrip

    foreach ($enrols as $enrol){
        if (file_exists($CFG->dirroot.'/enrol/'.$enrol.'/db/migrate2utf8.xml')) {
-            $xmls[] = xmlize(file_get_contents($CFG->dirroot.'/enrol/'.$enrol.'/db/migrate2utf8.xml'));
+           $xmls[] = xmlize(file_get_contents($CFG->dirroot.'/enrol/'.$enrol.'/db/migrate2utf8.xml'));
        }
    }

@@ -121,6 +121,14 @@ Optional:
    Userinformation in array ( name => value, .... 
    or false in case of error

+    auth_validate_form(&$form, &$err)
+    
+    Validate form data.
+
+    Returns:
+    Bool. Manipulates $form and $err arrays in place
+
+
 COURSE CREATING

    auth_iscreator($username)
@@ -36,14 +36,9 @@
        </form>
 <?php } ?>

-<?php if ($CFG->changepassword or is_internal_auth() ) {
-          if (is_internal_auth()) {
-              $changepassword = "forgot_password.php";
-              $changebuttonname = get_string("senddetails");
-          } else {
-              $changepassword = $CFG->changepassword;
-              $changebuttonname = get_string("passwordrecovery");
-          }
+<?php if (is_internal_auth() ) {
+    $changepassword = "forgot_password.php";
+    $changebuttonname = get_string("senddetails");
 ?>
      <hr width="80%" />
      <p><?php print_string("forgotten") ?></p> 
@@ -18,7 +18,7 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
        if (empty($CFG->loginhttps)) {
            $wwwroot = $CFG->wwwroot;
        } else {
-            $wwwroot = str_replace('http','https',$CFG->wwwroot);
+            $wwwroot = str_replace('http:','https:',$CFG->wwwroot);
        }
        $langmenu = popup_form ("$wwwroot/login/index.php?lang=", $langs, "chooselang", $currlang, "", "", "", true);
    }
@@ -109,10 +109,7 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
            //Select password change url
            if (is_internal_auth() || $CFG->{'auth_'.$USER->auth.'_stdchangepassword'}){
                $passwordchangeurl=$CFG->wwwroot.'/login/change_password.php';
-            } elseif($CFG->changepassword) {
-                $passwordchangeurl=$CFG->changepassword;
            } 
-            

            // check whether the user should be changing password
            if (get_user_preferences('auth_forcepasswordchange', false)){
@@ -219,10 +216,7 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
        //Select password change url
        if (is_internal_auth() || $CFG->{'auth_'.$USER->auth.'_stdchangepassword'}){
            $passwordchangeurl=$CFG->wwwroot.'/login/change_password.php';
-        } elseif($CFG->changepassword) {
-            $passwordchangeurl=$CFG->changepassword;
-        } 
-        
+        }

        // check whether the user should be changing password
        if (get_user_preferences('auth_forcepasswordchange', false)){
@@ -319,4 +313,4 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');

    // No footer on this page

-?>
+?>
@@ -118,6 +118,16 @@ function auth_get_userinfo($username){
 }


+function auth_user_update_password($username, $newpassword) {
+    global $CFG;
+    if ($CFG->auth_dbpasstype === 'internal') {
+        return set_field('user', 'password', md5($newpassword), 'username', $username);
+    } else {
+        // we should have never been called!
+        return false;
+    }
+}
+
 /**
 * syncronizes user fron external db to moodle user table
 *
@@ -409,4 +419,43 @@ function auth_db_update_user_record($username, $updatekeys=false) {
    return get_record_select("user", "username = '$username' AND deleted <> '1'");
 }

-?>
+// A chance to validate form data, and last chance to 
+// do stuff before it is inserted in config_plugin
+function auth_validate_form(&$form, &$err) {
+    
+    // compat until we rework auth a bit
+    if ($form['auth_dbpasstype'] === 'internal') {
+        $CFG->auth_db_stdchangepassword = true;
+        if ($conf = get_record('config', 'name', 'auth_db_stdchangepassword')) {
+            $conf->value = 1;
+            if (! update_record('config', $conf)) {
+                notify("Could not update $name to $value");
+            }
+        } else {
+            $conf = new StdClass;
+            $conf->name = 'auth_db_stdchangepassword';
+            $conf->value = 1;
+            if (! insert_record('config', $conf)) {
+                notify("Error: could not add new variable $name !");
+            }
+        }
+    } else {
+        $CFG->auth_db_stdchangepassword = false;
+        if ($conf = get_record('config', 'name', 'auth_db_stdchangepassword')) {
+            $conf->value = 0;
+            if (! update_record('config', $conf)) {
+                notify("Could not update $name to $value");
+            }
+        } else {
+            $conf = new StdClass;
+            $conf->name = 'auth_db_stdchangepassword';
+            $conf->value = 0;
+            if (! insert_record('config', $conf)) {
+                notify("Error: could not add new variable $name !");
+            }
+        }
+    }
+    return true;
+}
+
+?>
@@ -144,7 +144,9 @@ function auth_get_userinfo($username){
                    $ldapval = $newval;
                } 
            }
-            $result[$key] = $ldapval;
+            if (!is_null($ldapval)) {
+                $result[$key] = $ldapval;
+            }
        }
    }

@@ -838,7 +840,7 @@ function auth_user_update($olduser, $newuser) {
    if ($user_info_result){

        $user_entry = auth_ldap_get_entries($ldapconnection, $user_info_result);
-        if (count($user_entry)) {
+        if (count($user_entry) > 1) {
            trigger_error("ldap: Strange! More than one user record found in ldap. Only using the first one.");
        }
        $user_entry = $user_entry[0];
@@ -1080,8 +1082,8 @@ function auth_ldap_getdefaults(){
                        );
    $default['ldap_memberattribute_isdn'] = array(
                        'edir' => '1',
-                        'rfs2307' => '0',
-                        'rfs2307bis' => '1',
+                        'rfc2307' => '0',
+                        'rfc2307bis' => '1',
                        'samba' => '0', //is this right?
                        'ad' => '1',
                        'default' => '0'
@@ -19,8 +19,8 @@ Changes:

 Moodle Configuration with Dual login
 -------------------------------------------------------------------------------
-1. Protect the file moodle/auth/shibboleth/ directory with Shibboleth.
-   The page index.php actually logs in a Shibboleth user. 
+1. Protect the directory moodle/auth/shibboleth/ with Shibboleth.
+   The page index.php in that directory actually logs in a Shibboleth user. 
   For Apache you have to define a rule like the following in the Apache config:

 --
@@ -63,7 +63,7 @@ Moodle Configuration with Dual login
 4. The large text field 'Instructions' must contain a link to the 
   moodle/auth/shibboleth/index.php file which is protected by 
   Shibboleth (see step 1) and causes the Shibboleth login procedure to start. 
-   You also could use HTML code in that field, e.g. to create your own 
+   You could also use HTML code in that field, e.g. to create your own 
   Shibboleth login button.

 5. Save the changes for the Shibboleth authentication method.
@@ -79,11 +79,11 @@ described in the dual login section above and do the following steps:

 How the Shibboleth authentication works
 --------------------------------------------------------------------------------
-For a user to get Shibboleth authenticated in Moodle he basically must go to the 
+To get Shibboleth authenticated in Moodle a user basically must access the 
 Shibboleth-protected page /auth/shibboleth/index.php. If Shibboleth is the only 
 authentication method (see 4.a), this happens automatically when a user wants to 
-login. Otherwise the user has to click on the link on the login page you 
-provided in step 4.
+login in Moodle. Otherwise, the user has to click on the link on the login page 
+you provided in step 4.

 Moodle basically checks whether the Shibboleth attribute that you mapped
 as the username is present. This attribute should only be present if a user is 
@@ -98,19 +98,16 @@ these are checked by Shibboleth itself. Only users who met these rules
 actually can access /auth/shibboleth/index.php and get logged in.

 You can use Shibboleth AND another authentication method (it was tested with 
-manual login). So if there are a few users that don't have a Shibboleth 
+manual login). So, if there are a few users that don't have a Shibboleth 
 login, you could create manual accounts for them and they could use the manual 
 login. For other authentication methods you first have to configure them and 
 then set Shibboleth as your authentication method. Users can log in only via one 
 authentication method unless they have two accounts in Moodle.
-Users that provide a non-existing login name for non-Shibboleth authentication 
-methods are automatically redirected to auth/shibboleth/index.php and it is 
-tried to authenticate them via Shibboleth.

 Shibboleth dual login with custom login page
 --------------------------------------------------------------------------------
 Of course you can create a dual login page that better fits your needs. For this 
-to work you have to set up the two authentication methods (e.g. 'Manual' and 
+to work, you have to set up the two authentication methods (e.g. 'Manual' and 
 'Shibboleth') and specify an alternate login link to your own dual login page. 
 On that page you basically need a link to the Shibboleth-protected page
 ('/auth/shibboleth/index.php') for the Shibboleth login and a 
@@ -3,7 +3,7 @@
    $pluginconfig   = get_config('auth/shibboleth');

    if (!isset($config->auth_instructions) or empty($pluginconfig->shib_user_attribute)) {
-        $config->auth_instructions = get_string('auth_shib_instructions', 'auth', $CFG->wwwroot.'/auth/shibboleth/shib-protected.php');
+        $config->auth_instructions = get_string('auth_shib_instructions', 'auth', $CFG->wwwroot.'/auth/shibboleth/index.php');
    }

    if (!isset ($pluginconfig->user_attribute)) {
@@ -16,7 +16,7 @@
        
        redirect($urltogo);
    }
-	
+
    $pluginconfig   = get_config('auth/shibboleth');

    // Check whether Shibboleth is configured properly
@@ -1,6 +1,7 @@
 <?PHP  // $Id$
 //CHANGELOG:
 //28.10.2004 SHIBBOLETH Authentication functions v.0.1
+//2005-2006 Various extensions and fixes by Lukas Haemmerle
 //Distributed under GPL (c)Markus Hagman 2004-

 function auth_user_login($username, $password) {
@@ -41,9 +42,9 @@ function auth_get_userinfo($username) {
  
    foreach ($attrmap as $key=>$value) {
        if (!empty($CFG->unicodedb)) {
-            $result[$key]=$_SERVER[$value];
+            $result[$key]=get_first_string($_SERVER[$value]);
        } else {
-            $result[$key]=utf8_decode($_SERVER[$value]);
+            $result[$key]=utf8_decode(get_first_string($_SERVER[$value]));
        }
    }

@@ -65,7 +66,7 @@ function auth_get_userinfo($username) {

 function auth_shib_attributes(){
 //returns array containg attribute mappings between Moodle and shibboleth
-	global $CFG;
+    global $CFG;

    $pluginconfig   = get_config('auth/shibboleth');
    $pluginconfig   = (array) $pluginconfig;
@@ -82,6 +83,17 @@ function auth_shib_attributes(){
    }
    $moodleattributes['username']=$pluginconfig["shib_user_attribute"];

-	return $moodleattributes;
+    return $moodleattributes;
 }
+
+
+function get_first_string($string){
+// Cleans and returns first of potential many values (multi-valued attributes)
+
+    $list = split( ';', $string);
+    $clean_string = rtrim($list[0]);
+
+    return $clean_string;
+}
+
 ?>
@@ -17,13 +17,7 @@

    if (!empty($id)) {
        if (!isteacheredit($id)) {
-            if (empty($to)) {
-                error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
-            } else {
-                if (!isteacheredit($to)) {
-                    error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
-                }
-            }
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
        }
    } else {
        if (!isadmin()) {
@@ -31,6 +25,12 @@
        }
    }

+    if (!empty($to)) {
+        if (!isteacheredit($to)) {
+            error("You need to be a teacher or admin user to use this page.", "$CFG->wwwroot/login/index.php");
+        }
+    }
+
    //Check site
    if (!$site = get_site()) {
        error("Site not found!");
@@ -117,7 +117,9 @@
    //Call the form, depending the step we are
    if (!$launch) {
        // if we're at the start, clear the cache of prefs
-        unset($SESSION->backupprefs[$course->id]);
+        if (isset($SESSION->backupprefs[$course->id])) {
+            unset($SESSION->backupprefs[$course->id]);
+        }
        include_once("backup_form.html");
    } else if ($launch == "check") {
        include_once("backup_check.html");
@@ -126,7 +128,7 @@
    }
    print_simple_box_end();

-    //Print footer  
+    //Print footer
    print_footer();

 ?>
@@ -107,7 +107,7 @@
            if (isset($backupprefs->$var) && $backupprefs->$var) {
                $var = "backup_".$modname;
                //Only if selected
-                if ($backupprefs->$var == 1) {
+                if (!empty($backupprefs->$var) and ($backupprefs->$var == 1)) {
                    //Print the full tr
                    echo "<tr>";
                    echo "<td colspan=\"2\">";
@@ -145,7 +145,7 @@

        //If we have selected to backup quizzes, backup categories and
        //questions structure (step 1). See notes on mod/quiz/backuplib.php
-        if ($status and $preferences->mods['quiz']->backup) {
+        if ($status and !empty($preferences->mods['quiz']->backup)) {
            echo "<li>".get_string("writingcategoriesandquestions").'</li>';
            require_once($CFG->dirroot.'/mod/quiz/backuplib.php');
            if (!$status = backup_question_categories($backup_file,$preferences)) {
@@ -98,18 +98,19 @@ function schedule_backup_cron() {
                if (!$backup_course) {
                    mtrace("            ERROR (in backup_courses detection)");
                    $status = false;
+                    continue;
                }
-                //Now we backup every course with nextstarttime < now
-                if ($backup_course->nextstarttime > 0 && $backup_course->nextstarttime < $now) {
+                // Skip backup of unavailable courses that have remained unmodified in a month
+                $skipped = false;
+                if (!$course->visible && ($now - $course->timemodified) > 31*24*60*60) {  //Hidden + unmodified last month
+                    mtrace("            SKIPPING - hidden+unmodified");
+                    set_field("backup_courses","laststatus","3","courseid",$backup_course->courseid);
+                    $skipped = true;
+                } 
+                //Now we backup every non skipped course with nextstarttime < now
+                if (!$skipped  && $backup_course->nextstarttime > 0 && $backup_course->nextstarttime < $now) {
                    //We have to send a email because we have included at least one backup
                    $emailpending = true;
-                    // Skip backup of unavailable courses that have remained unmodified in a month
-                    if (!$course->visible && ($now - $course->timemodified) > 31) {  //Hidden + unmodified last month
-                    //if (!$course->visible && ($now - $course->timemodified) > 31*24*60*60) {  //Hidden + unmodified last month
-                         mtrace("            SKIPPING - hidden+unmodified");
-                         set_field("backup_courses","laststatus","3","courseid",$backup_course->courseid);
-                         continue;
-                    }
                    //Only make the backup if laststatus isn't 2-UNFINISHED (uncontrolled error)
                    if ($backup_course->laststatus != 2) {
                        //Set laststarttime
@@ -334,7 +335,7 @@ function schedule_backup_course_configure($course,$starttime = 0) {
            $backup_config->backup_sche_coursefiles = 1;
        }
        if (!isset($backup_config->backup_sche_messages)) {
-            $backup_config->backup_sche_messages = 1;
+            $backup_config->backup_sche_messages = 0;
        }
        if (!isset($backup_config->backup_sche_active)) {
            $backup_config->backup_sche_active = 0;
@@ -407,8 +408,8 @@ function schedule_backup_course_configure($course,$starttime = 0) {
                    if (empty($preferences->mods[$mod->modname]->instances)) {
                        $preferences->mods[$mod->modname]->instances = array(); // avoid warnings
                    }
-                    $preferences->mods[$mod->modname]->instances[$mod->instance]->backup = $preferences->mods[$modname]->backup;
-                    $preferences->mods[$mod->modname]->instances[$mod->instance]->userinfo = $preferences->mods[$modname]->userinfo;
+                    $preferences->mods[$mod->modname]->instances[$mod->instance]->backup = $preferences->mods[$mod->modname]->backup;
+                    $preferences->mods[$mod->modname]->instances[$mod->instance]->userinfo = $preferences->mods[$mod->modname]->userinfo;
                    // there isn't really a nice way to do this...
                    $preferences->mods[$mod->modname]->instances[$mod->instance]->name = get_field($mod->modname,'name','id',$mod->instance);
                }
@@ -513,7 +514,13 @@ function schedule_backup_course_configure($course,$starttime = 0) {
    //Now calculate the users
    if ($status) {
        schedule_backup_log($starttime,$course->id,"    calculating users");
-        user_check_backup($course->id,$backup_unique_code,$preferences->backup_users,$preferences->backup_messages);  
+        //Decide about include users with messages, based on SITEID
+        if ($preferences->backup_messages && $preferences->backup_course == SITEID) {
+            $include_message_users = true;
+        } else {
+            $include_message_users = false;
+        }
+        user_check_backup($course->id,$backup_unique_code,$preferences->backup_users,$include_message_users);  
    }

    //Now calculate the logs
@@ -765,7 +772,9 @@ function schedule_backup_course_delete_old_files($preferences,$starttime=0) {
        $dirtocheck = $CFG->dataroot."/".$preferences->backup_course."/backupdata";
    }
    schedule_backup_log($starttime,$preferences->backup_course,"    checking $dirtocheck");
-    mtrace("            Keeping backup files in $dirtocheck");
+    if ($CFG->debug > 7) {
+        mtrace("            Keeping backup files in $dirtocheck");
+    }

    //Get all the files in $dirtocheck
    $files = get_directory_list($dirtocheck,"",false);
@@ -460,10 +460,11 @@

    function xml_tag_safe_content($content) {
        global $CFG;
-        //If enabled, we strip all the control chars from the text but tabs, newlines and returns
+        //If enabled, we strip all the control chars (\x0-\x1f) from the text but tabs (\x9), 
+        //newlines (\xa) and returns (\xd). The delete control char (\x7f) is also included.
        //because they are forbiden in XML 1.0 specs. The expression below seems to be
        //UTF-8 safe too because it simply ignores the rest of characters.
-        $content = preg_replace("/(?(?=[[:cntrl:]])[^\n\r\t])/is","",$content);
+        $content = preg_replace("/[\x-\x8\xb-\xc\xe-\x1f\x7f]/is","",$content);
        if (!empty($CFG->unicodedb)) {
            // Don't perform the conversion. Contents are Unicode.
            $content = preg_replace("/\r\n|\r/", "\n", htmlspecialchars($content));
@@ -520,7 +521,8 @@
            fwrite ($bf,full_tag("INCLUDED",4,false,$included));
            fwrite ($bf,full_tag("USERINFO",4,false,$userinfo));

-            if (is_array($preferences->mods[$element->name]->instances)
+            if (isset($preferences->mods[$element->name]->instances)
+                && is_array($preferences->mods[$element->name]->instances)
                && count($preferences->mods[$element->name]->instances)) {
                fwrite ($bf, start_tag("INSTANCES",4,true));
                foreach ($preferences->mods[$element->name]->instances as $id => $object) {
@@ -1001,7 +1003,6 @@
               fwrite ($bf,full_tag("TYPE",6,false,$moduletype));
               fwrite ($bf,full_tag("INSTANCE",6,false,$course_module[$tok]->instance));
               fwrite ($bf,full_tag("ADDED",6,false,$course_module[$tok]->added));
-               fwrite ($bf,full_tag("DELETED",6,false,$course_module[$tok]->deleted));
               fwrite ($bf,full_tag("SCORE",6,false,$course_module[$tok]->score));
               fwrite ($bf,full_tag("INDENT",6,false,$course_module[$tok]->indent));
               fwrite ($bf,full_tag("VISIBLE",6,false,$course_module[$tok]->visible));
@@ -1048,7 +1049,6 @@
                //Output all user data
                fwrite ($bf,full_tag("ID",4,false,$user_data->id));
                fwrite ($bf,full_tag("AUTH",4,false,$user_data->auth));
-                fwrite ($bf,full_tag("GUID",4,false,$user_data->guid));
                fwrite ($bf,full_tag("CONFIRMED",4,false,$user_data->confirmed));
                fwrite ($bf,full_tag("POLICYAGREED",4,false,$user_data->policyagreed));
                fwrite ($bf,full_tag("DELETED",4,false,$user_data->deleted));
@@ -1078,7 +1078,7 @@
                fwrite ($bf,full_tag("LASTACCESS",4,false,$user_data->lastaccess));
                fwrite ($bf,full_tag("LASTLOGIN",4,false,$user_data->lastlogin));
                fwrite ($bf,full_tag("CURRENTLOGIN",4,false,$user_data->currentlogin));
-                fwrite ($bf,full_tag("LASTIP",4,false,$user_data->lastIP));
+                fwrite ($bf,full_tag("LASTIP",4,false,$user_data->lastip));
                fwrite ($bf,full_tag("SECRET",4,false,$user_data->secret));
                fwrite ($bf,full_tag("PICTURE",4,false,$user_data->picture));
                fwrite ($bf,full_tag("URL",4,false,$user_data->url));
@@ -1240,7 +1240,8 @@
                    //See if it is a valid module to backup
                    if ($log->module == "course" or 
                        $log->module == "user" or
-                        $preferences->mods[$log->module]->backup == 1) {
+                        (array_key_exists($log->module, $preferences->mods) and $preferences->mods[$log->module]->backup == 1)) {
+                        // logs with 'upload' in module field are ignored, there is no restore code anyway 
                        //Begin log tag
                         fwrite ($bf,start_tag("LOG",3,true));
    
@@ -1662,7 +1663,8 @@

        require_once($CFG->dirroot.'/mod/'.$module.'/backuplib.php');

-        if (is_array($preferences->mods[$module]->instances)) {
+        if (isset($preferences->mods[$module]->instances)
+            && is_array($preferences->mods[$module]->instances)) {
            $onemodbackup = $module.'_backup_one_mod';
            if (function_exists($onemodbackup)) {
                foreach ($preferences->mods[$module]->instances as $instance => $object) {
@@ -1719,6 +1721,7 @@

        foreach ($mypreferences->mods as $name => $info) {
            //Check if the xxxx_encode_content_links exists
+            include_once("$CFG->dirroot/mod/$name/backuplib.php");
            $function_name = $name."_encode_content_links";
            if (function_exists($function_name)) {
                $result = $function_name($result,$mypreferences);
@@ -50,6 +50,17 @@ function backup_upgrade($oldversion=0) {
        }
    }

+    if ($oldversion < 2006042801) {
+        table_column('backup_log', 'time', 'time', 'integer', '', '', '0');
+        table_column('backup_log', 'laststarttime', 'laststarttime', 'integer', '', '', '0');
+        table_column('backup_log', 'courseid', 'courseid', 'integer', '', '', '0');
+
+        table_column('backup_courses', 'lastendtime', 'lastendtime', 'integer', '', '', '0');
+        table_column('backup_courses', 'laststarttime', 'laststarttime', 'integer', '', '', '0');
+        table_column('backup_courses', 'courseid', 'courseid', 'integer', '', '', '0');
+        table_column('backup_courses', 'nextstarttime', 'nextstarttime', 'integer', '', '', '0');
+    }
+
    //Finally, return result
    return $result;

@@ -293,6 +293,8 @@

        global $CFG;

+        $status = true; // Initialize this, next code will change its value if needed
+
        if (!is_dir($to_file)) {
            //echo "<br />Creating ".$to_file;                                //Debug
            umask(0000);
@@ -411,8 +413,10 @@
            $rec->old_id = $old_id;
            $rec->new_id = ($new_id === null? 0 : $new_id);
            $rec->info = $info_to_save;
-            
-            $status = insert_record('backup_ids', $rec, false);
+
+            if (!insert_record('backup_ids', $rec, false)) {
+                $status = false;
+            }
        }
        return $status;
    }
@@ -140,7 +140,7 @@
    if (!$launch) {
        include_once("restore_precheck.html");
    } else if ($launch == "form") {
-        if ($SESSION->restore->importing) {
+        if (!empty($SESSION->restore->importing)) {
            // set up all the config stuff and skip asking the user about it.
            restore_setup_for_check($SESSION->restore,$backup_unique_code);
            include_once("restore_execute.html");
@@ -45,7 +45,7 @@
                $$var = optional_param( $var,0); 
                $var = "restore_user_info_".$modname;
                $$var = optional_param( $var,0);
-                $instances = $info->mods[$mod->name]->instances;
+                $instances = !empty($info->mods[$mod->name]->instances) ? $info->mods[$mod->name]->instances : NULL;
                if ($instances === NULL) {
                    continue;
                }
@@ -86,7 +86,7 @@
                $restore->mods[$modname]->restore=$$var;
                $var = "restore_user_info_".$modname;
                $restore->mods[$modname]->userinfo=$$var;
-                $instances = $info->mods[$mod->name]->instances;
+                $instances = !empty($info->mods[$mod->name]->instances) ? $info->mods[$mod->name]->instances : NULL;
                if ($instances === NULL) {
                    continue;
                }
@@ -48,8 +48,7 @@
        error ("An error has occurred and the restore could not be completed!");
    }

-    if (!$restore->importing) {
-        echo $output;
+    if (empty($restore->importing)) {
        //Print final message
        print_simple_box(get_string("restorefinished"),"center");
    } else {
@@ -63,6 +63,8 @@
    //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;

        if (!defined('RESTORE_SILENTLY')) {
@@ -72,6 +74,7 @@
            //If the module is being restored
            if ($info->restore == 1) {
                //Check if the xxxx_decode_content_links_caller exists
+	            include_once("$CFG->dirroot/mod/$name/restorelib.php");
                $function_name = $name."_decode_content_links_caller";
                if (function_exists($function_name)) {
                    if (!defined('RESTORE_SILENTLY')) {
@@ -477,7 +480,8 @@
                $suffixshort = "";
            }
            $currentfullname = $fullname.$suffixfull;
-            $currentshortname = $shortname.$suffixshort;
+            // Limit the size of shortname - database column accepts <= 15 chars
+            $currentshortname = substr($shortname, 0, 15 - strlen($suffixshort)).$suffixshort;
            $coursefull  = get_record("course","fullname",addslashes($currentfullname));
            $courseshort = get_record("course","shortname",addslashes($currentshortname));
            $counter++;
@@ -889,7 +893,6 @@
                                        $course_module->module = $module->id;
                                        $course_module->section = $newid;
                                        $course_module->added = $mod->added;
-                                        $course_module->deleted = $mod->deleted;
                                        $course_module->score = $mod->score;
                                        $course_module->indent = $mod->indent;
                                        $course_module->visible = $mod->visible;
@@ -962,7 +965,7 @@
        //Process info about metacourse
        if ($status and $info) {
            //Process child records
-            if ($info->childs) {
+            if (!empty($info->childs)) {
                foreach ($info->childs as $child) {
                    $dbcourse = false;
                    $dbmetacourse = false;
@@ -994,7 +997,7 @@
                sync_metacourse($restore->course_id);
            }
            //Process parent records
-            if ($info->parents) {
+            if (!empty($info->parents)) {
                foreach ($info->parents as $parent) {
                    $dbcourse = false;
                    $dbmetacourse = false;
@@ -1268,7 +1271,11 @@
                                                        $itemid = insert_record('grade_item',$item);

                                                        //Now process grade_exceptions
-                                                        $exceptions = $ite_info['#']['GRADE_EXCEPTIONS']['0']['#']['GRADE_EXCEPTION'];
+                                                        if (!empty($ite_info['#']['GRADE_EXCEPTIONS'])) {
+                                                            $exceptions = $ite_info['#']['GRADE_EXCEPTIONS']['0']['#']['GRADE_EXCEPTION'];
+                                                        } else {
+                                                            $exceptions = array();
+                                                        }

                                                        //Iterate over exceptions
                                                        for($j = 0; $j < sizeof($exceptions); $j++) {
@@ -2483,7 +2490,7 @@
                        $modrestore = $mod->modtype."_restore_mods";
                        if (function_exists($modrestore)) {
                            //print_object ($mod);                                                //Debug
-                            $status &= $modrestore($mod,$restore);
+                            $status = $status and $modrestore($mod,$restore); //bit operator & not reliable here!
                        } else {
                            //Something was wrong. Function should exist.
                            $status = false;
@@ -2732,6 +2739,31 @@
            $log->info = "";
            $toinsert = true;
            break;
+        case "report log":
+            $log->url = "report/log/index.php?id=".$log->course;
+            $log->info = $log->course;
+            $toinsert = true;
+            break;
+        case "report live":
+            $log->url = "report/log/live.php?id=".$log->course;
+            $log->info = $log->course;
+            $toinsert = true;
+            break;
+        case "report outline":
+            $log->url = "report/outline/index.php?id=".$log->course;
+            $log->info = $log->course;
+            $toinsert = true;
+            break;
+        case "report participation":
+            $log->url = "report/participation/index.php?id=".$log->course;
+            $log->info = $log->course;
+            $toinsert = true;
+            break;
+        case "report stats":
+            $log->url = "report/stats/index.php?id=".$log->course;
+            $log->info = $log->course;
+            $toinsert = true;
+            break;
        default:
            echo "action (".$log->module."-".$log->action.") unknown. Not restored<br />";                 //Debug
            break;
@@ -3591,8 +3623,6 @@
                                $this->info->tempmod->instance;
                            $this->info->tempsection->mods[$this->info->tempmod->id]->added = 
                                $this->info->tempmod->added;
-                            $this->info->tempsection->mods[$this->info->tempmod->id]->deleted = 
-                                $this->info->tempmod->deleted;
                            $this->info->tempsection->mods[$this->info->tempmod->id]->score = 
                                $this->info->tempmod->score;
                            $this->info->tempsection->mods[$this->info->tempmod->id]->indent = 
@@ -3618,9 +3648,6 @@
                        case "ADDED":
                            $this->info->tempmod->added = $this->getContents();
                            break;
-                        case "DELETED":
-                            $this->info->tempmod->deleted = $this->getContents();
-                            break;
                        case "SCORE":
                            $this->info->tempmod->score = $this->getContents();
                            break;
@@ -3847,9 +3874,6 @@
                        case "AUTH": 
                            $this->info->tempuser->auth = $this->getContents();
                            break;
-                        case "GUID": 
-                            $this->info->tempuser->guid = $this->getContents();
-                            break;
                        case "CONFIRMED": 
                            $this->info->tempuser->confirmed = $this->getContents();
                            break;
@@ -5218,6 +5242,7 @@
                if (!defined('RESTORE_SILENTLY')) {
                    echo '<li>'.get_string('creatingblocks').'</li>';
                }
+                $course_header->blockinfo = !empty($course_header->blockinfo) ? $course_header->blockinfo : NULL;
                if (!$status = restore_create_blocks($restore, $info->backup_block_format, $course_header->blockinfo, $xml_file)) {
                    if (!defined('RESTORE_SILENTLY')) {
                        notify('Error while creating the course blocks');
@@ -5,6 +5,8 @@
 // database (backup_version) to determine whether upgrades should
 // be performed (see db/backup_*.php)

-$backup_version = 2006042800;   // The current version is a date (YYYYMMDDXX)
+$backup_version = 2006082300;   // The current version is a date (YYYYMMDDXX)

-$backup_release = "1.6beta4";  // User-friendly version number
+$backup_release = "1.6.2";  // User-friendly version number
+
+?>
@@ -14,7 +14,9 @@ class block_activity_modules extends block_list {
        // data from db if the course format has already fetched them
        if(!isset($GLOBALS['modnamesplural']) || !isset($GLOBALS['modnamesused'])) {
            require_once($CFG->dirroot.'/course/lib.php');
-            get_all_mods($this->instance->pageid, $mods, $modnames, $modnamesplural, $modnamesused);
+            if (!empty($this->instance)) {
+                get_all_mods($this->instance->pageid, $mods, $modnames, $modnamesplural, $modnamesused);
+            }
        }
        else {
            $modnamesplural = $GLOBALS['modnamesplural'];
@@ -30,7 +32,7 @@ class block_activity_modules extends block_list {
        $this->content->icons = array();
        $this->content->footer = '';

-        if ($modnamesused) {
+        if (isset($modnamesused) && $modnamesused) {
            foreach ($modnamesused as $modname => $modfullname) {
                if ($modname != 'label') {
                    $this->content->items[] = '<a href="'.$CFG->wwwroot.'/mod/'.$modname.'/index.php?id='.$this->instance->pageid.'">'.$modnamesplural[$modname].'</a>';
@@ -56,10 +56,8 @@ class block_admin extends block_list {
            $this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/log.gif" alt="" />';


-            if (!empty($CFG->enablestats)) {
-                $this->content->items[] = '<a href="'.$CFG->wwwroot.'/course/report/stats/index.php?course='.SITEID.'">'.get_string('stats').'</a>';
-                $this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/stats.gif" alt="" />';
-            }
+            $this->content->items[] = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/report.php">'.get_string('reports').'</a>';
+            $this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/stats.gif" alt="" />';

            $this->content->items[] = '<a href="'.$CFG->wwwroot.'/files/index.php?id='.SITEID.'">'.get_string('sitefiles').'</a>';
            $this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/files.gif" alt="" />';
@@ -92,6 +90,12 @@ class block_admin extends block_list {
            return $this->content;
        }

+        if(empty($CFG->loginhttps)) {
+            $securewwwroot = $CFG->wwwroot;
+        } else {
+            $securewwwroot = str_replace('http:','https:',$CFG->wwwroot);
+        }
+
        $course = get_record('course', 'id', $this->instance->pageid);

        if (isteacher($this->instance->pageid)) {
@@ -111,9 +115,9 @@ class block_admin extends block_list {


            $fullname = fullname($USER, true);
-            $editmyprofile = '<a title="'.$fullname.'" href="'.$CFG->wwwroot.'/user/edit.php?id='.$USER->id.'&amp;course='.$this->instance->pageid.'">'.get_string('editmyprofile').'</a>';
+            $editmyprofile = '<a title="'.$fullname.'" href="'.$securewwwroot.'/user/edit.php?id='.$USER->id.'&amp;course='.$this->instance->pageid.'">'.get_string('editmyprofile').'</a>';
            if (empty($USER->description)) {
-            	//Accessibility: replace non-standard <blink> with CSS (<a> makes title visible in IE).
+                //Accessibility: replace non-standard <blink> with CSS (<a> makes title visible in IE).
                $text = get_string('profile').' '.get_string('missingdescription');
                $this->content->items[]= $editmyprofile.' <a title="'.$text.'" class="useredit blink">*<span class="accesshide">'.$text.'</span></a>';
            } else {
@@ -186,7 +190,9 @@ class block_admin extends block_list {
                $this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/payment.gif" alt="" />';
            }

-            $this->content->items[]='<a href="'.$CFG->wwwroot.'/doc/view.php?id='.$this->instance->pageid.'&amp;file=teacher.html">'.get_string('help').'</a>';
+            $lang = str_replace('_utf8', '', current_language());
+
+            $this->content->items[]='<a href="http://docs.moodle.org/'.$lang.'/Teacher_documentation">'.get_string('help').'</a>';
            $this->content->icons[]='<img src="'.$CFG->modpixpath.'/resource/icon.gif" alt="" />';

            if ($teacherforum = forum_get_course_forum($this->instance->pageid, 'teacher')) {
@@ -206,10 +212,10 @@ class block_admin extends block_list {
            }

            $fullname = fullname($USER, true);
-            $editmyprofile = '<a title="'.$fullname.'" href="'.$CFG->wwwroot.'/user/edit.php?id='.
+            $editmyprofile = '<a title="'.$fullname.'" href="'.$securewwwroot.'/user/edit.php?id='.
                             $USER->id.'&amp;course='.$this->instance->pageid.'">'.get_string('editmyprofile').'</a>';
            if (empty($USER->description)) {
-            	//Accessibility: replace non-standard <blink> with CSS (<a> makes title visible in IE).
+                //Accessibility: replace non-standard <blink> with CSS (<a> makes title visible in IE).
                $text = get_string('profile').' '.get_string('missingdescription');
                $this->content->items[]= $editmyprofile.' <a title="'.$text.'" class="useredit blink">*<span class="accesshide">'.$text.'</span></a>';
            } else {
@@ -218,12 +224,10 @@ class block_admin extends block_list {
            $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" alt="" />';

            if (is_internal_auth() && !is_restricted_user($USER->username)) {
-                $this->content->items[]='<a href="'.$CFG->wwwroot.'/login/change_password.php?id='.$this->instance->pageid.'">'.get_string('changepassword').'</a>';
+                $this->content->items[]='<a href="'.$securewwwroot.'/login/change_password.php?id='.$this->instance->pageid.'">'.get_string('changepassword').'</a>';
                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" alt="" />';
-            } else if ($CFG->changepassword && !is_restricted_user($USER->username)) {
-                $this->content->items[]='<a href="'.$CFG->changepassword.'">'.get_string('changepassword').'</a>';
-                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" alt="" />';
-            }
+            } 
+            
            if ($CFG->allowunenroll && !$course->metacourse) {
                $this->content->items[]='<a href="unenrol.php?id='.$this->instance->pageid.'">'.get_string('unenrolme', '', $course->shortname).'</a>';
                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" alt="" />';
@@ -1,5 +1,7 @@
 <?php //$Id$

+require_once($CFG->dirroot .'/blog/lib.php');
+
 class block_blog_menu extends block_base {
    
    function init() {
@@ -15,13 +17,13 @@ class block_blog_menu extends block_base {
            $course = SITEID;
        }

-        if ($CFG->bloglevel < 1) {
+        if ($CFG->bloglevel < BLOG_USER_LEVEL) {
            $this->content->text = '';
            return $this->content;
        }

        // don't display menu block if block is set at site level, and user is not logged in
-        if ($CFG->bloglevel < 5 && !(isloggedin() && !isguest())) {
+        if ($CFG->bloglevel < BLOG_GLOBAL_LEVEL && !(isloggedin() && !isguest())) {
            $this->content->text = '';
            return $this->content;
        }
@@ -48,15 +50,13 @@ class block_blog_menu extends block_base {
            $this->content->text = $output;
            return $this->content;
        }
-        
-        require_once($CFG->dirroot .'/blog/lib.php');

        //if ( blog_isLoggedIn() && !isguest() ) {
            $courseviewlink = '';
            $addentrylink = '';
                            
            $coursearg = '';
-            if((isloggedin() && !isguest()) && isset($course) && isset($course->id) && $course->id !=0 && $course->id!=SITEID && $CFG->bloglevel >=3 ) {
+            if((isloggedin() && !isguest()) && isset($course) && isset($course->id) && $course->id !=0 && $course->id!=SITEID && $CFG->bloglevel >= BLOG_COURSE_LEVEL) {
                $coursearg = '&amp;courseid='. $course->id;
                // a course is specified
                
@@ -66,10 +66,10 @@ class block_blog_menu extends block_base {
                
            $blogmodon = false;

-                if ((isloggedin() && !isguest()) && (isadmin() || !$blogmodon || ($blogmodon && $coursearg != '')) && $CFG->bloglevel >= 1) {
+                if ((isloggedin() && !isguest()) && (isadmin() || !$blogmodon || ($blogmodon && $coursearg != '')) && $CFG->bloglevel >= BLOG_USER_LEVEL) {

                    // show Add entry link - user is not admin, moderation is off, or moderation is on and the user is viewing the block within the context of a course
-                        $addentrylink = '<a href="'. $CFG->wwwroot. '/blog/edit.php?userid='. $userBlog->userid . $coursearg .'">'. get_string('addnewentry', 'blog') .'</a><br />';
+                    $addentrylink = '<a href="'. $CFG->wwwroot. '/blog/edit.php?userid='. $userBlog->userid . $coursearg .'">'. get_string('addnewentry', 'blog') .'</a><br />';

                    // show View my entries link
                    $addentrylink .= '<a href="'. $CFG->wwwroot .'/blog/index.php?userid='. $userBlog->userid.'">';
@@ -83,7 +83,7 @@ class block_blog_menu extends block_base {
            }

            // show View site entries link
-            if ($CFG->bloglevel >= 4) {
+            if ($CFG->bloglevel >= BLOG_SITE_LEVEL) {
                $output .= '<a href="'. $CFG->wwwroot .'/blog/index.php?filtertype=site&amp;">';
                $output .= get_string('viewsiteentries', 'blog') .'</a><br />';
            }
@@ -4,13 +4,7 @@ define('BLOGDEFAULTTIMEWITHIN', 90);
 define('BLOGDEFAULTNUMBEROFTAGS', 20);
 define('BLOGDEFAULTSORT', 'text');

-if (!defined('BLOG_USER_LEVEL')) {
-    define ('BLOG_USER_LEVEL', 1);
-    define ('BLOG_GROUP_LEVEL', 2);
-    define ('BLOG_COURSE_LEVEL', 3);
-    define ('BLOG_SITE_LEVEL', 4);
-    define ('BLOG_GLOBAL_LEVEL', 5);
-}
+require_once($CFG->dirroot .'/blog/lib.php');

 class block_blog_tags extends block_base {
    function init() {
@@ -47,7 +41,7 @@ class block_blog_tags extends block_base {

    function get_content() {

-        global $CFG;
+        global $CFG, $SITE, $COURSE;

        if (empty($this->config->timewithin)) {
            $this->config->timewithin = BLOGDEFAULTTIMEWITHIN;
@@ -137,17 +131,21 @@ class block_blog_tags extends block_base {

                    case BLOG_COURSE_LEVEL:
                        $filtertype = 'course';
-                        global $course;           // Need to do this unfortunately for pages like blog pages
-                        if (isset($course->id)) {     
-                            $filterselect = $course->id;
+                        if (isset($COURSE->id)) {     
+                            $filterselect = $COURSE->id;
                        } else {
                            $filterselect = $this->instance->pageid;
                        }
                    break;

                    default:
-                        $filtertype = 'site';
-                        $filterselect = SITEID;
+                        if (isset($COURSE->id) && $COURSE->id != SITEID) {     
+                            $filtertype = 'course';
+                            $filterselect = $COURSE->id;
+                        } else {
+                            $filtertype = 'site';
+                            $filterselect = SITEID;
+                        }
                    break;
                }

@@ -11,7 +11,7 @@ class block_calendar_month extends block_base {
    }

    function get_content() {
-        global $USER, $CFG, $SESSION;
+        global $USER, $CFG, $SESSION, $COURSE;
        $cal_m = optional_param( 'cal_m', 0, PARAM_INT );
        $cal_y = optional_param( 'cal_y', 0, PARAM_INT );

@@ -28,12 +28,7 @@ class block_calendar_month extends block_base {
        // [pj] To me it looks like this if would never be needed, but Penny added it 
        // when committing the /my/ stuff. Reminder to discuss and learn what it's about.
        // It definitely needs SOME comment here!
-        if (!empty($this->instance->pageid)) {
-            $courseshown = $this->instance->pageid;
-        }
-        else {
-            $courseshown = SITEID;
-        }
+        $courseshown = $COURSE->id;

        if($courseshown == SITEID) {
            // Being displayed at site level. This will cause the filter to fall back to auto-detecting
@@ -58,13 +53,12 @@ class block_calendar_month extends block_base {
            $this->content->text .= calendar_get_mini($courses, $group, $user, $cal_m, $cal_y);
            // No filters for now

-        } elseif (!empty($courseshown)) {
+        } else {
            // For any other course
            $this->content->text .= calendar_overlib_html();
            $this->content->text .= calendar_top_controls('course', array('id' => $courseshown, 'm' => $cal_m, 'y' => $cal_y));
            $this->content->text .= calendar_get_mini($courses, $group, $user, $cal_m, $cal_y);
-            $course = get_record('course', 'id', $this->instance->pageid);
-            $this->content->text .= '<div class="filters">'.calendar_filter_controls('course', '', $course).'</div>';
+            $this->content->text .= '<div class="filters">'.calendar_filter_controls('course', '', $COURSE).'</div>';
            
        }

@@ -7,7 +7,7 @@ class block_calendar_upcoming extends block_base {
    }

    function get_content() {
-        global $USER, $CFG, $SESSION;
+        global $USER, $CFG, $SESSION, $COURSE;
        $cal_m = optional_param( 'cal_m', 0, PARAM_INT );
        $cal_y = optional_param( 'cal_y', 0, PARAM_INT );

@@ -27,12 +27,7 @@ class block_calendar_upcoming extends block_base {
            $this->content->footer = '';

        } else {
-            if (!empty($this->instance->pageid)) {
-                $courseshown = $this->instance->pageid;
-            }
-            else {
-                $courseshown = SITEID;
-            }
+            $courseshown = $COURSE->id;
            $this->content->footer = '<br /><a href="'.$CFG->wwwroot.
                                     '/calendar/view.php?view=upcoming&amp;course='.$courseshown.'">'.
                                      get_string('gotocalendar', 'calendar').'</a>...';
@@ -34,7 +34,7 @@ class block_course_list extends block_list {
           }
        }

-        if (isset($USER->id) and !(isadmin() and $adminseesall)) {    // Just print My Courses
+        if (empty($CFG->disablemycourses) and isset($USER->id) and !(isadmin() and $adminseesall)) {    // Just print My Courses
            if ($courses = get_my_courses($USER->id)) {
                foreach ($courses as $course) {
                    if ($course->id == SITEID) {
@@ -7,13 +7,14 @@ class block_course_summary extends block_base {
    }

    function specialization() {
-        if($this->instance->pagetype == PAGE_COURSE_VIEW && $this->instance->pageid != SITEID) {
+        global $COURSE;
+        if($this->instance->pagetype == PAGE_COURSE_VIEW && $COURSE->id != SITEID) {
            $this->title = get_string('coursesummary', 'block_course_summary');
        }
    }

    function get_content() {
-        global $CFG, $THEME;
+        global $CFG, $COURSE;

        if($this->content !== NULL) {
            return $this->content;
@@ -23,19 +24,14 @@ class block_course_summary extends block_base {
            return '';
        }

-        if (empty($this->instance->pageid)) {
-            $this->instance->pageid = SITEID;
-        }
-        $course  = get_record('course', 'id', $this->instance->pageid);
-        
        $this->content = New stdClass;
        $options->noclean = true;    // Don't clean Javascripts etc
-        $this->content->text = format_text($course->summary, FORMAT_HTML, $options);
-        if(isediting($this->instance->pageid)) {
-            if($this->instance->pageid == SITEID) {
+        $this->content->text = format_text($COURSE->summary, FORMAT_HTML, $options);
+        if(isediting($COURSE->id)) {
+            if($COURSE->id == SITEID) {
                $editpage = $CFG->wwwroot.'/'.$CFG->admin.'/site.php';
            } else {
-                $editpage = $CFG->wwwroot.'/course/edit.php?id='.$this->instance->pageid;
+                $editpage = $CFG->wwwroot.'/course/edit.php?id='.$COURSE->id;
            }
            $this->content->text .= "<div align=\"right\"><a href=\"$editpage\"><img src=\"$CFG->pixpath/t/edit.gif\" alt=\"\" /></a></div>";
        }
@@ -61,6 +61,35 @@ function migrate2utf8_block_instance_configdata($recordid){

        return $blah;

+    } else if ($blocktype -> name == 'glossary_random'){
+
+        ///find course
+        if ($globallang) {
+            $fromenc = $globallang;
+        } else {
+            $sitelang   = $CFG->lang;
+            $courselang = get_course_lang($blockinstance->pageid);  //Non existing!
+            $userlang   = get_main_teacher_lang($blockinstance->pageid); //N.E.!!
+
+            $fromenc = get_original_encoding($sitelang, $courselang, $userlang);
+        }
+
+        $blah = unserialize(base64_decode($blockinstance->configdata));
+
+    /// We are going to use textlib facilities
+
+    /// Convert the text
+        $blah->title = utfconvert($blah->title, $fromenc, false);
+        $blah->addentry = utfconvert($blah->addentry, $fromenc, false);
+        $blah->viewglossary = utfconvert($blah->viewglossary, $fromenc, false);
+        $blah->invisible = utfconvert($blah->invisible, $fromenc, false);
+
+        $blockinstance->configdata = base64_encode(serialize($blah));
+
+        migrate2utf8_update_record('block_instance',$blockinstance);
+
+        return $blah;
+
    }

 }
@@ -127,6 +156,35 @@ global $CFG, $globallang;

        return $blah;

+    } else if ($blocktype -> name == 'glossary_random'){
+
+        ///find course
+        if ($globallang) {
+            $fromenc = $globallang;
+        } else {
+            $sitelang   = $CFG->lang;
+            $courselang = get_course_lang($blockpinned->pageid);  //Non existing!
+            $userlang   = get_main_teacher_lang($blockpinned->pageid); //N.E.!!
+
+            $fromenc = get_original_encoding($sitelang, $courselang, $userlang);
+        }
+
+        $blah = unserialize(base64_decode($blockpinned->configdata));
+
+    /// We are going to use textlib facilities
+
+    /// Convert the text
+        $blah->title = utfconvert($blah->title, $fromenc, false);
+        $blah->addentry = utfconvert($blah->addentry, $fromenc, false);
+        $blah->viewglossary = utfconvert($blah->viewglossary, $fromenc, false);
+        $blah->invisible = utfconvert($blah->invisible, $fromenc, false);
+
+        $blockinstance->configdata = base64_encode(serialize($blah));
+
+        migrate2utf8_update_record('block_instance',$blockinstance);
+
+        return $blah;
+
    }
 }
 ?>
@@ -13,8 +13,8 @@ class block_glossary_random extends block_base {
    }

    function specialization() {
-        global $CFG;
-        $this->course = get_record('course', 'id', $this->instance->pageid);
+        global $CFG, $COURSE;
+        $this->course = $COURSE;

        // load userdefined title and make sure it's never empty
        if (empty($this->config->title)) {
@@ -12,26 +12,26 @@
 <td><input type="text" name="title" size="50" value="<?php p($this->config->title) ?>" /></td>
 </tr>

-<tr valign=top>	
+<tr valign=top>
 <td align=right><?php print_string("select_glossary","block_glossary_random") ?>:</td>
 <td><?php choose_from_menu($glossaries,"glossary",$this->config->glossary) ?></td>
 </tr>

-<tr valign=top>	
+<tr valign=top>
 <td align=right><?php print_string("refresh","block_glossary_random") ?>:</td>
 <td><input type="text" name="refresh" size="5" value="<?php p($this->config->refresh) ?>" /></td>
 </tr>

-<tr valign=top>	
-<td align=right><?php print_string("type","block_glossary_random") ?>:</td>	
+<tr valign=top>
+<td align=right><?php print_string("type","block_glossary_random") ?>:</td>
 <td><?php
     choose_from_menu($type, "type", $this->config->type, "");
     helpbutton("",get_string("type","block_glossary_random"),"moodle",true,false,get_string("typehelp","block_glossary_random"));
     ?></td>
 </tr> 

-<tr valign=top>	
-<td align=right><?php print_string("showconcept","block_glossary_random") ?>:</td>	
+<tr valign=top>
+<td align=right><?php print_string("showconcept","block_glossary_random") ?>:</td>
 <td>
 <input type="hidden" name="showconcept" value="0" />
 <input type="checkbox" name="showconcept" value="1" <?php if(!empty($this->config->showconcept)) echo 'checked="checked"'; ?> /></td>
@@ -2,7 +2,7 @@
 <table cellpadding="9" cellspacing="0">
 <tr valign="top">
    <td align="right"><?php print_string('configtitle', 'block_html'); ?>:</td>
-    <td><input type="text" name="title" size="30" value="<?php echo isset($this->config->title)?$this->config->title:''; ?>" /> (<?php print_string('leaveblanktohide', 'block_html'); ?>)</td>
+    <td><input type="text" name="title" size="30" value="<?php echo isset($this->config->title)?p($this->config->title):''; ?>" /> (<?php print_string('leaveblanktohide', 'block_html'); ?>)</td>
 </tr>
 <tr valign="top">
    <td align="right"><?php print_string('configcontent', 'block_html'); ?>:</td>
@@ -198,6 +198,7 @@ function comp(v) { // general entry point for all cases
 				</tr>
 			</table>
 			</form>';
+        $this->content->footer = '';

        return $this->content;

@@ -32,13 +32,12 @@ class block_login extends block_base {
            $forgot = $wwwroot . '/login/forgot_password.php';
        } else {
            if (!empty($CFG->{'auth_'.$CFG->auth.'_stdchangepassword'})
-                || $CFG->changepassword
                || is_internal_auth() ) {
                if (is_internal_auth() || !empty($CFG->{'auth_'.$CFG->auth.'_stdchangepassword'})) {
                    $forgot =  $wwwroot . '/login/forgot_password.php';
                }
                else {
-                    $forgot = $CFG->changepassword;
+                    $forgot = '';
                }
            }
        }
@@ -7,7 +7,7 @@ class block_news_items extends block_base {
    }

    function get_content() {
-        global $CFG, $USER;
+        global $CFG, $USER, $COURSE;

        if ($this->content !== NULL) {
            return $this->content;
@@ -22,44 +22,39 @@ class block_news_items extends block_base {
        }


-        if ($this->instance->pageid == 0) {
-            $this->instance->pageid = SITEID;
-        }
-        $course = get_record('course', 'id', $this->instance->pageid);
-
-        if ($course->newsitems) {   // Create a nice listing of recent postings
+        if ($COURSE->newsitems) {   // Create a nice listing of recent postings

            require_once($CFG->dirroot.'/mod/forum/lib.php');   // We'll need this
           
            $text = '';

-            if (!$forum = forum_get_course_forum($course->id, 'news')) {
+            if (!$forum = forum_get_course_forum($COURSE->id, 'news')) {
                return $this->content;
            }


        /// First work out whether we can post to this group and if so, include a link

-            if (isteacheredit($course->id)) {     /// Teachers can always post
+            if (isteacheredit($COURSE->id)) {     /// Teachers can always post
                $visiblegroups = -1; 

                $text .= '<div align="center" class="newlink"><a href="'.$CFG->wwwroot.'/mod/forum/post.php?forum='.$forum->id.'">'.
                          get_string('addanewtopic', 'forum').'</a>...</div>';

            } else {                              /// Check the group situation
-                $currentgroup = get_current_group($course->id);
+                $currentgroup = get_current_group($COURSE->id);

                if (forum_user_can_post_discussion($forum, $currentgroup)) {
                    $text .= '<div align="center" class="newlink"><a href="'.$CFG->wwwroot.'/mod/forum/post.php?forum='.$forum->id.'">'.
                              get_string('addanewtopic', 'forum').'</a>...</div>';
                }

-                if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) {
+                if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $COURSE->id)) {
                    $this->content->text = $text;
                    return $this->content;
                }
    
-                $groupmode = groupmode($course, $cm);
+                $groupmode = groupmode($COURSE, $cm);
    
                /// Decides if current user is allowed to see ALL the current discussions or not
    
@@ -73,7 +68,7 @@ class block_news_items extends block_base {
        /// Get all the recent discussions we're allowed to see

            if (! $discussions = forum_get_discussions($forum->id, 'p.modified DESC', 0, false, 
-                                                       $visiblegroups, $course->newsitems) ) {
+                                                       $visiblegroups, $COURSE->newsitems) ) {
                $text .= '('.get_string('nonews', 'forum').')';
                $this->content->text = $text;
                return $this->content;
@@ -119,7 +114,7 @@ class block_news_items extends block_base {
                } else {
                    $userid = $USER->id;
                }
-                $this->content->footer .= '<br />'.rss_get_link($course->id, $userid, 'forum', $forum->id, $tooltiptext);
+                $this->content->footer .= '<br />'.rss_get_link($COURSE->id, $userid, 'forum', $forum->id, $tooltiptext);
            }

        }
@@ -9,7 +9,7 @@ class block_online_users extends block_base {
    function has_config() {return true;}

    function get_content() {
-        global $USER, $CFG;
+        global $USER, $CFG, $COURSE;

        if ($this->content !== NULL) {
            return $this->content;
@@ -23,8 +23,6 @@ class block_online_users extends block_base {
            return $this->content;
        }
    
-        $course = get_record('course', 'id', $this->instance->pageid);
-
        $timetoshowusers = 300; //Seconds default
        if (isset($CFG->block_online_users_timetosee)) {
            $timetoshowusers = $CFG->block_online_users_timetosee * 60;
@@ -32,10 +30,10 @@ class block_online_users extends block_base {
        $timefrom = time()-$timetoshowusers;

        //Calculate if we are in separate groups
-        $isseparategroups = ($course->groupmode == SEPARATEGROUPS && $course->groupmodeforce && !isteacheredit($this->instance->pageid));
+        $isseparategroups = ($COURSE->groupmode == SEPARATEGROUPS && $COURSE->groupmodeforce && !isteacheredit($COURSE->id));

        //Get the user current group
-        $currentgroup = $isseparategroups ? get_current_group($this->instance->pageid) : NULL;
+        $currentgroup = $isseparategroups ? get_current_group($COURSE->id) : NULL;

        $groupmembers = "";
        $groupselect = "";
@@ -46,11 +44,11 @@ class block_online_users extends block_base {
            $groupselect .= " AND u.id = gm.userid AND gm.groupid = '$currentgroup'";
        }

-        if ($this->instance->pageid == SITEID) {  // Site-level
+        if ($COURSE->id == SITEID) {  // Site-level
            $courseselect = '';
            $timeselect = "AND (s.timeaccess > $timefrom OR u.lastaccess > $timefrom)";
        } else {
-            $courseselect = "AND s.course = '".$this->instance->pageid."'";
+            $courseselect = "AND s.course = '".$COURSE->id."'";
            $timeselect = "AND s.timeaccess > $timefrom";
        }

@@ -69,7 +67,7 @@ class block_online_users extends block_base {
            }
        }

-        if ($this->instance->pageid == SITEID && $CFG->allusersaresitestudents) {
+        if ($COURSE->id == SITEID && $CFG->allusersaresitestudents) {
            if ($siteusers = get_records_sql("SELECT u.id, u.username, u.firstname, u.lastname, u.picture, u.lastaccess
                                     FROM {$CFG->prefix}user u
                                     WHERE u.lastaccess > $timefrom AND u.username <> 'guest'
@@ -88,7 +86,7 @@ class block_online_users extends block_base {
                                          $groupmembers
                                     WHERE u.id = s.userid $courseselect $groupselect $timeselect ";

-        if (!isteacher($course->id)) {
+        if (!isteacher($COURSE->id)) {
            // Hide hidden teachers from students.
            $findteacherssql .= 'AND s.authority > 0 ';
        }
@@ -110,14 +108,14 @@ class block_online_users extends block_base {
        //Now, we have in users, the list of users to show
        //Because they are online
        if (!empty($users)) {
-        	//Accessibility: Don't want 'Alt' text for the user picture; DO want it for the envelope/message link (existing lang string).
-        	//Accessibility: Converted <div> to <ul>, inherit existing classes & styles.
-        	$this->content->text .= "<ul class='list'>\n";
+            //Accessibility: Don't want 'Alt' text for the user picture; DO want it for the envelope/message link (existing lang string).
+            //Accessibility: Converted <div> to <ul>, inherit existing classes & styles.
+            $this->content->text .= "<ul class='list'>\n";
            foreach ($users as $user) {
-            	$this->content->text .= '<li class="listentry">';
+                $this->content->text .= '<li class="listentry">';
                $timeago = format_time(time() - max($user->timeaccess, $user->lastaccess)); //bruno to calculate correctly on frontpage 
-                $this->content->text .= print_user_picture($user->id, $this->instance->pageid, $user->picture, 16, true).' ';
-                $this->content->text .= '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$this->instance->pageid.'" title="'.$timeago.'">'.$user->fullname.'</a>';
+                $this->content->text .= print_user_picture($user->id, $COURSE->id, $user->picture, 16, true).' ';
+                $this->content->text .= '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$COURSE->id.'" title="'.$timeago.'">'.$user->fullname.'</a>';
                if (!empty($USER->id) and ($USER->id != $user->id) and !empty($CFG->messaging) and !isguest()) {  // Only when logged in
                    $this->content->text .= "\n".' <a title="'.get_string('messageselectadd').'" target="message_'.$user->id.'" href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);">'
                        .'<img class="icon message" src="'.$CFG->pixpath.'/t/message.gif" alt="'. get_string('messageselectadd') .'" /></a>';
@@ -7,6 +7,7 @@ class block_recent_activity extends block_base {
    }

    function get_content() {
+        global $COURSE;

        if ($this->content !== NULL) {
            return $this->content;
@@ -21,11 +22,9 @@ class block_recent_activity extends block_base {
        $this->content->text = '';
        $this->content->footer = '';

-        $course = get_record('course', 'id', $this->instance->pageid);
-
        // Slightly hacky way to do it but...
        ob_start();
-        print_recent_activity($course);
+        print_recent_activity($COURSE);
        $this->content->text = ob_get_contents();
        ob_end_clean();

@@ -42,7 +42,7 @@
    }

    function get_content() {
-        global $CFG, $editing;
+        global $CFG, $editing, $COURSE;

        require_once($CFG->libdir .'/rsslib.php');

@@ -89,7 +89,7 @@
        $isteacher = false;
        $this->courseid = SITEID;
        if ($this->instance->pagetype == PAGE_COURSE_VIEW) {
-            $this->courseid = $this->instance->pageid;
+            $this->courseid = $COURSE->id;
            $isteacher = isteacher($this->courseid);
        }

@@ -27,6 +27,7 @@ if (isguest()) {
    error(get_string('noguestpost', 'forum'), $referrer);
 }

+$url = optional_param('url','',PARAM_URL);

 if (!empty($url)) {
    // attempting to replace feed and rss url types with http
@@ -41,7 +42,7 @@ if (!empty($url)) {
 $act            = optional_param('act', NULL, PARAM_ALPHA);
 $rssid          = optional_param('rssid', NULL, PARAM_INT);
 $id             = optional_param('id', SITEID, PARAM_INT);
-$url            = clean_param($url, PARAM_URL);
+//$url            = clean_param($url, PARAM_URL);
 $preferredtitle = optional_param('preferredtitle', '', PARAM_ALPHA);

 if (!defined('MAGPIE_OUTPUT_ENCODING')) {
@@ -12,6 +12,12 @@ function rss_client_upgrade($oldversion) {
        table_column('block_rss_client','description','description','text');
    }

+    if ($oldversion < 2005090201) {
+        modify_database('', 'ALTER TABLE prefix_block_rss_client
+            ALTER COLUMN title SET DEFAULT \'\',
+            ALTER COLUMN description SET DEFAULT \'\'');
+    }
+
    return true;
 }

@@ -22,7 +22,7 @@ class block_section_links extends block_base {
    }

    function applicable_formats() {
-        return (array('course-view-weeks' => true, 'course-view-topics' => true));
+        return (array('course-view-weeks' => true, 'course-view-topics' => true, 'course-edit-weeks' => true, 'course-edit-topics' => true));
    }

    function get_content() {
@@ -5,4 +5,4 @@
 // database (blocks_version) to determine whether upgrades should
 // be performed (see db/backup_*.php)

-$blocks_version = 2005090200;   // The current version is a date (YYYYMMDDXX)
+$blocks_version = 2005090201;   // The current version is a date (YYYYMMDDXX)
@@ -137,16 +137,6 @@ print_simple_box_start("center");
 require('edit.html');
 print_simple_box_end();

-    // Janne comment: Let's move this in here
-    // so IE gets more time to load the
-    // Page.
-    if ($usehtmleditor) {
-        // Janne comment: there are two text fields in form
-        // so lets try to replace them both with
-        // HTMLArea editors
-        use_html_editor();
-    }
-
 include($CFG->dirroot .'/blog/footer.php');


@@ -21,6 +21,17 @@ if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {

 <?php

+// Janne comment: Let's move this in here
+// so IE gets more time to load the
+// Page.
+
+if (isset($usehtmleditor) && $usehtmleditor) {
+    // Janne comment: there are two text fields in form
+    // so lets try to replace them both with
+    // HTMLArea editors
+    use_html_editor();
+}
+
 if (isset($course) && ($course->id)) {
    print_footer($course);
 } else {
@@ -15,9 +15,6 @@ $blockid = optional_param('blockid',    0, PARAM_INT);
 /// If user has never visited this page before, install 2 blocks for him
 blog_check_and_install_blocks();

-if (!$site = get_site()) {
-    redirect($CFG->wwwroot.'/index.php');
-}

 // now check that they are logged in and allowed into the course (if specified)
 if ($courseid != SITEID) {
@@ -26,7 +23,7 @@ if ($courseid != SITEID) {
    }
    require_login($course->id);
 } else {
-    $course = get_site();
+    $course = $SITE;
 }

 // Bounds for block widths within this page
@@ -92,7 +89,7 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') {  /// We are in edit mode, print the
        $formHeading = get_string('addnewentry', 'blog');
    }
    
-    print_header("$site->shortname: $blogstring", "$site->fullname",
+    print_header("$SITE->shortname: $blogstring", "$SITE->fullname",
                        '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$filterselect.'">'.fullname($user).'</a> ->
                        <a href="'.$CFG->wwwroot.'/blog/index.php?userid='.$user->id.'">'.$blogstring.'</a> -> '.               $formHeading,'','',true);

@@ -103,20 +100,20 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') {  /// We are in edit mode, print the
    switch ($filtertype) {
        case 'site':
            if ($tagid || !empty($tag)) {
-                print_header("$site->shortname: $blogstring", "",
+                print_header("$SITE->shortname: $blogstring", $SITE->fullname,
                            '<a href="index.php?filtertype=site">'. "$blogstring</a> -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string());
            } else {
-                print_header("$site->shortname: $blogstring", "",
+                print_header("$SITE->shortname: $blogstring", $SITE->fullname,
                            $blogstring,'','',true,$PAGE->get_extra_header_string());
            }
        break;

        case 'course':
            if ($tagid || !empty($tag)) {
-                print_header_simple("$course->shortname: $blogstring", "",
+                print_header_simple("$course->shortname: $blogstring", $course->fullname,
                            '<a href="index.php?filtertype=course&amp;filterselect='.$filterselect.'">'. "$blogstring</a> -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string());
            } else {
-                print_header_simple("$course->shortname: $blogstring", "",
+                print_header_simple("$course->shortname: $blogstring", $course->fullname,
                            $blogstring,'','',true,$PAGE->get_extra_header_string());
            }
        break;
@@ -126,11 +123,11 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') {  /// We are in edit mode, print the
            $thisgroup = get_record('groups', 'id', $filterselect);

            if ($tagid || !empty($tag)) {
-                print_header_simple("$course->shortname: $blogstring", "$course->fullname",
+                print_header_simple("$course->shortname: $blogstring", $course->fullname,
                            '<a href="'.$CFG->wwwroot.'/user/index.php?id='.$course->id.'&amp;group='.$filterselect.'">'.$thisgroup->name.'</a> ->
                            <a href="index.php?filtertype=group&amp;filterselect='.$filterselect.'">'. "$blogstring</a> -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string());
            } else {
-                print_header_simple("$course->shortname: $blogstring", "$course->fullname",
+                print_header_simple("$course->shortname: $blogstring", $course->fullname,
                            '<a href="'.$CFG->wwwroot.'/user/index.php?id='.$course->id.'&amp;group='.$filterselect.'">'.$thisgroup->name."</a> ->
                            $blogstring",'','',true,$PAGE->get_extra_header_string());

@@ -144,14 +141,14 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') {  /// We are in edit mode, print the

            if (isset($course->id) && $course->id && $course->id != SITEID) {
                if ($tagid || !empty($tag)) {
-                    print_header("$course->shortname: $blogstring", "$course->fullname",
+                    print_header("$course->shortname: $blogstring", $course->fullname,
                            '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">'.$course->shortname.'</a> ->
                            <a href="'.$CFG->wwwroot.'/user/index.php?id='.$course->id.'">'.$participants.'</a> ->
                            <a href="'.$CFG->wwwroot.'/user/view.php?id='.$filterselect.'&amp;course='.$course->id.'">'.fullname($user).'</a> ->
                            <a href="index.php?courseid='.optional_param('courseid', 0, PARAM_INT).'&amp;filtertype=user&amp;filterselect='.$filterselect.'">'. "$blogstring</a> -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string());

                } else {
-                    print_header("$course->shortname: $blogstring", "$course->fullname",
+                    print_header("$course->shortname: $blogstring", $course->fullname,
                            '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">'.$course->shortname.'</a> ->
                            <a href="'.$CFG->wwwroot.'/user/index.php?id='.$course->id.'">'.$participants.'</a> ->
                            <a href="'.$CFG->wwwroot.'/user/view.php?id='.$filterselect.'&amp;course='.$course->id.'">'.fullname($user).'</a> ->
@@ -163,12 +160,12 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') {  /// We are in edit mode, print the
            else {

                if ($tagid || !empty($tag)) {
-                    print_header("$site->shortname: $blogstring", "$site->fullname",
+                    print_header("$SITE->shortname: $blogstring", $SITE->fullname,
                            '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$filterselect.'">'.fullname($user).'</a> ->
                            <a href="index.php?filtertype=user&amp;filterselect='.$filterselect.'">'. "$blogstring</a> -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string());

                } else {
-                    print_header("$site->shortname: $blogstring", "$site->fullname",
+                    print_header("$SITE->shortname: $blogstring", $SITE->fullname,
                            '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$filterselect.'">'.fullname($user).'</a> ->
                            '.$blogstring,'','',true,$PAGE->get_extra_header_string());

@@ -178,7 +175,7 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') {  /// We are in edit mode, print the
        break;

        default:    //user click on add from block
-            print_header("$site->shortname: $blogstring", "$site->fullname",
+            print_header("$SITE->shortname: $blogstring", $SITE->fullname,
                            '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$filterselect.'">'.fullname($user).'</a> ->
                            <a href="'.$CFG->wwwroot.'/blog/index.php?userid='.$user->id.'">'.$blogstring.'</a> -> '.get_string('addentry','blog'),'','',true,$PAGE->get_extra_header_string());
        break;
@@ -186,18 +183,24 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') {  /// We are in edit mode, print the

 } /// close switch

+// prints the tabs
+$currenttab = 'blogs';
+$user = $USER;
+if (!$course) {
+    $course = get_record('course','id',optional_param('courseid', SITEID, PARAM_INT));
+}
+require_once($CFG->dirroot .'/user/tabs.php');
+
 $editing = false;
 if ($PAGE->user_allowed_editing()) {
    $editing = $PAGE->user_is_editing();
 }

 // Calculate the preferred width for left, right and center (both center positions will use the same)
-$preferred_width_left = optional_param('preferred_width_left',  blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]), PARAM_INT);
-$preferred_width_right = optional_param('preferred_width_right', blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), PARAM_INT);
-$preferred_width_left = min($preferred_width_left, BLOCK_L_MAX_WIDTH);
-$preferred_width_left = max($preferred_width_left, BLOCK_L_MIN_WIDTH);
-$preferred_width_right = min($preferred_width_right, BLOCK_R_MAX_WIDTH);
-$preferred_width_right = max($preferred_width_right, BLOCK_R_MIN_WIDTH);
+$preferred_width_left  = bounded_number(BLOCK_L_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
+                                        BLOCK_L_MAX_WIDTH);
+$preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]),
+                                        BLOCK_R_MAX_WIDTH);

 // Display the blocks and allow blocklib to handle any block action requested
 $pageblocks = blocks_get_by_page($PAGE);
@@ -139,19 +139,11 @@ if ($limit == 'none') {

 include($CFG->dirroot .'/blog/header.php');

-// prints the tabs
-$currenttab = 'blogs';
-$user = $USER;
-if (!$course) {
-    $course = get_record('course','id',optional_param('courseid', SITEID, PARAM_INT));
-}
-require_once($CFG->dirroot .'/user/tabs.php');
-
 $blogpage = optional_param('blogpage',0,PARAM_INT);

 blog_print_html_formatted_entries($userid, $postid, $limit, ($blogpage * $limit) ,$filtertype, $filterselect, $tagid, $tag, $filtertype, $filterselect);

-add_to_log($site->id, 'blog', 'view', 'index.php?filtertype='.$filtertype.'&amp;filterselect='.$filterselect.'&amp;postid='.$postid.'&amp;tagid='.$tagid.'&amp;tag='.$tag, 'view blog entry');
+add_to_log($courseid, 'blog', 'view', 'index.php?filtertype='.$filtertype.'&amp;filterselect='.$filterselect.'&amp;postid='.$postid.'&amp;tagid='.$tagid.'&amp;tag='.$tag, 'view blog entry');

 include($CFG->dirroot .'/blog/footer.php');

@@ -408,8 +408,8 @@

            case 'site':

-                if (!isguest() && isloggedin()) {
-
+                if (isloggedin()) {
+					
                    $SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
                            .$CFG->prefix.'user u
                            WHERE p.userid = u.id '.$tagquerysql.'
@@ -469,22 +469,33 @@

            case 'group':

-                $SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
-                        .$CFG->prefix.'groups_members m, '.$CFG->prefix.'user u
-                        WHERE p.userid = m.userid '.$tagquerysql.'
-                        AND u.id = p.userid
-                        AND m.groupid = '.$filterselect.'
-                        AND (p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')';
+				$SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
+	                    .$CFG->prefix.'groups_members m, '.$CFG->prefix.'user u
+	                    WHERE p.userid = m.userid '.$tagquerysql.'
+	                    AND u.id = p.userid
+	                    AND m.groupid = '.$filterselect.'
+	                    AND (p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')';

            break;

            case 'user':
-
-                $SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
-                        .$CFG->prefix.'user u
-                        WHERE p.userid = u.id '.$tagquerysql.'
-                        AND u.id = '.$filterselect.'
-                        AND (p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')';
+				
+				if (isloggedin()) {
+				  
+	                $SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
+	                        .$CFG->prefix.'user u
+	                        WHERE p.userid = u.id '.$tagquerysql.'
+	                        AND u.id = '.$filterselect.'
+	                        AND (p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')';
+	            } else {
+	                
+					$SQL = 'SELECT '.$requiredfields.' FROM '.$CFG->prefix.'post p, '.$tagtablesql
+	                        .$CFG->prefix.'user u
+	                        WHERE p.userid = u.id '.$tagquerysql.'
+	                        AND u.id = '.$filterselect.'
+	                        AND p.publishstate = \'public\'';	              
+	              
+	            }

            break;

@@ -8,7 +8,7 @@
 </tr>
 <tr>
    <td colspan="2" align="center">
-	<input type="submit" value="<?php print_string("savechanges"); ?>" />
+    <input type="submit" value="<?php print_string("savechanges"); ?>" />
    <input type="button" value="<?php print_string('cancel'); ?>" onclick="javascript:history.go(-1)" /></td>
 </tr>
 </table>
@@ -29,7 +29,7 @@

 /// If data submitted, then process and store.

-	if ($post = data_submitted()) {
+    if ($post = data_submitted()) {

        $pagesize = optional_param('pagesize', 10, PARAM_INT);
        if ($pagesize < 1 ) {
@@ -54,7 +54,7 @@

    print_simple_box_start('center', '', '');

-	include('./preferences.html');
+    include('./preferences.html');
    print_simple_box_end();

    print_footer();
@@ -116,7 +116,7 @@

            if($form = data_submitted()) {

-                $form->name = clean_text(strip_tags($form->name,'<lang><span>'));
+                $form->name = clean_param(strip_tags($form->name,'<lang><span>'), PARAM_CLEAN);

                $form->timestart = make_timestamp($form->startyr, $form->startmon, $form->startday, $form->starthr, $form->startmin);
                if($form->duration == 1) {
@@ -484,15 +484,20 @@
            echo '<div class="header">'.get_string('newevent', 'calendar').$header.'</div>';

            if($eventtype == 'select') {
-                $defaultcourse = $SESSION->cal_course_referer;
-                if(isteacheredit($defaultcourse, $USER->id)) {
-                    $defaultgroup = $groupid = 0;
+                $courseid = optional_param('courseid', $SESSION->cal_course_referer, PARAM_INT);
+                if ($courseid == 0) { // workaround by Dan for bug #6130
+                    $courseid = SITEID;
                }
-                else {
-                    $defaultgroup = user_group($defaultcourse, $USER->id);
-                    $groupid      = optional_param('groupid',  $defaultgroup->id, PARAM_INT);
+                if (!$course = get_record('course', 'id', $courseid)) {
+                    error('Incorrect course ID');
                }
-                $courseid = optional_param('courseid', $defaultcourse, PARAM_INT);
+                if ($groupmode = groupmode($course)) {   // Groups are being used
+                    $changegroup = optional_param('group', -1, PARAM_INT);
+                    $groupid = get_and_set_current_group($course, $groupmode, $changegroup);
+                } else {
+                    $groupid = 0;
+                }
+
                echo '<h2>'.get_string('eventkind', 'calendar').':</h2>';
                echo '<div id="selecteventtype">';
                include('event_select.html');
@@ -29,9 +29,9 @@
      <?php print_string('eventdate', 'calendar'); ?>:
    </td>
    <td>
-      <?php print_date_selector('startday', 'startmon', 'startyr', $form->timestart);?>
+      <?php print_date_selector('startday', 'startmon', 'startyr', (int)$form->timestart);?>
      <?php print_string('eventtime', 'calendar');?>
-      <?php print_time_selector('starthr', 'startmin', $form->timestart) ?>
+      <?php print_time_selector('starthr', 'startmin', (int)$form->timestart) ?>
      <?php if (isset($err['timestart'])) formerr($err['timestart']); ?>
    </td>
  </tr>
@@ -104,9 +104,15 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
    list($d, $m, $y) = array($date['mday'], $date['mon'], $date['year']); // This is what we want to display
    $display->maxdays = calendar_days_in_month($m, $y);

-    // We 'll keep these values as GMT here, and offset them when the time comes to query the db
-    $display->tstart = gmmktime(0, 0, 0, $m, 1, $y); // This is GMT
-    $display->tend = gmmktime(23, 59, 59, $m, $display->maxdays, $y); // GMT
+    if (get_user_timezone_offset() < 99) {
+        // We 'll keep these values as GMT here, and offset them when the time comes to query the db
+	    $display->tstart = gmmktime(0, 0, 0, $m, 1, $y); // This is GMT
+	    $display->tend = gmmktime(23, 59, 59, $m, $display->maxdays, $y); // GMT
+    } else {
+        // no timezone info specified
+	    $display->tstart = mktime(0, 0, 0, $m, 1, $y);
+	    $display->tend = mktime(23, 59, 59, $m, $display->maxdays, $y);
+    }

    $startwday = dayofweek(1, $m, $y);

@@ -241,9 +247,9 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
            
            //Accessibility: functionality moved to calendar_get_popup.
            if($display->thismonth && $day == $d) {
-            	$popup = calendar_get_popup(true, $events[$eventid]->timestart, $popupcontent);
+                $popup = calendar_get_popup(true, $events[$eventid]->timestart, $popupcontent);
            } else {
-            	$popup = calendar_get_popup(false, $events[$eventid]->timestart, $popupcontent);
+                $popup = calendar_get_popup(false, $events[$eventid]->timestart, $popupcontent);
            } 

            // Class and cell content
@@ -279,15 +285,15 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
        }

        // Special visual fx for today
-        //Accessibility: hidden text for today, and popup.	
+        //Accessibility: hidden text for today, and popup.
        if($display->thismonth && $day == $d) {
            $class .= ' today';
            $today = get_string('today', 'calendar').' '.userdate(time(), get_string('strftimedayshort'));
                        
            if(! isset($eventsbyday[$day])) {
-                $class .= ' eventnone';            	
-            	$popup = calendar_get_popup(true, false);
-            	$cell = '<a href="#" '.$popup.'>'.$day.'</a>';
+                $class .= ' eventnone';
+                $popup = calendar_get_popup(true, false);
+                $cell = '<a href="#" '.$popup.'>'.$day.'</a>';
            }
            $cell = '<span class="accesshide">'.$today.' </span>'.$cell;
        }
@@ -327,13 +333,13 @@ function calendar_get_popup($is_today, $event_timestart, $popupcontent='') {
    if (false === $event_timestart) {
        $popupcaption .= userdate(time(), get_string('strftimedayshort'));
        $popupcontent = get_string('eventnone', 'calendar');
-          	
+
    } else {
        $popupcaption .= get_string('eventsfor', 'calendar', userdate($event_timestart, get_string('strftimedayshort')));
    }
    $popupcontent = str_replace("'", "\'", htmlspecialchars($popupcontent));
    $popup = 'onmouseover="return overlib(\''.$popupcontent.'\', CAPTION, \''.$popupcaption.'\');" onmouseout="return nd();"';
-    return $popup;	
+    return $popup;
 }

 function calendar_get_upcoming($courses, $groups, $users, $daysinfuture, $maxevents, $fromtime=0) {
@@ -1087,6 +1093,10 @@ function calendar_set_filters(&$courses, &$group, &$user, $courseeventsfrom = NU
    else {
        $courses = false;
    }
+   //BUG 6130 clean $courses array as SESSION has bad entries. 
+   foreach ($courses as $index => $value) {
+       if (empty($value)) unset($courses[$index]);
+   }

    if($SESSION->cal_show_user || $ignorefilters) {
        // This doesn't work for arrays yet (maybe someday it will)
@@ -54,6 +54,10 @@
        redirect($CFG->wwwroot.'/'.$CFG->admin.'/index.php');
    }

+    if ($CFG->forcelogin) {
+        require_login();
+    }
+
    //add_to_log($course->id, "course", "view", "view.php?id=$course->id", "$course->id");
    $now = usergetdate(time());
    $pagetitle = '';
@@ -139,6 +139,9 @@ $CFG->admin = 'admin';
 // Useful for webhost operators who have alternate methods of backups
 //      $CFG->disablescheduledbackups = true;
 //
+// Prevent stats processing and hide the GUI
+//      $CFG->disablestatsprocessing = true;
+//
 // Restrict certain usernames from doing things that may mess up a site
 // This is especially useful for demonstration teacher accounts
 //      $CFG->restrictusers = 'teacher,fred,jim';
@@ -281,6 +284,9 @@ $CFG->admin = 'admin';
 //
 //     $CFG->emailconnectionerrorsto = 'your@emailaddress.com';
 // 
+// Restore pre-1.6 behaviour where courses could still be available
+// even if the category they were in was hidden
+//     $CFG->allowvisiblecoursesinhiddencategories = true;
 // 
 // NOTE: if you are using custompix in your theme, see /fixpix.php.

@@ -8,7 +8,7 @@

    $id       = required_param('id', PARAM_INT);          // Category id
    $page     = optional_param('page', 0, PARAM_INT);     // which page to show
-    $perpage  = optional_param('perpage', 20, PARAM_INT); // how many per page
+    $perpage  = optional_param('perpage', $CFG->coursesperpage, PARAM_INT); // how many per page
    $edit     = optional_param('edit', -1, PARAM_BOOL);
    $hide     = optional_param('hide', 0, PARAM_INT);
    $show     = optional_param('show', 0, PARAM_INT);
@@ -301,33 +301,33 @@
                    echo "<td>";
                    echo '<a title="'.$strsettings.'" href="'.$CFG->wwwroot.'/course/edit.php?id='.
                         $acourse->id.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="" /></a> ';
+                         '<img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="'.$stredit.'" /></a> ';
                    echo '<a title="'.$strassignteachers.'" href="'.$CFG->wwwroot.'/course/teacher.php?id='.
                         $acourse->id.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/user.gif" height="11" width="11" border="0" alt="" /></a> ';
+                         '<img src="'.$CFG->pixpath.'/t/user.gif" height="11" width="11" border="0" alt="'.$strassignteachers.'" /></a> ';
                    echo '<a title="'.$strdelete.'" href="delete.php?id='.$acourse->id.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/delete.gif" height="11" width="11" border="0" alt="" /></a> ';
+                         '<img src="'.$CFG->pixpath.'/t/delete.gif" height="11" width="11" border="0" alt="'.$strdelete.'" /></a> ';
                    if (!empty($acourse->visible)) {
                        echo '<a title="'.$strhide.'" href="category.php?id='.$category->id.'&amp;page='.$page.
                             '&amp;perpage='.$perpage.'&amp;hide='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
-                             '<img src="'.$CFG->pixpath.'/t/hide.gif" height="11" width="11" border="0" alt="" /></a> ';
+                             '<img src="'.$CFG->pixpath.'/t/hide.gif" height="11" width="11" border="0" alt="'.$strhide.'" /></a> ';
                    } else {
                        echo '<a title="'.$strshow.'" href="category.php?id='.$category->id.'&amp;page='.$page.
                             '&amp;perpage='.$perpage.'&amp;show='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
-                             '<img src="'.$CFG->pixpath.'/t/show.gif" height="11" width="11" border="0" alt="" /></a> ';
+                             '<img src="'.$CFG->pixpath.'/t/show.gif" height="11" width="11" border="0" alt="'.$strshow.'" /></a> ';
                    }

                    echo '<a title="'.$strbackup.'" href="../backup/backup.php?id='.$acourse->id.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/backup.gif" height="11" width="11" border="0" alt="" /></a> ';
+                         '<img src="'.$CFG->pixpath.'/t/backup.gif" height="11" width="11" border="0" alt="'.$strbackup.'" /></a> ';

                        echo '<a title="'.$strrestore.'" href="../files/index.php?id='.$acourse->id.
                             '&amp;wdir=/backupdata">'.
-                             '<img src="'.$CFG->pixpath.'/t/restore.gif" height="11" width="11" border="0" alt="" /></a> ';
+                             '<img src="'.$CFG->pixpath.'/t/restore.gif" height="11" width="11" border="0" alt="'.$strrestore.'" /></a> ';

                    if ($up) {
                        echo '<a title="'.$strmoveup.'" href="category.php?id='.$category->id.'&amp;page='.$page.
                             '&amp;perpage='.$perpage.'&amp;moveup='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
-                             '<img src="'.$CFG->pixpath.'/t/up.gif" height="11" width="11" border="0" alt="" /></a> ';
+                             '<img src="'.$CFG->pixpath.'/t/up.gif" height="11" width="11" border="0" alt="'.$strmoveup.'" /></a> ';
                    } else {
                        echo '<img src="'.$CFG->wwwroot.'/pix/spacer.gif" height="11" width="11" border="0" alt="" /> ';
                    }
@@ -335,7 +335,7 @@
                    if ($down) {
                        echo '<a title="'.$strmovedown.'" href="category.php?id='.$category->id.'&amp;page='.$page.
                             '&amp;perpage='.$perpage.'&amp;movedown='.$acourse->id.'&amp;sesskey='.$USER->sesskey.'">'.
-                             '<img src="'.$CFG->pixpath.'/t/down.gif" height="11" width="11" border="0" alt="" /></a> ';
+                             '<img src="'.$CFG->pixpath.'/t/down.gif" height="11" width="11" border="0" alt="'.$strmovedown.'" /></a> ';
                    } else {
                        echo '<img src="'.$CFG->wwwroot.'/pix/spacer.gif" height="11" width="11" border="0" alt="" /> ';
                    }
@@ -348,9 +348,9 @@
                } else if (isteacheredit($acourse->id)) {
                    echo '<td>';
                    echo '<a title="'.$strsettings.'" href="'.$CFG->wwwroot.'/course/edit.php?id='.$acourse->id.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="" /></a> ';
+                         '<img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="'.$strsettings.'" /></a> ';
                    echo '<a title="'.$strassignteachers.'" href="'.$CFG->wwwroot.'/course/teacher.php?id='.$acourse->id.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/user.gif" height="11" width="11" border="0" alt="" /></a> ';
+                         '<img src="'.$CFG->pixpath.'/t/user.gif" height="11" width="11" border="0" alt="'.$strassignteachers.'" /></a> ';
                }
                echo '</td>';
            } else {
@@ -68,6 +68,7 @@
    print_heading($strdeletingcourse);

    delete_course($course->id);
+    fix_course_sortorder(); //update course count in catagories

    print_heading( get_string("deletedcourse", "", $course->shortname) );

@@ -145,6 +145,7 @@
                        $newteacher->course = $newcourseid;
                        $newteacher->authority = 1;   // First teacher is the main teacher
                        $newteacher->editall = 1;     // Course creator can edit their own course
+                        $newteacher->enrol = 'manual';// enrol the teacher too - bug #6120

                        if (!$newteacher->id = insert_record("user_teachers", $newteacher)) {
                            error("Could not add you to this new course!");
@@ -7,7 +7,8 @@
    require_once("lib.php");
    require_once("$CFG->dirroot/enrol/enrol.class.php");

-    $id = required_param('id',PARAM_INT);
+    $id           = required_param('id', PARAM_INT);
+    $loginasguest = optional_param('loginasguest', 0, PARAM_BOOL);

    require_login();

@@ -19,12 +20,6 @@
        error("Could not find a site!");
    }

-/// Check if the course is a meta course
-    if ($course->metacourse) {
-        print_header_simple();
-        notice(get_string('coursenotaccessible'), $CFG->wwwroot);
-    }
-
    check_for_restricted_user($USER->username);

 /// Refreshing enrolment data in the USER session
@@ -47,6 +42,7 @@

 /// Double check just in case they are actually enrolled already 
 /// This might occur if they were enrolled during this session
+/// also happens when course is unhidden after student logs in

    if ( !empty($USER->student[$course->id]) or !empty($USER->teacher[$course->id]) ) {

@@ -59,11 +55,18 @@

        redirect($destination);
    }
+
+/// Check if the course is a meta course
+/// moved here to fix bug 5734
+    if ($course->metacourse) {
+        print_header_simple();
+        notice(get_string('coursenotaccessible'), "$CFG->wwwroot/index.php");
+    }
    
 /// Users can't enroll to site course
    if (!$course->category) {
        print_header_simple();
-        notice(get_string('enrollfirst'), $CFG->wwwroot);
+        notice(get_string('enrollfirst'), "$CFG->wwwroot/index.php");
    }

 /// Double check just in case they are enrolled to start in the future 
@@ -72,14 +75,14 @@
        if ($course->enrolperiod and $student->timestart and ($student->timestart >= time())) {
            $message = get_string('enrolmentnotyet', '', userdate($student->timestart));
            print_header();
-            notice($message, $CFG->wwwroot);
+            notice($message, "$CFG->wwwroot/index.php");
        }
    }

 /// Check if the course is enrollable
    if (!method_exists($enrol, 'print_entry')) {
        print_header_simple();
-        notice(get_string('enrolmentnointernal'), $CFG->wwwroot);
+        notice(get_string('enrolmentnointernal'), "$CFG->wwwroot/index.php");
    }

    if (!$course->enrollable ||
@@ -87,7 +90,7 @@
            ($course->enrollable == 2 && $course->enrolenddate > 0 && $course->enrolenddate <= time())
            ) {
        print_header_simple();
-        notice(get_string('notenrollable'), $CFG->wwwroot);
+        notice(get_string('notenrollable'), "$CFG->wwwroot/index.php");
    }

 /// Check the submitted enrollment key if there is one
@@ -95,21 +98,15 @@
    if ($form = data_submitted()) {
      //User is not enrolled in the course, wants to access course content
      //as a guest, and course setting allow unlimited guest access
-      //Code cribbed from course/loginas.php
-      if (isset($loginasguest) && ($course->guest==1)) {
-        $realuser = $USER->id;
-        $realname = fullname($USER, true);
-        $USER = guest_user();
-        $USER->loggedin = true;
-        $USER->site = $CFG->wwwroot;
-        $USER->realuser = $realuser;
-        $USER->sessionIP = md5(getremoteaddr());   // Store the current IP in the session
-        if (isset($SESSION->currentgroup)) {    // Remember current cache setting for later
-            $SESSION->oldcurrentgroup = $SESSION->currentgroup;
+      //
+      //the original idea was to use "loginas" feature, but require_login() would have to be changed
+      //and we would have to explain it to all users - it is now plain login action
+      if ($loginasguest and !empty($CFG->guestloginbutton) and ($course->guest==1 or $course->guest==2)) {
+        if (isset($SESSION->currentgroup)) {
            unset($SESSION->currentgroup);
        }
-        $guest_name = fullname($USER, true);
-        add_to_log($course->id, "course", "loginas", "../user/view.php?id=$course->id&$USER->id$", "$realname -> $guest_name");
+        $USER = get_complete_user_data('username', 'guest');    // get full guest user data
+        add_to_log(SITEID, 'user', 'login', "view.php?id=$USER->id&course=".SITEID, $USER->id, 0, $USER->id);
        if ($SESSION->wantsurl) {
            $destination = $SESSION->wantsurl;
            unset($SESSION->wantsurl);
@@ -30,7 +30,7 @@ if ($topic != -1) {
    }
 }

-if (isteacher($course->id) and !empty($marker) and confirm_sesskey()) {
+if (($marker >=0) and isteacher($course->id) and confirm_sesskey()) {
    $course->marker = $marker;
    if (! set_field("course", "marker", $marker, "id", $course->id)) {
        error("Could not mark that topic for this course");
@@ -63,7 +63,7 @@ echo '<table id="layout-table" cellspacing="0"><tr>';
 /// The left column ...

 if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
-    echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
+    echo '<td width="'.$preferred_width_left.'" id="left-column">';
    blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
    echo '</td>';
 }
@@ -283,28 +283,28 @@ while ($section <= $course->numsections) {
        if (isediting($course->id)) {
            if ($course->marker == $section) {  // Show the "light globe" on/off
                echo '<a href="view.php?id='.$course->id.'&amp;marker=0&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strmarkedthistopic.'">'.
-                    '<img src="'.$CFG->pixpath.'/i/marked.gif" vspace="3" height="16" width="16" border="0" alt="" /></a><br />';
+                    '<img src="'.$CFG->pixpath.'/i/marked.gif" vspace="3" height="16" width="16" border="0" alt="'.$strmarkedthistopic.'" /></a><br />';
            } else {
                echo '<a href="view.php?id='.$course->id.'&amp;marker='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strmarkthistopic.'">'.
-                    '<img src="'.$CFG->pixpath.'/i/marker.gif" vspace="3" height="16" width="16" border="0" alt="" /></a><br />';
+                    '<img src="'.$CFG->pixpath.'/i/marker.gif" vspace="3" height="16" width="16" border="0" alt="'.$strmarkthistopic.'" /></a><br />';
            }

            if ($thissection->visible) {        // Show the hide/show eye
                echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopichide.'">'.
-                    '<img src="'.$CFG->pixpath.'/i/hide.gif" vspace="3" height="16" width="16" border="0" alt="" /></a><br />';
+                    '<img src="'.$CFG->pixpath.'/i/hide.gif" vspace="3" height="16" width="16" border="0" alt="'.$strtopichide.'" /></a><br />';
            } else {
-                echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopichide.'">'.
-                    '<img src="'.$CFG->pixpath.'/i/show.gif" vspace="3" height="16" width="16" border="0" alt="" /></a><br />';
+                echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopicshow.'">'.
+                    '<img src="'.$CFG->pixpath.'/i/show.gif" vspace="3" height="16" width="16" border="0" alt="'.$strtopicshow.'" /></a><br />';
            }

            if ($section > 1) {                       // Add a arrow to move section up
-                echo '<a href="view.php?id='.$course->id.'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
-                    '<img src="'.$CFG->pixpath.'/t/up.gif" vspace="3" height="11" width="11" border="0" alt="" /></a><br />';
+                echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
+                    '<img src="'.$CFG->pixpath.'/t/up.gif" vspace="3" height="11" width="11" border="0" alt="'.$strmoveup.'" /></a><br />';
            }

            if ($section < $course->numsections) {    // Add a arrow to move section down
-                echo '<a href="view.php?id='.$course->id.'&amp;section='.$section.'&amp;move=1&amp;sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
-                    '<img src="'.$CFG->pixpath.'/t/down.gif" vspace="3" height="11" width="11" border="0" alt="" /></a><br />';
+                echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
+                    '<img src="'.$CFG->pixpath.'/t/down.gif" vspace="3" height="11" width="11" border="0" alt="'.$strmovedown.'" /></a><br />';
            }

        }
@@ -329,7 +329,7 @@ echo '</td>';

 // The right column
 if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
-    echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
+    echo '<td width="'.$preferred_width_right.'" id="right-column">';
    blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
    echo '</td>';
 }
@@ -25,7 +25,7 @@
    echo '<tr>';

    if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
-        echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
+        echo '<td width="'.$preferred_width_left.'" id="left-column">';
        blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
        echo '</td>';
    }
@@ -41,7 +41,7 @@

    // The right column
    if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
-        echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
+        echo '<td width="'.$preferred_width_right.'" id="right-column">';
        blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
        echo '</td>';
    }
@@ -23,7 +23,7 @@
    echo '<tr>';

    if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
-        echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
+        echo '<td width="'.$preferred_width_left.'" id="left-column">';
        blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
        echo '</td>';
    }
@@ -51,7 +51,7 @@

    // The right column
    if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
-        echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
+        echo '<td width="'.$preferred_width_right.'" id="right-column">';
        blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
        echo '</td>';
    }
@@ -31,7 +31,7 @@
        }
    }

-    if ($marker && isteacher($course->id) && confirm_sesskey()) {
+    if (($marker >=0) && isteacher($course->id) && confirm_sesskey()) {
        $course->marker = $marker;
        if (! set_field("course", "marker", $marker, "id", $course->id)) {
            error("Could not mark that topic for this course");
@@ -64,7 +64,7 @@
 /// The left column ...

    if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
-        echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
+        echo '<td width="'.$preferred_width_left.'" id="left-column">';
        blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
        echo '</td>';
    }
@@ -221,17 +221,17 @@
                    echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopichide.'">'.
                         '<img src="'.$CFG->pixpath.'/i/hide.gif" vspace="3" height="16" width="16" border="0" alt="'.$strtopichide.'" /></a><br />';
                } else {
-                    echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopichide.'">'.
-                         '<img src="'.$CFG->pixpath.'/i/show.gif" vspace="3" height="16" width="16" border="0" alt="'.$strtopichide.'" /></a><br />';
+                    echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopicshow.'">'.
+                         '<img src="'.$CFG->pixpath.'/i/show.gif" vspace="3" height="16" width="16" border="0" alt="'.$strtopicshow.'" /></a><br />';
                }

                if ($section > 1) {                       // Add a arrow to move section up
-                    echo '<a href="view.php?id='.$course->id.'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
+                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
                         '<img src="'.$CFG->pixpath.'/t/up.gif" vspace="3" height="11" width="11" border="0" alt="'.$strmoveup.'" /></a><br />';
                }

                if ($section < $course->numsections) {    // Add a arrow to move section down
-                    echo '<a href="view.php?id='.$course->id.'&amp;section='.$section.'&amp;move=1&amp;sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
+                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
                         '<img src="'.$CFG->pixpath.'/t/down.gif" vspace="3" height="11" width="11" border="0" alt="'.$strmovedown.'" /></a><br />';
                }

@@ -257,7 +257,7 @@

    // The right column
    if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
-        echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
+        echo '<td width="'.$preferred_width_right.'" id="right-column">';
        blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
        echo '</td>';
    }
@@ -55,7 +55,7 @@
 /// The left column ...

    if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
-        echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
+        echo '<td width="'.$preferred_width_left.'" id="left-column">';
        blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
        echo '</td>';
    }
@@ -213,16 +213,16 @@
                    echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strweekhide.'">'.
                         '<img src="'.$CFG->pixpath.'/i/hide.gif" vspace="3" class="icon hide" alt="'.$strweekhide.'" /></a><br />';
                } else {
-                    echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strweekhide.'">'.
-                         '<img src="'.$CFG->pixpath.'/i/show.gif" vspace="3" class="icon hide" alt="'.$strweekhide.'" /></a><br />';
+                    echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strweekshow.'">'.
+                         '<img src="'.$CFG->pixpath.'/i/show.gif" vspace="3" class="icon hide" alt="'.$strweekshow.'" /></a><br />';
                }
                if ($section > 1) {                       // Add a arrow to move section up
-                    echo '<a href="view.php?id='.$course->id.'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
+                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
                         '<img src="'.$CFG->pixpath.'/t/up.gif" vspace="3" class="icon up" alt="'.$strmoveup.'" /></a><br />';
                }

                if ($section < $course->numsections) {    // Add a arrow to move section down
-                    echo '<a href="view.php?id='.$course->id.'&amp;section='.$section.'&amp;move=1&amp;sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
+                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
                         '<img src="'.$CFG->pixpath.'/t/down.gif" vspace="3" class="icon down" alt="'.$strmovedown.'" /></a><br />';
                }
            }
@@ -247,7 +247,7 @@

    // The right column
    if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
-        echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
+        echo '<td width="'.$preferred_width_right.'" id="right-column">';
        blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
        echo '</td>';
    }
@@ -217,16 +217,16 @@
                    echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strweekhide.'">'.
                         '<img src="'.$CFG->pixpath.'/i/hide.gif" class="icon hide" alt="'.$strweekhide.'" /></a><br />';
                } else {
-                    echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strweekhide.'">'.
-                         '<img src="'.$CFG->pixpath.'/i/show.gif" class="icon hide" alt="'.$strweekhide.'" /></a><br />';
+                    echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strweekshow.'">'.
+                         '<img src="'.$CFG->pixpath.'/i/show.gif" class="icon hide" alt="'.$strweekshow.'" /></a><br />';
                }
                if ($section > 1) {                       // Add a arrow to move section up
-                    echo '<a href="view.php?id='.$course->id.'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
+                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
                         '<img src="'.$CFG->pixpath.'/t/up.gif" class="icon up" alt="'.$strmoveup.'" /></a><br />';
                }

                if ($section < $course->numsections) {    // Add a arrow to move section down
-                    echo '<a href="view.php?id='.$course->id.'&amp;section='.$section.'&amp;move=1&amp;sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
+                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
                         '<img src="'.$CFG->pixpath.'/t/down.gif" class="icon down" alt="'.$strmovedown.'" /></a><br />';
                }
            }
@@ -57,5 +57,5 @@

 <input type="hidden" name="group" value="<?php p($group->id) ?>" /> 
 <input type="hidden" name="id" value="<?php p($course->id) ?>" /> 
-<input type="hidden" name="sesskey" value="<?php sesskey() ?>" /> 
+<input type="hidden" name="sesskey" value="<?php p(sesskey()) ?>" /> 
 </form>
@@ -15,7 +15,7 @@
    $strimport = get_string("importdata");
 
    $tcourseids = '';
-  	 
+ 
    if ($teachers = get_records_select('user_teachers', "userid = $USER->id AND editall = 1",'','id,course')) {
        foreach ($teachers as $teacher) {
            if ($teacher->course != $course->id && $teacher->course != SITEID){
@@ -25,7 +25,7 @@
    }

    $taught_courses = array();
-  	if (!empty($tcourseids)) {
+    if (!empty($tcourseids)) {
        $tcourseids = substr($tcourseids,0,-1);
        $taught_courses = get_records_list('course', 'id', $tcourseids);
    }
@@ -53,7 +53,7 @@
                  }
                  else {
                      foreach ($courses as $course) {
-   	                  echo "<option value=\"$course->id\">".course_format_name($course,60)."</option>\n";
+                      echo "<option value=\"$course->id\">".course_format_name($course,60)."</option>\n";
                      }
                  }
              }
@@ -56,10 +56,13 @@
        }

        echo "<center>";
+        if (isloggedin() and !isguest() and !isadmin() and !iscreator()) {  // Print link to request a new course
+            print_single_button("request.php", NULL, get_string("courserequest"), "get");
+        }
        if (iscreator()) {       // Print link to create a new course
            print_single_button("edit.php", NULL, get_string("addnewcourse"), "get");
        }
-        if (!empty($CFG->enablecourserequests)) {
+        if (isadmin() and !empty($CFG->enablecourserequests)) {
            print_single_button('pending.php',NULL, get_string('coursespending'),"get");
        }
        echo "</center>";
@@ -346,23 +349,23 @@ function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $
        echo "<td nowrap=\"nowrap\">";    /// Print little icons

        echo "<a title=\"$str->delete\" href=\"index.php?delete=$category->id&amp;sesskey=$USER->sesskey\"><img".
-             " src=\"$CFG->pixpath/t/delete.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
+             " src=\"$CFG->pixpath/t/delete.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"$str->delete\" /></a> ";

        if (!empty($category->visible)) {
            echo "<a title=\"$str->hide\" href=\"index.php?hide=$category->id&amp;sesskey=$USER->sesskey\"><img".
-                 " src=\"$CFG->pixpath/t/hide.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
+                 " src=\"$CFG->pixpath/t/hide.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"$str->hide\" /></a> ";
        } else {
            echo "<a title=\"$str->show\" href=\"index.php?show=$category->id&amp;sesskey=$USER->sesskey\"><img".
-                 " src=\"$CFG->pixpath/t/show.gif\" height=\"11\" width=\"11\" border=\"0\"alt=\"\" /></a> ";
+                 " src=\"$CFG->pixpath/t/show.gif\" height=\"11\" width=\"11\" border=\"0\"alt=\"$str->show\" /></a> ";
        }

        if ($up) {
            echo "<a title=\"$str->moveup\" href=\"index.php?moveup=$category->id&amp;sesskey=$USER->sesskey\"><img".
-                 " src=\"$CFG->pixpath/t/up.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"\" /></a> ";
+                 " src=\"$CFG->pixpath/t/up.gif\" height=\"11\" width=\"11\" border=\"0\" alt=\"$str->moveup\" /></a> ";
        }
        if ($down) {
            echo "<a title=\"$str->movedown\" href=\"index.php?movedown=$category->id&amp;sesskey=$USER->sesskey\"><img".
-                 " src=\"$CFG->pixpath/t/down.gif\" height=\"11\" width=\"11\" border=\"0\"alt=\"\" /></a> ";
+                 " src=\"$CFG->pixpath/t/down.gif\" height=\"11\" width=\"11\" border=\"0\"alt=\"$str->movedown\" /></a> ";
        }
        echo "</td>";

@@ -10,6 +10,10 @@

    $jump = optional_param('jump', '', PARAM_RAW);

+    if (!confirm_sesskey()) {
+        print_error('confirmsesskeybad');
+    }
+
    if (strpos($jump, $CFG->wwwroot) === 0) {            // Anything on this site
        redirect(urldecode($jump));
    } else if (preg_match('/^[a-z]+\.php\?/', $jump)) { 
@@ -24,6 +24,9 @@ define("FRONTPAGENEWS",           0);
 define("FRONTPAGECOURSELIST",     1);
 define("FRONTPAGECATEGORYNAMES",  2);
 define("FRONTPAGETOPICONLY",      3);
+define("FRONTPAGECATEGORYCOMBO",  4);
+
+define("FRONTPAGECOURSELIMIT",    200);           // maximum number of courses displayed on the frontpage

 function print_recent_selector_form($course, $advancedfilter=0, $selecteduser=0, $selecteddate="lastlogin",
                                    $mod="", $modid="activity/All", $modaction="", $selectedgroup="", $selectedsort="default") {
@@ -410,7 +413,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
        echo '<tr class="r'.$row.'">';
        if ($course->id == SITEID) {
            echo "<td class=\"r$row c0\" nowrap=\"nowrap\">\n";
-            echo "    <a href=\"view.php?id={$log->course}\">".$courses[$log->course]."</a>\n";
+            echo "    <a href=\"{$CFG->wwwroot}/course/view.php?id={$log->course}\">".$courses[$log->course]."</a>\n";
            echo "</td>\n";
        }
        echo "<td class=\"r$row c1\" nowrap=\"nowrap\" align=\"right\">".userdate($log->time, '%a').
@@ -505,7 +508,7 @@ function print_recent_activity($course) {

    echo '<a href="'.$CFG->wwwroot.'/course/recent.php?id='.$course->id.'">'.get_string('recentactivityreport').'</a>';

-    echo '</div>';
+    echo "</div>\n";


    // Firstly, have there been any new enrolments?
@@ -515,18 +518,21 @@ function print_recent_activity($course) {

    $users = get_recent_enrolments($course->id, $timestart);

+    //Accessibility: new users now appear in an <OL> list.
    if ($users) {
        echo '<div class="newusers">';
-        foreach ($users as $user) {
-            if (! $heading) {
-                print_headline(get_string("newusers").':', 3);
-                $heading = true;
-                $content = true;
-            }
-            $fullname = fullname($user, $isteacher);
-            echo '<span class="name"><a href="'.$CFG->wwwroot."/user/view.php?id=$user->id&amp;course=$course->id\">$fullname</a></span><br />";
+        if (! $heading) {
+            print_headline(get_string("newusers").':', 3);      
+            $heading = true;
+            $content = true;
        }
-        echo '</div>';
+        echo "<ol class=\"list\">\n";
+        foreach ($users as $user) {
+            
+            $fullname = fullname($user, $isteacher);
+            echo '<li class="name"><a href="'.$CFG->wwwroot."/user/view.php?id=$user->id&amp;course=$course->id\">$fullname</a></li>\n";
+        }
+        echo "</ol>\n</div>\n";
    }

    // Next, have there been any modifications to the course structure?
@@ -944,9 +950,9 @@ function print_section_add_menus($course, $section, $modnames, $vertical=false,
    }

    // we need to loop through the forms and check to see if we can add them.
-    foreach ($modnames as $key) {
+    foreach ($modnames as $key=>$value) {
        if (!course_allowed_module($course,$key))
-            unset($modnames[strtolower($key)]);
+            unset($modnames[$key]);
    }
    
    // this is stupid but labels get put into resource, so if resource is hidden and label is not, we're in trouble.
@@ -1031,7 +1037,7 @@ function make_categories_list(&$list, &$parents, $category=NULL, $path="") {
 }


-function print_whole_category_list($category=NULL, $displaylist=NULL, $parentslist=NULL, $depth=-1) {
+function print_whole_category_list($category=NULL, $displaylist=NULL, $parentslist=NULL, $depth=-1, $files = true) {
 /// Recursive function to print out all the categories in a nice format
 /// with or without courses included
    global $CFG;
@@ -1046,7 +1052,7 @@ function print_whole_category_list($category=NULL, $displaylist=NULL, $parentsli

    if ($category) {
        if ($category->visible or iscreator()) {
-            print_category_info($category, $depth);
+            print_category_info($category, $depth, $files);
        } else {
            return;  // Don't bother printing children of invisible categories
        }
@@ -1069,7 +1075,7 @@ function print_whole_category_list($category=NULL, $displaylist=NULL, $parentsli
            $down = $last ? false : true;
            $first = false;

-            print_whole_category_list($cat, $displaylist, $parentslist, $depth + 1);
+            print_whole_category_list($cat, $displaylist, $parentslist, $depth + 1, $files);
        }
    }
 }
@@ -1090,7 +1096,7 @@ function make_categories_options() {
    return $cats;
 }

-function print_category_info($category, $depth) {
+function print_category_info($category, $depth, $files = false) {
 /// Prints the category info in indented fashion
 /// This function is only used by print_whole_category_list() above

@@ -1105,10 +1111,8 @@ function print_category_info($category, $depth) {

    $catlinkcss = $category->visible ? '' : ' class="dimmed" ';

-    $frontpage = explode(',', $CFG->frontpage);
-    $frontpage = $frontpage?array_flip($frontpage):array();
-    $coursecount = count_records('course') <= 200;
-    if (isset($frontpage[FRONTPAGECATEGORYNAMES]) && !isset($frontpage[FRONTPAGECOURSELIST]) && $coursecount) {
+    $coursecount = count_records('course') <= FRONTPAGECOURSELIMIT;
+    if ($files and $coursecount) {
        $catimage = '<img src="'.$CFG->pixpath.'/i/course.gif" width="16" height="16" border="0" alt="" />';
    } else {
        $catimage = "&nbsp;";
@@ -1116,7 +1120,7 @@ function print_category_info($category, $depth) {

    echo "\n\n".'<table border="0" cellpadding="3" cellspacing="0" width="100%">';

-    if (isset($frontpage[FRONTPAGECATEGORYNAMES]) && !isset($frontpage[FRONTPAGECOURSELIST]) && $coursecount) {
+    if ($files and $coursecount) {
        $courses = get_courses($category->id, 'c.sortorder ASC', 'c.id,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.guest,c.cost,c.currency');

        echo "<tr>";
@@ -1198,14 +1202,14 @@ function print_courses($category, $width="100%", $hidesitecourse = false) {
        $categories = get_categories(0);  // Parent = 0   ie top-level categories only
        if (count($categories) == 1) {
            $category   = array_shift($categories);
-            $courses    = get_courses($category->id, 'c.sortorder ASC', 'c.id,c.category,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.teacher,c.cost,c.currency,c.enrol');
+            $courses    = get_courses($category->id, 'c.sortorder ASC', 'c.id,c.category,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.teacher,c.cost,c.currency,c.enrol,c.guest');
        } else {
-            $courses    = get_courses('all', 'c.sortorder ASC', 'c.id,c.category,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.teacher,c.cost,c.currency,c.enrol');
+            $courses    = get_courses('all', 'c.sortorder ASC', 'c.id,c.category,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.teacher,c.cost,c.currency,c.enrol,c.guest');
        }
        unset($categories);
    } else {
        $categories = get_categories($category->id);  // sub categories
-        $courses    = get_courses($category->id, 'c.sortorder ASC', 'c.id,c.category,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.teacher,c.cost,c.currency,c.enrol');
+        $courses    = get_courses($category->id, 'c.sortorder ASC', 'c.id,c.category,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.teacher,c.cost,c.currency,c.enrol,c.guest');
    }

    if ($courses) {
@@ -1506,20 +1510,17 @@ function move_section($course, $section, $move) {
        course_set_display($course->id, $sectiondest);
    }

-    // Check for duplicates.
+    // Check for duplicates and fix order if needed.
    // There is a very rare case that some sections in the same course have the same section id.
-    if (($count_section = count_records('course_sections', 'course', $course->id) - 1) != $course->numsections) {
-        $sections = get_records_select('course_sections', "course = $course->id AND section > 0", 'section ASC');
-        $n = 1;
-        foreach ($sections as $section) {
+    $sections = get_records_select('course_sections', "course = $course->id", 'section ASC');
+    $n = 0;
+    foreach ($sections as $section) {
+        if ($section->section != $n) {
            if (!set_field('course_sections', 'section', $n, 'id', $section->id)) {
                return false;
            }
-            $n++;
-        }
-        if (!set_field('course', 'numsections', $count_section, 'id', $course->id)) {
-            return false;
        }
+        $n++;
    }
    return true;
 }
@@ -1813,7 +1814,7 @@ function course_allowed_module($course,$mod) {
    if (is_numeric($mod)) {
        $modid = $mod;
    } else if (is_string($mod)) {
-        if ($mod = get_field("modules","id","name",strtolower($mod)))
+        if ($mod = get_field("modules","id","name",$mod))
            $modid = $mod;
    }
    if (empty($modid)) {
--- a/Show More
+++ b/Show More