Bumped for release

I don't know exactly how this works, but it looks like a good fix to me, so committing.

admin/config.php

@@ -1,185 +0,0 @@
-<?php  // $Id$
-       // config.php - allows admin to edit all configuration variables
-
-    require_once('../config.php');
-
-    $focus = '';
-
-    if ($site = get_site()) {   // If false then this is a new installation
-        require_login();
-        require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
-    }
-
-/// This is to overcome the "insecure forms paradox"
-    if (isset($secureforms) and $secureforms == 0) {
-        $match = 'nomatch';
-    } else {
-        $match = '';
-    }
-
-/// If data submitted, then process and store.
-
-    if ($config = data_submitted($match)) {  
-
-        if (!empty($USER->id)) {            // Additional identity check
-            if (!confirm_sesskey()) {
-                error(get_string('confirmsesskeybad', 'error'));
-            }
-        }
-
-        validate_form($config, $err);
-
-        if (count($err) == 0) {
-            foreach ($config as $name => $value) {
-                if ($name == "sessioncookie") {
-                    $value = eregi_replace("[^a-zA-Z0-9_]", "", $value);
-                }
-                if ($name == "defaultallowedmodules") {
-                    $value = implode(',',$value);
-                }
-                if ($name == 'hiddenuserfields') {
-                    if (in_array('none', $value)) {
-                        $value = '';
-                    } else {
-                        $value = implode(',',$value);
-                    }
-                }
-                if ($name == "locale") {
-                    $value = trim($value);
-                }
-                $conf = new object();
-                $conf->name  = $name;
-                $conf->value = $value;
-                if ($current = get_record('config', 'name', $name)) {
-                    $conf->id = $current->id;
-                    if (! update_record('config', $conf)) {
-                        error("Error: Could not update $name to $value");
-                    }
-                } else {
-                    if (! insert_record('config', $conf)) {
-                        error("Error: could not add new variable $name !");
-                    }
-                }
-            }
-            redirect('index.php');
-            exit;
-
-        } else {
-            foreach ($err as $key => $value) {
-                $focus = "form.$key";
-            }
-        }
-    }
-
-/// Otherwise fill and print the form.
-
-    if (empty($config)) {
-        $config = $CFG;
-    }
-
-    $sesskey = !empty($USER->id) ? $USER->sesskey : '';
-
-
-    $stradmin = get_string('administration');
-    $strconfiguration = get_string('configuration');
-    $strconfigvariables = get_string('configvariables', 'admin');
-
-    if ($site) {
-        print_header("$site->shortname: $strconfigvariables", $site->fullname,
-                      "<a href=\"index.php\">$stradmin</a> -> ".
-                      "<a href=\"configure.php\">$strconfiguration</a> -> $strconfigvariables", $focus);
-        print_heading($strconfigvariables);
-    } else {
-        print_header();
-        print_heading($strconfigvariables);
-        print_simple_box(get_string('configintro', 'admin'), 'center', "50%");
-        echo '<br />';
-    }
-
-
-
-/// Get all the configuration fields and helptext
-    require('configvars.php');
-
-/// Cycle through the sections to get the sectionnames
-    $linktext = '';
-    foreach($configvars as $sectionname=>$section) {
-        if ($linktext !== '') {
-            $linktext .= ' | ';
-        }
-        $linktext .= '<a href="#configsection'.$sectionname.'">'.get_string('configsection'.$sectionname, 'admin').'</a>';
-    }
-        
-    echo "<center>$linktext</center>\n";
-
-    
-    echo '<form method="post" action="config.php" name="form">';
-    echo '<center><input type="submit" value="'.get_string('savechanges').'" /></center>';
-
-/// Cycle through each section of the configuration
-    foreach ($configvars as $sectionname=>$section) {
-
-        print_heading('<a name="configsection'.$sectionname.'"></a>'.get_string('configsection'.$sectionname, 'admin'));
-
-        $table = NULL;
-        $table->data = array();
-        foreach ($section as $configvariable=>$configobject) {
-            $table->data[] = array ( $configvariable.': ',
-                                     $configobject->field
-                                   );
-            if ($configobject->display_warning()) {
-                $table->data[] = array ( '&nbsp;',
-                                         '<span class="configwarning">'.$configobject->warning.'</span>'
-                                       );
-            }
-            $table->data[] = array ( '&nbsp;',
-                                     '<span class="confighelp">'.$configobject->help.'</span>'
-                                   );
-            $table->align = array ('right', 'left');
-        }
-        print_table($table);
-
-    }
-    echo '<center>';
-    echo '<input type="hidden" name="sesskey" value="'.$sesskey.'" />';
-    echo '<input type="submit" value="'.get_string('savechanges').'" />';
-    echo '</center>';
-                
-    echo '</form>';
-    
-
-
-    
-
-    /// Lock some options
-
-    $httpsurl = str_replace('http://', 'https://', $CFG->wwwroot);
-    if ($httpsurl != $CFG->wwwroot) {
-        if (ini_get('allow_url_fopen')) {
-            if ((($fh = @fopen($httpsurl, 'r')) == false) and ($config->loginhttps == 0)) {
-                echo '<script type="text/javascript">'."\n";
-                echo '<!--'."\n";
-                echo "eval('document.form.loginhttps.disabled=true');\n";
-                echo '-->'."\n";
-                echo '</script>'."\n";
-            }
-        }
-    }
-
-
-    if ($site) {
-        print_footer();
-    }
-
-    exit;
-
-/// Functions /////////////////////////////////////////////////////////////////
-
-function validate_form(&$form, &$err) {
-
-    // Currently no checks are needed ...
-
-    return true;
-}
-
-?>

admin/configvars.php

@@ -1,660 +0,0 @@
-<?php // $Id$
-      // Shane Elliott
-defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
-
-/// Add new sitewide configuration variables to this file.
-
-
-/// $configvars is parsed by config.php
-/// It is an array of arrays of objects
-/// $configvars[sectionname][configvariablename] = configvar object
-    $configvars = array();
-
-
-/// no, yes strings and menu options are used in a number of places
-/// so we define them here to save time on repeatedly calling
-/// get_string()
-    $stryes = get_string('yes');
-    $strno  = get_string('no');
-
-    $noyesoptions[0] = $strno;
-    $noyesoptions[1] = $stryes;
-
-
-
-/// A class to hold the configurable information
-/// $field   - the html code for the form field
-/// $help    - help text for the field
-/// $warning - optional warning text to be displayed
-/// method display_warning() - a generic function that can be used in an extended class
-///     e.g. enablerssfeeds
-class configvar {
-
-    var $field;
-    var $help;
-    var $warning;
-
-    function configvar($help, $field, $warning='') {
-        $this->help    = $help;
-        $this->field   = $field;
-        $this->warning = $warning;
-    }
-
-    function display_warning() {
-        return false;
-    }
-}
-
-
-
-
-
-////////////////////////////////////////////////////////////////////
-/// Miscellaneous config variables
-////////////////////////////////////////////////////////////////////
-    $misc = array();
-
-
-/// maxeditingtime
-    unset($options);
-    $options[3600] = get_string('numminutes', '', 60);
-    $options[2700] = get_string('numminutes', '', 45);
-    $options[1800] = get_string('numminutes', '', 30);
-    $options[900]  = get_string('numminutes', '', 15);
-    $options[300]  = get_string('numminutes', '', 5);
-    $options[60]   = get_string('numminutes', '', 1);
-
-    $misc['maxeditingtime'] = new configvar (get_string('configmaxeditingtime', 'admin'),
-        choose_from_menu ($options, 'maxeditingtime', $config->maxeditingtime, '', '', '', true) );
-
-/// debug
-    unset($options);
-    $options[5]  = $strno;
-    $options[15] = $stryes;
-
-    $misc['debug'] = new configvar (get_string('configdebug', 'admin'),
-        choose_from_menu ($options, 'debug', $config->debug, '', '', '', true) );
-
-    $misc['perfdebug'] = new configvar (get_string('configperfdebug', 'admin'),
-        choose_from_menu ($options, 'perfdebug', $config->perfdebug, '', '', '', true) );
-
-/// enablerssfeeds
-class configvarrss extends configvar {
-    function display_warning() {
-        return (!function_exists('utf8_encode'));
-    }
-}
-
-    $misc['enablerssfeeds'] = new configvarrss (get_string('configenablerssfeeds', 'admin'),
-        choose_from_menu ($noyesoptions, 'enablerssfeeds', $config->enablerssfeeds, '', '', '', true),
-        '<font color="red"> You need to add XML support to your PHP installation.</font>' );
-
-    $misc['mymoodleredirect'] = new configvar (get_string('configmymoodleredirect','admin'),
-        choose_from_menu($noyesoptions,'mymoodleredirect',$config->mymoodleredirect,'','','',true));
-
-    unset($options);
-    $options[5] = get_string('worldblogs','blog');
-    $options[4] = get_string('siteblogs','blog');
-    $options[3] = get_string('courseblogs','blog');
-    $options[2] = get_string('groupblogs','blog');
-    $options[1] = get_string('personalblogs','blog');
-    $options[0] = get_string('disableblogs','blog');
-
-    $misc['bloglevel'] = new configvar (get_string('configbloglevel', 'admin'),
-        choose_from_menu ($options, 'bloglevel', $config->bloglevel,'','','',true));
-
-////////////////////////////////////////////////////////////////////
-/// OPERATING SYSTEM config variables
-////////////////////////////////////////////////////////////////////
-    $operatingsystem = array();
-
-/// gdversion
-    unset($options);
-    $options[0] = get_string('gdnot');
-    $options[1] = get_string('gd1');
-    $options[2] = get_string('gd2');
-
-    $installed  = check_gd_version();
-
-    $operatingsystem['gdversion'] = new configvar (get_string('configgdversion', 'admin'),
-        choose_from_menu ($options, 'gdversion', $installed, '', '', '', true) );
-
-/// dbsessions
-    $operatingsystem['dbsessions'] = new configvar (get_string('configdbsessions', 'admin'),
-        choose_from_menu ($noyesoptions, 'dbsessions', $config->dbsessions, '', '', '', true) );
-
-/// sessiontimeout
-    unset($options);
-    $options[14400] = get_string('numhours', '', 4);
-    $options[10800] = get_string('numhours', '', 3);
-    $options[7200]  = get_string('numhours', '', 2);
-    $options[5400]  = get_string('numhours', '', '1.5');
-    $options[3600]  = get_string('numminutes', '', 60);
-    $options[2700]  = get_string('numminutes', '', 45);
-    $options[1800]  = get_string('numminutes', '', 30);
-    $options[900]   = get_string('numminutes', '', 15);
-    $options[300]   = get_string('numminutes', '', 5);
-
-    $operatingsystem['sessiontimeout'] = new configvar (get_string('configsessiontimeout', 'admin'),
-        choose_from_menu ($options, 'sessiontimeout', $config->sessiontimeout, '', '', '', true) );
-
-/// sessioncookie
-    $operatingsystem['sessioncookie'] = new configvar (get_string('configsessioncookie', 'admin'),
-        '<input name="sessioncookie" type="text" size="10" value="'.s($config->sessioncookie).'" alt="sessioncookie" />' );
-    $operatingsystem['sessioncookiepath'] = new configvar (get_string('configsessioncookiepath', 'admin'),
-        '<input name="sessioncookiepath" type="text" size="10" value="'.s($config->sessioncookiepath).'" alt="sessioncookiepath" />' );
-
-/// zip
-    $operatingsystem['zip'] = new configvar (get_string('configzip', 'admin'),
-        '<input name="zip" type="text" size="30" value="'.s($config->zip).'" alt="zip" />' );
-
-/// unzip
-    $operatingsystem['unzip'] = new configvar (get_string('configunzip', 'admin'),
-        '<input name="unzip" type="text" size="30" value="'.s($config->unzip).'" alt="unzip" />' );
-
-    $operatingsystem['pathtodu'] = new configvar(get_string('configpathtodu', 'admin'),
-        '<input name="pathtodu" type="text" size="30" value="'.s($config->pathtodu).'" alt="pathtodu" />');                                                
-
-/// slasharguments
-    unset($options);
-    $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) );
-
-/// proxyhost
-    $operatingsystem['proxyhost'] = new configvar (get_string('configproxyhost', 'admin'),
-        '<input name="proxyhost" type="text" size="30" value="'.s($config->proxyhost).'" alt="proxyhost" />' );
-
-/// proxyport
-    $operatingsystem['proxyport'] = new configvar ('',
-        '<input name="proxyport" type="text" size="5" value="'.s($config->proxyport).'" alt="proxyport" />' );
-
-
-
-////////////////////////////////////////////////////////////////////
-/// PERMISSIONS config variables
-////////////////////////////////////////////////////////////////////
-    $permissions = array();
-
-/// teacherassignteachers
-    $permissions['teacherassignteachers'] = new configvar (get_string('configteacherassignteachers', 'admin'),
-        choose_from_menu ($noyesoptions, 'teacherassignteachers', $config->teacherassignteachers, '', '', '', true) );
-
-/// allowunenroll
-    $permissions['allowunenroll'] = new configvar (get_string('configallowunenroll', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowunenroll', $config->allowunenroll, '', '', '', true) );
-
-/// allusersaresitestudents
-    $permissions['allusersaresitestudents'] = new configvar (get_string('configallusersaresitestudents', 'admin'),
-        choose_from_menu ($noyesoptions, 'allusersaresitestudents', $config->allusersaresitestudents, '', '', '', true) );
-
-/// showsiteparticipantslist
-    unset($options);
-    $options[0]  = get_string('siteteachers');
-    $options[1]  = get_string('allteachers');
-    $options[2]  = get_string('studentsandteachers');
-
-    $permissions['showsiteparticipantslist'] = new configvar (get_string('configshowsiteparticipantslist', 'admin'),
-        choose_from_menu ($options, 'showsiteparticipantslist', $config->showsiteparticipantslist, '', '', '', true) );
-
-/// forcelogin
-    $permissions['forcelogin'] = new configvar (get_string('configforcelogin', 'admin'),
-        choose_from_menu ($noyesoptions, 'forcelogin', $config->forcelogin, '', '', '', true) );
-
-/// forceloginforprofiles
-   $permissions['forceloginforprofiles'] = new configvar (get_string('configforceloginforprofiles', 'admin'),
-        choose_from_menu ($noyesoptions, 'forceloginforprofiles', $config->forceloginforprofiles, '', '', '', true) );
-
-/// opentogoogle
-    $permissions['opentogoogle'] = new configvar (get_string('configopentogoogle', 'admin'),
-        choose_from_menu ($noyesoptions, 'opentogoogle', $config->opentogoogle, '', '', '', true) );
-
-/// maxbytes
-    $options = get_max_upload_sizes();
-
-    $permissions['maxbytes'] = new configvar (get_string('configmaxbytes', 'admin'),
-        choose_from_menu ($options, 'maxbytes', $config->maxbytes, '', '', 0, true) );
-
-/// messaging
-    $permissions['messaging'] = new configvar (get_string('configmessaging', 'admin'),
-        choose_from_menu ($noyesoptions, 'messaging', $config->messaging, '', '', '', true) );
-
-/// allowobjectembed
-    $permissions['allowobjectembed'] = new configvar (get_string('configallowobjectembed', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowobjectembed', $config->allowobjectembed, '', '', '', true) );
-
-/// enabletrusttext
-    $permissions['enabletrusttext'] = new configvar (get_string('configenabletrusttext', 'admin'),
-        choose_from_menu ($noyesoptions, 'enabletrusttext', $config->enabletrusttext, '', '', '', true) );
-
-    unset($options);
-    $options['none'] = 'No courses';
-    $options['all'] = 'All courses';
-    $options['requested'] = 'Requested courses';
-
-    $permissions['restrictmodulesfor'] = new configvar (get_string('configrestrictmodulesfor','admin'),
-   ' <script language="JavaScript">
-    function togglemodules(index) {
-        if (index == 0) {
-            document.getElementById(\'allowedmodules\').disabled=true;
-        }
-        else {
-            document.getElementById(\'allowedmodules\').disabled=false;
-        }
-    }
-    </script>'.
-        choose_from_menu($options,'restrictmodulesfor',$config->restrictmodulesfor,'','togglemodules(this.selectedIndex);','',true) );
-
-    $permissions['restrictbydefault'] = new configvar (get_string('configrestrictbydefault','admin'),
-        choose_from_menu($noyesoptions, 'restrictbydefault',$config->restrictbydefault,'','','',true) );
-
-    $allowstr = '<select name="defaultallowedmodules[]" id="allowedmodules" multiple="multiple" size="10"'.((empty($config->restrictmodulesfor)) ? "disabled=\"disabled\"" : "").'>';
-
-    $allowedmodules = array();
-    if (!empty($config->defaultallowedmodules)) {
-        $allowedmodules = explode(',',$config->defaultallowedmodules);
-    }
-
-//  On a fresh install of Moodle, this could be empty; prevent a warning on the following loop.
-    if (!$mods = get_records("modules")) {
-        $mods = array();
-    }
-    $s = "selected=\"selected\"";
-    $allowstr .= '<option value="0" '.((empty($allowedmodules)) ? $s : '').'>'.get_string('allownone').'</option>'."\n";
-    foreach ($mods as $mod) {
-        $selected = "";
-        if (in_array($mod->id,$allowedmodules)) 
-            $selected = $s;
-        $allowstr .= '<option '.$selected.' value="'.$mod->id.'">'.$mod->name.'</option>'."\n";
-    }  
-    $allowstr .= '</select>';
-
-    $permissions['defaultallowedmodules'] = new configvar (get_string('configdefaultallowedmodules','admin'),$allowstr);
-
-
-/// course requests
-    $reqcourse['enablecourserequests'] = new configvar (get_string('configenablecourserequests', 'admin'),
-        choose_from_menu ($noyesoptions,'enablecourserequests',$config->enablecourserequests,'','','',true) );
-
-/// default category for course requests
-    require_once($CFG->dirroot.'/course/lib.php');
-    $reqcourse['defaultrequestedcategory'] = new configvar (get_string('configdefaultrequestedcategory', 'admin'),
-        choose_from_menu (make_categories_options(), 'defaultrequestedcategory',$config->defaultrequestedcategory,'','','',true) );
-
-    $reqcourse['requestedteachername'] = new configvar (get_string('configrequestedteachername','admin'),
-        '<input type="text" name="requestedteachername" size="20" maxlength="100" value="'.s($config->requestedteachername).'" />');
-
-    $reqcourse['requestedteachersname'] = new configvar (get_string('configrequestedteachersname','admin'),
-        '<input type="text" name="requestedteachersname" size="20" maxlength="100" value="'.s($config->requestedteachersname).'" />');
-
-    $reqcourse['requestedstudentname'] = new configvar (get_string('configrequestedstudentname','admin'),
-        '<input type="text" name="requestedstudentname" size="20" maxlength="100" value="'.s($config->requestedstudentname).'" />');
-
-    $reqcourse['requestedstudentsname'] = new configvar (get_string('configrequestedstudentsname','admin'),
-        '<input type="text" name="requestedstudentsname" size="20" maxlength="100" value="'.s($config->requestedstudentsname).'" />');
-
-////////////////////////////////////////////////////////////////////
-/// INTERFACE config variables
-////////////////////////////////////////////////////////////////////
-    $interface = array();
-
-/// language settings
-    $interface['lang'] = new configvar ( get_string('configlang', 'admin'),
-        choose_from_menu(get_list_of_languages(), 'lang', $config->lang, '', '', '', true) );
-
-/// language menu
-    $interface['langmenu'] = new configvar ( get_string('configlangmenu', 'admin'),
-        choose_from_menu($noyesoptions, 'langmenu', $config->langmenu, '', '', '', true) );
-
-/// language list
-    $interface['langlist'] = new configvar ( get_string('configlanglist', 'admin'),
-        '<input name="langlist" type="text" size="60" value="'.s($config->langlist).'" alt="langlist" />' );
-
-/// 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="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 ) );
-
-/// country
-    $interface['country'] = new configvar ( get_string('configcountry', 'admin'),
-        choose_from_menu (get_list_of_countries(), 'country', $config->country, get_string('selectacountry'), '', 0, true) );
-
-/// framename
-    if (empty($config->framename)) {
-        $config->framename = "_top";
-    }
-
-    $interface['framename'] = new configvar (get_string('configframename', 'admin'),
-        '<input name="framename" type="text" size="15" value="'.s($config->framename).'" alt="framename" />' );
-
-/// language list
-    $interface['themelist'] = new configvar ( get_string('configthemelist', 'admin'),
-        '<input name="themelist" type="text" size="60" value="'.s($config->themelist).'" alt="themelist" />' );
-
-/// user themes
-    $interface['allowuserthemes'] = new configvar (get_string('configallowuserthemes', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowuserthemes', $config->allowuserthemes, '', '', '', true) );
-
-/// course themes
-    $interface['allowcoursethemes'] = new configvar (get_string('configallowcoursethemes', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowcoursethemes', $config->allowcoursethemes, '', '', '', true) );
-
-/// allowuserblockhiding
-    $interface['allowuserblockhiding'] = new configvar (get_string('configallowuserblockhiding', 'admin'),
-        choose_from_menu ($noyesoptions, 'allowuserblockhiding', $config->allowuserblockhiding, '', '', '', true) );
-
-/// showblocksonmodpages
-    $interface['showblocksonmodpages'] = new configvar (get_string('configshowblocksonmodpages', 'admin'),
-        choose_from_menu ($noyesoptions, 'showblocksonmodpages', $config->showblocksonmodpages, '', '', '', true) );
-
-
-/// tabselectedtofront
-    $interface['tabselectedtofront'] = new configvar (get_string('tabselectedtofront', 'admin'),
-        choose_from_menu ($noyesoptions, 'tabselectedtofront', $config->tabselectedtofront, '', '', '', true) );
-
-
-
-////////////////////////////////////////////////////////////////////
-/// USER config variables
-////////////////////////////////////////////////////////////////////
-    $user = array();
-
-/// sitepolicy
-    $user['sitepolicy'] = new configvar (get_string('configsitepolicy', 'admin'),
-        '<input type="text" name="sitepolicy" size="60" value="'.$config->sitepolicy.'" alt="sitepolicy" />' );
-
-
-/// fullnamedisplay
-    unset($options);
-    $options['language']  = get_string('language');
-    $options['firstname lastname']  = get_string('firstname') . ' + ' . get_string('lastname');
-    $options['lastname firstname']  = get_string('lastname') . ' + ' . get_string('firstname');
-    $options['firstname']  = get_string('firstname');
-
-    $user['fullnamedisplay'] = new configvar (get_string('configfullnamedisplay', 'admin'),
-        choose_from_menu ($options, 'fullnamedisplay', $config->fullnamedisplay, '', '', '', true) );
-
-/// extendedusernamechars
-    $user['extendedusernamechars'] = new configvar (get_string('configextendedusernamechars', 'admin'),
-        choose_from_menu ($noyesoptions, 'extendedusernamechars', $config->extendedusernamechars, '', '', '', true) );
-
-/// autologinguests
-    $user['autologinguests'] = new configvar (get_string('configautologinguests', 'admin'),
-        choose_from_menu ($noyesoptions, 'autologinguests', $config->autologinguests, '', '', '', true) );
-
-/// hiddenuserfields
-    $fields = array('none', 'description', 'city', 'country', 'webpage', 'icqnumber', 'skypeid', 'yahooid', 'aimid', 'msnid', 'lastaccess');
-    if (empty($config->hiddenuserfields)) {
-        $config->hiddenuserfields = 'none';
-    }
-    $configfields = array_flip(explode(',', $config->hiddenuserfields));
-    $fieldoptions = '';
-    foreach ($fields as $value) {
-        $fieldoptions .= '<option value="'.$value.'"';
-        if (isset($configfields[$value])) {
-            $fieldoptions .= ' selected="selected"';
-        }
-        $fieldoptions .= '>'.get_string($value).'</option>';
-    }
-
-    $user['hiddenuserfields'] = new configvar (get_string('confighiddenuserfields', 'admin'),
-        '<select id="menuhiddenuserfields" name="hiddenuserfields[]" size="10" multiple="multiple">'.$fieldoptions.'</select>' );
-
-
-
-
-////////////////////////////////////////////////////////////////////
-/// SECURITY config variables
-////////////////////////////////////////////////////////////////////
-    $security = array();
-
-/// displayloginfailures
-    unset($options);
-    $options[''] = get_string('nobody');
-    $options['admin'] = get_string('administrators');
-    $options['teacher'] = get_string('administratorsandteachers');
-    $options['everybody'] = get_string('everybody');
-
-    $security['displayloginfailures'] = new configvar (get_string('configdisplayloginfailures', 'admin'),
-        choose_from_menu($options, 'displayloginfailures', $config->displayloginfailures, '', '', '', true) );
-
-/// notifyloginfailures
-    unset($options);
-    $options[''] = get_string('nobody');
-    $options['mainadmin'] = get_string('administrator');
-    $options['alladmins'] = get_string('administratorsall');
-
-    $security['notifyloginfailures'] = new configvar (get_string('confignotifyloginfailures', 'admin'),
-        choose_from_menu($options, 'notifyloginfailures', $config->notifyloginfailures, '', '', '', true) );
-
-/// notifyloginthreshold
-    unset($options);
-    for ($i=1; $i<=100; $i++) {
-        $options[$i] = "$i";
-    }
-
-    $security['notifyloginthreshold'] = new configvar (get_string('confignotifyloginthreshold', 'admin'),
-        choose_from_menu($options, 'notifyloginthreshold', $config->notifyloginthreshold, '', '', '', true) );
-
-/// secureforms
-    $security['secureforms'] = new configvar (get_string('configsecureforms', 'admin'),
-        choose_from_menu ($noyesoptions, 'secureforms', $config->secureforms, '', '', '', true) );
-
-/// loginhttps
-    $security['loginhttps'] = new configvar (get_string('configloginhttps', 'admin'),
-        choose_from_menu ($noyesoptions, 'loginhttps', $config->loginhttps, '', '', '', true) );
-
-/// runclamonupload
-    $security['runclamonupload'] = new configvar (get_string('configrunclamonupload', 'admin'),
-        choose_from_menu($noyesoptions, 'runclamonupload', $config->runclamonupload, '', '', '', true) );
-
-/// pathtoclam
-    $security['pathtoclam'] = new configvar (get_string('configpathtoclam', 'admin'),
-        '<input type="text" name="pathtoclam" size="30" value="'.$config->pathtoclam.'" alt="pathtoclam" />' );
-
-/// quarantinedir
-    $security['quarantinedir'] = new configvar (get_string('configquarantinedir', 'admin'),
-        '<input type="text" name="quarantinedir" size="30" value="'.$config->quarantinedir.'" alt="quarantinedir" />' );
-
-/// clamfailureonupload
-    unset($options);
-    $options['donothing'] = get_string('configclamdonothing', 'admin');
-    $options['actlikevirus'] = get_string('configclamactlikevirus', 'admin');
-
-    $security['clamfailureonupload'] = new configvar (get_string('configclamfailureonupload', 'admin'),
-        choose_from_menu($options, 'clamfailureonupload', $config->clamfailureonupload, '', '', '', true) );
-
-
-
-
-////////////////////////////////////////////////////////////////////
-/// MAINTENANCE config variables
-////////////////////////////////////////////////////////////////////
-    $maintenance = array();
-
-/// longtimenosee
-    unset($options);
-    $options[0]    = get_string('never');
-    $options[1000] = get_string('numdays', '', 1000);
-    $options[365]  = get_string('numdays', '', 365);
-    $options[180]  = get_string('numdays', '', 180);
-    $options[150]  = get_string('numdays', '', 150);
-    $options[120]  = get_string('numdays', '', 120);
-    $options[90]   = get_string('numdays', '', 90);
-    $options[60]   = get_string('numdays', '', 60);
-    $options[30]   = get_string('numdays', '', 30);
-    $options[21]   = get_string('numdays', '', 21);
-    $options[14]   = get_string('numdays', '', 14);
-    $options[7]   = get_string('numdays', '', 7);
-
-    $maintenance['longtimenosee'] = new configvar (get_string('configlongtimenosee', 'admin'),
-        choose_from_menu ($options, 'longtimenosee', $config->longtimenosee, '', '', '', true) );
-
-/// deleteunconfirmed
-    unset($options);
-    $options[0]    = get_string('never');
-    $options[168]  = get_string('numdays', '', 7);
-    $options[144]  = get_string('numdays', '', 6);
-    $options[120]  = get_string('numdays', '', 5);
-    $options[96]   = get_string('numdays', '', 4);
-    $options[72]   = get_string('numdays', '', 3);
-    $options[48]   = get_string('numdays', '', 2);
-    $options[24]   = get_string('numdays', '', 1);
-    $options[12]   = get_string('numhours', '', 12);
-    $options[6]    = get_string('numhours', '', 6);
-    $options[1]    = get_string('numhours', '', 1);
-
-    $maintenance['deleteunconfirmed'] = new configvar (get_string('configdeleteunconfirmed', 'admin'),
-        choose_from_menu ($options, 'deleteunconfirmed', $config->deleteunconfirmed, '', '', '', true) );
-
-/// loglifetime
-    unset($options);
-    $options[0]    = get_string('neverdeletelogs');
-    $options[1000] = get_string('numdays', '', 1000);
-    $options[365]  = get_string('numdays', '', 365);
-    $options[180]  = get_string('numdays', '', 180);
-    $options[150]  = get_string('numdays', '', 150);
-    $options[120]  = get_string('numdays', '', 120);
-    $options[90]   = get_string('numdays', '', 90);
-    $options[60]   = get_string('numdays', '', 60);
-    $options[30]   = get_string('numdays', '', 30);
-
-    $maintenance['loglifetime'] = new configvar (get_string('configloglifetime', 'admin'),
-        choose_from_menu ($options, 'loglifetime', $config->loglifetime, '', '', '', true) );
-
-
-////////////////////////////////////////////////////////////////////
-/// MAIL config variables
-////////////////////////////////////////////////////////////////////
-    $mail = array();
-
-/// smtphosts
-    $mail['smtphosts'] = new configvar (get_string('configsmtphosts', 'admin'),
-        '<input name="smtphosts" type="text" size="30" value="'.s($config->smtphosts).'" alt="smtphosts" />' );
-
-/// smtpuser
-    $mail['smtpuser'] = new configvar (get_string('configsmtpuser', 'admin'),
-        '<input name="smtpuser" type="text" size="10" value="'.s($config->smtpuser).'" alt="smtpuser" />' );
-
-/// smtppass
-    $mail['smtppass'] = new configvar ('',
-        '<input name="smtppass" type="password" size="10" value="'.s($config->smtppass).'" alt="smtppass" />' );
-
-/// noreplyaddress
-    $mail['noreplyaddress'] = new configvar (get_string('confignoreplyaddress', 'admin'),
-        '<input name="noreplyaddress" type="text" size="30" value="'.s($config->noreplyaddress).'" alt="noreplyaddress" />' );
-
-/// digestmailtime
-    $hours = array();
-    for ($i=0; $i<=23; $i++) {
-        $hours[$i] = sprintf("%02d",$i);
-    }
-
-    $mail['digestmailtime'] = new configvar (get_string('configdigestmailtime', 'admin'),
-        choose_from_menu($hours, 'digestmailtime', $config->digestmailtime, '', '', 0, true) );
-
-/// allowemailaddresses
-    $mail['allowemailaddresses'] = new configvar (get_string('configallowemailaddresses', 'admin'),
-        '<input name="allowemailaddresses" type="text" size="60" value="'.s($config->allowemailaddresses).'" alt="allowemailaddresses" />' );
-
-/// denyemailaddresses
-    $mail['denyemailaddresses'] = new configvar (get_string('configdenyemailaddresses', 'admin'),
-        '<input name="denyemailaddresses" type="text" size="60" value="'.s($config->denyemailaddresses).'" alt="denyemailaddresses" />' );
-
-    if (!empty($CFG->unicodedb)) { ///These options are only available if running under unicodedb
-    /// sitemailcharset
-        unset($options);
-        unset($charsets);
-        $charsets = get_list_of_charsets();
-        $options['0'] = get_string('none');
-        $options = array_merge($options, $charsets);
-        $mail['sitemailcharset'] = new configvar (get_string('configsitemailcharset', 'admin'),
-            choose_from_menu($options, 'sitemailcharset', $config->sitemailcharset, '', '', '', true));
-
-    /// allowusermailcharset
-        $mail['allowusermailcharset'] = new configvar (get_string('configallowusermailcharset', 'admin'),
-            choose_from_menu($noyesoptions, 'allowusermailcharset', $config->allowusermailcharset, '', '', '', true));
-    }
-    
-/// enable stats
-if (empty($CFG->disablestatsprocessing)) {
-    $stats['enablestats'] = new configvar (get_string('configenablestats','admin'),
-        choose_from_menu($noyesoptions, 'enablestats', $config->enablestats, '', '', '', true) );
-
-    unset($options);
-    $options['none'] = get_string('none');
-    $options[60*60*24*7] = get_string('numweeks','moodle',1);
-    $options[60*60*24*14] = get_string('numweeks','moodle',2);
-    $options[60*60*24*21] = get_string('numweeks','moodle',3);
-    $options[60*60*24*28] = get_string('nummonths','moodle',1);
-    $options[60*60*24*56] = get_string('nummonths','moodle',2);
-    $options[60*60*24*84] = get_string('nummonths','moodle',3);
-    $options[60*60*24*112] = get_string('nummonths','moodle',4);
-    $options[60*60*24*140] = get_string('nummonths','moodle',5);
-    $options[60*60*24*168] = get_string('nummonths','moodle',6);
-    $options['all'] = get_string('all');
-    
-    $stats['statsfirstrun'] = new configvar (get_string('configstatsfirstrun','admin'),
-       choose_from_menu($options,'statsfirstrun',$config->statsfirstrun,'','','',true) );
-
-    unset($options);
-    $options[0] = get_string('untilcomplete');
-    $options[60*60] = '1 '.get_string('hour');
-    $options[60*60*2] = '2 '.get_string('hours');
-    $options[60*60*3] = '3 '.get_string('hours');
-    $options[60*60*4] = '4 '.get_string('hours');
-    $options[60*60*5] = '5 '.get_string('hours');
-    $options[60*60*6] = '6 '.get_string('hours');
-    $options[60*60*7] = '7 '.get_string('hours');
-    $options[60*60*8] = '8 '.get_string('hours');
-
-    if (empty($config->statsruntimestarthour)) {
-        $config->statsruntimestarthour = 0;
-    }
-    if (empty($config->statsruntimestartminute)) {
-        $config->statsruntimestartminute = 0;
-    }
-
-    $stats['statsmaxruntime'] = new configvar (get_string('configstatsmaxruntime','admin'),
-      choose_from_menu($options,'statsmaxruntime',$config->statsmaxruntime,'','','',true) );                                        
-
-    $stats['statsruntimestart'] = new configvar (get_string('configstatsruntimestart','admin'),
-      print_time_selector("statsruntimestarthour","statsruntimestartminute",make_timestamp(2000,1,1,$config->statsruntimestarthour,$config->statsruntimestartminute),5,true) );
-
-    $stats['statsuserthreshold'] = new configvar (get_string('configstatsuserthreshold','admin'),
-      '<input type="text" name="statsuserthreshold" size="4" value="'.$config->statsuserthreshold.'" />');
-}                                        
-
-////////////////////////////////////////////////////////////////////
-
-    $configvars['interface']       = $interface;
-    $configvars['security']        = $security;
-    $configvars['operatingsystem'] = $operatingsystem;
-    $configvars['maintenance']     = $maintenance;
-    $configvars['mail']            = $mail;
-    $configvars['user']            = $user;
-    $configvars['permissions']     = $permissions;
-    $configvars['requestedcourse'] = $reqcourse;
-    $configvars['misc']            = $misc;
-if (empty($CFG->disablestatsprocessing)) {
-    $configvars['stats']           = $stats;
-}
-
-?>

admin/cron.php

@@ -53,7 +53,17 @@
     moodle_setlocale();
 
 /// send mime type and encoding
-    @header('Content-Type: text/plain; charset='.current_charset());
+    if (check_browser_version('MSIE')) {
+        //ugly IE hack to work around downloading instead of viewing
+        @header('Content-Type: text/html; charset='.current_charset());
+        echo "<xmp>"; //<pre> is not good enough for us here
+    } else {
+        //send proper plaintext header
+        @header('Content-Type: text/plain; charset='.current_charset());
+    }
+
+/// increase memory limit (PHP 5.2 does different calculation, we need more memory now)
+    @raise_memory_limit('128M');
 
 /// Start output log
 
@@ -77,6 +87,8 @@
                             mtrace("Error: could not update timestamp for $mod->fullname");
                         }
                     }
+                /// Reset possible changes by modules to time_limit. MDL-11597
+                    @set_time_limit(0);
                     mtrace("done.");
                 }
             }
@@ -101,19 +113,35 @@
                             mtrace('Error: could not update timestamp for '.$block->name);
                         }
                     }
+                /// Reset possible changes by blocks to time_limit. MDL-11597
+                    @set_time_limit(0);
                     mtrace('done.');
                 }
             }
 
         }
     }
-    mtrace("Finished blocks");
+    mtrace('Finished blocks');
 
     if (!empty($CFG->langcache)) {
         mtrace('Updating languages cache');
         get_list_of_languages();
     }
 
+    mtrace('Removing expired enrolments ...', '');     // See MDL-8785
+    $timenow = time();
+    if ($oldenrolments = get_records_select('role_assignments', "timeend > 0 AND timeend < '$timenow'")) {
+        mtrace(count($oldenrolments).' to delete');
+        foreach ($oldenrolments as $oldenrolment) {
+            if (role_unassign($oldenrolment->roleid, $oldenrolment->userid, 0, $oldenrolment->contextid)) {
+                mtrace("Deleted expired role assignment $oldenrolment->roleid for user $oldenrolment->userid from context $oldenrolment->contextid");
+            }
+        }
+        mtrace('Done');
+    } else {
+        mtrace('none found');
+    }
+
 
 /// Run all core cron jobs, but not every time since they aren't too important.
 /// These don't have a timer to reduce load, so we'll use a random number 
@@ -132,8 +160,8 @@
             if ($assigns = get_users_longtimenosee($longtime)) {
                 foreach ($assigns as $assign) {
                     if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
-                        if (role_unassign(0, $assign->userid, 0, $context->id)) {
-                            mtrace("Deleted student enrolment for user $assign->userid from course $assign->courseid");
+                        if (role_unassign(0, $assign->id, 0, $context->id)) {
+                            mtrace("Deleted student enrolment for user $assign->id from course $assign->courseid");
                         }
                     }
                 }
@@ -143,11 +171,13 @@
     
         /// Delete users who haven't confirmed within required period
 
-        $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
-        if ($users = get_users_unconfirmed($oneweek)) {
-            foreach ($users as $user) {
-                if (delete_records('user', 'id', $user->id)) {
-                    mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
+        if (!empty($CFG->deleteunconfirmed)) {
+            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+            if ($users = get_users_unconfirmed($oneweek)) {
+                foreach ($users as $user) {
+                    if (delete_records('user', 'id', $user->id)) {
+                        mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
+                    }
                 }
             }
         }
@@ -157,11 +187,13 @@
 
         /// Delete users who haven't completed profile within required period
 
-        $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
-        if ($users = get_users_not_fully_set_up($oneweek)) {
-            foreach ($users as $user) {
-                if (delete_records('user', 'id', $user->id)) {
-                    mtrace("Deleted not fully setup user $user->username ($user->id)");
+        if (!empty($CFG->deleteunconfirmed)) {
+            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+            if ($users = get_users_not_fully_set_up($oneweek)) {
+                foreach ($users as $user) {
+                    if (delete_records('user', 'id', $user->id)) {
+                        mtrace("Deleted not fully setup user $user->username ($user->id)");
+                    }
                 }
             }
         }
@@ -224,7 +256,7 @@
         //Execute backup's cron
         //Perhaps a long time and memory could help in large sites
         @set_time_limit(0);
-        @raise_memory_limit("128M");
+        @raise_memory_limit("192M");
         if (function_exists('apache_child_terminate')) {
             // if we are running from Apache, give httpd a hint that 
             // it can recycle the process after it's done. Apache's 
@@ -279,7 +311,7 @@
     if (!empty($CFG->enablestats) and empty($CFG->disablestatsprocessing)) {
 
         // check we're not before our runtime
-        $timetocheck = strtotime("$CFG->statsruntimestarthour:$CFG->statsruntimestartminute today");
+        $timetocheck = strtotime("today $CFG->statsruntimestarthour:$CFG->statsruntimestartminute");
 
         if (time() > $timetocheck) {
             $time = 60*60*20; // set it to 20 here for first run... (overridden by $CFG)
@@ -287,7 +319,7 @@
             if (!empty($CFG->statsmaxruntime)) {
                 $time = $CFG->statsmaxruntime+(60*30); // add on half an hour just to make sure (it could take that long to break out of the loop)
             }
-            if (!get_field_sql('SELECT id FROM '.$CFG->prefix.'stats_daily LIMIT 1')) {
+            if (!get_field_sql('SELECT id FROM '.$CFG->prefix.'stats_daily')) {
                 // first run, set another lock. we'll check for this in subsequent runs to set the timeout to later for the normal lock.
                 set_cron_lock('statsfirstrunlock',true,$time,true);
                 $firsttime = true;
@@ -330,4 +362,9 @@
     $difftime = microtime_diff($starttime, microtime());
     mtrace("Execution took ".$difftime." seconds"); 
 
+/// finishe the IE hack
+    if (check_browser_version('MSIE')) {
+        echo "</xmp>";
+    }
+
 ?>

admin/delete.php

@@ -54,7 +54,7 @@ function delete_subdirectories($rootdir) {
 
     $dir = opendir($rootdir);
 
-    while ($file = readdir($dir)) {
+    while (false !== ($file = readdir($dir))) {
         if ($file != '.' and $file != '..') {
             $fullfile = $rootdir .'/'. $file;
             if (filetype($fullfile) == 'dir') {

admin/environment.xml

@@ -35,6 +35,11 @@
     </PHP_EXTENSIONS>
   </MOODLE>
   <MOODLE version="1.7">
+    <UNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="unicoderecommended" />
+      </FEEDBACK>
+    </UNICODE>
     <DATABASE level="required">
       <VENDOR name="mysql" version="4.1.16">
         <FEEDBACK>
@@ -45,6 +50,7 @@
       <VENDOR name="postgres" version="7.4" />
       <VENDOR name="mssql" version="9.0" />
       <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
       <VENDOR name="oracle" version="9.0" />
     </DATABASE>
     <PHP version="4.3.0" level="required">
@@ -63,4 +69,108 @@
       </PHP_EXTENSION>
     </PHP_EXTENSIONS>
   </MOODLE>
+  <MOODLE version="1.8">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <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="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="9.0" />
+    </DATABASE>
+    <PHP version="4.3.0" level="required">
+      <RESTRICT function="restrict_php50_version" message="php50restricted" />
+    </PHP>
+    <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>
+  <MOODLE version="1.9">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <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="8.0" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="9.0" />
+    </DATABASE>
+    <PHP version="4.3.0" level="required">
+      <RESTRICT function="restrict_php50_version" message="php50restricted" />
+    </PHP>
+    <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>
+  <MOODLE version="2.0">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <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="8.0" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="9.0" />
+    </DATABASE>
+    <PHP version="5.2.4" level="required">
+    </PHP>
+    <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>

admin/filter.php

@@ -59,10 +59,10 @@
             // run through submitted data
             // reject if does not start with filter_
             foreach ($config as $name => $value) {
-                set_config( $name,$value );
+                set_config($name, stripslashes($value));
             }
         }
-        redirect( "$CFG->wwwroot/$CFG->admin/filters.php", get_string('changessaved'), 1);
+        redirect("$CFG->wwwroot/$CFG->admin/filters.php");
         exit;
     }
 
@@ -94,7 +94,5 @@
     <?php
     print_simple_box_end();
 
-    print_simple_box_end();
-
     admin_externalpage_print_footer($adminroot);
 ?>

admin/health.php

@@ -525,11 +525,203 @@ class problem_000011 extends problem_base {
             }
             return 'Error counter was cleared.';
         } else {
-            return '<p>Session errors can be caused by:<ul><li>unresolved problem in server software (aka random switching of users),</li><li>blocked or modified cookies,</li><li>deleting of active session files.</li></ul></p><p><a href="'.me().'&resetsesserrorcounter=1">Reset counter.</a></p>';
+            return '<p>Session errors can be caused by:</p><ul>' .
+            '<li>unresolved problem in server software (aka random switching of users),</li>' .
+            '<li>blocked or modified cookies,</li>' .
+            '<li>deleting of active session files.</li>' .
+            '</ul><p><a href="'.me().'&amp;resetsesserrorcounter=1">Reset counter</a></p>';
         }
     }
 }
 
+class problem_000012 extends problem_base {
+    function title() {
+        return 'Random questions data consistency';
+    }
+    function exists() {
+        return record_exists_select('question', "qtype = 'random' AND parent <> id");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>For random questions, question.parent should equal question.id. ' .
+        'There are some questions in your database for which this is not true. ' .
+        'One way that this could have happened is for random questions restored from backup before ' .
+        '<a href="http://tracker.moodle.org/browse/MDL-5482">MDL-5482</a> was fixed.</p>';
+    }
+    function solution() {
+        global $CFG;
+        return '<p>Upgrade to Moodle 1.9.1 or later, or manually execute the SQL</p>' .
+        '<pre>UPDATE ' . $CFG->prefix . 'question SET parent = id WHERE qtype = \'random\' and parent &lt;> id;</pre>';
+    }
+}
+
+class problem_000013 extends problem_base {
+    function title() {
+        return 'Multi-answer questions data consistency';
+    }
+    function exists() {
+        global $CFG;
+        $positionexpr = sql_position(sql_concat("','", "q.id", "','"), 
+                sql_concat("','", "qma.sequence", "','"));
+        return record_exists_sql("
+                SELECT * FROM {$CFG->prefix}question q
+                    JOIN {$CFG->prefix}question_multianswer qma ON $positionexpr > 0
+                WHERE qma.question <> q.parent") ||
+            record_exists_sql("
+                SELECT * FROM {$CFG->prefix}question q
+                    JOIN {$CFG->prefix}question parent_q ON parent_q.id = q.parent
+                WHERE q.category <> parent_q.category");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>For each sub-question whose id is listed in ' .
+        'question_multianswer.sequence, its question.parent field should equal ' .
+        'question_multianswer.question; and each sub-question should be in the same ' .
+        'category as its parent. There are questions in your database for ' .
+        'which this is not the case. One way that this could have happened is ' .
+        'for multi-answer questions restored from backup before ' .
+        '<a href="http://tracker.moodle.org/browse/MDL-14750">MDL-14750</a> was fixed.</p>';
+    }
+    function solution() {
+        return '<p>Upgrade to Moodle 1.9.1 or later, or manually execute the ' .
+        'code in question_multianswer_fix_subquestion_parents_and_categories in ' .
+        '<a href="http://cvs.moodle.org/moodle/question/type/multianswer/db/upgrade.php?revision=1.1.10.2&amp;view=markup">/question/type/multianswer/db/upgrade.php' .
+        'from the 1.9 stable branch</a>.</p>';
+    }
+}
+
+class problem_000014 extends problem_base {
+    function title() {
+        return 'Only multianswer and random questions should be the parent of another question';
+    }
+    function exists() {
+        global $CFG;
+        return record_exists_sql("
+                SELECT * FROM {$CFG->prefix}question q
+                    JOIN {$CFG->prefix}question parent_q ON parent_q.id = q.parent
+                WHERE parent_q.qtype NOT IN ('random', 'multianswer')");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>You have questions that violate this in your databse. ' .
+        'You will need to investigate to determine how this happened.</p>';
+    }
+    function solution() {
+        return '<p>It is impossible to give a solution without knowing more about ' .
+        ' how the problem was caused. You may be able to get help from the ' .
+        '<a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a>.</p>';
+    }
+}
+
+class problem_000017 extends problem_base {
+    function title() {
+        return 'Question categories tree structure';
+    }
+    function find_problems() {
+        static $answer = null;
+
+        if (is_null($answer)) {
+            $categories = get_records('question_categories', '', '', 'id');
+
+            // Look for missing parents.
+            $missingparent = array();
+            foreach ($categories as $category) {
+                if ($category->parent != 0 && !array_key_exists($category->parent, $categories)) {
+                    $missingparent[$category->id] = $category;
+                }
+            }
+
+            // Look for loops.
+            $loops = array();
+            while (!empty($categories)) {
+                $current = array_pop($categories);
+                $thisloop = array($current->id => $current);
+                while (true) {
+                    if (isset($thisloop[$current->parent])) {
+                        // Loop detected
+                        $loops[$current->id] = $thisloop;
+                        break;
+                    } else if (!isset($categories[$current->parent])) {
+                        // Got to the top level, or a category we already know is OK.
+                        break;
+                    } else {
+                        // Continue following the path.
+                        $current = $categories[$current->parent];
+                        $thisloop[$current->id] = $current;
+                        unset($categories[$current->id]);
+                    }
+                }
+            }
+
+            $answer = array($missingparent, $loops);
+        }
+
+        return $answer;
+    }
+    function exists() {
+        list($missingparent, $loops) = $this->find_problems();
+        return !empty($missingparent) || !empty($loops);
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        list($missingparent, $loops) = $this->find_problems();
+
+        $description = '<p>The question categories should be arranged into tree ' .
+                ' structures by the question_categories.parent field. Sometimes ' .
+                ' this tree structure gets messed up.</p>';
+
+        if (!empty($missingparent)) {
+            $description .= '<p>The following categories are missing their parents:</p><ul>';
+            foreach ($missingparent as $cat) {
+                $description .= "<li>Category $cat->id: " . s($cat->name) . "</li>\n";
+            }
+            $description .= "</ul>\n";
+        }
+
+        if (!empty($loops)) {
+            $description .= '<p>The following categories form a loop of parents:</p><ul>';
+            foreach ($loops as $loop) {
+                $description .= "<li><ul>\n";
+                foreach ($loop as $cat) {
+                    $description .= "<li>Category $cat->id: " . s($cat->name) . " has parent $cat->parent</li>\n";
+                }
+                $description .= "</ul></li>\n";
+            }
+            $description .= "</ul>\n";
+        }
+
+        return $description;
+    }
+    function solution() {
+        global $CFG;
+        list($missingparent, $loops) = $this->find_problems();
+
+        $solution = '<p>Consider executing the following SQL queries. These fix ' .
+                'the problem by moving some categories to the top level.</p>';
+
+        if (!empty($missingparent)) {
+            $solution .= "<pre>UPDATE " . $CFG->prefix . "question_categories\n" .
+                    "        SET parent = 0\n" .
+                    "        WHERE id IN (" . implode(',', array_keys($missingparent)) . ");</pre>\n";
+        }
+
+        if (!empty($loops)) {
+            $solution .= "<pre>UPDATE " . $CFG->prefix . "question_categories\n" .
+                    "        SET parent = 0\n" .
+                    "        WHERE id IN (" . implode(',', array_keys($loops)) . ");</pre>\n";
+        }
+
+        return $solution;
+    }
+}
 
 class problem_00000x extends problem_base {
     function title() {

admin/index.php

@@ -27,6 +27,7 @@
 
     $id             = optional_param('id', '', PARAM_ALPHANUM);
     $confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
+    $confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL);
     $agreelicence = optional_param('agreelicence',0, PARAM_BOOL);
     $ignoreupgradewarning = optional_param('ignoreupgradewarning', 0, PARAM_BOOL);
 
@@ -52,6 +53,13 @@
         error("The PHP server variable 'file_uploads' is not turned On - $documentationlink");
     }
 
+    if (empty($CFG->prefix) && $CFG->dbtype != 'mysql') {  //Enforce prefixes for everybody but mysql
+        error('$CFG->prefix can\'t be empty for your target DB (' . $CFG->dbtype . ')');
+    }
+
+    if ($CFG->dbtype == 'oci8po' && strlen($CFG->prefix) > 2) { //Max prefix length for Oracle is 2cc
+        error('$CFG->prefix maximum allowed length for Oracle DBs is 2cc.');
+    }
 
 /// Check that config.php has been edited
 
@@ -133,6 +141,8 @@
 
     /// Both old .sql files and new install.xml are supported
     /// But we prioritise install.xml (XMLDB) if present
+    
+        change_db_encoding(); // first try to change db encoding to utf8
         $status = false;
         if (file_exists("$CFG->libdir/db/install.xml")) {
             $status = install_from_xmldb_file("$CFG->libdir/db/install.xml"); //New method
@@ -214,19 +224,50 @@
             }
 
             if (empty($confirmupgrade)) {
+
                 print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
                         "", "", false, " ", " ");
+
                 notice_yesno(get_string('upgradesure', 'admin', $a->newversion), 'index.php?confirmupgrade=yes', 'index.php');
                 exit;
 
+            } else if (empty($confirmrelease)) {
+                $strcurrentrelease = get_string("currentrelease");
+                print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, " ", " ");
+                print_heading("Moodle $release");
+                print_simple_box(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'), 'center');
+
+                require_once($CFG->libdir.'/environmentlib.php');
+                print_heading(get_string('environment', 'admin'));
+                if (!check_moodle_environment($release, $environment_results, true)) {
+                    notice_yesno(get_string('environmenterrorupgrade', 'admin'), 
+                                 'index.php?confirmupgrade=1&confirmrelease=1', 'index.php');
+                } else {
+                    notify(get_string('environmentok', 'admin'), 'notifysuccess');
+
+                    echo '<form action="index.php">';
+                    echo '<input type="hidden" name="confirmupgrade" value="1" />';
+                    echo '<input type="hidden" name="confirmrelease" value="1" />';
+                    echo '<div class="continuebutton"><input type="submit" value="'.get_string('continue').'" /></div>';
+                    echo '</form>';
+                }
+
+                print_footer('none');
+                exit;
+
             } else {
                 $strdatabasesuccess  = get_string("databasesuccess");
                 print_header($strdatabasechecking, $stradministration, $strdatabasechecking,
                         "", $linktoscrolltoerrors, false, "&nbsp;", "&nbsp;");
+
             /// return to original debugging level
                 $CFG->debug = $origdebug;
                 error_reporting($CFG->debug);
                 upgrade_log_start();
+
+            /// Upgrade current language pack if we can
+                upgrade_language_pack();   
+
                 print_heading($strdatabasechecking);
                 $db->debug=true;
             /// Launch the old main upgrade (if exists)
@@ -280,13 +321,9 @@
 /// Updated human-readable release version if necessary
 
     if ($release <> $CFG->release) {  // Update the release version
-        $strcurrentrelease = get_string("currentrelease");
-        print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, "&nbsp;", "&nbsp;");
-        print_heading("Moodle $release");
         if (!set_config("release", $release)) {
-            notify("ERROR: Could not update release version in database!!");
+            error("ERROR: Could not update release version in database!!");
         }
-        notice(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'), 'index.php', 'none');
     }
 
 /// Find and check all main modules and load them up or upgrade them if necessary
@@ -382,7 +419,7 @@
 
 /// Define the unique site ID code if it isn't already
     if (empty($CFG->siteidentifier)) {    // Unique site identification code
-        set_config('siteidentifier', random_string(32));
+        set_config('siteidentifier', random_string(32).$_SERVER['HTTP_HOST']);
     }
 
 /// Check if the guest user exists.  If not, create one.
@@ -451,14 +488,21 @@
         print_spacer(10,10);
     }
 
-    if (ini_get_bool('register_globals') && !ini_get_bool('magic_quotes_gpc')) {
-        print_simple_box(get_string('globalsquoteswarning', 'admin'), 'center', '60%');
+    if (ini_get_bool('register_globals')) {
+        print_simple_box(get_string('globalswarning', 'admin'), 'center', '60%');
     }
 
     if (is_dataroot_insecure()) {
         print_simple_box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'center', '60%');
     }
 
+    if (substr($CFG->wwwroot, -1) == '/') {
+        print_simple_box(get_string('cfgwwwrootslashwarning', 'admin'), 'center', '60%');
+    }
+    if (strpos($ME, $CFG->httpswwwroot.'/') === false) {
+        print_simple_box(get_string('cfgwwwrootwarning', 'admin'), 'center', '60%');
+    }
+
 /// If no recently cron run
     $lastcron = get_field_sql('SELECT max(lastcron) FROM ' . $CFG->prefix . 'modules');
     if (time() - $lastcron > 3600 * 24) {
@@ -511,15 +555,6 @@
         echo '</div>';
     }
 
-
-    if (optional_param('dbmigrate')) {               // ??? Is this actually used?
-        print_simple_box_start('center','60%');
-        require_once($CFG->dirroot.'/'.$CFG->admin.'/utfdbmigrate.php');
-        db_migrate2utf8();
-        print_simple_box_end();
-    }
-
-
     admin_externalpage_print_footer($adminroot);
 
 

admin/lang.php

@@ -4,6 +4,9 @@
     *
     * CHANGES
     *
+    * 2006/11/07 mudrd8mz
+    * Fixed bug MDL-7361. Thanks to Dan Poltawski for the patch proposal.
+    *
     * 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
@@ -133,13 +136,14 @@
 
     // Get a list of all the root files in the English directory
 
+    $langbase = $CFG->dataroot . '/lang';
     $enlangdir = "$CFG->dirroot/lang/en_utf8";
     if ($currentlang == 'en_utf8') {
         $langdir = $enlangdir;
     } else {
-        $langdir = "$CFG->dataroot/lang/$currentlang";
+        $langdir = "$langbase/$currentlang";
     }
-    $locallangdir = "$CFG->dataroot/lang/{$currentlang}_local";
+    $locallangdir = "$langbase/{$currentlang}_local";
 
     if (! $stringfiles = get_directory_list($enlangdir, "", false)) {
         error("Could not find English language pack!");
@@ -256,6 +260,14 @@
 
     } else if ($mode == "compare") {
    
+        if (!file_exists($langbase) ){
+            if (!lang_make_directory($langbase) ){
+                error('ERROR: Could not create base lang directory ' . $langbase);
+            } else {
+                echo '<div class="notifysuccess" align="center">Created directory '.
+                                                     $langbase .'</div>'."<br />\n";
+            }
+        } 
         if (!$uselocal && !file_exists($langdir)) {
             if (!lang_make_directory($langdir)) {
                 error('ERROR: Could not create directory '.$langdir);
@@ -573,7 +585,7 @@ function lang_fix_value_from_file($value='') {
  * Try and create a new language directory.
  *
  * @uses $CFG
- * @param string $directory  directory name under $CFG->dataroot/lang eg cs_utf8_local
+ * @param string $directory full path to the directory under $langbase
  * @return string|false Returns full path to directory if successful, false if not
  */
 function lang_make_directory($dir, $shownotices=true) {

admin/modules.php

@@ -168,7 +168,7 @@
             $settings = "";
         }
 
-        $count = count_records("$module->name");
+        $count = count_records_select("$module->name",'course<>0');
 
         if ($module->visible) {
             $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=$USER->sesskey\" title=\"$strhide\">".

admin/oacleanup.php

@@ -46,7 +46,7 @@ function online_assignment_cleanup($output=false) {
 
 
     /// get a list of all courses on this site
-    $courses = get_courses();
+    $courses = get_records('course');
 
     /// cycle through each course
     foreach ($courses as $course) {

admin/register.php

@@ -24,7 +24,7 @@
     }
 
     if (empty($CFG->siteidentifier)) {    // Unique site identification code
-        set_config('siteidentifier', random_string(32));
+        set_config('siteidentifier', random_string(32).$_SERVER['HTTP_HOST']);
     }
 
 

admin/report/courseoverview/index.php

@@ -31,9 +31,9 @@
 
     $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');
+    $earliestday = get_field_sql('SELECT timeend FROM '.$tableprefix.'daily ORDER BY timeend');
+    $earliestweek = get_field_sql('SELECT timeend FROM '.$tableprefix.'weekly ORDER BY timeend');
+    $earliestmonth = get_field_sql('SELECT timeend FROM '.$tableprefix.'monthly ORDER BY timeend');
 
     if (empty($earliestday)) $earliestday = time();
     if (empty($earliestweek)) $earliestweek = time();
@@ -66,24 +66,27 @@
         $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
 
         if (!empty($param->sql)) {
-            $sql = $param->sql ." LIMIT ".$numcourses;
+            $sql = $param->sql;
         } else {
             $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
                 ." WHERE timeend >= ".$param->timeafter.' AND stattype = \'activity\''
                 ." GROUP BY courseid "
                 .$param->extras
-                ." ORDER BY ".$param->orderby
-                ." LIMIT ".$numcourses;
+                ." ORDER BY ".$param->orderby;
         }
         error_log($sql);
 
-        $courses = get_records_sql($sql);
+        $courses = get_records_sql($sql, 0, $numcourses);
 
         if (empty($courses)) {
             notify(get_string('statsnodata'));
 
         } else {
-            echo '<div align="center"><img src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></div>';
+            if (empty($CFG->gdversion)) {
+                echo '<div align="center">(' . get_string("gdneed") .')</div>';
+            } else {
+                echo '<div align="center"><img src="'.$CFG->wwwroot.'/'.$CFG->admin.'/report/courseoverview/reportsgraph.php?time='.$time.'&report='.$report.'&numcourses='.$numcourses.'" /></div>';
+            }
 
             $table = new StdClass;
             $table->align = array('left','center','center','center');

admin/report/courseoverview/reportsgraph.php

@@ -17,17 +17,16 @@
     $param = stats_get_parameters($time,$report,SITEID,STATS_MODE_RANKED);
 
     if (!empty($param->sql)) {
-        $sql = $param->sql ." LIMIT ".$numcourses;
+        $sql = $param->sql;
     } else {
         $sql = "SELECT courseid,".$param->fields." FROM ".$CFG->prefix.'stats_'.$param->table
             ." WHERE timeend >= ".$param->timeafter.' AND stattype = \'activity\''
             ." GROUP BY courseid "
             .$param->extras
-            ." ORDER BY ".$param->orderby
-            ." LIMIT ".$numcourses;
+            ." ORDER BY ".$param->orderby;
     }
 
-    $courses = get_records_sql($sql);
+    $courses = get_records_sql($sql, 0, $numcourses);
 
     if (empty($courses)) {
         error(get_string('statsnodata'),$CFG->wwwroot.'/'.$CFG->admin.'/report/course/index.php');
@@ -40,6 +39,8 @@
     $graph->parameter['legend_size'] = 10;
     $graph->parameter['x_axis_angle'] = 90;
     $graph->parameter['title'] = false; // moodle will do a nicer job.
+    $graph->y_tick_labels = null;
+    $graph->offset_relation = null;
     if ($report != STATS_REPORT_ACTIVE_COURSES) {
         $graph->parameter['y_decimal_left'] = 2;
     }

admin/report/stats/index.php

@@ -67,7 +67,7 @@
 //             $strstats";
 
 //    print_header("$course->shortname: $strstats", "$course->fullname",
-//                  $crumb, '', '', true, '&nbsp', $menu);
+//                  $crumb, '', '', true, ' ', $menu);
 
 
     require_once($CFG->dirroot.'/course/report/stats/report.php');

admin/roles/assign.html

@@ -23,18 +23,33 @@
                            document.assignform.remove.disabled=false;
                            document.assignform.addselect.selectedIndex=-1;" />
           <?php
-              foreach ($contextusers as $contextuser) {
-                  $fullname = fullname($contextuser, true);
-                  echo "<option value=\"$contextuser->id\">".$fullname.", ".$contextuser->email."</option>\n";
-              }
+            $i = 0;
+            foreach ($contextusers as $contextuser) {
+                $fullname = fullname($contextuser, true);
+                if ($contextuser->hidden) {
+                    $hidden=' ('.get_string('hiddenassign').') ';
+                } else {
+                    $hidden="";
+                }
+                echo "<option value=\"$contextuser->id\">".$fullname.", ".$contextuser->email.$hidden."</option>\n";
+                $i++;    
+            }
+            if ($i==0) {
+                echo '<option/>'; // empty select breaks xhtml strict
+            }
           ?>
 
           </select></td>
       <td valign="top">
+        <label title="<?php print_string('hiddenassign') ?>">
+            <input type="checkbox" name="hidden" value="1" />
+            <img src="<?php echo $CFG->pixpath; ?>/t/hide.gif" alt="<?php print_string('hiddenassign') ?>" class="hide-show-image" />            <? 
+            helpbutton ('hiddenassign', get_string('hiddenassign'));
+            ?>
+        </label>
         <br />
-        <input name="add" type="submit" id="add" value="&larr;" />
-        <br />
-        <input name="remove" type="submit" id="remove" value="&rarr;" />
+        <input name="add" id="add" type="submit" value="<?php echo '&nbsp;&nbsp;&nbsp;'.$THEME->larrow.'&nbsp;'.get_string('add'); ?>" title="<?php print_string('add'); ?>" /><br />
+        <input name="remove" id="remove" type="submit" value="<?php echo '&nbsp;&nbsp;&nbsp;'.get_string('remove'). '&nbsp;'.$THEME->rarrow.'&nbsp;'; ?>" title="<?php print_string('remove'); ?>" />
         <br />
       </td>
       <td valign="top">
@@ -46,13 +61,11 @@
 
               if (!empty($searchtext)) {
                   echo "<optgroup label=\"$strsearchresults (" . $availableusers->_numOfRows . ")\">\n";
-                  while (! $availableusers->EOF) {
-                      $user = $availableusers->FetchObj();
+                  while ($user = rs_fetch_next_record($availableusers)) {
                       if (!isset($contextusers[$user->id])) {
                           $fullname = fullname($user, true);
                           echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
                       }
-                      $availableusers->MoveNext();
                   }
                   echo "</optgroup>\n";
 
@@ -61,13 +74,11 @@
                       echo '<optgroup label="'.get_string('toomanytoshow').'"><option></option></optgroup>'."\n"
                           .'<optgroup label="'.get_string('trysearching').'"><option></option></optgroup>'."\n";
                   } else {
-                      while (! $availableusers->EOF) {
-                          $user = $availableusers->FetchObj();
+                      while ($user = rs_fetch_next_record($availableusers)) {
                           if (!isset($contextusers[$user->id])) {
                               $fullname = fullname($user, true);
                               echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
                           }
-                          $availableusers->MoveNext();
                       }
                   }
               }

admin/roles/assign.php

@@ -116,7 +116,6 @@
         $adminroot = admin_get_root();
         admin_externalpage_setup('assignroles', $adminroot);
         admin_externalpage_print_header($adminroot);
-        print_heading($straction);
     } else {
         $currenttab = '';
         $tabsmode = 'assign';
@@ -158,8 +157,25 @@
 
         } else if ($remove and !empty($frm->removeselect) and confirm_sesskey()) {
 
+            $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+            $topleveladmin = false;
+   
+            // we only worry about this if the role has doanything capability at site level
+            if ($context->id == $sitecontext->id && $adminroles = get_roles_with_capability('moodle/site:doanything', CAP_ALLOW, $sitecontext)) {
+                foreach ($adminroles as $adminrole) {
+                    if ($adminrole->id == $roleid) {
+                        $topleveladmin = true;
+                    }
+                }
+            }
+ 
             foreach ($frm->removeselect as $removeuser) {
                 $removeuser = clean_param($removeuser, PARAM_INT);
+
+                if ($topleveladmin && ($removeuser == $USER->id)) {   // Prevent unassigning oneself from being admin
+                    continue;
+                }
+
                 if (! role_unassign($roleid, $removeuser, 0, $context->id)) {
                     $errors[] = "Could not remove user with id $removeuser from this role!";
                 } else if ($inmeta) {
@@ -179,12 +195,19 @@
         }
     }
 
+
+    print_heading_with_help(get_string('assignroles', 'role'), 'assignroles');
+
+    if ($context->contextlevel==CONTEXT_SYSTEM) {
+        print_simple_box(get_string('globalroleswarning', 'role'));
+    }
+
     if ($roleid) {        /// prints a form to swap roles
 
     /// Get all existing participants in this context.
         // Why is this not done with get_users???
 
-        if (!$contextusers = get_role_users($roleid, $context, false, 'u.id, u.firstname, u.lastname, u.email')) {
+        if (!$contextusers = get_role_users($roleid, $context, false, 'u.id, u.firstname, u.lastname, u.email, r.hidden')) {
             $contextusers = array();
         }
 
@@ -243,14 +266,15 @@
         $table->tablealign = 'center';
         $table->cellpadding = 5;
         $table->cellspacing = 0;
-        $table->width = '20%';
-        $table->head = array(get_string('roles', 'role'), get_string('users'));
-        $table->wrap = array('nowrap', 'nowrap');
-        $table->align = array('right', 'center');
+        $table->width = '60%';
+        $table->head = array(get_string('roles', 'role'), get_string('description'), get_string('users'));
+        $table->wrap = array('nowrap', '', 'nowrap');
+        $table->align = array('right', 'left', 'center');
 
         foreach ($assignableroles as $roleid => $rolename) {
             $countusers = count_role_users($roleid, $context);
-            $table->data[] = array('<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$rolename.'</a>', $countusers);
+            $description = format_string(get_field('role', 'description', 'id', $roleid));
+            $table->data[] = array('<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$rolename.'</a>',$description, $countusers);
         }
 
         print_table($table);

admin/roles/manage.html

@@ -52,17 +52,24 @@
 </tr>
 </table>
 
-<?php print_heading(get_string('permissions','role')) ?>
+<?php
+    print_heading_with_help(get_string('permissions','role'), 'permissions');
+
+    $strinherit = get_string('inherit','role');
+    $strallow = get_string('allow','role');
+    $strprevent = get_string('prevent','role');
+    $strprohibit = get_string('prohibit','role');
+?>
 
 <table class="rolecap" align="center">
 
 <tr>
 <th class="name" align="left"><?php print_string('capability','role') ?></th>
-<th class="inherit"><?php print_string('inherit','role') ?></th>
-<th class="allow"><?php print_string('allow','role') ?></th>
-<th class="prevent"><?php print_string('prevent','role') ?></th>
-<th class="prohibit"><?php print_string('prohibit','role') ?></th>
-<th class="risk"><?php print_string('risks','role') ?></th>
+<th class="inherit"><?php p($strinherit); ?></th>
+<th class="allow"><?php p($strallow); ?></th>
+<th class="prevent"><?php p($strprevent); ?></th>
+<th class="prohibit"><?php p($strprohibit); ?></th>
+<th class="risk" colspan="5"><?php print_string('risks','role') ?></th>
 </tr>
 
 <?php
@@ -71,10 +78,13 @@
 $contextlevel = 0;
 $component = '';
 
+$strrisks = s(get_string('risks', 'role'));
+$strcapabilities = s(get_string('capabilities', 'role'));
+
 foreach ($capabilities as $capability) {
     // prints a breaker if component or name or context level
     if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
-        echo ('<tr class="rolecapheading header"><td colspan="6" class="header"><strong>'.
+        echo ('<tr class="rolecapheading header"><td colspan="10" class="header"><strong>'.
                get_component_string($capability->component, $capability->contextlevel).'</strong></td></tr>');
     }
 
@@ -91,42 +101,47 @@ foreach ($capabilities as $capability) {
         $localoverride->permission = $role->{$capability->name};
     }
 
-    $disabled = ($action != 'edit') ? ' disabled="disabled" ' : '';
+    $disabled = ($action != 'edit' and $action != 'add') ? ' disabled="disabled" ' : '';
 
-    $riskinfo = '';
+    $riskinfo = '<td class="risk managetrust">';
     $rowclasses = '';
     if (RISK_MANAGETRUST & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">T</a>';
+        $riskinfo .= '<a target="docspopup" title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">T</a>';
         $rowclasses .= ' riskmanagetrust';
     }
+    $riskinfo .= '</td><td class="risk config">';
     if (RISK_CONFIG & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">C</a>';
+        $riskinfo .= '<a target="docspopup" title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">C</a>';
         $rowclasses .= ' riskconfig';
     }
+    $riskinfo .= '</td><td class="risk xss">';
     if (RISK_XSS & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">X</a>';
+        $riskinfo .= '<a target="docspopup" title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">X</a>';
         $rowclasses .= ' riskxss';
     }
+    $riskinfo .= '</td><td class="risk personal">';
     if (RISK_PERSONAL & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">P</a>';
+        $riskinfo .= '<a target="docspopup" title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">P</a>';
         $rowclasses .= ' riskpersonal';
     }
+    $riskinfo .= '</td><td class="risk spam">';
     if (RISK_SPAM & (int)$capability->riskbitmask) {
-        $riskinfo .= '<a title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">S</a>';
+        $riskinfo .= '<a target="docspopup" title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">S</a>';
         $rowclasses .= ' riskspam';
     }
+    $riskinfo .= '</td>';
 
     ?>
 
         <tr class="rolecap <?php echo $rowclasses; ?>">
-        <td class="name"><span title="<?php echo $capability->name ?>"><?php echo get_capability_string($capability->name); ?></span></td>
-        <td class="inherit"><input type="radio" name="<?php echo $capability->name; ?>" value="<?php echo CAP_INHERIT ?>" <?php if (!isset($localoverride->permission) || $localoverride->permission==CAP_INHERIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="allow"><input type="radio" name="<?php echo $capability->name; ?>" value="<?php echo CAP_ALLOW ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_ALLOW){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="prevent" ><input type="radio" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PREVENT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PREVENT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="prohibit" ><input type="radio" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PROHIBIT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PROHIBIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
-        <td class="risk"><?php 
-            echo $riskinfo; 
-        ?></td>
+        <td class="name"><span class="cap-desc"><a target="docspopup" href="<?php echo $CFG->docroot.'/'.$lang.'/'.$strcapabilities.'/'.$capability->name ?>"><?php echo get_capability_string($capability->name); ?></a><span class="cap-name"><?php echo $capability->name ?></span></label></td>
+        <td class="inherit"><input type="radio" title="<?php p($strinherit); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_INHERIT ?>" <?php if (!isset($localoverride->permission) || $localoverride->permission==CAP_INHERIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="allow"><input type="radio" title="<?php p($strallow); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_ALLOW ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_ALLOW){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="prevent" ><input type="radio" title="<?php p($strprevent); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PREVENT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PREVENT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+        <td class="prohibit" ><input type="radio" title="<?php p($strprohibit); ?>" name="<?php echo $capability->name; ?>" value="<?php echo CAP_PROHIBIT ?>" <?php if (isset($localoverride->permission) && $localoverride->permission==CAP_PROHIBIT){ echo 'checked="checked"'; }?> <?php echo $disabled; ?>/></td>
+
+        <?php echo $riskinfo; ?>
+
         </tr>
 
 <?php } ?>

admin/roles/manage.php

@@ -16,6 +16,7 @@
     $cancel      = optional_param('cancel', 0, PARAM_BOOL);
 
     $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    require_capability('moodle/role:manage', $sitecontext);
 
     if ($cancel) {
         redirect('manage.php');
@@ -171,6 +172,7 @@
                     // update normal role settings
                     $role->id = $roleid;
                     $role->name = $name;
+                    $role->shortname = $shortname;
                     $role->description = $description;
 
                     if (!update_record('role', $role)) {
@@ -223,9 +225,9 @@
             if (array_key_exists($roleid, $roles) and confirm_sesskey()) {
                 $role = $roles[$roleid];
                 if ($role->sortorder + 1 < $rolescount) {
-                    $bellow = $roles[$rolesort[$role->sortorder + 1]];
+                    $below = $roles[$rolesort[$role->sortorder + 1]];
 
-                    if (!switch_roles($role, $bellow)) {
+                    if (!switch_roles($role, $below)) {
                         error("Cannot move role with ID $roleid");
                     }
                 }
@@ -280,13 +282,13 @@
 
         switch ($action) {
             case 'add':
-                print_heading(get_string('addrole', 'role'));
+                print_heading_with_help(get_string('addrole', 'role'), 'roles');
                 break;
             case 'view':
-                print_heading(get_string('viewrole', 'role'));
+                print_heading_with_help(get_string('viewrole', 'role'), 'roles');
                 break;
             case 'edit':
-                print_heading(get_string('editrole', 'role'));
+                print_heading_with_help(get_string('editrole', 'role'), 'roles');
                 break;
         }
 
@@ -317,6 +319,8 @@
 
     } else {
 
+        print_heading_with_help(get_string('roles', 'role'), 'roles');
+
         $table = new object;
 
         $table->tablealign = 'center';

admin/roles/managetabs.php

@@ -1,7 +1,7 @@
 <?php
 // this page deals with the 2 tabs for manage.php and grant.php
 
-    $toprow[] = new tabobject('manage', $CFG->wwwroot.'/'.$CFG->admin.'/roles/manage.php', get_string('manageroles', 'role'));
+    $toprow[] = new tabobject('manage', $CFG->wwwroot.'/'.$CFG->admin.'/roles/manage.php', get_string('manageroles', 'role'),'', true);
 
     $toprow[] = new tabobject('allowassign', $CFG->wwwroot.'/'.$CFG->admin.'/roles/allowassign.php', get_string('allowassign', 'role'));
 

admin/roles/override.html

@@ -1,3 +1,10 @@
+<?php
+    $strinherit = get_string('inherit','role');
+    $strallow = get_string('allow','role');
+    $strprevent = get_string('prevent','role');
+    $strprohibit = get_string('prohibit','role');
+?>
+
 <form name="overrideform" action="override.php" method="post">
     <input type="hidden" name="contextid" value="<?php p($contextid) ?>">
     <input type="hidden" name="roleid" value="<?php p($roleid) ?>">
@@ -8,11 +15,11 @@
     <table class="rolecap">
         <tr>
             <th class="name" align="left"><?php print_string('capability','role') ?></th>
-            <th class="inherit"><?php print_string('inherit','role') ?></th>
-            <th class="allow"><?php print_string('allow','role') ?></th>
-            <th class="prevent"><?php print_string('prevent','role') ?></th>
-            <th class="prohibit"><?php print_string('prohibit','role') ?></th>
-            <th class="risk"><?php print_string('risks','role') ?></th>
+            <th class="inherit"><?php p($strinherit); ?></th>
+            <th class="allow"><?php p($strallow); ?></th>
+            <th class="prevent"><?php p($strprevent); ?></th>
+            <th class="prohibit"><?php p($strprohibit); ?></th>
+            <th class="risk" colspan="5"><?php print_string('risks','role') ?></th>
         </tr>
         <?php
 
@@ -20,10 +27,13 @@
         $contextlevel = 0;
         $component = '';
 
+        $strrisks = s(get_string('risks', 'role'));
+        $strcapabilities = s(get_string('capabilities', 'role'));
+
         foreach ($capabilities as $capability) {
         // prints a breaker if component or name or context level
             if ($capability->component != $component or $capability->contextlevel != $contextlevel) {
-                echo ('<tr class="rolecapheading header"><td colspan="6" class="header"><strong>'.get_component_string($capability->component, $capability->contextlevel).'</strong></td></tr>');
+                echo ('<tr class="rolecapheading header"><td colspan="10" class="header"><strong>'.get_component_string($capability->component, $capability->contextlevel).'</strong></td></tr>');
             }
 
             // these 2 are used to see to group same mod/core capabilities together
@@ -49,63 +59,68 @@
 
             $isdisabled = $isprohibit || islegacy($capability->name);
 
-            $riskinfo = '';
+            $riskinfo = '<td class="risk managetrust">';
             $rowclasses = '';
             if (RISK_MANAGETRUST & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">T</a>';
+                $riskinfo .= '<a target="docspopup" title="'.get_string('riskmanagetrust', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">T</a>';
                 $rowclasses .= ' riskmanagetrust';
             }
+            $riskinfo .= '</td><td class="risk config">';
             if (RISK_CONFIG & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">C</a>';
+                $riskinfo .= '<a target="docspopup" title="'.get_string('riskconfig', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">C</a>';
                 $rowclasses .= ' riskconfig';
             }
+            $riskinfo .= '</td><td class="risk xss">';
             if (RISK_XSS & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">X</a>';
+                $riskinfo .= '<a target="docspopup" title="'.get_string('riskxss', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">X</a>';
                 $rowclasses .= ' riskxss';
             }
+            $riskinfo .= '</td><td class="risk personal">';
             if (RISK_PERSONAL & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">P</a>';
+                $riskinfo .= '<a target="docspopup" title="'.get_string('riskpersonal', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">P</a>';
                 $rowclasses .= ' riskpersonal';
             }
+            $riskinfo .= '</td><td class="risk spam">';
             if (RISK_SPAM & (int)$capability->riskbitmask) {
-                $riskinfo .= '<a title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/Risks">S</a>';
+                $riskinfo .= '<a target="docspopup" title="'.get_string('riskspam', 'admin').'" href="'.$CFG->docroot.'/'.$lang.'/'.$strrisks.'">S</a>';
                 $rowclasses .= ' riskspam';
             }
+            $riskinfo .= '</td>';
 
 
         ?>
 
         <tr class="rolecap <?php echo $rowclasses; ?>">
-          <td class="name"><?php echo get_capability_string($capability->name); ?></td>
+          <td class="name"><span class="cap-desc"><a target="docspopup" href="<?php echo $CFG->docroot.'/'.$lang.'/'.$strcapabilities.'/'.$capability->name ?>"><?php echo get_capability_string($capability->name); ?></a><span class="cap-name"><?php echo $capability->name ?></span></label></td>
 
              <td class="inherit">
-             <input type="radio" name="<?php echo $capability->name; ?>" value="0"
+             <input type="radio" title="<?php p($strinherit); ?>" name="<?php echo $capability->name; ?>" value="0"
                 <?php
                     if ($localpermission == CAP_INHERIT) {echo 'checked="checked"';}
                     if ($isdisabled)           {echo 'disabled="disabled"';}?> />
              </td>
 
-             <td class="inherit <?php if ($isallow) {echo ' capcurrent';} ?>">
-             <input type="radio" name="<?php echo $capability->name; ?>"
+             <td class="allow <?php if ($isallow) {echo ' capcurrent';} ?>">
+             <input type="radio" title="<?php p($strallow); ?>" name="<?php echo $capability->name; ?>"
                 <?php echo ' value="'.CAP_ALLOW.'"';
                    if ($localpermission == CAP_ALLOW) {echo ' checked="checked"';}
                    if ($isdisabled)                   {echo ' disabled="disabled"';}?> />
              </td>
 
              <td class="prevent <?php if ($isprevent) {echo ' capcurrent';} ?>">
-             <input type="radio" name="<?php echo $capability->name; ?>"
+             <input type="radio" title="<?php p($strprevent); ?>" name="<?php echo $capability->name; ?>"
                 <?php echo ' value="'.CAP_PREVENT.'"';
                    if ($localpermission == CAP_PREVENT) {echo ' checked="checked"';}
                    if ($isdisabled)                     {echo ' disabled="disabled"';}?> />
              </td>
 
              <td class="prohibit <?php if ($isprohibit) {echo ' capcurrent';} ?>">
-             <input type="radio" name="<?php echo $capability->name; ?>"
+             <input type="radio" title="<?php p($strprohibit); ?>" name="<?php echo $capability->name; ?>"
                 <?php echo ' value="'.CAP_PROHIBIT.'"';
                    if ($localpermission == CAP_PROHIBIT) {echo ' checked="checked"';}
                    if ($isdisabled)                      {echo ' disabled="disabled"';}?> />
              </td>
-             <td class="risk"><?php echo $riskinfo; ?></td>
+            <?php echo $riskinfo; ?>
         </tr>
 
         <?php } ?>

admin/roles/override.php

@@ -141,6 +141,7 @@
         include_once('tabs.php');
     }
 
+    print_heading_with_help(get_string('overrides', 'role'), 'overrides');
 
     $overridableroles = get_overridable_roles($context);
 
@@ -188,15 +189,16 @@
         $table->tablealign = 'center';
         $table->cellpadding = 5;
         $table->cellspacing = 0;
-        $table->width = '20%';
-        $table->head = array(get_string('roles', 'role'), get_string('overrides', 'role'));
-        $table->wrap = array('nowrap', 'nowrap');
-        $table->align = array('right', 'center');
+        $table->width = '60%';
+        $table->head = array(get_string('roles', 'role'), get_string('description'), get_string('overrides', 'role'));
+        $table->wrap = array('nowrap', '', 'nowrap');
+        $table->align = array('right', 'left', 'center');
 
         foreach ($overridableroles as $roleid => $rolename) {
             $countusers = 0;
             $overridecount = count_records_select('role_capabilities', "roleid = $roleid AND contextid = $context->id");
-            $table->data[] = array('<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$rolename.'</a>', $overridecount);
+            $description = format_string(get_field('role', 'description', 'id', $roleid));
+            $table->data[] = array('<a href="'.$baseurl.'&amp;roleid='.$roleid.'">'.$rolename.'</a>', $description, $overridecount);
         }
 
         print_table($table);

admin/search.php

@@ -13,43 +13,50 @@ admin_externalpage_setup('search', $adminroot); // now hidden page
 $CFG->adminsearchquery = $query;  // So we can reference it in search boxes later in this invocation
 
 
-$resultshtml = search_settings_html(admin_get_root(), $query);
-
 // now we'll deal with the case that the admin has submitted the form with changed settings
+
+$statusmsg = '';
+
 if ($data = data_submitted()) {
-    $data = (array)$data;
+    $unslashed = (array)stripslashes_recursive($data);
     if (confirm_sesskey()) {
+        $olddbsessions = !empty($CFG->dbsessions);
         $changedsettings = search_settings(admin_get_root(), $query);
         $errors = '';
 
         foreach($changedsettings as $changedsetting) {
-            if (isset($data['s_' . $changedsetting->name])) {
-                $errors .= $changedsetting->write_setting($data['s_' . $changedsetting->name]);
-            } else {
-                $errors .= $changedsetting->write_setting($changedsetting->defaultsetting);
+            if (!isset($unslashed['s_' . $changedsetting->name])) {
+                $unslashed['s_' . $changedsetting->name] = ''; // needed for checkboxes
             }
+            $errors .= $changedsetting->write_setting($unslashed['s_' . $changedsetting->name]);
+        }
+
+        if ($olddbsessions != !empty($CFG->dbsessions)) {
+            require_logout();
         }
 
         if (empty($errors)) {
-            // there must be either redirect without message or continue button or else upgrade would be sometimes broken
-            redirect($CFG->wwwroot . '/' . $CFG->admin . '/search.php?query=' . $query);
-            die;
+            $statusmsg = get_string('changessaved');
         } else {
-            error(get_string('errorwithsettings', 'admin') . ' <br />' . $errors);
-            die;
+            $statusmsg = get_string('errorwithsettings', 'admin') . ' <br />' . $errors;
         }
     } else {
         error(get_string('confirmsesskeybad', 'error'));
-        die;
     }
-
+    // now update $SITE - it might have been changed
+    $SITE = get_record('course', 'id', $SITE->id);
+    $COURSE = clone($SITE);
 }
 
 // and finally, if we get here, then there are matching settings and we have to print a form
 // to modify them
 admin_externalpage_print_header($adminroot);
 
-// print_simple_box(get_string('upgradesettingsintro','admin'),'','100%','',5,'generalbox','');
+if ($statusmsg != '') {
+    notify ($statusmsg);
+}
+
+$resultshtml = search_settings_html(admin_get_root(), $query);
 
 echo '<form action="search.php" method="post" name="adminsettings" id="adminsettings">';
 echo '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
@@ -62,6 +69,7 @@ if ($resultshtml != '') {
 } else {
     echo get_string('noresults','admin');
 }
+echo '</fieldset>';
 echo '</form>';
 
 admin_externalpage_print_footer($adminroot);

admin/settings.php

@@ -49,12 +49,17 @@ if (!($root->check_access())) {
 
 $CFG->pagepath = 'admin/setting/'.$section;
 
-// WRITING SUBMITTED DATA (IF ANY) -------------------------------------------------------------------------------
+
+
+/// WRITING SUBMITTED DATA (IF ANY) -------------------------------------------------------------------------------
+
+$statusmsg = '';
 
 if ($data = data_submitted()) {
     if (confirm_sesskey()) {
         $olddbsessions = !empty($CFG->dbsessions);
-        $errors = $root->write_settings((array)$data);
+        $unslashed = (array)stripslashes_recursive($data);
+        $errors = $root->write_settings($unslashed);
         //force logout if dbsession setting changes
         if ($olddbsessions != !empty($CFG->dbsessions)) {
             require_logout();
@@ -66,22 +71,22 @@ if ($data = data_submitted()) {
                 case 'admin':
                     redirect("$CFG->wwwroot/$CFG->admin/");
                 default:
-                    // following redirect should display confirmation message because it redirects
-                    // to the same page, user might not know if save button worked
-                    redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=" . $PAGE->section, get_string('changessaved'),2);
+                    $statusmsg = get_string('changessaved');
             }
         } else {
-            error(get_string('errorwithsettings', 'admin') . ' <br />' . $errors);
+            $statusmsg = get_string('errorwithsettings', 'admin') . ' <br />' . $errors;
         }
     } else {
         error(get_string('confirmsesskeybad', 'error'));
-        die;
     }
+    // now update $SITE - it might have been changed
+    $SITE = get_record('course', 'id', $SITE->id);
+    $COURSE = clone($SITE);
 }
 
-// ---------------------------------------------------------------------------------------------------------------
-
 
+/// print header stuff ------------------------------------------------------------
+// header must be printed after the redirects and require_logout
 if (!empty($SITE->fullname)) {
     $pageblocks = blocks_setup($PAGE);
 
@@ -90,7 +95,6 @@ if (!empty($SITE->fullname)) {
     $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]),
                                             BLOCK_R_MAX_WIDTH);
 
-    // print header stuff
     $PAGE->print_header();
 
     echo '<table id="layout-table"><tr>';
@@ -105,6 +109,12 @@ if (!empty($SITE->fullname)) {
 
 }
 
+if ($statusmsg != '') {
+    notify ($statusmsg);
+}
+
+// ---------------------------------------------------------------------------------------------------------------
+
 echo '<form action="settings.php" method="post" name="adminsettings" id="adminsettings">';
 echo '<input type="hidden" name="section" value="' . $PAGE->section . '" />';
 echo '<input type="hidden" name="sesskey" value="' . $USER->sesskey . '" />';

admin/settings/appearance.php

@@ -17,8 +17,8 @@ $ADMIN->add('themes', new admin_externalpage('themeselector', get_string('themes
 
 // "frontpage" settingpage
 $temp = new admin_settingpage('frontpage', get_string('frontpage','admin'));
-$temp->add(new admin_setting_sitesettext('fullname', get_string('fullsitename'), '', '', PARAM_NOTAGS));
-$temp->add(new admin_setting_sitesettext('shortname', get_string('shortsitename'), '', PARAM_NOTAGS));
+$temp->add(new admin_setting_sitesettext('fullname', get_string('fullsitename'), '', ''));
+$temp->add(new admin_setting_sitesettext('shortname', get_string('shortsitename'), '', ''));
 $temp->add(new admin_setting_special_frontpagedesc());
 $temp->add(new admin_setting_courselist_frontpage(false)); // non-loggedin version of the setting (that's what the parameter is for :) )
 $temp->add(new admin_setting_courselist_frontpage(true)); // loggedin version of the setting
@@ -118,6 +118,16 @@ $temp = new admin_settingpage('mymoodle', get_string('mymoodle', 'admin'));
 $temp->add(new admin_setting_configcheckbox('mymoodleredirect', get_string('mymoodleredirect', 'admin'), get_string('configmymoodleredirect', 'admin'), 0));
 $ADMIN->add('appearance', $temp);
 
+// new CFG variable for gradebook (what roles to display)
+$temp = new admin_settingpage('gradebook', get_string('gradebook', 'admin'));
+$temp->add(new admin_setting_special_gradebookroles());
+$ADMIN->add('appearance', $temp);
+
+// new CFG variable for coursemanager (what roles to display)
+$temp = new admin_settingpage('coursemanager', get_string('coursemanager', 'admin'));
+$temp->add(new admin_setting_special_coursemanager());
+$ADMIN->add('appearance', $temp);
+
 $ADMIN->add('appearance', new admin_externalpage('stickyblocks', get_string('stickyblocks', 'admin'), "$CFG->wwwroot/$CFG->admin/stickyblocks.php"));
 
 ?>

admin/settings/location.php

@@ -5,7 +5,6 @@ $temp = new admin_settingpage('locationsettings', get_string('locationsettings',
 $options = get_list_of_timezones();
 $options[99] = get_string('serverlocaltime');
 $temp->add(new admin_setting_configselect('timezone', get_string('timezone','admin'), get_string('configtimezone', 'admin'), 99, $options));
-$options = get_list_of_timezones();
 $options[99] = get_string('timezonenotforced', 'admin');
 $temp->add(new admin_setting_configselect('forcetimezone', get_string('forcetimezone', 'admin'), get_string('helpforcetimezone', 'admin'), 99, $options));
 $options = get_list_of_countries();

admin/settings/misc.php

@@ -1,9 +1,17 @@
 <?php // $Id$
 
-// * Miscellaneous settings (still to be sorted)
+// * Miscellaneous settings
 
+// Experimental settings page
+$temp = new admin_settingpage('experimental', get_string('experimental', 'admin'));
+$temp->add(new admin_setting_configcheckbox('enableajax', get_string('enableajax', 'admin'), get_string('configenableajax', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('enableglobalsearch', get_string('enableglobalsearch', 'admin'), get_string('configenableglobalsearch', 'admin'), 0));
+$ADMIN->add('misc', $temp);
+
+// XMLDB editor
 $ADMIN->add('misc', new admin_externalpage('xmldbeditor', get_string('xmldbeditor'), "$CFG->wwwroot/$CFG->admin/xmldb/"));
 
+
 // hidden scripts linked from elsewhere
 $ADMIN->add('misc', new admin_externalpage('oacleanup', 'Online Assignment Cleanup', $CFG->wwwroot.'/'.$CFG->admin.'/oacleanup.php', 'moodle/site:config', true));
 $ADMIN->add('misc', new admin_externalpage('upgradeforumread', 'Upgrade forum', $CFG->wwwroot.'/'.$CFG->admin.'/upgradeforumread.php', 'moodle/site:config', true));

admin/settings/security.php

@@ -6,7 +6,7 @@
 $temp = new admin_settingpage('sitepolicies', get_string('sitepolicies', 'admin'));
 $temp->add(new admin_setting_configcheckbox('protectusernames', get_string('protectusernames', 'admin'), get_string('configprotectusernames', 'admin'), 1));
 $temp->add(new admin_setting_configcheckbox('forcelogin', get_string('forcelogin', 'admin'), get_string('configforcelogin', 'admin'), 0));
-$temp->add(new admin_setting_configcheckbox('forceloginforprofiles', get_string('forceloginforprofiles', 'admin'), get_string('configforceloginforprofiles', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('forceloginforprofiles', get_string('forceloginforprofiles', 'admin'), get_string('configforceloginforprofiles', 'admin'), 1));
 $temp->add(new admin_setting_configcheckbox('opentogoogle', get_string('opentogoogle', 'admin'), get_string('configopentogoogle', 'admin'), 0));
 $temp->add(new admin_setting_configtext('maxbytes', get_string('maxbytes', 'admin'), get_string('configmaxbytes', 'admin'), 0, PARAM_INT));
 $temp->add(new admin_setting_configcheckbox('messaging', get_string('messaging', 'admin'), get_string('configmessaging','admin'), 1));
@@ -32,6 +32,7 @@ $temp->add(new admin_setting_configselect('bloglevel', get_string('bloglevel', '
                                                                                                                                           2 => get_string('groupblogs','blog'),
                                                                                                                                           1 => get_string('personalblogs','blog'),
                                                                                                                                           0 => get_string('disableblogs','blog'))));
+$temp->add(new admin_setting_configcheckbox('profilesforenrolledusersonly', get_string('profilesforenrolledusersonly','admin'),get_string('configprofilesforenrolledusersonly', 'admin'),'1'));
 
 $ADMIN->add('security', $temp);
 
@@ -87,8 +88,8 @@ $ADMIN->add('security', $temp);
 // "antivirus" settingpage
 $temp = new admin_settingpage('antivirus', get_string('antivirus', 'admin'));
 $temp->add(new admin_setting_configcheckbox('runclamonupload', get_string('runclamavonupload', 'admin'), get_string('configrunclamavonupload', 'admin'), 0));
-$temp->add(new admin_setting_configtext('pathtoclam', get_string('pathtoclam', 'admin'), get_string('configpathtoclam', 'admin'), '', PARAM_PATH));
-$temp->add(new admin_setting_configtext('quarantinedir', get_string('quarantinedir', 'admin'), get_string('configquarantinedir', 'admin'), '', PARAM_PATH));
+$temp->add(new admin_setting_configtext('pathtoclam', get_string('pathtoclam', 'admin'), get_string('configpathtoclam', 'admin'), '', PARAM_RAW)); // TODO: add path validation
+$temp->add(new admin_setting_configtext('quarantinedir', get_string('quarantinedir', 'admin'), get_string('configquarantinedir', 'admin'), '', PARAM_RAW)); // TODO: add path validation
 $temp->add(new admin_setting_configselect('clamfailureonupload', get_string('clamfailureonupload', 'admin'), get_string('configclamfailureonupload', 'admin'), 'donothing', array('donothing' => get_string('configclamdonothing', 'admin'),
                                                                                                                                                                                   'actlikevirus' => get_string('configclamactlikevirus', 'admin'))));
 $ADMIN->add('security', $temp);

admin/settings/server.php

@@ -7,10 +7,10 @@ $temp = new admin_settingpage('systempaths', get_string('systempaths','admin'));
 $temp->add(new admin_setting_configselect('gdversion', get_string('gdversion','admin'), get_string('configgdversion', 'admin'), check_gd_version(), array('0' => get_string('gdnot'),
                                                                                                                                                           '1' => get_string('gd1'),
                                                                                                                                                           '2' => get_string('gd2'))));
-$temp->add(new admin_setting_configtext('zip', get_string('pathtozip','admin'), get_string('configzip', 'admin'), '', PARAM_PATH));
-$temp->add(new admin_setting_configtext('unzip', get_string('pathtounzip','admin'), get_string('configunzip', 'admin'), '', PARAM_PATH));
-$temp->add(new admin_setting_configtext('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'), '', PARAM_PATH));
-$temp->add(new admin_setting_configtext('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'), '', PARAM_PATH));
+$temp->add(new admin_setting_configtext('zip', get_string('pathtozip','admin'), get_string('configzip', 'admin'), '', PARAM_RAW)); // TODO: add path validation
+$temp->add(new admin_setting_configtext('unzip', get_string('pathtounzip','admin'), get_string('configunzip', 'admin'), '', PARAM_RAW)); // TODO: add path validation
+$temp->add(new admin_setting_configtext('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'), '', PARAM_RAW)); // TODO: add path validation
+$temp->add(new admin_setting_configtext('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'), '', PARAM_RAW)); // TODO: add path validation
 $ADMIN->add('server', $temp, 0);
 
 
@@ -175,6 +175,11 @@ $ADMIN->add('server', new admin_externalpage('environment', get_string('environm
 $ADMIN->add('server', new admin_externalpage('phpinfo', get_string('phpinfo'), "$CFG->wwwroot/$CFG->admin/phpinfo.php"));
 
 
+// "performance" settingpage
+$temp = new admin_settingpage('performance', get_string('performance', 'admin'));
+$temp->add(new admin_setting_configcheckbox('enablerecordcache', get_string('enablerecordcache', 'admin'), get_string('configenablerecordcache', 'admin'), 1));
+$ADMIN->add('server', $temp);
+
 if (file_exists("$CFG->dirroot/$CFG->admin/mysql/frame.php")) {
     $ADMIN->add('server', new admin_externalpage('database', get_string('managedatabase'), "$CFG->wwwroot/$CFG->admin/mysql/frame.php"));
 }

admin/settings/top.php

@@ -28,7 +28,12 @@ $ADMIN->add('root', new admin_category('appearance', get_string('appearance','ad
 $ADMIN->add('root', new admin_category('server', get_string('server','admin')));
 
 $ADMIN->add('root', new admin_category('reports', get_string('reports')));
-foreach(get_list_of_plugins('admin/report') as $plugin) {
+foreach (get_list_of_plugins('admin/report') as $plugin) {
+/// This snippet is temporary until simpletest can be fixed to use xmldb.   See MDL-7377   XXX TODO
+    if ($plugin == 'simpletest' && $CFG->dbtype != 'mysql' && $CFG->dbtype != 'postgres7') {
+        continue;
+    }
+/// End of removable snippet
     $ADMIN->add('reports', new admin_externalpage('report'.$plugin, get_string($plugin, 'admin'), "$CFG->wwwroot/$CFG->admin/report/$plugin/index.php"));
 }
 

admin/settings/users.php

@@ -16,7 +16,8 @@ $ADMIN->add('accounts', new admin_externalpage('uploadusers', get_string('upload
 // stuff under the "roles" subcategory
 $ADMIN->add('users', new admin_category('roles', get_string('permissions', 'role')));
 $ADMIN->add('roles', new admin_externalpage('defineroles', get_string('defineroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/manage.php"));
-$ADMIN->add('roles', new admin_externalpage('assignroles', get_string('assignroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=" . SITEID));
+$sitecontext = get_context_instance(CONTEXT_SYSTEM);
+$ADMIN->add('roles', new admin_externalpage('assignroles', get_string('assignglobalroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=" . $sitecontext->id));
 
 
 // "userpolicies" settingpage

admin/upgradesettings.php

@@ -24,14 +24,14 @@ if ($newsettingshtml == '') {
 
 // now we'll deal with the case that the admin has submitted the form with new settings
 if ($data = data_submitted()) {
-    $data = (array)$data;
+    $unslashed = (array)stripslashes_recursive($data);
     if (confirm_sesskey()) {
         $newsettings = find_new_settings(admin_get_root());
         $errors = '';
 
         foreach($newsettings as $newsetting) {
-            if (isset($data['s_' . $newsetting->name])) {
-                $errors .= $newsetting->write_setting($data['s_' . $newsetting->name]);
+            if (isset($unslashed['s_' . $newsetting->name])) {
+                $errors .= $newsetting->write_setting($unslashed['s_' . $newsetting->name]);
             } else {
                 $errors .= $newsetting->write_setting($newsetting->defaultsetting);
             }

admin/uploaduser.php

@@ -270,7 +270,6 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                             //This can be used to obtain a list of userids for existing users
                             notify("$olduser->id ".get_string('usernotaddedregistered', 'error', $username));
                             $userserrors++;
-                            continue;
                         }
 
                     } else { // new user
@@ -424,4 +423,3 @@ function my_file_get_contents($filename, $use_include_path = 0) {
 }
 
 ?>
-

admin/user.php

@@ -19,7 +19,7 @@
         redirect('index.php');
     }
 
-    if (!$CFG->rolesactive) {   // No admin user yet.
+    if (empty($CFG->rolesactive)) {   // No admin user yet.
 
         $user = new object();
         $user->firstname    = get_string('admin');
@@ -65,7 +65,7 @@
 
         sesskey();   // For added security, used to check script parameters
 
-        load_user_capability();
+        load_all_capabilities();
 
         redirect("$CFG->wwwroot/user/edit.php?id=$user->id&course=$site->id");  // Edit thyself
         exit;
@@ -86,6 +86,11 @@
         admin_externalpage_setup('editusers', $adminroot);
     }
 
+    if (empty($CFG->loginhttps)) {
+        $securewwwroot = $CFG->wwwroot;
+    } else {
+        $securewwwroot = str_replace('http:','https:',$CFG->wwwroot);
+    }
 
     if ($newuser) {                 // Create a new user
 
@@ -111,7 +116,7 @@
             }
         }
 
-        redirect("$CFG->wwwroot/user/edit.php?id=$user->id&course=$site->id");
+        redirect("$securewwwroot/user/edit.php?id=$user->id&course=$site->id");
 
     } else {                        // List all users for editing
 
@@ -169,7 +174,7 @@
                 $updateuser = new object();
                 $updateuser->id = $user->id;
                 $updateuser->deleted = 1;
-                $updateuser->username = "$user->email.".time();  // Remember it just in case
+                $updateuser->username = addslashes("$user->email.".time());  // Remember it just in case
                 $updateuser->email = '';               // Clear this field to free it up
                 $updateuser->idnumber = '';               // Clear this field to free it up
                 $updateuser->timemodified = time();
@@ -330,7 +335,7 @@
                 }
 
                 if (has_capability('moodle/user:update', $sitecontext)) {
-                    $editbutton = "<a href=\"../user/edit.php?id=$user->id&amp;course=$site->id\">$stredit</a>";
+                    $editbutton = "<a href=\"$securewwwroot/user/edit.php?id=$user->id&amp;course=$site->id\">$stredit</a>";
                     if ($user->confirmed == 0) {
                         $confirmbutton = "<a href=\"user.php?confirmuser=$user->id&amp;sesskey=$USER->sesskey\">" . get_string('confirm') . "</a>";
                     } else {

admin/utfdbmigrate.php

@@ -594,8 +594,8 @@ function db_migrate2utf8(){   //Eloy: Perhaps some type of limit parameter here
                          * 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)) {
+                            $SQL = 'SELECT * FROM '.$prefix.$dbtablename.' ORDER BY id ASC';
+                            if ($records = get_records_sql($SQL, $counter, $recordsetsize)) {
                                 foreach ($records as $record) {
 
                                     //if we are up this far, either no crash, or crash with same table, field name.

admin/xmldb/actions/test/test.class.php

@@ -93,7 +93,7 @@ class test extends XMLDBAction {
         $table->addFieldInfo('type', XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, XMLDB_ENUM, array('single', 'news', 'general', 'social', 'eachuser', 'teacher', 'qanda'), 'general');
         $table->addFieldInfo('name', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, null, null, '');
         $table->addFieldInfo('intro', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, null, null, '');
-        $table->addFieldInfo('logo', XMLDB_TYPE_BINARY, 'big', null, XMLDB_NOTNULL, null, null, null, '');
+        $table->addFieldInfo('logo', XMLDB_TYPE_BINARY, 'big', null, XMLDB_NOTNULL, null, null, null);
         $table->addFieldInfo('assessed', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
         $table->addFieldInfo('assesstimestart', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
         $table->addFieldInfo('assesstimefinish', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
@@ -114,6 +114,8 @@ class test extends XMLDBAction {
         $table->addIndexInfo('course', XMLDB_INDEX_NOTUNIQUE, array('course'));
         $table->addIndexInfo('rsstype', XMLDB_INDEX_UNIQUE, array('rsstype'));
 
+        $table->setComment("This is a test'n drop table. You can drop it safely");
+
     /// Get SQL code and execute it
         $test = new stdClass;
         $test->sql = $table->getCreateTableSQL($CFG->dbtype, $CFG->prefix, true);
@@ -142,8 +144,9 @@ class test extends XMLDBAction {
             $table->addFieldInfo('course', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
             $table->addFieldInfo('name', XMLDB_TYPE_CHAR, '30', null, null, null, null, null, 'Moodle');
             $table->addFieldInfo('secondname', XMLDB_TYPE_CHAR, '30', null, XMLDB_NOTNULL, null, null, null, null);
-            $table->addFieldInfo('intro', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, null, null, null);
-            $table->addFieldInfo('grade', XMLDB_TYPE_NUMBER, '20,10', null, null, null, null, null, '');
+            $table->addFieldInfo('intro', XMLDB_TYPE_TEXT, 'medium', null, XMLDB_NOTNULL, null, null, null, null);
+            $table->addFieldInfo('avatar', XMLDB_TYPE_BINARY, 'medium', null, null, null, null, null, null);
+            $table->addFieldInfo('grade', XMLDB_TYPE_NUMBER, '20,10', null, null, null, null, null);
             $table->addKeyInfo('primary', XMLDB_KEY_PRIMARY, array('id'));
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -181,7 +184,7 @@ class test extends XMLDBAction {
             if (!$test->status) {
                 $test->error = $db->ErrorMsg();
             }
-            $tests['add field'] = $test;
+            $tests['add enum field'] = $test;
         }
 
     /// 5th test. Dropping one complex enum field
@@ -193,7 +196,7 @@ class test extends XMLDBAction {
             if (!$test->status) {
                 $test->error = $db->ErrorMsg();
             }
-            $tests['drop field'] = $test;
+            $tests['drop enum field'] = $test;
         }
 
     /// 6th test. Adding one complex enum field
@@ -208,22 +211,38 @@ class test extends XMLDBAction {
             if (!$test->status) {
                 $test->error = $db->ErrorMsg();
             }
-            $tests['add field again'] = $test;
+            $tests['add enum field again'] = $test;
         }
 
-    /// 7th test. Dropping one complex enum field
+    /// 7th test. Adding one numeric field
+        if ($test->status) {
+        /// Create a new field (numeric)
+            $field = new XMLDBField('onenumber');
+            $field->setAttributes(XMLDB_TYPE_INTEGER, '6', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, 0, 'type');
+        /// Get SQL code and execute it
+            $test = new stdClass;
+            $test->sql = $table->getAddFieldSQL($CFG->dbtype, $CFG->prefix, $field, true);
+            $test->status = add_field($table, $field, false, false);
+            if (!$test->status) {
+                $test->error = $db->ErrorMsg();
+            }
+            $tests['add numeric field'] = $test;
+        }
+
+    /// 8th test. Dropping one complex enum field
         if ($test->status) {
         /// Create a new field with complex specs (enums are good candidates)
+            $field = new XMLDBField('type');
             $test = new stdClass;
             $test->sql = $table->getDropFieldSQL($CFG->dbtype, $CFG->prefix, $field, true);
             $test->status = drop_field($table, $field, false, false);
             if (!$test->status) {
                 $test->error = $db->ErrorMsg();
             }
-            $tests['drop field again'] = $test;
+            $tests['drop enum field again'] = $test;
         }
 
-    /// 8th test. Change the type of one column from integer to varchar
+    /// 9th test. Change the type of one column from integer to varchar
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -238,7 +257,7 @@ class test extends XMLDBAction {
             $tests['change field type (int2char)'] = $test;
         }
 
-    /// 9th test. Change the type of one column from varchar to integer
+    /// 10th test. Change the type of one column from varchar to integer
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -253,12 +272,12 @@ class test extends XMLDBAction {
             $tests['change field type (char2int)'] = $test;
         }
 
-    /// 10th test. Change the type of one column from number to varchar
+    /// 11th test. Change the type of one column from number to varchar
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
             $field = new XMLDBField('grade');
-            $field->setAttributes(XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, null, null, 'test');
+            $field->setAttributes(XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, null, null, "test'n drop");
 
             $test->sql = $table->getAlterFieldSQL($CFG->dbtype, $CFG->prefix, $field, true);
             $test->status = change_field_type($table, $field, false, false);
@@ -268,7 +287,7 @@ class test extends XMLDBAction {
             $tests['change field type (number2char)'] = $test;
         }
 
-    /// 11th test. Change the type of one column from varchar to float
+    /// 12th test. Change the type of one column from varchar to float
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -283,7 +302,7 @@ class test extends XMLDBAction {
             $tests['change field type (char2float)'] = $test;
         }
 
-    /// 12th test. Change the type of one column from float to char
+    /// 13th test. Change the type of one column from float to char
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -298,7 +317,7 @@ class test extends XMLDBAction {
             $tests['change field type (float2char)'] = $test;
         }
 
-    /// 13th test. Change the type of one column from char to number
+    /// 14th test. Change the type of one column from char to number
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -314,7 +333,7 @@ class test extends XMLDBAction {
         }
 
 
-    /// 14th test. Change the precision of one text field
+    /// 15th test. Change the precision of one text field
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -329,7 +348,7 @@ class test extends XMLDBAction {
             $tests['change field precision (text)'] = $test;
         }
 
-    /// 15th test. Change the precision of one char field
+    /// 16th test. Change the precision of one char field
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -344,7 +363,7 @@ class test extends XMLDBAction {
             $tests['change field precision (char)'] = $test;
         }
 
-    /// 16th test. Change the precision of one numeric field
+    /// 17th test. Change the precision of one numeric field
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -359,7 +378,7 @@ class test extends XMLDBAction {
             $tests['change field precision (number)'] = $test;
         }
 
-    /// 17th test. Change the sign of one numeric field to unsigned
+    /// 18th test. Change the sign of one numeric field to unsigned
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -374,7 +393,7 @@ class test extends XMLDBAction {
             $tests['change field sign (unsigned)'] = $test;
         }
 
-    /// 18th test. Change the sign of one numeric field to signed
+    /// 19th test. Change the sign of one numeric field to signed
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -389,7 +408,7 @@ class test extends XMLDBAction {
             $tests['change field sign (signed)'] = $test;
         }
 
-    /// 19th test. Change the nullability of one char field to not null
+    /// 20th test. Change the nullability of one char field to not null
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -404,7 +423,7 @@ class test extends XMLDBAction {
             $tests['change field nullability (not null)'] = $test;
         }
 
-    /// 20th test. Change the nullability of one char field to null
+    /// 21th test. Change the nullability of one char field to null
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -419,7 +438,7 @@ class test extends XMLDBAction {
             $tests['change field nullability (null)'] = $test;
         }
 
-    /// 21th test. Dropping the default of one field
+    /// 22th test. Dropping the default of one field
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -434,7 +453,7 @@ class test extends XMLDBAction {
             $tests['drop field default of NULL field'] = $test;
         }
 
-    /// 22th test. Creating the default for one field
+    /// 23th test. Creating the default for one field
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -449,7 +468,7 @@ class test extends XMLDBAction {
             $tests['add field default of NULL field'] = $test;
         }
 
-    /// 23th test. Creating the default for one field
+    /// 24th test. Creating the default for one field
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -465,7 +484,7 @@ class test extends XMLDBAction {
         }
 
 
-    /// 24th test. Dropping the default of one NOT NULL field
+    /// 25th test. Dropping the default of one NOT NULL field
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -480,7 +499,7 @@ class test extends XMLDBAction {
             $tests['drop field default of NOT NULL field'] = $test;
         }
 
-    /// 25th test. Adding one unique index to the table
+    /// 26th test. Adding one unique index to the table
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -495,7 +514,7 @@ class test extends XMLDBAction {
             $tests['add unique index'] = $test;
         }
 
-    /// 26th test. Adding one not unique index to the table
+    /// 27th test. Adding one not unique index to the table
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -510,7 +529,7 @@ class test extends XMLDBAction {
             $tests['add not unique index'] = $test;
         }
 
-    /// 27th test. Re-add the same index than previous test. Check find_index_name() works.
+    /// 28th test. Re-add the same index than previous test. Check find_index_name() works.
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -529,7 +548,7 @@ class test extends XMLDBAction {
             $tests['check find_index_name()'] = $test;
         }
 
-    /// 28th test. Dropping one index from the table
+    /// 29th test. Dropping one index from the table
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -544,7 +563,7 @@ class test extends XMLDBAction {
             $tests['drop index'] = $test;
         }
 
-    /// 29th test. Adding one unique key to the table
+    /// 30th test. Adding one unique key to the table
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -559,7 +578,7 @@ class test extends XMLDBAction {
             $tests['add unique key'] = $test;
         }
 
-    /// 30th test. Adding one foreign+unique key to the table
+    /// 31th test. Adding one foreign+unique key to the table
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -574,7 +593,7 @@ class test extends XMLDBAction {
             $tests['add foreign+unique key'] = $test;
         }
 
-    /// 31th test. Drop one key
+    /// 32th test. Drop one key
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -589,7 +608,7 @@ class test extends XMLDBAction {
             $tests['drop foreign+unique key'] = $test;
         }
 
-    /// 32th test. Adding one foreign key to the table
+    /// 33th test. Adding one foreign key to the table
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -604,7 +623,7 @@ class test extends XMLDBAction {
             $tests['add foreign key'] = $test;
         }
 
-    /// 33th test. Drop one foreign key
+    /// 34th test. Drop one foreign key
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -619,7 +638,7 @@ class test extends XMLDBAction {
             $tests['drop foreign key'] = $test;
         }
 
-    /// 34th test. Adding one complex enum field
+    /// 35th test. Adding one complex enum field
         if ($test->status) {
         /// Create a new field with complex specs (enums are good candidates)
             $field = new XMLDBField('type');
@@ -634,7 +653,7 @@ class test extends XMLDBAction {
             $tests['add field with enum'] = $test;
         }
 
-    /// 35th test. Dropping the enum of one field
+    /// 36th test. Dropping the enum of one field
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -649,7 +668,7 @@ class test extends XMLDBAction {
             $tests['delete enumlist from one field'] = $test;
         }
 
-    /// 36th test. Creating the enum for one field
+    /// 37th test. Creating the enum for one field
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -663,7 +682,7 @@ class test extends XMLDBAction {
             $tests['add enumlist to one field'] = $test;
         }
 
-    /// 37th test. Renaming one index
+    /// 38th test. Renaming one index
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -678,7 +697,7 @@ class test extends XMLDBAction {
             $tests['rename index (experimental. DO NOT USE IT)'] = $test;
         }
 
-    /// 38th test. Renaming one key
+    /// 39th test. Renaming one key
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -693,7 +712,7 @@ class test extends XMLDBAction {
             $tests['rename key (experimental. DO NOT USE IT)'] = $test;
         }
 
-    /// 39th test. Renaming one field
+    /// 40th test. Renaming one field
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -708,7 +727,7 @@ class test extends XMLDBAction {
             $tests['rename field'] = $test;
         }
 
-    /// 40th test. Renaming one table
+    /// 41th test. Renaming one table
         if ($test->status) {
         /// Get SQL code and execute it
             $test = new stdClass;
@@ -721,7 +740,188 @@ class test extends XMLDBAction {
             $tests['rename table'] = $test;
         }
 
+    /// 42th test. Getting the PK sequence name for one table
+        if ($test->status) {
+            $test = new stdClass;
+            $table->setName('newnameforthetable');
+            $test->sql =  array(find_sequence_name($table));
+            $test->status = find_sequence_name($table);
+            if (!$test->status) {
+                if (!$test->error = $db->ErrorMsg()) { //If no db errors, result is ok. Just the driver doesn't support this
+                    $test->sql = array('not needed for this DB');
+                    $test->status = true;
+                }
+            }
+            $tests['find sequence name'] = $test;
+        }
 
+    /// 43th test. Inserting TEXT contents
+        $textlib = textlib_get_instance();
+        if ($test->status) {
+            $test = new stdClass;
+            $test->status = false;
+            $test->sql = array();
+            $basetext = '日本語 • Русский • Deutsch • English • Español • Français • Italiano • Nederlands • Polski • Português • Svenska • العربية • فارسی 한국어 • עברית • ไทย中文  Ελληνικά • Български • Српски • Українська • Bosanski • Català • Česky • Dansk • Eesti • Simple English • Esperanto • Euskara • Galego • Hrvatski • Ido • Bahasa Indonesia • Íslenska • Lëtzebuergesch • Lietuvių • Magyar • Bahasa Melayu اردو • ئۇيغۇرچه • हिन्दी • नेपाल भाषा मराठी • தமிழ் Հայերեն • Беларуская • Чăваш • Ирон æвзаг • Македонски • Сибирской говор • Afrikaans • Aragonés • Arpitan • Asturianu • Kreyòl Ayisyen • Azərbaycan • Bân-lâm-gú • Basa Banyumasan • Brezhoneg • Corsu • Cymraeg • Deitsch • Føroyskt • Frysk • Furlan • Gaeilge • Gàidhlig • Ilokano • Interlingua • Basa Jawa • Kapampangan • Kernewek • Kurdî  كوردی • Ladino  לאדינו • Latina • Latviešu • Limburgs • Lumbaart • Nedersaksisch • Nouormand • Occitan • O‘zbek • Piemontèis • Plattdüütsch • Ripoarisch • Sámegiella • Scots • Shqip • Sicilianu • Sinugboanon • Srpskohrvatski / Српскохрватски • Basa Sunda • Kiswahili • Tagalog • Tatarça • Walon • Winaray  Авар • Башҡорт • Кыргызча  Монгол • Қазақша • Тоҷикӣ • Удмурт • Armãneashce • Bamanankan • Eald Englisc • Gaelg • Interlingue • Kaszëbsczi • Kongo • Ligure • Lingála • lojban • Malagasy • Malti • Māori • Nāhuatl • Ekakairũ Naoero • Novial • Pangasinán • Tok Pisin • Romani / रोमानी • Rumantsch • Runa Simi • Sardu • Tetun • Türkmen / تركمن / Туркмен • Vèneto • Volapük • Võro • West-Vlaoms • Wollof • Zazaki • Žemaitėška';
+        /// Create one big text (1.500.000 chars)
+            $fulltext = '';
+            for ($i=0; $i<1000; $i++) { //1500 * 1000 chars
+                $fulltext .= $basetext;
+            }
+
+        /// Build the record to insert
+            $rec->intro = addslashes($fulltext);
+            $rec->name = 'texttest';
+        /// Calculate its length
+            $textlen = $textlib->strlen($fulltext, current_charset());
+            if ($rec->id = insert_record('newnameforthetable', $rec)) {
+                if ($new = get_record('newnameforthetable', 'id', $rec->id)) {
+                    delete_records('newnameforthetable', 'id', $new->id);
+                    $newtextlen = $textlib->strlen($new->intro, current_charset());
+                    if ($fulltext === $new->intro) {
+                        $test->sql = array($newtextlen . ' cc. (text) sent and received ok');
+                        $test->status = true;
+                    } else {
+                        $test->error = $db->ErrorMsg();
+                        $test->sql = array($newtextlen . ' cc. (text) transfer failed. Data changed!');
+                        $test->status = false;
+                    }
+                } else {
+                    $test->error = $db->ErrorMsg();
+                }
+            } else {
+                $test->error = $db->ErrorMsg();
+            }
+            $tests['insert record '. $textlen . ' cc. (text)'] = $test;
+        }
+
+    /// 44th test. Inserting BINARY contents
+        if ($test->status) {
+            $test = new stdClass;
+            $test->status = false;
+        /// Build the record to insert
+            $rec->avatar = addslashes($fulltext);
+            $rec->name = 'binarytest';
+        /// Calculate its length
+            $textlen = strlen($fulltext);
+            if ($rec->id = insert_record('newnameforthetable', $rec)) {
+                if ($new = get_record('newnameforthetable', 'id', $rec->id)) {
+                    $newtextlen = strlen($new->avatar);
+                    if ($fulltext === $new->avatar) {
+                        $test->sql = array($newtextlen . ' bytes (binary) sent and received ok');
+                        $test->status = true;
+                    } else {
+                        $test->error = $db->ErrorMsg();
+                        $test->sql = array($newtextlen . ' bytes (binary) transfer failed. Data changed!');
+                        $test->status = false;
+                    }
+                } else {
+                    $test->error = $db->ErrorMsg();
+                }
+            } else {
+                $test->error = $db->ErrorMsg();
+            }
+            $tests['insert record '. $textlen . ' bytes (binary)'] = $test;
+        }
+
+    /// 45th test. update_record with TEXT and BINARY contents
+        if ($test->status) {
+            $test = new stdClass;
+            $test->status = false;
+            $test->sql = array();
+        /// Build the record to insert
+            $rec->intro = addslashes($basetext);
+            $rec->avatar = addslashes($basetext);
+            $rec->name = 'updatelobs';
+        /// Calculate its length
+            $textlen = $textlib->strlen($basetext, current_charset());
+            $imglen = strlen($basetext);
+            if (update_record('newnameforthetable', $rec)) {
+                if ($new = get_record('newnameforthetable', 'id', $rec->id)) {
+                    $newtextlen = $textlib->strlen($new->intro, current_charset());
+                    $newimglen = strlen($new->avatar);
+                    if ($basetext === $new->avatar && $basetext === $new->intro) {
+                        $test->sql = array($newtextlen . ' cc. (text) sent and received ok',
+                                           $newimglen . ' bytes (binary) sent and received ok');
+                        $test->status = true;
+                    } else {
+                        if ($rec->avatar !== $new->avatar) {
+                            $test->error = $db->ErrorMsg();
+                            $test->sql = array($newimglen . ' bytes (binary) transfer failed. Data changed!');
+                            $test->status = false;
+                        } else {
+                            $test->error = $db->ErrorMsg();
+                            $test->sql = array($newtextlen . ' cc. (text) transfer failed. Data changed!');
+                            $test->status = false;
+                        }
+                    }
+                } else {
+                    $test->error = $db->ErrorMsg();
+                }
+            } else {
+                $test->error = $db->ErrorMsg();
+            }
+            $tests['update record '. $textlen . ' cc. (text) and ' . $imglen . ' bytes (binary)'] = $test;
+        }
+
+    /// 46th test. set_field with TEXT contents
+        if ($test->status) {
+            $test = new stdClass;
+            $test->status = false;
+            $test->sql = array();
+        /// Build the record to insert
+            $rec->intro = addslashes($fulltext);
+            $rec->name = 'updatelobs';
+        /// Calculate its length
+            $textlen = $textlib->strlen($fulltext, current_charset());
+            if (set_field('newnameforthetable', 'intro', $rec->intro, 'name', $rec->name)) {
+                if ($new = get_record('newnameforthetable', 'id', $rec->id)) {
+                    $newtextlen = $textlib->strlen($new->intro);
+                    if ($fulltext === $new->intro) {
+                        $test->sql = array($newtextlen . ' cc. (text) sent and received ok');
+                        $test->status = true;
+                    } else {
+                        $test->error = $db->ErrorMsg();
+                        $test->sql = array($newtextlen . ' cc. (text) transfer failed. Data changed!');
+                        $test->status = false;
+                    }
+                } else {
+                    $test->error = $db->ErrorMsg();
+                }
+            } else {
+                $test->error = $db->ErrorMsg();
+            }
+            $tests['set field '. $textlen . ' cc. (text)'] = $test;
+        }
+
+    /// 47th test. set_field with BINARY contents
+        if ($test->status) {
+            $test = new stdClass;
+            $test->status = false;
+            $test->sql = array();
+        /// Build the record to insert
+            $rec->avatar = addslashes($fulltext);
+            $rec->name = 'updatelobs';
+        /// Calculate its length
+            $textlen = strlen($fulltext);
+            if (set_field('newnameforthetable', 'avatar', $rec->avatar, 'name', $rec->name)) {
+                if ($new = get_record('newnameforthetable', 'id', $rec->id)) {
+                    $newtextlen = strlen($new->avatar);
+                    if ($fulltext === $new->avatar) {
+                        $test->sql = array($newtextlen . ' bytes (binary) sent and received ok');
+                        $test->status = true;
+                    } else {
+                        $test->error = $db->ErrorMsg();
+                        $test->sql = array($newtextlen . ' bytes (binary) transfer failed. Data changed!');
+                        $test->status = false;
+                    }
+                } else {
+                    $test->error = $db->ErrorMsg();
+                }
+            } else {
+                $test->error = $db->ErrorMsg();
+            }
+            $tests['set field '. $textlen . ' bytes (binary)'] = $test;
+        }
 
     /// TODO: Check here values of the inserted records to see that everything ha the correct value
 

admin/xmldb/actions/view_reserved_words/view_reserved_words.class.php

@@ -133,7 +133,7 @@ class view_reserved_words extends XMLDBAction {
 
     /// The textarea showing all the reserved words
         $o.= '    <table id="formelements" align="center" cellpadding="5">';
-        $o.= '      <tr><td align="center">' . $this->str['listreservedwords'];
+        $o.= '      <tr><td align="center">' . $this->str['listreservedwords'].'</td></tr>';
         $o.= '      <tr><td><textarea cols="80" rows="32">';
         $o.= s(implode(', ', $reserved_words));
         $o.= '</textarea></td></tr>';

admin/xmldb/actions/view_structure_php/view_structure_php.class.php

@@ -99,7 +99,7 @@ class view_structure_php extends XMLDBAction {
     /// Calculate the popup of commands
         $commands = array('create_table',
                          'drop_table',
-                         'rename_table (not imp!)');
+                         'rename_table');
         foreach ($commands as $command) {
             $popcommands[$command] = str_replace('_', ' ', $command);
         }
@@ -211,7 +211,7 @@ class view_structure_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch create table for ' . $table->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && create_table($table);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && create_table($table);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -249,7 +249,7 @@ class view_structure_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch drop table for ' . $table->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && drop_table($table);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && drop_table($table);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -287,7 +287,7 @@ class view_structure_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch rename table for ' . $table->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && rename_table($table, ' . "'NEWNAMEGOESHERE'" . ');' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && rename_table($table, ' . "'NEWNAMEGOESHERE'" . ');' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;

admin/xmldb/actions/view_table_php/view_table_php.class.php

@@ -119,13 +119,12 @@ class view_table_php extends XMLDBAction {
         $commands = array('Fields',
                          $optionspacer . 'add_field',
                          $optionspacer . 'drop_field',
-                         $optionspacer . 'rename_field (not imp!)',
+                         $optionspacer . 'rename_field',
                          $optionspacer . 'change_field_type',
                          $optionspacer . 'change_field_precision',
                          $optionspacer . 'change_field_unsigned',
                          $optionspacer . 'change_field_notnull',
-                         $optionspacer . 'change_field_sequence (not imp!)',
-                         $optionspacer . 'change_field_enum (not imp!)',
+                         $optionspacer . 'change_field_enum',
                          $optionspacer . 'change_field_default',
                          'Keys',
                          $optionspacer . 'add_key',
@@ -229,6 +228,13 @@ class view_table_php extends XMLDBAction {
                         $o.= $this->str['mustselectonefield'];
                     }
                     break;
+                case 'change_field_enum':
+                    if ($fieldkeyindexinitial == 'f') { //Only if we have got one field
+                        $o.= s($this->change_field_enum_php($structure, $tableparam, $fieldkeyindexparam));
+                    } else {
+                        $o.= $this->str['mustselectonefield'];
+                    }
+                    break;
                 case 'change_field_default':
                     if ($fieldkeyindexinitial == 'f') { //Only if we have got one field
                         $o.= s($this->change_field_default_php($structure, $tableparam, $fieldkeyindexparam));
@@ -330,7 +336,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch add field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && add_field($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && add_field($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -373,7 +379,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch drop field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && drop_field($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && drop_field($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -416,7 +422,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch rename field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && rename_field($table, $field, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && rename_field($table, $field, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -469,7 +475,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch change of type for field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && change_field_type($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && change_field_type($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -519,7 +525,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch change of precision for field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && change_field_precision($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && change_field_precision($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -565,7 +571,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch change of sign for field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && change_field_unsigned($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && change_field_unsigned($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -611,7 +617,54 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch change of nullability for field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && change_field_notnull($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && change_field_notnull($table, $field);' . XMLDB_LINEFEED;
+
+    /// Add standard PHP footer
+        $result .= XMLDB_PHP_FOOTER;
+
+        return $result;
+    }
+
+    /**
+     * This function will generate all the PHP code needed to
+     * change the enum values (check constraint) of one field 
+     * using XMLDB objects and functions
+     *
+     * @param XMLDBStructure structure object containing all the info
+     * @param string table table name
+     * @param string field field name to change its enum
+     */
+    function change_field_enum_php($structure, $table, $field) {
+
+        $result = '';
+    /// Validate if we can do it
+        if (!$table = $structure->getTable($table)) {
+            return false;
+        }
+        if (!$field = $table->getField($field)) {
+            return false;
+        }
+        if ($table->getAllErrors()) {
+            return false;
+        }
+
+    /// Calculate the enum tip text
+        $enum = $field->getEnum() ? implode(', ', $field->getEnumValues()) : 'none';
+
+    /// Add the standard PHP header
+        $result .= XMLDB_PHP_HEADER;
+
+    /// Add contents
+        $result .= XMLDB_LINEFEED;
+        $result .= '    /// Changing list of values (enum) of field ' . $field->getName() . ' on table ' . $table->getName() . ' to ' . $enum . XMLDB_LINEFEED;
+        $result .= '        $table = new XMLDBTable(' . "'" . $table->getName() . "'" . ');' . XMLDB_LINEFEED;
+        $result .= '        $field = new XMLDBField(' . "'" . $field->getName() . "'" . ');' . XMLDB_LINEFEED;
+        $result .= '        $field->setAttributes(' . $field->getPHP(true) . ');' . XMLDB_LINEFEED;
+
+    /// Launch the proper DDL
+        $result .= XMLDB_LINEFEED;
+        $result .= '    /// Launch change of list of values for field ' . $field->getName() . XMLDB_LINEFEED;
+        $result .= '        $result = $result && change_field_enum($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -657,7 +710,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch change of default for field ' . $field->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && change_field_default($table, $field);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && change_field_default($table, $field);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -701,7 +754,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch add key ' . $key->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && add_key($table, $key);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && add_key($table, $key);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -745,7 +798,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch drop key ' . $key->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && drop_key($table, $key);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && drop_key($table, $key);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -776,6 +829,9 @@ class view_table_php extends XMLDBAction {
             return false;
         }
 
+    /// Prepend warning. This function isn't usable!
+        $result .= 'DON\'T USE THIS FUNCTION (IT\'S ONLY EXPERIMENTAL). SOME DBs DON\'T SUPPORT IT!' . XMLDB_LINEFEED . XMLDB_LINEFEED;
+
     /// Add the standard PHP header
         $result .= XMLDB_PHP_HEADER;
 
@@ -789,7 +845,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch rename key ' . $key->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && rename_key($table, $key, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && rename_key($table, $key, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -833,7 +889,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch add index ' . $index->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && add_index($table, $index);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && add_index($table, $index);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -877,7 +933,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch drop index ' . $index->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && drop_index($table, $index);' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && drop_index($table, $index);' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;
@@ -908,6 +964,9 @@ class view_table_php extends XMLDBAction {
             return false;
         }
 
+    /// Prepend warning. This function isn't usable!
+        $result .= 'DON\'T USE THIS FUNCTION (IT\'S ONLY EXPERIMENTAL). SOME DBs DON\'T SUPPORT IT!' . XMLDB_LINEFEED . XMLDB_LINEFEED;
+
     /// Add the standard PHP header
         $result .= XMLDB_PHP_HEADER;
 
@@ -921,7 +980,7 @@ class view_table_php extends XMLDBAction {
     /// Launch the proper DDL
         $result .= XMLDB_LINEFEED;
         $result .= '    /// Launch rename index ' . $index->getName() . XMLDB_LINEFEED;
-        $result .= '        $status = $status && rename_index($table, $index, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
+        $result .= '        $result = $result && rename_index($table, $index, ' . "'" . 'NEWNAMEGOESHERE' . "'" . ');' . XMLDB_LINEFEED;
 
     /// Add standard PHP footer
         $result .= XMLDB_PHP_FOOTER;

admin/xmldb/index.php

@@ -52,6 +52,7 @@
 /// getting "incomplete" objects
     require_once('../../config.php');
     require_once($CFG->libdir.'/adminlib.php');
+    require_once($CFG->libdir.'/ddllib.php'); // Install/upgrade related db functions
     $adminroot = admin_get_root();
     admin_externalpage_setup('xmldbeditor', $adminroot);
 

auth/cas/config.html

@@ -112,7 +112,3 @@
 <?php
     include($CFG->dirroot.'/auth/ldap/config.html');
 ?>
-
-
-
-

auth/cas/forbidden.php

@@ -15,4 +15,3 @@
     print_footer();
     exit;
 ?>
-

auth/cas/login.php

@@ -159,6 +159,8 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
 
             reset_login_count();
 
+            load_all_capabilities();     /// This is what lets the user do anything on the site  :-)
+
             redirect($urltogo);
 
             exit;
@@ -266,6 +268,8 @@ defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
 
         reset_login_count();
 
+        load_all_capabilities();     /// This is what lets the user do anything on the site  :-)
+
         redirect($urltogo);
 
         exit;

auth/db/config.html

@@ -44,7 +44,7 @@
 <tr valign="top" class="required">
     <td align="right">auth_dbtype:</td>
     <td>
-    <?php  $dbtypes = array("access","ado_access", "ado", "ado_mssql", "borland_ibase", "csv", "db2", "fbsql", "firebird", "ibase", "informix72", "informix", "mssql", "mysql", "mysqlt", "oci805", "oci8", "oci8po", "odbc", "odbc_mssql", "odbc_oracle", "oracle", "postgres64", "postgres7", "postgres", "proxy", "sqlanywhere", "sybase", "vfp");
+    <?php  $dbtypes = array("access","ado_access", "ado", "ado_mssql", "borland_ibase", "csv", "db2", "fbsql", "firebird", "ibase", "informix72", "informix", "mssql", "mssql_n", "mysql", "mysqlt", "oci805", "oci8", "oci8po", "odbc", "odbc_mssql", "odbc_oracle", "oracle", "postgres64", "postgres7", "postgres", "proxy", "sqlanywhere", "sybase", "vfp");
        foreach ($dbtypes as $dbtype) {
            $dboptions[$dbtype] = $dbtype;
        }

auth/db/lib.php

@@ -22,7 +22,8 @@ function auth_user_login ($username, $password) {
 
     // Connect to the external database
     $authdb = &ADONewConnection($CFG->auth_dbtype); 
-    $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname); 
+    $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname);
+    $authdb->SetFetchMode(ADODB_FETCH_ASSOC); ///Set Assoc mode always after DB connection
 
     if ($CFG->auth_dbpasstype === 'internal') { 
         // lookup username externally, but resolve
@@ -92,6 +93,7 @@ function auth_get_userinfo($username){
     ADOLoadCode($CFG->auth_dbtype);          
     $authdb = &ADONewConnection();         
     $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname); 
+    $authdb->SetFetchMode(ADODB_FETCH_ASSOC); ///Set Assoc mode always after DB connection
 
     $fields = array("firstname", "lastname", "email", "phone1", "phone2", 
                     "department", "address", "city", "country", "description", 
@@ -101,15 +103,17 @@ function auth_get_userinfo($username){
 
     foreach ($fields as $field) {
         if ($pcfg["field_map_$field"]) {
-            if ($rs = $authdb->Execute("SELECT ".$pcfg["field_map_$field"]." FROM $CFG->auth_dbtable
+            if ($rs = $authdb->Execute("SELECT ".$pcfg["field_map_$field"]." as myfield FROM $CFG->auth_dbtable
                                         WHERE $CFG->auth_dbfielduser = '$username'")) {
                 if ( $rs->RecordCount() == 1 ) {
+                    $fields_obj = rs_fetch_record($rs);
                     if (!empty($CFG->unicodedb)) {
-                        $result["$field"] = addslashes(stripslashes($rs->fields[0]));
+                        $result["$field"] = addslashes(stripslashes($fields_obj->myfield));
                     } else {
-                        $result["$field"] = addslashes(stripslashes(utf8_decode($rs->fields[0])));
+                        $result["$field"] = addslashes(stripslashes(utf8_decode($fields_obj->myfield)));
                     }
                 }
+                rs_close($rs);
             }
         }
     }
@@ -302,6 +306,7 @@ function auth_user_exists ($username) {
     global $CFG;
     $authdb = &ADONewConnection($CFG->auth_dbtype); 
     $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname); 
+    $authdb->SetFetchMode(ADODB_FETCH_ASSOC); ///Set Assoc mode always after DB connection
 
     $rs = $authdb->Execute("SELECT * FROM $CFG->auth_dbtable 
                                  WHERE $CFG->auth_dbfielduser = '$username' ");
@@ -334,6 +339,7 @@ function auth_get_userlist() {
     // Connect to the external database
     $authdb = &ADONewConnection($CFG->auth_dbtype); 
     $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname); 
+    $authdb->SetFetchMode(ADODB_FETCH_ASSOC); ///Set Assoc mode always after DB connection
 
     // fetch userlist
     $rs = $authdb->Execute("SELECT $CFG->auth_dbfielduser AS username
@@ -347,9 +353,10 @@ function auth_get_userlist() {
     
     if ( $rs->RecordCount() ) {
         $userlist = array();
-        while ($rec = $rs->FetchRow()) {
-            array_push($userlist, $rec['username']);
+        while ($rec = rs_fetch_next_record($rs)) {
+            array_push($userlist, $rec->username);
         }
+        rs_close($rs);
         return $userlist;
     } else {
         return array();
@@ -459,4 +466,4 @@ function auth_validate_form(&$form, &$err) {
     return true;
 }
 
-?>
+?>

auth/fc/config.html

@@ -1,169 +1,85 @@
 <?php
-
     if (!isset($config->auth_fchost)) {
-
         $config->auth_fchost = "127.0.0.1";
-
     }
-
     if (!isset($config->auth_fcfppport)) {
-
         $config->auth_fcfppport = "3333";
-
     }
-
     if (!isset($config->auth_fcuserid)) {
-
         $config->auth_fcuserid = "fcMoodle";
-
     }
-
     if (!isset($config->auth_fcpasswd)) {
-
         $config->auth_fcpasswd = "";
-
     }    
-
     if (!isset($config->auth_fccreators)) {
-
         $config->auth_fccreators = "";
-
     }   
-
 ?>
 
-
-
 <tr valign="top" class="required">
-
     <td align="right">auth_fchost:</td>
-
     <td>
-
         <input name="auth_fchost" type="text" size="30" value="<?php echo $config->auth_fchost?>" />
-
     <?php  if (isset($err["auth_fchost"])) formerr($err["auth_fchost"]); ?>
-
     </td>
-
     <td>
-
     <?php  print_string("auth_fchost","auth") ?>
-
     </td>
-
 </tr>
 
-
-
 <tr valign="top" class="required">
-
     <td align="right">auth_fcfppport:</td>
-
     <td>
-
         <input name="auth_fcfppport" type="text" size="30" value="<?php echo $config->auth_fcfppport?>" />
-
     <?php  if (isset($err["auth_fcfppport"])) formerr($err["auth_fchost"]); ?>
-
     </td>
-
     <td>
-
     <?php  print_string("auth_fcfppport","auth") ?>
-
     </td>
-
 </tr>
 
-
-
 <tr valign="top" class="required">
-
     <td align="right">auth_fcuserid:</td>
-
     <td>
-
         <input name="auth_fcuserid" type="text" size="30" maxlength="15" value="<?php echo $config->auth_fcuserid?>" />
-
     <?php  if (isset($err["auth_fcuserid"])) formerr($err["auth_fcuserid"]); ?>
-
     </td>
-
     <td>
-
     <?php  print_string("auth_fcuserid","auth") ?>
-
     </td>
-
 </tr>
 
-
-
 <tr valign="top" class="required">
-
     <td align="right">auth_fcpasswd:</td>
-
     <td>
-
         <input name="auth_fcpasswd" type="password" size="30" maxlength="12" value="<?php echo $config->auth_fcpasswd?>" />
-
     <?php  if (isset($err["auth_fcpasswd"])) formerr($err["auth_fcpasswd"]); ?>
-
     </td>
-
     <td>
-
     <?php  print_string("auth_fcpasswd","auth") ?>
-
     </td>
-
 </tr>
 
-
-
 <tr valign="top" class="required">
-
     <td align="right">auth_fccreators:</td>
-
     <td>
-
         <input name="auth_fccreators" type="text" size="30" value="<?php echo $config->auth_fccreators?>" />
-
     <?php  if (isset($err["auth_fccreators"])) formerr($err["auth_fccreators"]); ?>
-
     </td>
-
     <td>
-
     <?php  print_string("auth_fccreators","auth") ?>
-
     </td>
-
 </tr>
 
 
-
-
-
 <tr valign="top">
-
     <td align="right"><?php  print_string("instructions", "auth") ?>:</td>
-
     <td>
-
     <textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php  p($config->auth_instructions) ?></textarea> 
-
     </td>
-
     <td>
-
     <?php  print_string("authinstructions","auth") ?>
-
     <?php  helpbutton("text", get_string("helptext")) ?>
-
     </td>
-
 </tr>
-
 <?php print_auth_lock_options($auth, $user_fields, get_string('auth_fieldlocks_help', 'auth'), false, false); ?>

auth/fc/fcFPP.php

@@ -108,13 +108,14 @@ class fcFPP
         if($this->_debug) echo $line;
         
         if (preg_match ("/^\+0/", $line)) {      //+0, user with subadmin privileges
-        $this->_user = $userid;
-        $this->_pwd  = $passwd; 
-        return TRUE;        
-        } elseif (preg_match ("/^\Sorry/",$line)){    //Denied access but a valid user and password
+            $this->_user = $userid;
+            $this->_pwd  = $passwd; 
+            return TRUE;        
+        } elseif (strpos($line, 'You are not allowed')){ // Denied access but a valid user and password
+                                                         // "Sorry. You are not allowed to login with the FPP interface"
             return TRUE;
         } else {                    //Invalid user or password
-        return FALSE;
+            return FALSE;
         }
     
 
@@ -215,4 +216,4 @@ class fcFPP
 }
    
 
-?>
+?>

auth/ldap/lib.php

@@ -551,7 +551,7 @@ function auth_sync_users ($bulk_insert_records = 1000, $do_updates=1) {
         
     }
     if ( $do_updates && !(empty($updatekeys)) ) { // run updates only if relevant
-        $users = get_records_sql('SELECT u.username, u.id FROM ' . $CFG->prefix . 'user  AS u WHERE u.deleted=0 and u.auth=\'' . AUTH_LDAP_NAME . '\'' );
+        $users = get_records_sql('SELECT u.username, u.id FROM ' . $CFG->prefix . 'user  u WHERE u.deleted=0 and u.auth=\'' . AUTH_LDAP_NAME . '\'' );
         if (!empty($users)) {
             print "User entries to update: ". count($users). "\n";
             
@@ -713,7 +713,7 @@ function auth_ldap_bulk_insert($users){
     // bulk insert -- superfast with $bulk_insert_records
     $sql = 'INSERT INTO '.$CFG->prefix.'extuser (idnumber) VALUES ';
     // make those values safe
-    array_map('addslashes', $users);
+    $users = array_map('addslashes', $users);
     // join and quote the whole lot
     $sql = $sql . '(\'' . join('\'),(\'', $users) . '\')';
     print "+ " . count($users) . " users\n";
@@ -817,13 +817,27 @@ function auth_user_update($olduser, $newuser) {
     global $USER , $CFG;
 
     $pcfg = get_config('auth/ldap');
-    
+
+    $attrmap = auth_ldap_attributes();  
+
+    // Before doing anything else, make sure we really need to update anything
+    // in the external LDAP server.
+    $update_external = false;
+    foreach ($attrmap as $key => $ldapkeys) {
+        if (!empty($pcfg->{'field_updateremote_'.$key})) {
+            $update_external = true;
+            break;
+        }
+    }
+    if (!$update_external) {
+        return true;
+    }
+
     $ldapconnection = auth_ldap_connect();
     
     $result = array();
     $search_attribs = array();
 
-    $attrmap = auth_ldap_attributes();  
     foreach ($attrmap as $key=>$values) {
         if (!is_array($values)) {
             $values = array($values);
@@ -842,8 +856,18 @@ function auth_user_update($olduser, $newuser) {
     if ($user_info_result){
 
         $user_entry = auth_ldap_get_entries($ldapconnection, $user_info_result);
-        if (count($user_entry) > 1) {
-            trigger_error("ldap: Strange! More than one user record found in ldap. Only using the first one.");
+        if (empty($user_entry)) {
+            $error = 'ldap: Could not find user while updating externally. '.
+                     'Details follow: search base: \''.$user_dn.'\'; search filter: \''.
+                     $CFG->ldap_objectclass.'\'; search attributes: ';
+            foreach ($search_attribs as $attrib) {
+                $error .= $attrib.' ';
+            }
+            error_log($error);
+            return false; // old user not found!
+        } else if (count($user_entry) > 1) {
+            error_log('ldap: Strange! More than one user record found in ldap. Only using the first one.');
+            return false;
         }
         $user_entry = $user_entry[0];
 
@@ -1002,15 +1026,33 @@ function auth_user_update_password($username, $newpassword) {
                           . ldap_err2str(ldap_errno($ldapconnection)));
             }    
             break;
+
+        case 'ad':
+            // Passwords in Active Directory must be encoded as Unicode
+            // strings (UCS-2 Little Endian format) and surrounded with
+            // double quotes. See http://support.microsoft.com/?kbid=269190
+            if (!function_exists('mb_convert_encoding')) {
+                error_log ('You need the mbstring extension to change passwords in Active Directory');
+                return false;
+            }
+            $newpassword = mb_convert_encoding('"'.$newpassword.'"', "UCS-2LE", "auto");
+            $result = ldap_modify($ldapconnection, $user_dn, array('unicodePwd' => $newpassword));
+            if(!$result){
+                error_log('LDAP Error in auth_user_update_password(). Error code: ' 
+                          . ldap_errno($ldapconnection) . '; Error string : '
+                          . ldap_err2str(ldap_errno($ldapconnection)));
+            }
+            break;
+
         default:
             $usedconnection = &$ldapconnection;
             // send ldap the password in cleartext, it will md5 it itself
             $result = ldap_modify($ldapconnection, $user_dn, array('userPassword' => $newpassword));
-    if(!$result){
-        error_log('LDAP Error in auth_user_update_password(). Error code: ' 
-                  . ldap_errno($ldapconnection) . '; Error string : '
-                  . ldap_err2str(ldap_errno($ldapconnection)));
-    }
+            if(!$result){
+                error_log('LDAP Error in auth_user_update_password(). Error code: ' 
+                          . ldap_errno($ldapconnection) . '; Error string : '
+                          . ldap_err2str(ldap_errno($ldapconnection)));
+            }
     
     }
 
@@ -1162,8 +1204,10 @@ function auth_ldap_init () {
         }
     }   
     //hack prefix to objectclass
-    if ('objectClass=' != substr($CFG->ldap_objectclass, 0, 12)) {
-       $CFG->ldap_objectclass = 'objectClass='.$CFG->ldap_objectclass;
+    if (empty($CFG->ldap_objectclass)) {        // Can't send empty filter
+        $CFG->ldap_objectclass = 'objectClass=*';
+    } else if (stripos($CFG->ldap_objectclass, 'objectClass=') !== 0) {
+        $CFG->ldap_objectclass = 'objectClass='.$CFG->ldap_objectclass;
     }
    
     //all chages go in $CFG , no need to return value
@@ -1318,6 +1362,11 @@ function auth_ldap_connect($binddn='',$bindpwd=''){
             ldap_set_option($connresult, LDAP_OPT_PROTOCOL_VERSION, $CFG->ldap_version);
         }
 
+        // Fix MDL-10921
+        if ($CFG->ldap_user_type == 'ad') {
+             ldap_set_option($connresult, LDAP_OPT_REFERRALS, 0);
+        }
+
         if (!empty($binddn)){
             //bind with search-user
             //$debuginfo .= 'Using bind user'.$binddn.'and password:'.$bindpwd; 

auth/radius/lib.php

@@ -47,4 +47,3 @@ function auth_user_login ($username, $password) {
     $rauth->close();
 }
 ?>
-

auth/shibboleth/README.txt

@@ -14,7 +14,7 @@ Changes:
 - 10. 2005: Added better error messages and moved text to language directories
 - 02. 2006: Simplified authentication so that authorization works properly
             Added instructions for IIS
-            
+- 11. 2006: User capabilities are now loaded properly as of Moodle 1.7+
 
 
 Moodle Configuration with Dual login
@@ -164,11 +164,6 @@ Example file:
 ?>
 --
 
-Bugs
---------------------------------------------------------------------------------
-Please send bug reports concerning the Shibboleth part to 
-Lukas Haemmerle <haemmerle@switch.ch>
-
 --------------------------------------------------------------------------------
 In case of problems and questions with Shibboleth authentication, contact 
 Lukas Haemmerle <haemmerle@switch.ch> or Markus Hagman <hagman@hytti.uku.fi>

auth/shibboleth/index.php

@@ -56,6 +56,15 @@
                 $urltogo = $CFG->wwwroot.'/';      /// Go to the standard home page
                 unset($SESSION->wantsurl);         /// Just in case
             }
+            
+            /// Go to my-moodle page instead of homepage if mymoodleredirect enabled
+            if (!has_capability('moodle/site:config',get_context_instance(CONTEXT_SYSTEM, SITEID)) and !empty($CFG->mymoodleredirect) and !isguest()) {
+                if ($urltogo == $CFG->wwwroot or $urltogo == $CFG->wwwroot.'/' or $urltogo == $CFG->wwwroot.'/index.php') {
+                    $urltogo = $CFG->wwwroot.'/my/';
+                }
+            }
+            
+            load_all_capabilities();     /// This is what lets the user do anything on the site  :-)
 
             redirect($urltogo);
         }

backup/backuplib.php

@@ -170,25 +170,10 @@
         return get_users_by_capability(get_context_instance(CONTEXT_COURSE, $courseid), 'moodle/course:view');
     }
 
-    //Returns all users (every record in users table)
-
+    //Returns all users ids (every record in users table)
     function backup_get_all_users() {
 
-        global $CFG;
-
-        $result = false;
-
-        //Get users
-        $users = get_records_sql("SELECT DISTINCT id,id
-                                  FROM {$CFG->prefix}user");
-        //Add users
-        if ($users) {
-            foreach ($users as $user) {
-                $result[$user->id]->id = $user->id;
-            }
-        }
-
-        return $result;
+        return get_records('user', '', '', '', 'id, id'); 
     }
 
     //Calculate the number of log entries to backup
@@ -1751,6 +1736,16 @@
 
         global $CFG,$preferences;
 
+        //Use one static variable to cache all the require_once calls that,
+        //under PHP5 seems to increase load too much, and we are requiring
+        //them here thousands of times (one per content). MDL-8700. 
+        //Once fixed by PHP, we'll delete this hack
+
+        static $includedfiles;
+        if (!isset($includedfiles)) {
+            $includedfiles = array();
+        }
+
         //Check if preferences is ok. If it isn't set, we are 
         //in a scheduled_backup to we are able to get a copy
         //from CFG->backup_preferences
@@ -1770,8 +1765,14 @@
         $result = str_replace($search,$replace,$content);
 
         foreach ($mypreferences->mods as $name => $info) {
+        /// We only include the corresponding backuplib.php if it hasn't been included before
+        /// This will save some load under PHP5. MDL-8700.
+        /// Once fixed by PHP, we'll delete this hack
+            if (!in_array($name, $includedfiles)) {
+                include_once("$CFG->dirroot/mod/$name/backuplib.php");
+                $includedfiles[] = $name;
+            }
             //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);
@@ -2222,4 +2223,4 @@
         }   
         fwrite ($bf, end_tag("ROLES_ASSIGNMENTS", $startlevel, true));     
     }
-?>
+?>

backup/bb/restore_bb.php

@@ -9,7 +9,7 @@ require_once($CFG->dirroot.'/backup/bb/xsl_emulate_xslt.inc');
   
 function get_subdirs($directory){
     $opendirectory = opendir( $directory );
-    while($filename = readdir($opendirectory)) {
+    while(false !== ($filename = readdir($opendirectory))) {
         if (is_dir($directory.$filename) and $filename != ".." and $filename != "."){
             $subdirs[] = $filename;
         }

backup/db/mysql.php

@@ -1,20 +1,9 @@
 <?php  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// backup/restore utility.
-// 
-// Sometimes, changes between versions involve 
-// alterations to database structures and other 
-// major things that may break installations.  
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it 
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to MySQL
 
@@ -164,6 +153,7 @@ function backup_upgrade($oldversion=0) {
         table_column('backup_ids','info','info','mediumtext','','','','not null');
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
 
     //Finally, return result
     return $result;

backup/db/oci8po.sql

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

backup/db/postgres7.php

@@ -1,21 +1,9 @@
 <?php  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// backup/restore utility.
-// 
-// Sometimes, changes between versions involve 
-// alterations to database structures and other 
-// major things that may break installations.  
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it 
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
-//
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 
 function backup_upgrade($oldversion=0) {
 
@@ -61,6 +49,8 @@ function backup_upgrade($oldversion=0) {
         table_column('backup_courses', 'nextstarttime', 'nextstarttime', 'integer', '', '', '0');
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 

backup/db/upgrade.php

@@ -0,0 +1,38 @@
+<?php  //$Id$
+
+// This file keeps track of upgrades to 
+// the backup system
+//
+// Sometimes, changes between versions involve
+// alterations to database structures and other
+// major things that may break installations.
+//
+// The upgrade function in this file will attempt
+// to perform all the necessary actions to upgrade
+// your older installtion to the current version.
+//
+// If there's something it cannot do itself, it
+// will tell you what you need to do.
+//
+// The commands in here will all be database-neutral,
+// using the functions defined in lib/ddllib.php
+
+function xmldb_backup_upgrade($oldversion=0) {
+
+    global $CFG, $THEME, $db;
+
+    $result = true;
+
+/// And upgrade begins here. For each one, you'll need one 
+/// block of code similar to the next one. Please, delete 
+/// this comment lines once this file start handling proper
+/// upgrade code.
+
+/// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php
+///     $result = result of "/lib/ddllib.php" function calls
+/// }
+
+    return $result;
+}
+
+?>

backup/lib.php

@@ -7,10 +7,11 @@
     //Sets a name/value pair in backup_config table
     function backup_set_config($name, $value) {
         if (get_field("backup_config", "name", "name", $name)) {
-            return set_field("backup_config", "value", $value, "name", $name);
+            return set_field("backup_config", "value", addslashes($value), "name", $name);
         } else {
+            $config = new object();
             $config->name = $name;
-            $config->value = $value;
+            $config->value = addslashes($value);
             return insert_record("backup_config", $config);
         }
     }
@@ -118,7 +119,7 @@
         }
 
         // Loop through all directory entries, and construct two temporary arrays containing files and sub directories
-        while($entry = readdir($handle)) {
+        while(false !== ($entry = readdir($handle))) {
             if (is_dir($dir. $slash .$entry) && $entry != ".." && $entry != "." && $entry != $excludeddir) {
                 $dir_subdirs[] = $dir. $slash .$entry;
             }
@@ -195,7 +196,7 @@
         $results = null;
   
         $dir = opendir($rootdir);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
             if ($file=="." || $file=="..") {
                 continue;
             }
@@ -214,7 +215,7 @@
         $results = "";
  
         $dir = opendir($rootdir);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
             if ($file=="." || $file=="..") {
                 continue;
             }
@@ -301,7 +302,7 @@
             $status = mkdir($to_file,$CFG->directorypermissions);
         }
         $dir = opendir($from_file);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
             if ($file=="." || $file=="..") {
                 continue;
             }

backup/restore_check.html

@@ -17,15 +17,26 @@
     //Detect if we are coming from the restore form
     $fromform = optional_param ('fromform', 0, PARAM_INT);
 
-    if ($form1 = data_submitted()); {
+    if ($form1 = data_submitted()) {
         $currentcourseshortname = $course_header->course_shortname; //"store_ShortName";
-        $course_header->course_shortname =  $form1->shortname;  //"update_ShortName";    
-        $course_header->course_fullname =   $form1->fullname;   //"update_FullName";  
-        $form1->startdate = make_timestamp($form1->startyear, $form1->startmonth, $form1->startday);          
-        $currentcoursestartdate = $course_header->course_startdate;
-        $coursestartdatedateoffset = $form1->startdate - $currentcoursestartdate;
-        $restore->course_startdateoffset = $coursestartdatedateoffset; //change to restore
-    } 
+        $course_header->course_shortname =  $form1->shortname;  //"update_ShortName";
+        $course_header->course_fullname =   $form1->fullname;   //"update_FullName";
+    /// Roll dates only if the backup course has a start date
+    /// (some formats like main page, social..., haven't it and rolling dates
+    /// from 0 produces crazy dates. MDL-10125
+        if ($course_header->course_startdate) {
+            $form1->startdate = make_timestamp($form1->startyear, $form1->startmonth, $form1->startday);
+            $currentcoursestartdate = $course_header->course_startdate;
+            $coursestartdatedateoffset = $form1->startdate - $currentcoursestartdate;
+            $restore->course_startdateoffset = $coursestartdatedateoffset; //change to restore
+        } else { // don't roll if the course hasn't start date
+            $coursestartdatedateoffset = 0;
+            $restore->course_startdateoffset = 0;
+        }
+    }
+
+    ///Enforce SESSION->course_header rewrite (PHP 4.x needed because assigns are by value) MDL-8298
+    $SESSION->course_header = $course_header;
 
     //If restore session info exists, but we are coming from the form
     //it has prioriry

backup/restore_execute.html

@@ -54,6 +54,15 @@
         print_simple_box(get_string("restorefinished"),"center");
     } else {
         print_simple_box(get_string("importdatafinished"),"center");
+        $file = $CFG->dataroot . '/'
+            . $SESSION->import_preferences->backup_course
+            . '/backupdata/' . $SESSION->import_preferences->backup_name;
+        if (is_readable($file)) {
+            unlink($file);
+        }
+        else {
+            error_log("import course data: couldn't unlink $file");
+        }
         unset($SESSION->restore);
     }
     print_continue("$CFG->wwwroot/course/view.php?id=".$restore->course_id);

backup/restore_form.html

@@ -169,15 +169,16 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
     echo "<td align=\"right\"><b>";
     echo get_string("restoreto").":</b>";
     echo "</td><td colspan=\"3\">";
-    if (!has_capability('moodle/course:create', get_context_instance(CONTEXT_COURSE, $id))) {
-        $restore_restoreto_options[0] = get_string("currentcoursedeleting");
-        $restore_restoreto_options[1] = get_string("currentcourseadding");
-    } 
+    
     if (has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
         $restore_restoreto_options[0] = get_string("existingcoursedeleting");
         $restore_restoreto_options[1] = get_string("existingcourseadding");
         $restore_restoreto_options[2] = get_string("newcourse"); 
+    } else { // fix for MDL-7773
+        $restore_restoreto_options[0] = get_string("currentcoursedeleting");
+        $restore_restoreto_options[1] = get_string("currentcourseadding");
     }
+   
     choose_from_menu($restore_restoreto_options, "restore_restoreto", $restore_restoreto, "");
     echo "</td></tr>";
     if (iscreator()) {  //display these fields conditionally
@@ -200,7 +201,17 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
         echo "<td align=\"right\"> ";
         print_string("startdate"); 
         echo ":</td><td>"; 
-        print_date_selector("startday", "startmonth", "startyear", $form1->startdate);
+    /// Show the roll dates option only if the backup course has a start date
+    /// (some formats like main page, social..., haven't it and rolling dates
+    /// from 0 produces crazy dates. MDL-10125
+        if ($form1->startdate) {
+            print_date_selector("startday", "startmonth", "startyear", $form1->startdate);
+        } else {
+            print_string('notavailable');
+            echo '<input type="hidden" name="startyear" value="0" />';
+            echo '<input type="hidden" name="startmonth" value="0" />';
+            echo '<input type="hidden" name="startday" value="0" />';
+        }
         helpbutton("coursestartdate", get_string("startdate"));
         echo "</td></tr>";
     }
@@ -266,7 +277,9 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
                             echo "<input type=\"hidden\" name=\"$user_info_var\" value=\"0\" />";
                         }
                         echo "</td></tr>";
-                        $instances = $info->mods[$modname]->instances;
+                        if (isset($info->mods[$modname]->instances)) {
+                            $instances = $info->mods[$modname]->instances;
+                        }
                         if (!empty($instances) && is_array($instances)) {
                             echo '<tr><td></td><td colspan="3"><table class="restore-form-instances">';
                             foreach ($instances as $instance) {
@@ -422,7 +435,11 @@ $xml_file  = $CFG->dataroot."/temp/backup/".$backup_unique_code."/moodle.xml";
 
 $info = restore_read_xml_info($xml_file);
 
-$siterolesarray = get_assignable_roles (get_context_instance(CONTEXT_COURSE, $course->id), "shortname");
+if ($course->id == SITEID) {
+    $siterolesarray = get_assignable_roles (get_context_instance(CONTEXT_SYSTEM, SITEID), "shortname");  
+} else {
+    $siterolesarray = get_assignable_roles (get_context_instance(CONTEXT_COURSE, $course->id), "shortname");
+}
 
 echo ('<table width="100%" class="restore-form-instances">');
 echo ('<tr><td align="right"><b>'.get_string('sourcerole').'</b></td><td align="left"><b>'.get_string('targetrole').'</b></td></tr>');
@@ -439,7 +456,7 @@ if ($info->backup_moodle_version < 2006092801) {
     $roles = get_roles_with_capability('moodle/legacy:editingteacher', CAP_ALLOW, get_context_instance(CONTEXT_SYSTEM, SITEID));
 
     $editteacher = array_shift($roles);
-    choose_from_menu ($siterolesarray, "defaultteacheredit", $editteacher->id);
+    choose_from_menu ($siterolesarray, "defaultteacheredit", $editteacher->id, 'new role', '', '0');
     echo ('</td></tr>');
     
     /// Non-editting teacher
@@ -451,7 +468,7 @@ if ($info->backup_moodle_version < 2006092801) {
     $roles = get_roles_with_capability('moodle/legacy:teacher', CAP_ALLOW, get_context_instance(CONTEXT_SYSTEM, SITEID));
     $teacher = array_shift($roles);
     
-    choose_from_menu ($siterolesarray, "defaultteacher", $teacher->id);
+    choose_from_menu ($siterolesarray, "defaultteacher", $teacher->id, 'new role', '', '0');
     echo ('</td></tr>');
      
     
@@ -464,7 +481,7 @@ if ($info->backup_moodle_version < 2006092801) {
     $roles = get_roles_with_capability('moodle/legacy:student', CAP_ALLOW, get_context_instance(CONTEXT_SYSTEM, SITEID));
     $studentrole = array_shift($roles);
     
-    choose_from_menu ($siterolesarray, "defaultstudent", $studentrole->id);
+    choose_from_menu ($siterolesarray, "defaultstudent", $studentrole->id, 'new role', '', '0');
     echo ('</td></tr>');
   
 } else {

backup/restorelib.php

@@ -45,7 +45,7 @@
         //Iterate
         foreach($modules as $name => $module) {
             //Only if the module is being restored
-            if ($module->restore == 1) {
+            if (isset($module->restore) && $module->restore == 1) {
                 //Include module library
                 include_once("$CFG->dirroot/mod/$name/lib.php");
                 //If module_refresh_events exists
@@ -70,9 +70,47 @@
         if (!defined('RESTORE_SILENTLY')) {
             echo "<ul>";
         }
+
+        // Recode links in the course summary.
+        if (!defined('RESTORE_SILENTLY')) {
+            echo '<li>' . get_string('from') . ' ' . get_string('course');
+        }
+        $course = get_record('course', 'id', $restore->course_id, '', '', '', '', 'id,summary');
+        $coursesummary = restore_decode_content_links_worker($course->summary, $restore);
+        if ($coursesummary != $course->summary) {
+            $course->summary = addslashes($coursesummary);
+            if (!update_record('course', $course)) {
+                $status = false;
+            }
+        }
+        if (!defined('RESTORE_SILENTLY')) {
+            echo '</li>';
+        }
+
+        // Recode links in section summaries.
+        $sections = get_records('course_sections', 'course', $restore->course_id, 'id', 'id,summary');
+        if ($sections) {
+            if (!defined('RESTORE_SILENTLY')) {
+                echo '<li>' . get_string('from') . ' ' . get_string('sections');
+            }
+            foreach ($sections as $section) {
+                $sectionsummary = restore_decode_content_links_worker($section->summary, $restore);
+                if ($sectionsummary != $section->summary) {
+                    $section->summary = addslashes($sectionsummary);
+                    if (!update_record('course_sections', $section)) {
+                        $status = false;
+                    }
+                }
+            }
+            if (!defined('RESTORE_SILENTLY')) {
+                echo '</li>';
+            }
+        }
+
+        // Restore links in modules.
         foreach ($restore->mods as $name => $info) {
             //If the module is being restored
-            if ($info->restore == 1) {
+            if (isset($info->restore) && $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";
@@ -85,12 +123,23 @@
                 }
             }
         }
+
+        // TODO: process all html text also in blocks too
+
+        // Restore links in questions.
+        require_once("$CFG->dirroot/question/restorelib.php");
+        if (!defined('RESTORE_SILENTLY')) {
+            echo '<li>' . get_string('from') . ' ' . get_string('questions', 'quiz');
+        }
+        $status = question_decode_content_links_caller($restore);
+        if (!defined('RESTORE_SILENTLY')) {
+            echo '</li>';
+        }
+
         if (!defined('RESTORE_SILENTLY')) {
             echo "</ul>";
         }
-        
-        // TODO: process all html text also in blocks too
-        
+
         return $status;
     }
     
@@ -365,7 +414,7 @@
                     } else {
                         $tab[$elem][1] = get_string("included")." ".get_string("withoutuserdata");
                     }
-                    if (is_array($mod->instances) && count($mod->instances)) {
+                    if (isset($mod->instances) && is_array($mod->instances) && count($mod->instances)) {
                         foreach ($mod->instances as $instance) {
                             if ($instance->backup) {
                                 $elem++;
@@ -565,7 +614,7 @@
             $course->lang = addslashes($course_header->course_lang);
             $course->theme = addslashes($course_header->course_theme);
             $course->cost = addslashes($course_header->course_cost);
-            $course->currency = addslashes($course_header->course_currency);
+            $course->currency = isset($course_header->course_currency)?addslashes($course_header->course_currency):'';
             $course->marker = addslashes($course_header->course_marker);
             $course->visible = addslashes($course_header->course_visible);
             $course->hiddensections = addslashes($course_header->course_hiddensections);
@@ -901,18 +950,22 @@
                             // Yu: This part is called repeatedly for every instance, 
                             // so it is necessary to set the granular flag and check isset() 
                             // when the first instance of this type of mod is processed.
-                            if (!isset($restore->mods[$mod->type]->granular) && is_array($restore->mods[$mod->type]->instances)) {
-                                // This defines whether we want to restore specific
-                                // instances of the modules (granular restore), or
-                                // whether we don't care and just want to restore
-                                // all module instances (non-granular).
-                                $restore->mods[$mod->type]->granular = true;
-                            } else {
-                                $restore->mods[$mod->type]->granular = false;
+                            //if (!isset($restore->mods[$mod->type]->granular) && isset($restore->mods[$mod->type]->instances) && is_array($restore->mods[$mod->type]->instances)) {
+                            
+                            if (!isset($restore->mods[$mod->type]->granular)) {
+                                if (isset($restore->mods[$mod->type]->instances) && is_array($restore->mods[$mod->type]->instances)) {                              
+                                    // This defines whether we want to restore specific
+                                    // instances of the modules (granular restore), or
+                                    // whether we don't care and just want to restore
+                                    // all module instances (non-granular).
+                                    $restore->mods[$mod->type]->granular = true;
+                                } else {
+                                    $restore->mods[$mod->type]->granular = false;
+                                }
                             }
                           
                             //Check if we've to restore this module (and instance) 
-                            if ($restore->mods[$mod->type]->restore) {                      
+                            if (!empty($restore->mods[$mod->type]->restore)) {                      
                                 if (empty($restore->mods[$mod->type]->granular)  // we don't care about per instance
                                     || (array_key_exists($mod->instance,$restore->mods[$mod->type]->instances) 
                                         && !empty($restore->mods[$mod->type]->instances[$mod->instance]->restore))) {
@@ -1111,7 +1164,7 @@
                     if (!$preferencescount) {
                         $continue = false;
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<li>'.get_string('backupwithoutgradebook','grade').'</li>';
+                            echo '<li>'.get_string('backupwithoutgradebook','grades').'</li>';
                         }
                     }
 
@@ -1122,7 +1175,7 @@
                             if ($pref_rec->value == 0) {
                                 $continue = false;
                                 if (!defined('RESTORE_SILENTLY')) {
-                                    echo '<li>'.get_string('respectingcurrentdata','grade').'</li>';
+                                    echo '<li>'.get_string('respectingcurrentdata','grades').'</li>';
                                 }
                             }
                         }
@@ -1138,7 +1191,7 @@
                             //Fetch recordset_size records in each iteration
                             $recs = get_records_select("backup_ids","table_name = 'grade_preferences' AND backup_code = '$restore->backup_unique_code'",
                                                        "old_id",
-                                                       "old_id, old_id",
+                                                       "old_id",
                                                        $counter,
                                                        $recordset_size);
                             if ($recs) {
@@ -1192,7 +1245,7 @@
                             //Fetch recordset_size records in each iteration
                             $recs = get_records_select("backup_ids","table_name = 'grade_letter' AND backup_code = '$restore->backup_unique_code'",
                                                        "old_id",
-                                                       "old_id, old_id",
+                                                       "old_id",
                                                        $counter,
                                                        $recordset_size);
                             if ($recs) {
@@ -1242,7 +1295,7 @@
                             //Fetch recordset_size records in each iteration
                             $recs = get_records_select("backup_ids","table_name = 'grade_category' AND backup_code = '$restore->backup_unique_code'",
                                                        "old_id",
-                                                       "old_id, old_id",
+                                                       "old_id",
                                                        $countercat,
                                                        $recordset_size);
                             if ($recs) {
@@ -1401,21 +1454,42 @@
             //in backup_ids->info will be the real info (serialized)
             $info = restore_read_xml_users($restore,$xml_file);
         }
-
+        
         //Now, get evey user_id from $info and user data from $backup_ids
         //and create the necessary records (users, user_students, user_teachers
         //user_course_creators and user_admins
         if (!empty($info->users)) {
             //For each user, take its info from backup_ids
             foreach ($info->users as $userid) {
-                $rec = backup_getid($restore->backup_unique_code,"user",$userid); 
+                $rec = backup_getid($restore->backup_unique_code,"user",$userid);
                 $user = $rec->info;
+                foreach (array_keys(get_object_vars($user)) as $field) {
+                    if (!is_array($user->$field)) {
+                        $user->$field = backup_todb($user->$field);
+                        if (is_null($user->$field)) {
+                            $user->$field = '';
+                        }
+                    }
+                }
 
                 //Now, recode some languages (Moodle 1.5)
                 if ($user->lang == 'ma_nt') {
                     $user->lang = 'mi_nt';
                 }
 
+                //Country list updates - MDL-13060 
+                //Any user whose country code has been deleted or modified needs to be assigned a valid one.
+                $country_update_map = array(
+                    'ZR' => 'CD', 
+                    'TP' => 'TL',
+                    'FX' => 'FR', 
+                    'KO' => 'RS', 
+                    'CS' => 'RS',
+                    'WA' => 'GB');
+                if (array_key_exists($user->country, $country_update_map)) {
+                    $user->country = $country_update_map[$user->country];
+                }
+
                 //Check if it's admin and coursecreator
                 $is_admin =         !empty($user->roles['admin']);
                 $is_coursecreator = !empty($user->roles['coursecreator']);
@@ -1693,7 +1767,7 @@
                         $counter = 0;
                         while ($counter < $unreadcount) {
                             //Fetch recordset_size records in each iteration
-                            $recs = get_records_select("backup_ids","table_name = 'message' AND backup_code = '$restore->backup_unique_code'","old_id","old_id, old_id",$counter,$recordset_size);
+                            $recs = get_records_select("backup_ids","table_name = 'message' AND backup_code = '$restore->backup_unique_code'","old_id","old_id",$counter,$recordset_size);
                             if ($recs) {
                                 foreach ($recs as $rec) {
                                     //Get the full record from backup_ids
@@ -1758,7 +1832,7 @@
                         $counter = 0;
                         while ($counter < $readcount) {
                             //Fetch recordset_size records in each iteration
-                            $recs = get_records_select("backup_ids","table_name = 'message_read' AND backup_code = '$restore->backup_unique_code'","old_id","old_id, old_id",$counter,$recordset_size);
+                            $recs = get_records_select("backup_ids","table_name = 'message_read' AND backup_code = '$restore->backup_unique_code'","old_id","old_id",$counter,$recordset_size);
                             if ($recs) {
                                 foreach ($recs as $rec) {
                                     //Get the full record from backup_ids
@@ -1825,7 +1899,7 @@
                         $counter = 0;
                         while ($counter < $contactcount) {
                             //Fetch recordset_size records in each iteration
-                            $recs = get_records_select("backup_ids","table_name = 'message_contacts' AND backup_code = '$restore->backup_unique_code'","old_id","old_id, old_id",$counter,$recordset_size);
+                            $recs = get_records_select("backup_ids","table_name = 'message_contacts' AND backup_code = '$restore->backup_unique_code'","old_id","old_id",$counter,$recordset_size);
                             if ($recs) {
                                 foreach ($recs as $rec) {
                                     //Get the full record from backup_ids
@@ -1913,14 +1987,7 @@
                 foreach ($info as $category) {
                     //Skip empty categories (some backups can contain them)
                     if (!empty($category->id)) {
-                        $catrestore = "restore_question_categories";
-                        if (function_exists($catrestore)) {
-                            //print_object ($category);                                                //Debug
-                            $status = $catrestore($category,$restore);
-                        } else {
-                            //Something was wrong. Function should exist.
-                            $status = false;
-                        }
+                        $status = restore_question_categories($category,$restore);
                     }
                 }
 
@@ -1932,15 +1999,14 @@
                 if ($categories) {
                     foreach ($categories as $category) {
                         $restoredcategory = get_record('question_categories','id',$category->new_id);
+                        $restoredcategory = addslashes_object($restoredcategory);
                         if ($restoredcategory->parent != 0) {
-                            //echo 'Parent '.$restoredcategory->parent.' is ';           //Debug
                             $idcat = backup_getid($restore->backup_unique_code,'question_categories',$restoredcategory->parent);
                             if ($idcat->new_id) {
                                 $restoredcategory->parent = $idcat->new_id;
                             } else {
                                 $restoredcategory->parent = 0;
                             }
-                            //echo $restoredcategory->parent.' now<br />';  //Debug
                             update_record('question_categories', $restoredcategory);
                         }
                     }
@@ -2091,7 +2157,18 @@
                 
                         //Now search if that group exists (by name and description field) in 
                         //restore->course_id course 
-                        $gro_db = get_record("groups","courseid",$restore->course_id,"name",$gro->name,"description",$gro->description);
+                        //Going to compare LOB columns so, use the cross-db sql_compare_text() in both sides.
+                        $description_clause = '';
+                        if (!empty($gro->description)) { /// Only for groups having a description
+                            $literal_description = "'" . $gro->description . "'";
+                            $description_clause = " AND " . 
+                                                  sql_compare_text('description') . " = " . 
+                                                  sql_compare_text($literal_description);
+                        }
+                        $gro_db = get_record_sql("SELECT *
+                                                  FROM {$CFG->prefix}groups
+                                                  WHERE courseid = $restore->course_id AND
+                                                        name = '{$gro->name}'" . $description_clause);
                         //If it doesn't exist, create
                         if (!$gro_db) {
                             $create_group = true;
@@ -2205,10 +2282,7 @@
         //Get admin->id for later use
         $admin = get_admin();
         $adminid = $admin->id;
-        //First, we check the course_id backup data folder exists
-        $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata";
-        check_dir_exists($dest_dir,true);
-        $restorelog_file = fopen("$dest_dir/restorelog.html","a");
+
         //Now, if we have anything in events, we have to restore that
         //events
         if ($events) {
@@ -2227,6 +2301,11 @@
                         //print_object ($GLOBALS['traverse_array']);                                                  //Debug
                         //$GLOBALS['traverse_array']="";                                                              //Debug
 
+                        //if necessary, write to restorelog and adjust date/time fields
+                        if ($restore->course_startdateoffset) {
+                            restore_log_date_changes('Events', $restore, $info['EVENT']['#'], array('TIMESTART'));
+                        }
+
                         //Now build the EVENT record structure
                         $eve->name = backup_todb($info['EVENT']['#']['NAME']['0']['#']);
                         $eve->description = backup_todb($info['EVENT']['#']['DESCRIPTION']['0']['#']);
@@ -2239,11 +2318,6 @@
                         $eve->instance = 0;
                         $eve->eventtype = backup_todb($info['EVENT']['#']['EVENTTYPE']['0']['#']);  
                         $eve->timestart = backup_todb($info['EVENT']['#']['TIMESTART']['0']['#']);
-                        $date = usergetdate($eve->timestart);
-                        fwrite ($restorelog_file,"The Event - ".$eve->name. " - TIMESTART was " .$date['weekday'].", ".$date['mday']." ".$date['month']." ".$date['year']."");
-                        $eve->timestart +=  $restore->course_startdateoffset;
-                        $date = usergetdate($eve->timestart);
-                        fwrite ($restorelog_file,"&nbsp;&nbsp;&nbsp;the Event TIMESTART is now " .$date['weekday'].", ".$date['mday']." ".$date['month']." ".$date['year']."<br>");
                         $eve->timeduration = backup_todb($info['EVENT']['#']['TIMEDURATION']['0']['#']);
                         $eve->visible = backup_todb($info['EVENT']['#']['VISIBLE']['0']['#']);
                         $eve->timemodified = backup_todb($info['EVENT']['#']['TIMEMODIFIED']['0']['#']);
@@ -2266,19 +2340,6 @@
                                 //Assign it to admin
                                 $eve->userid = $adminid;
                             }
-
-                            //We must recode the repeatid if the event has it
-                            if (!empty($eve->repeatid)) {
-                                $repeat_rec = backup_getid($restore->backup_unique_code,"event_repeatid",$eve->repeatid);
-                                if ($repeat_rec) {    //Exists, so use it...
-                                    $eve->repeatid = $repeat_rec->new_id;
-                                } else {              //Doesn't exists, calculate the next and save it
-                                    $oldrepeatid = $eve->repeatid;
-                                    $max_rec = get_record_sql('SELECT 1, MAX(repeatid) AS repeatid FROM '.$CFG->prefix.'event');
-                                    $eve->repeatid = empty($max_rec) ? 1 : $max_rec->repeatid + 1;
-                                    backup_putid($restore->backup_unique_code,"event_repeatid", $oldrepeatid, $eve->repeatid);
-                                }
-                            }
  
                             //We have to recode the groupid field
                             $group = backup_getid($restore->backup_unique_code,"groups",$eve->groupid);
@@ -2291,6 +2352,22 @@
 
                             //The structure is equal to the db, so insert the event
                             $newid = insert_record ("event",$eve);
+
+                            //We must recode the repeatid if the event has it
+                            //The repeatid now refers to the id of the original event. (see Bug#5956)
+                            if ($newid && !empty($eve->repeatid)) {
+                                $repeat_rec = backup_getid($restore->backup_unique_code,"event_repeatid",$eve->repeatid);
+                                if ($repeat_rec) {    //Exists, so use it...
+                                    $eve->repeatid = $repeat_rec->new_id;
+                                } else {              //Doesn't exists, calculate the next and save it
+                                    $oldrepeatid = $eve->repeatid;
+                                    $eve->repeatid = $newid;
+                                    backup_putid($restore->backup_unique_code,"event_repeatid", $oldrepeatid, $eve->repeatid);
+                                }
+                                $eve->id = $newid;
+                                // update the record to contain the correct repeatid
+                                update_record('event',$eve);
+                            }
                         } else {
                             //get current event id
                             $newid = $eve_db->id;
@@ -2603,7 +2680,7 @@
             while ($counter < $count_logs) {
                 //Get a chunk of records
                 //Take old_id twice to avoid adodb limitation
-                $logs = get_records_select("backup_ids","table_name = 'log' AND backup_code = '$restore->backup_unique_code'","old_id","old_id,old_id",$counter,$recordset_size);
+                $logs = get_records_select("backup_ids","table_name = 'log' AND backup_code = '$restore->backup_unique_code'","old_id","old_id",$counter,$recordset_size);
                 //We have logs
                 if ($logs) {
                     //Iterate
@@ -4415,7 +4492,7 @@
                             break;
                     }
                 }
-                if ($this->level == 6 && $this->tree[5]!="ROLE_ASSIGNMENTS" && $this->tree[5]!="ROLE_OVERRIDES") {
+                if ($this->level == 6 && $this->tree[5]!="ROLES_ASSIGNMENTS" && $this->tree[5]!="ROLES_OVERRIDES") {
                     switch ($tagName) {
                         case "ROLE":
                             //We've finalized a role, get it
@@ -4430,7 +4507,7 @@
                     }
                 }
                               
-                if ($this->level == 7 && $this->tree[5]!="ROLE_ASSIGNMENTS" && $this->tree[5]!="ROLE_OVERRIDES") {
+                if ($this->level == 7) {
                     switch ($tagName) {
                         case "TYPE":
                             $this->info->temprole->type = $this->getContents();
@@ -4901,7 +4978,7 @@
                     $mod_id = $data["MOD"]["#"]["ID"]["0"]["#"];
                     $mod_type = $data["MOD"]["#"]["MODTYPE"]["0"]["#"];
                     //Only if we've selected to restore it
-                    if  ($this->preferences->mods[$mod_type]->restore) {
+                    if  (!empty($this->preferences->mods[$mod_type]->restore)) {
                         //Save to db
                         $status = backup_putid($this->preferences->backup_unique_code,$mod_type,$mod_id,
                                      null,$data);
@@ -5350,7 +5427,7 @@
      */
     function restore_userdata_selected($restore,$modname,$modid) {
         // check first for per instance array
-        if (!empty($restore->mods[$modname]->instances)) { // supports per instance
+        if (!empty($restore->mods[$modname]->granular)) { // supports per instance
             return array_key_exists($modid,$restore->mods[$modname]->instances) 
                 && !empty($restore->mods[$modname]->instances[$modid]->userinfo);
         }
@@ -5829,9 +5906,9 @@
             }
             if (!$status = restore_decode_content_links($restore)) {
                 if (!defined('RESTORE_SILENTLY')) {
-                    notify("Could not refresh events for activities!");
+                    notify("Could not decode content links!");
                 } else {
-                    $errorstr = "Could not refresh events for activities!";
+                    $errorstr = "Could not decode content links!";
                     return false;
                 }
             }
@@ -5878,7 +5955,7 @@
             // would have loaded it anyway, if there is any assignments. 
             // fix for MDL-6831
             $newcontext = get_context_instance(CONTEXT_COURSE, $restore->course_id);
-            if (!has_capability('course:manageactivities', $newcontext)) {
+            if (!has_capability('moodle/course:manageactivities', $newcontext)) {
                 if ($legacyteachers = get_roles_with_capability('moodle/legacy:editingteacher', CAP_ALLOW, get_context_instance(CONTEXT_SYSTEM, SITEID))) {
                     if ($legacyteacher = array_shift($legacyteachers)) {
                         role_assign($legacyteacher->id, $USER->id, 0, $newcontext->id);
@@ -6016,12 +6093,24 @@
         // the following code creates new roles
         // but we could use more intelligent detection, and role mapping
         // get role mapping info from $restore
+        $rolemappings = array();
 
-        $rolemappings = $restore->rolesmapping; // an array
-        if ($info->roles) {
-            foreach ($info->roles as $oldroleid=>$roledata) {
+        if (!empty($restore->rolesmapping)) {
+            $rolemappings = $restore->rolesmapping;
+        }
+        // $info->roles will be empty for backups pre 1.7
+        if (isset($info->roles) && $info->roles) {
             
-            /// first we check if the roles are in the mappings
+            foreach ($info->roles as $oldroleid=>$roledata) {
+                if (empty($restore->rolesmapping)) {                   
+                    // if this is empty altogether, we came from import or there's no roles used in course at all
+                    // in this case, write the same oldid as this is the same site
+                    // no need to do mapping
+                    $status = backup_putid($restore->backup_unique_code,"role",$oldroleid,
+                                     $oldroleid); // adding a new id                           
+                    continue;  // do not create additonal roles;
+                }
+            // first we check if the roles are in the mappings
             // if so, we just do a mapping i.e. update oldids table
                 if (isset($rolemappings[$oldroleid]) && $rolemappings[$oldroleid]) {
                     $status = backup_putid($restore->backup_unique_code,"role",$oldroleid,
@@ -6057,7 +6146,7 @@
             
                     // done finding a unique name
             
-                    $newroleid = create_role($roledata->name,$roledata->shortname,'');
+                    $newroleid = create_role(addslashes($roledata->name),addslashes($roledata->shortname),'');
                     $status = backup_putid($restore->backup_unique_code,"role",$oldroleid,
                                      $newroleid); // adding a new id
                     foreach ($roledata->capabilities as $capability) {
@@ -6073,7 +6162,6 @@
                 }
             }
         }
-    
         return true;
     }
     
@@ -6093,7 +6181,13 @@
         }
         $course = restore_read_xml_course_header($xmlfile);
         
-        if (!empty($course->roleassignments)) {
+        if (!isset($restore->rolesmapping)) {
+            $isimport = true; // course import from another course, or course with no role assignments
+        } else {
+            $isimport = false; // course restore with role assignments
+        }
+        
+        if (!empty($course->roleassignments) && !$isimport) {
             $courseassignments = $course->roleassignments;
 
             foreach ($courseassignments as $oldroleid => $courseassignment) {    
@@ -6104,14 +6198,12 @@
          * Restoring from course level overrides *
          *****************************************************/     
         
-        if (!empty($course->roleoverrides)) {
+        if (!empty($course->roleoverrides) && !$isimport) {
             $courseoverrides = $course->roleoverrides;
-            $rolemappings = $restore->rolesmapping;
             foreach ($courseoverrides as $oldroleid => $courseoverride) {
-            
                 // if not importing into exiting course, or creating new role, we are ok
                 // local course overrides to be respected (i.e. restored course overrides ignored)
-                if ($restore->restoreto != 1 || empty($rolemappings[$oldroleid])) {
+                if ($restore->restoreto != 1 || empty($restore->rolesmapping[$oldroleid])) {
                     restore_write_roleoverrides($restore, $courseoverride->overrides, "course", CONTEXT_COURSE, $course->course_id, $oldroleid);
                 }
             }
@@ -6131,11 +6223,12 @@
         foreach ($secs as $section) {
             if (isset($section->mods)) {
                 foreach ($section->mods as $modid=>$mod) {
-                    if (isset($mod->roleassignments)) {
+                    if (isset($mod->roleassignments) && !$isimport) {
                         foreach ($mod->roleassignments as $oldroleid=>$modassignment) {
                             restore_write_roleassignments($restore, $modassignment->assignments, "course_modules", CONTEXT_MODULE, $modid, $oldroleid);                       
                         }  
                     } 
+                    // role overrides always applies, in import or backup/restore
                     if (isset($mod->roleoverrides)) {
                         foreach ($mod->roleoverrides as $oldroleid=>$modoverride) {
                             restore_write_roleoverrides($restore, $modoverride->overrides, "course_modules", CONTEXT_MODULE, $modid, $oldroleid);
@@ -6157,13 +6250,14 @@
             $blocks = restore_read_xml_blocks($xmlfile);
             if (isset($blocks->instances)) {
                 foreach ($blocks->instances as $instance) {
-                    if (isset($instance->roleassignments)) {
+                    if (isset($instance->roleassignments) && !$isimport) {
                         foreach ($instance->roleassignments as $oldroleid=>$blockassignment) {
                             restore_write_roleassignments($restore, $blockassignment->assignments, "block_instance", CONTEXT_BLOCK, $instance->id, $oldroleid);
                       
                         }
                     }
-                    if (isset($instance->roleoverrides)) {
+                    // likewise block overrides should always be restored like mods
+                    if (isset($instance->roleoverrides)) {                    
                         foreach ($instance->roleoverrides as $oldroleid=>$blockoverride) {
                             restore_write_roleoverrides($restore, $blockoverride->overrides, "block_instance", CONTEXT_BLOCK, $instance->id, $oldroleid);
                         }
@@ -6179,7 +6273,7 @@
             echo "<li>".get_string("creatinguserroles").'</li>';
         }
         $info = restore_read_xml_users($restore, $xmlfile);
-        if (!empty($info->users)) {
+        if (!empty($info->users) && !$isimport) { // no need to restore user assignments for imports (same course)
             //For each user, take its info from backup_ids
             foreach ($info->users as $userid) {
                 $rec = backup_getid($restore->backup_unique_code,"user",$userid);
@@ -6212,7 +6306,7 @@
             }        
             $assignment->userid = $olduser->new_id; // new userid here
             $oldmodifier = backup_getid($restore->backup_unique_code,"user",$assignment->modifierid);
-            $assignment->modifierid = $oldmodifier->new_id?$oldmodifier->new_id:0; // new modifier id here
+            $assignment->modifierid = !empty($oldmodifier->new_id) ? $oldmodifier->new_id : 0; // new modifier id here
             $assignment->roleid = $role->new_id; // restored new role id
 
             // hack to make the correct contextid for course level imports
@@ -6225,7 +6319,7 @@
             $newcontext = get_context_instance($contextlevel, $oldinstance->new_id);
             $assignment->contextid = $newcontext->id; // new context id
             // might already have same assignment           
-            role_assign($assignment->roleid, $assignment->userid, 0, $assignment->contextid, $assignment->timestart, $assignment->timeend, $assignment->hidden, $assignment->enrol);
+            role_assign($assignment->roleid, $assignment->userid, 0, $assignment->contextid, $assignment->timestart, $assignment->timeend, $assignment->hidden, $assignment->enrol, $assignment->timemodified);
             
         }  
     }
@@ -6259,5 +6353,65 @@
                 insert_record('role_capabilities', $override);
             }
         }  
-    }  
-?>
+    }
+    //write activity date changes to the html log file, and update date values in the the xml array
+    function restore_log_date_changes($recordtype, &$restore, &$xml, $TAGS, $NAMETAG='NAME') { 
+
+        global $CFG; 
+        $openlog = false; 
+     
+        // loop through time fields in $TAGS 
+        foreach ($TAGS as $TAG) { 
+
+            // check $TAG has a sensible value 
+            if (!empty($xml[$TAG][0]['#']) && is_string($xml[$TAG][0]['#']) && is_numeric($xml[$TAG][0]['#'])) { 
+
+                if ($openlog==false) { 
+                    $openlog = true; // only come through here once
+
+                    // open file for writing 
+                    $course_dir = "$CFG->dataroot/$restore->course_id/backupdata"; 
+                    check_dir_exists($course_dir, true); 
+                    $restorelog = fopen("$course_dir/restorelog.html", "a");
+                 
+                    // start output for this record 
+                    $msg = new stdClass(); 
+                    $msg->recordtype = $recordtype; 
+                    $msg->recordname = $xml[$NAMETAG][0]['#']; 
+                    fwrite ($restorelog, get_string("backupdaterecordtype", "moodle", $msg)); 
+                } 
+
+                // write old date to $restorelog 
+                $value = $xml[$TAG][0]['#']; 
+                $date = usergetdate($value); 
+
+                $msg = new stdClass(); 
+                $msg->TAG = $TAG; 
+                $msg->weekday = $date['weekday']; 
+                $msg->mday = $date['mday']; 
+                $msg->month = $date['month']; 
+                $msg->year = $date['year']; 
+                fwrite ($restorelog, get_string("backupdateold", "moodle", $msg)); 
+
+                // write new date to $restorelog 
+                $value += $restore->course_startdateoffset; 
+                $date = usergetdate($value); 
+
+                $msg = new stdClass(); 
+                $msg->TAG = $TAG; 
+                $msg->weekday = $date['weekday']; 
+                $msg->mday = $date['mday']; 
+                $msg->month = $date['month']; 
+                $msg->year = $date['year']; 
+                fwrite ($restorelog, get_string("backupdatenew", "moodle", $msg)); 
+
+                // update $value in $xml tree for calling module 
+                $xml[$TAG][0]['#'] = "$value"; 
+            } 
+        }
+        // close the restore log, if it was opened
+        if ($openlog) {
+           fclose($restorelog); 
+        }
+    }
+?>

backup/version.php

@@ -6,7 +6,7 @@
 /// database (backup_version) to determine whether upgrades should
 /// be performed (see db/backup_*.php)
 
-    $backup_version = 2006082301;   // The current version is a date (YYYYMMDDXX)
-    $backup_release = "1.7dev";  // User-friendly version number
+    $backup_version = 2006082304;   // The current version is a date (YYYYMMDDXX)
+    $backup_release = "1.7";  // User-friendly version number
 
 ?>

blocks/activity_modules/db/mysql.php

@@ -1,20 +1,8 @@
 <?PHP  //$Id$
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to MySQL
 
@@ -28,6 +16,8 @@ function activity_modules_upgrade($oldversion=0) {
         $result = true; //Nothing to do
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/activity_modules/db/postgres7.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to PostgreSQL
 
@@ -28,6 +17,8 @@ function activity_modules_upgrade($oldversion=0) {
         $result = true; //Nothing to do
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/activity_modules/db/upgrade.php

@@ -0,0 +1,38 @@
+<?php  //$Id$
+
+// This file keeps track of upgrades to 
+// the activity_modules block
+//
+// Sometimes, changes between versions involve
+// alterations to database structures and other
+// major things that may break installations.
+//
+// The upgrade function in this file will attempt
+// to perform all the necessary actions to upgrade
+// your older installtion to the current version.
+//
+// If there's something it cannot do itself, it
+// will tell you what you need to do.
+//
+// The commands in here will all be database-neutral,
+// using the functions defined in lib/ddllib.php
+
+function xmldb_block_activity_modules_upgrade($oldversion=0) {
+
+    global $CFG, $THEME, $db;
+
+    $result = true;
+
+/// And upgrade begins here. For each one, you'll need one 
+/// block of code similar to the next one. Please, delete 
+/// this comment lines once this file start handling proper
+/// upgrade code.
+
+/// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php
+///     $result = result of "/lib/ddllib.php" function calls
+/// }
+
+    return $result;
+}
+
+?>

blocks/admin/block_admin.php

@@ -57,7 +57,7 @@ class block_admin extends block_list {
                 $this->content->items[]='<a href="view.php?id='.$this->instance->pageid.'&amp;edit=on&amp;sesskey='.sesskey().'">'.get_string('turneditingon').'</a>';
             }
             
-            $this->content->items[]='<a href="edit.php?id='.$this->instance->pageid.'">'.get_string('settings').'</a>';
+            $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/edit.php?id='.$this->instance->pageid.'">'.get_string('settings').'</a>';
             $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/settings.gif" alt="" />';
         }
             
@@ -143,16 +143,16 @@ class block_admin extends block_list {
         }
 
     /// Authorize hooks
-        if (has_capability('enrol/authorize:managepayments', $context)) {
-            if ($course->enrol == 'authorize' || (empty($course->enrol) && $CFG->enrol == 'authorize')) {
-                require_once($CFG->dirroot.'/enrol/authorize/const.php');
-                $paymenturl = '<a href="'.$CFG->wwwroot.'/enrol/authorize/index.php?course='.$course->id.'">'.get_string('payments').'</a> ';
+        if ($course->enrol == 'authorize' || (empty($course->enrol) && $CFG->enrol == 'authorize')) {
+            require_once($CFG->dirroot.'/enrol/authorize/const.php');
+            $paymenturl = '<a href="'.$CFG->wwwroot.'/enrol/authorize/index.php?course='.$course->id.'">'.get_string('payments').'</a> ';
+            if (has_capability('enrol/authorize:managepayments', $context)) {
                 if ($cnt = count_records('enrol_authorize', 'status', AN_STATUS_AUTH, 'courseid', $course->id)) {
                     $paymenturl .= '<a href="'.$CFG->wwwroot.'/enrol/authorize/index.php?status='.AN_STATUS_AUTH.'&amp;course='.$course->id.'">'.get_string('paymentpending', 'moodle', $cnt).'</a>';
                 }
-                $this->content->items[] = $paymenturl;
-                $this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/payment.gif" alt="" />';
             }
+            $this->content->items[] = $paymenturl;
+            $this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/payment.gif" alt="" />';
         }
 
     /// View course grades (or just your own grades, same link)
@@ -162,38 +162,19 @@ class block_admin extends block_list {
             $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/grades.gif" alt="" />';
         }
 
-    /// Person can unenrol themselves from this course
-        if (has_capability('moodle/role:unassignself', $context, NULL, false) and empty($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="" />';
+        if (empty($course->metacourse)) {
+            if (has_capability('moodle/legacy:guest', $context, NULL, false)) {   // Are a guest now
+                $this->content->items[]='<a href="enrol.php?id='.$this->instance->pageid.'">'.get_string('enrolme', '', $course->shortname).'</a>';
+                $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" alt="" />';
+            } else if (has_capability('moodle/role:unassignself', $context, NULL, false)) {  // Have some role
+                $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="" />';
+            }
         }
 
-
-
-    /// Should the following two be in this block?
-
-
-    /// View own activity report
-//        if ($course->showreports) {
-//            $this->content->items[]='<a href="user.php?id='.$this->instance->pageid.'&amp;user='.$USER->id.'">'.get_string('activityreport').'</a>';
-//            $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/report.gif" alt="" />';
-//        }
-
-
-    /// Edit your own profile
-
-//        $fullname = fullname($USER, has_capability('moodle/site:viewfullnames', $context));
-//        $editmyprofile = '<a title="'.$fullname.'" href="'.$CFG->wwwroot.'/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).
-//            $text = get_string('profile').' '.get_string('missingdescription');
-//            $this->content->items[]= $editmyprofile.' <a title="'.$text.'" class="useredit blink">*<span class="accesshide">'.$text.'</span></a>';
-//        } else {
-//            $this->content->items[]= $editmyprofile;
-//        }
-//        $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" alt="" />';
-
-
+   /// Link to the user own profile
+        $this->content->items[]='<a href="'.$CFG->wwwroot.'/user/view.php?id='.$USER->id.'&amp;course='.$course->id.'">'.get_string('profile').'</a>';
+        $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/user.gif" alt="" />';
 
         return $this->content;
     }

blocks/admin/db/mysql.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to MySQL
 
@@ -28,6 +17,8 @@ function admin_upgrade($oldversion=0) {
         $result = true; //Nothing to do
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/admin/db/postgres7.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to PostgreSQL
 
@@ -28,6 +17,8 @@ function admin_upgrade($oldversion=0) {
         $result = true; //Nothing to do
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/admin/db/upgrade.php

@@ -0,0 +1,38 @@
+<?php  //$Id$
+
+// This file keeps track of upgrades to 
+// the admin block
+//
+// Sometimes, changes between versions involve
+// alterations to database structures and other
+// major things that may break installations.
+//
+// The upgrade function in this file will attempt
+// to perform all the necessary actions to upgrade
+// your older installtion to the current version.
+//
+// If there's something it cannot do itself, it
+// will tell you what you need to do.
+//
+// The commands in here will all be database-neutral,
+// using the functions defined in lib/ddllib.php
+
+function xmldb_block_admin_upgrade($oldversion=0) {
+
+    global $CFG, $THEME, $db;
+
+    $result = true;
+
+/// And upgrade begins here. For each one, you'll need one 
+/// block of code similar to the next one. Please, delete 
+/// this comment lines once this file start handling proper
+/// upgrade code.
+
+/// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php
+///     $result = result of "/lib/ddllib.php" function calls
+/// }
+
+    return $result;
+}
+
+?>

blocks/admin_bookmarks/block_admin_bookmarks.php

@@ -57,7 +57,10 @@ class block_admin_bookmarks extends block_base {
             $bookmarks = array();
         }
 
-        if (($section = (isset($PAGE->section) ? $PAGE->section : '')) && (in_array($section, $bookmarks))) {
+	if(isset($PAGE->section) and $PAGE->section == 'search'){
+	  // the search page can't be properly bookmarked at present
+	  $this->content->footer = '';
+	}elseif (($section = (isset($PAGE->section) ? $PAGE->section : '')) && (in_array($section, $bookmarks))) {
             $this->content->footer = '<a href="' . $CFG->wwwroot . '/blocks/admin_bookmarks/delete.php?section=' . $section . '&amp;sesskey='.sesskey().'">' . get_string('unbookmarkthispage','admin') . '</a>';
         } elseif ($section = (isset($PAGE->section) ? $PAGE->section : '')) {
             $this->content->footer = '<a href="' . $CFG->wwwroot . '/blocks/admin_bookmarks/create.php?section=' . $section . '&amp;sesskey='.sesskey().'">' . get_string('bookmarkthispage','admin') . '</a>';

blocks/blog_menu/block_blog_menu.php

@@ -88,8 +88,8 @@ class block_blog_menu extends block_base {
                         && (!$blogmodon || ($blogmodon && $coursearg != ''))
                         && $CFG->bloglevel >= BLOG_USER_LEVEL ) {
 
-                // show Add entry link - moderation is off, or moderation is on and the user is viewing the block within the context of a course
-                if (has_capability('moodle/blog:create', $curcontext)) {
+                // show Add entry link
+                if (has_capability('moodle/blog:create', $sitecontext)) {
                     $addentrylink = '<li><a href="'. $CFG->wwwroot. '/blog/edit.php?action=add'
                                    .$coursearg.'">'.get_string('addnewentry', 'blog') ."</a></li>\n";
                 }
@@ -113,9 +113,9 @@ class block_blog_menu extends block_base {
                 $output .= get_string('viewsiteentries', 'blog')."</a></li>\n";
             }
 
-            if (isloggedin() && !isguest()
-                    && (has_capability('moodle/blog:manageofficialtags', $sitecontext)
-                    || has_capability('moodle/blog:managepersonaltags', $curcontext))) {
+            if (has_capability('moodle/blog:manageofficialtags', $sitecontext)
+              or has_capability('moodle/blog:managepersonaltags', $sitecontext)
+              or has_capability('moodle/blog:create', $sitecontext)) {
 
                 $output .= '<li>'. link_to_popup_window("/blog/tags.php",'popup',get_string('tagmanagement'), 400, 500, 'Popup window', 'none', true) ."</li>\n";
             }

blocks/blog_tags/block_blog_tags.php

@@ -77,16 +77,15 @@ class block_blog_tags extends block_base {
         $timewithin = $this->config->timewithin * 24 * 60 * 60; /// convert to seconds
 
         $sql  = 'SELECT t.id, t.type, t.text, COUNT(DISTINCT bt.id) as ct ';
-        $sql .= "FROM {$CFG->prefix}tags as t, {$CFG->prefix}blog_tag_instance as bt, {$CFG->prefix}post as p ";
+        $sql .= "FROM {$CFG->prefix}tags t, {$CFG->prefix}blog_tag_instance bt, {$CFG->prefix}post p ";
         $sql .= 'WHERE t.id = bt.tagid ';
         $sql .= 'AND p.id = bt.entryid ';
         $sql .= 'AND (p.publishstate = \'site\' or p.publishstate=\'public\') ';
         $sql .= "AND bt.timemodified > {$timewithin} ";
         $sql .= 'GROUP BY t.id, t.type, t.text ';
-        $sql .= 'ORDER BY ct DESC, t.text ASC ';
-        $sql .= "LIMIT {$this->config->numberoftags} ";
+        $sql .= 'ORDER BY ct DESC, t.text ASC';
 
-        if ($tags = get_records_sql($sql)) {
+        if ($tags = get_records_sql($sql, 0, $this->config->numberoftags)) {
 
         /// There are 2 things to do:
         /// 1. tags with the same count should have the same size class

blocks/calendar_month/db/mysql.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to MySQL
 
@@ -28,6 +17,8 @@ function calendar_month_upgrade($oldversion=0) {
         $result = true; //Nothing to do
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/calendar_month/db/postgres7.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to PostgreSQL
 
@@ -28,6 +17,8 @@ function calendar_month_upgrade($oldversion=0) {
         $result = true; //Nothing to do
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/calendar_month/db/upgrade.php

@@ -0,0 +1,38 @@
+<?php  //$Id$
+
+// This file keeps track of upgrades to 
+// the calendar_month block
+//
+// Sometimes, changes between versions involve
+// alterations to database structures and other
+// major things that may break installations.
+//
+// The upgrade function in this file will attempt
+// to perform all the necessary actions to upgrade
+// your older installtion to the current version.
+//
+// If there's something it cannot do itself, it
+// will tell you what you need to do.
+//
+// The commands in here will all be database-neutral,
+// using the functions defined in lib/ddllib.php
+
+function xmldb_block_calendar_month_upgrade($oldversion=0) {
+
+    global $CFG, $THEME, $db;
+
+    $result = true;
+
+/// And upgrade begins here. For each one, you'll need one 
+/// block of code similar to the next one. Please, delete 
+/// this comment lines once this file start handling proper
+/// upgrade code.
+
+/// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php
+///     $result = result of "/lib/ddllib.php" function calls
+/// }
+
+    return $result;
+}
+
+?>

blocks/calendar_upcoming/db/mysql.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to MySQL
 
@@ -28,6 +17,8 @@ function calendar_upcoming_upgrade($oldversion=0) {
         $result = true; //Nothing to do
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/calendar_upcoming/db/postgres7.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to PostgreSQL
 
@@ -28,6 +17,8 @@ function calendar_upcoming_upgrade($oldversion=0) {
         $result = true; //Nothing to do
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/calendar_upcoming/db/upgrade.php

@@ -0,0 +1,38 @@
+<?php  //$Id$
+
+// This file keeps track of upgrades to 
+// the calendar_upcoming block
+//
+// Sometimes, changes between versions involve
+// alterations to database structures and other
+// major things that may break installations.
+//
+// The upgrade function in this file will attempt
+// to perform all the necessary actions to upgrade
+// your older installtion to the current version.
+//
+// If there's something it cannot do itself, it
+// will tell you what you need to do.
+//
+// The commands in here will all be database-neutral,
+// using the functions defined in lib/ddllib.php
+
+function xmldb_block_calendar_upcoming_upgrade($oldversion=0) {
+
+    global $CFG, $THEME, $db;
+
+    $result = true;
+
+/// And upgrade begins here. For each one, you'll need one 
+/// block of code similar to the next one. Please, delete 
+/// this comment lines once this file start handling proper
+/// upgrade code.
+
+/// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php
+///     $result = result of "/lib/ddllib.php" function calls
+/// }
+
+    return $result;
+}
+
+?>

blocks/course_list/block_course_list.php

@@ -36,7 +36,7 @@ class block_course_list extends block_list {
 
         if (empty($CFG->disablemycourses) and 
             !empty($USER->id) and 
-            !(has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM, SITEID)) and $adminseesall)and
+            !(has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) and $adminseesall) and
             !isguest()) {    // Just print My Courses
             if ($courses = get_my_courses($USER->id)) {
                 foreach ($courses as $course) {

blocks/course_list/db/mysql.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to MySQL
 
@@ -28,6 +17,8 @@ function course_list_upgrade($oldversion=0) {
         $result = true; //Nothing to do
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/course_list/db/postgres7.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to PostgreSQL
 
@@ -28,6 +17,8 @@ function course_list_upgrade($oldversion=0) {
         $result = true; //Nothing to do
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/course_list/db/upgrade.php

@@ -0,0 +1,38 @@
+<?php  //$Id$
+
+// This file keeps track of upgrades to 
+// the course_list block
+//
+// Sometimes, changes between versions involve
+// alterations to database structures and other
+// major things that may break installations.
+//
+// The upgrade function in this file will attempt
+// to perform all the necessary actions to upgrade
+// your older installtion to the current version.
+//
+// If there's something it cannot do itself, it
+// will tell you what you need to do.
+//
+// The commands in here will all be database-neutral,
+// using the functions defined in lib/ddllib.php
+
+function xmldb_block_course_list_upgrade($oldversion=0) {
+
+    global $CFG, $THEME, $db;
+
+    $result = true;
+
+/// And upgrade begins here. For each one, you'll need one 
+/// block of code similar to the next one. Please, delete 
+/// this comment lines once this file start handling proper
+/// upgrade code.
+
+/// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php
+///     $result = result of "/lib/ddllib.php" function calls
+/// }
+
+    return $result;
+}
+
+?>

blocks/course_summary/db/mysql.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to MySQL
 
@@ -28,6 +17,8 @@ function course_summary_upgrade($oldversion=0) {
         $result = true; //Nothing to do
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/course_summary/db/postgres7.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to PostgreSQL
 
@@ -28,6 +17,8 @@ function course_summary_upgrade($oldversion=0) {
         $result = true; //Nothing to do
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/course_summary/db/upgrade.php

@@ -0,0 +1,38 @@
+<?php  //$Id$
+
+// This file keeps track of upgrades to 
+// the course_summary block
+//
+// Sometimes, changes between versions involve
+// alterations to database structures and other
+// major things that may break installations.
+//
+// The upgrade function in this file will attempt
+// to perform all the necessary actions to upgrade
+// your older installtion to the current version.
+//
+// If there's something it cannot do itself, it
+// will tell you what you need to do.
+//
+// The commands in here will all be database-neutral,
+// using the functions defined in lib/ddllib.php
+
+function xmldb_block_course_summary_upgrade($oldversion=0) {
+
+    global $CFG, $THEME, $db;
+
+    $result = true;
+
+/// And upgrade begins here. For each one, you'll need one 
+/// block of code similar to the next one. Please, delete 
+/// this comment lines once this file start handling proper
+/// upgrade code.
+
+/// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php
+///     $result = result of "/lib/ddllib.php" function calls
+/// }
+
+    return $result;
+}
+
+?>

blocks/db/migrate2utf8.php

@@ -15,8 +15,13 @@ function migrate2utf8_block_instance_configdata($recordid){
             $fromenc = $globallang;
         } else {
             $sitelang   = $CFG->lang;
-            $courselang = get_course_lang($blockinstance->pageid);  //Non existing!
-            $userlang   = get_main_teacher_lang($blockinstance->pageid); //N.E.!!
+            if ($blockinstance->pagetype == 'course-view') {
+                $courselang = get_course_lang($blockinstance->pageid);  //Non existing!
+                $userlang   = get_main_teacher_lang($blockinstance->pageid); //N.E.!!
+            } else {
+                $courselang = false;
+                $userlang = false;
+            }
 
             $fromenc = get_original_encoding($sitelang, $courselang, $userlang);
         }
@@ -42,8 +47,13 @@ function migrate2utf8_block_instance_configdata($recordid){
             $fromenc = $globallang;
         } else {
             $sitelang   = $CFG->lang;
-            $courselang = get_course_lang($blockinstance->pageid);  //Non existing!
-            $userlang   = get_main_teacher_lang($blockinstance->pageid); //N.E.!!
+            if ($blockinstance->pagetype == 'course-view') {
+                $courselang = get_course_lang($blockinstance->pageid);  //Non existing!
+                $userlang   = get_main_teacher_lang($blockinstance->pageid); //N.E.!!
+            } else {
+                $courselang = false;
+                $userlang = false;
+            }
 
             $fromenc = get_original_encoding($sitelang, $courselang, $userlang);
         }
@@ -68,8 +78,13 @@ function migrate2utf8_block_instance_configdata($recordid){
             $fromenc = $globallang;
         } else {
             $sitelang   = $CFG->lang;
-            $courselang = get_course_lang($blockinstance->pageid);  //Non existing!
-            $userlang   = get_main_teacher_lang($blockinstance->pageid); //N.E.!!
+            if ($blockinstance->pagetype == 'course-view') {
+                $courselang = get_course_lang($blockinstance->pageid);  //Non existing!
+                $userlang   = get_main_teacher_lang($blockinstance->pageid); //N.E.!!
+            } else {
+                $courselang = false;
+                $userlang = false;
+            }
 
             $fromenc = get_original_encoding($sitelang, $courselang, $userlang);
         }
@@ -110,10 +125,7 @@ global $CFG, $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);
+            $fromenc = get_original_encoding($sitelang, false, false);
         }
 
         $blah = unserialize(base64_decode($blockpinned->configdata));
@@ -137,10 +149,7 @@ global $CFG, $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);
+            $fromenc = get_original_encoding($sitelang, false, false);
         }
 
         $blah = unserialize(base64_decode($blockpinned->configdata));
@@ -163,10 +172,7 @@ global $CFG, $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);
+            $fromenc = get_original_encoding($sitelang, false, false);
         }
 
         $blah = unserialize(base64_decode($blockpinned->configdata));

blocks/db/mysql.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to MySQL
 
@@ -161,6 +150,8 @@ global $CFG;
         modify_database('','ALTER TABLE prefix_block_pinned ADD INDEX pagetype (pagetype);');
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/db/postgres7.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to PostgreSQL
 
@@ -163,6 +152,8 @@ global $CFG;
         modify_database('','CREATE INDEX prefix_block_pinned_pagetype_idx ON prefix_block_pinned (pagetype);');
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/db/upgrade.php

@@ -0,0 +1,38 @@
+<?php  //$Id$
+
+// This file keeps track of upgrades to 
+// the blocks system
+//
+// Sometimes, changes between versions involve
+// alterations to database structures and other
+// major things that may break installations.
+//
+// The upgrade function in this file will attempt
+// to perform all the necessary actions to upgrade
+// your older installtion to the current version.
+//
+// If there's something it cannot do itself, it
+// will tell you what you need to do.
+//
+// The commands in here will all be database-neutral,
+// using the functions defined in lib/ddllib.php
+
+function xmldb_blocks_upgrade($oldversion=0) {
+
+    global $CFG, $THEME, $db;
+
+    $result = true;
+
+/// And upgrade begins here. For each one, you'll need one 
+/// block of code similar to the next one. Please, delete 
+/// this comment lines once this file start handling proper
+/// upgrade code.
+
+/// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php
+///     $result = result of "/lib/ddllib.php" function calls
+/// }
+
+    return $result;
+}
+
+?>

blocks/glossary_random/block_glossary_random.php

@@ -41,11 +41,14 @@ class block_glossary_random extends block_base {
                 $this->instance_config_commit();
             }
 
+            $limitfrom = 0;
+            $limitnum = 1;
+
             switch ($this->config->type) {
 
                 case BGR_RANDOMLY:
                     $i = rand(1,$numberofentries);
-                    $LIMIT = sql_paging_limit($i-1, 1);
+                    $limitfrom = $i-1;
                     $SORT = 'ASC';
                     break;
 
@@ -58,13 +61,13 @@ class block_glossary_random extends block_base {
                     if ($i > $numberofentries) {  // Loop back to beginning
                         $i = 1;
                     }
-                    $LIMIT = sql_paging_limit($i-1, 1);
+                    $limitfrom = $i-1;
                     $SORT = 'ASC';
                     break;
 
                 default:  // BGR_LASTMODIFIED
                     $i = $numberofentries;
-                    $LIMIT = 'LIMIT 1';    // The last one
+                    $limitfrom = 0;
                     $SORT = 'DESC';
                     break;
             }
@@ -73,7 +76,7 @@ class block_glossary_random extends block_base {
                                          '    FROM '.$CFG->prefix.'glossary_entries'.
                                          '   WHERE glossaryid = '.$this->config->glossary.
                                          '     AND approved = 1 '.
-                                         'ORDER BY timemodified '.$SORT.' '.$LIMIT)) {
+                                         'ORDER BY timemodified '.$SORT, $limitfrom, $limitnum)) {
 
                 $entry = reset($entry);
 
@@ -82,7 +85,10 @@ class block_glossary_random extends block_base {
                 } else {
                     $text = "<h2>".format_string($entry->concept,true)."</h2>";
                 }  
-                $text .= format_text($entry->definition, $entry->format);
+
+                $options = new object;
+                $options->trusttext = true;
+                $text .= format_text($entry->definition, $entry->format, $options);
 
                 $this->config->nexttime = usergetmidnight(time()) + DAYSECS * $this->config->refresh;
                 $this->config->previous = $i;
@@ -169,7 +175,6 @@ class block_glossary_random extends block_base {
         // place link to glossary in the footer if the glossary is visible
         $glossaryid = $this->config->glossary;
         $glossary=get_record('glossary', 'id', $glossaryid);
-        $studentcanpost = $glossary->studentcanpost; //needed to decide on which footer
 
         //Create a temp valid module structure (course,id)
         $tempmod->course = $this->course->id;
@@ -178,7 +183,7 @@ class block_glossary_random extends block_base {
         //Obtain the visible property from the instance
         if (instance_is_visible('glossary', $tempmod)) {
             $cm = get_coursemodule_from_instance('glossary',$glossaryid, $this->course->id) ;
-            if ($studentcanpost) {
+            if (has_capability('mod/glossary:write', get_context_instance(CONTEXT_MODULE, $cm->id))) {
                 $this->content->footer = '<a href="'.$CFG->wwwroot.'/mod/glossary/edit.php?id='.$cm->id
                 .'" title="'.$this->config->addentry.'">'.$this->config->addentry.'</a><br />';
             } else {

blocks/html/block_html.php

@@ -12,7 +12,7 @@ class block_html extends block_base {
     }
 
     function specialization() {
-        $this->title = isset($this->config->title) ? $this->config->title : get_string('newhtmlblock', 'block_html');
+        $this->title = isset($this->config->title) ? format_string($this->config->title) : get_string('newhtmlblock', 'block_html');
     }
 
     function instance_allow_multiple() {
@@ -24,8 +24,13 @@ class block_html extends block_base {
             return $this->content;
         }
 
-        $filteropt = new stdClass;
-        $filteropt->noclean = true;
+        if (!empty($this->instance->pinned) or $this->instance->pagetype === 'course-view') {
+            // fancy html allowed only on course page and in pinned blocks for security reasons
+            $filteropt = new stdClass;
+            $filteropt->noclean = true;
+        } else {
+            $filteropt = null;
+        }
 
         $this->content = new stdClass;
         $this->content->text = isset($this->config->text) ? format_text($this->config->text, FORMAT_HTML, $filteropt) : '';

blocks/html/config_instance.html

@@ -1,4 +1,11 @@
-<?php $usehtmleditor = can_use_html_editor(); ?>
+<?php
+    $usehtmleditor = can_use_html_editor();
+
+    $text = isset($this->config->text) ? $this->config->text : '';
+    if (empty($this->instance->pinned) and $this->instance->pagetype !== 'course-view') {
+        $text = clean_text($text, FORMAT_HTML);
+    }
+?>
 <table cellpadding="9" cellspacing="0">
 <tr valign="top">
     <td align="right"><?php print_string('configtitle', 'block_html'); ?>:</td>
@@ -6,7 +13,7 @@
 </tr>
 <tr valign="top">
     <td align="right"><?php print_string('configcontent', 'block_html'); ?>:</td>
-    <td><?php print_textarea($usehtmleditor, 25, 50, 0, 0, 'text', isset($this->config->text)?$this->config->text:'') ?></td>
+    <td><?php print_textarea($usehtmleditor, 25, 50, 0, 0, 'text', $text) ?></td>
 </tr>
 <tr>
     <td colspan="3" align="center">

blocks/login/block_login.php

@@ -52,7 +52,7 @@ class block_login extends block_base {
             $this->content->text .= '<table align="center" cellpadding="2" cellspacing="0" class="logintable">';
 
             $this->content->text .= '<tr><td class="c0 r0" align="right">'.get_string('username').':</td>';
-            $this->content->text .= '<td class="c1 r0"><input type="text" name="username" size="10" value="'.$username.'" /></td></tr>';
+            $this->content->text .= '<td class="c1 r0"><input type="text" name="username" size="10" value="'.s($username).'" /></td></tr>';
 
             $this->content->text .= '<tr><td class="c0 r1" align="right">'.get_string('password').':</td>';
             $this->content->text .= '<td class="c1 r1"><input type="password" name="password" size="10" value="" /></td></tr>';

blocks/moodleblock.class.php

@@ -245,11 +245,6 @@ class block_base {
                 // The full treatment, please. Include the title text.
                 print_side_block($this->_title_html(), $this->content->text, NULL, NULL, $this->content->footer, $this->html_attributes(), $this->title);
             }
-            
-            //make a record of the block for the ajax course format to use
-            if (!empty($COURSE->javascriptportal)) {
-                $COURSE->javascriptportal->block_add('inst'.$this->instance->id,!$this->instance->visible);    
-            }
         }
     }
 
@@ -308,13 +303,7 @@ class block_base {
         
         switch ($this->instance->pagetype) {
             case 'course-view':
-                if ($this->instance->pageid == SITEID) {
-                      $context = get_context_instance(CONTEXT_SYSTEM, $this->instance->pageid);
-                } else {
-                    $context = get_context_instance(CONTEXT_COURSE, $this->instance->pageid);
-                }
-                
-                if (!has_capability('moodle/site:manageblocks', $context)) {
+                if (!has_capability('moodle/site:manageblocks', $blockcontext)) {
                     return null;
                 }
             break;
@@ -358,7 +347,7 @@ class block_base {
      
          // place holder for roles button
          $movebuttons .= '<a class="icon roles" title="'. $this->str->assignroles .'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$blockcontext->id.'">' .
-                        '<img src="'.$CFG->pixpath.'/i/roles.gif" alt="'.$this->str->assignroles.'" /></a>';
+                        '<img src="'.$CFG->pixpath.'/i/roles.gif" alt="'.$this->str->assignroles.'" height="11" width="11" border="0"/></a>';
      
         $movebuttons .= '<a class="icon hide" title="'. $title .'" href="'.$script.'&amp;blockaction=toggle">' .
                         '<img src="'. $CFG->pixpath.$icon .'" alt="'.$title.'" /></a>';
@@ -706,14 +695,9 @@ class block_list extends block_base {
                 print_side_block($this->_title_html(), '', $this->content->items, $this->content->icons, 
                                  $this->content->footer, $this->html_attributes(), $this->title);
             }
-            
-            //make a record of the block for the ajax course format to use
-            if (!empty($COURSE->javascriptportal)) {
-                $COURSE->javascriptportal->block_add('inst'.$this->instance->id,!$this->instance->visible);    
-            }
         }
     }
 
 }
 
-?>
+?>

blocks/news_items/db/mysql.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to MySQL
 
@@ -28,6 +17,8 @@ function news_items_upgrade($oldversion=0) {
         $result = true; //Nothing to do
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/news_items/db/postgres7.php

@@ -1,20 +1,9 @@
 <?PHP  //$Id$
+
+// THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
-// This file keeps track of upgrades to Moodle's
-// blocks system.
-//
-// Sometimes, changes between versions involve
-// alterations to database structures and other
-// major things that may break installations.
-//
-// The upgrade function in this file will attempt
-// to perform all the necessary actions to upgrade
-// your older installtion to the current version.
-//
-// If there's something it cannot do itself, it
-// will tell you what you need to do.
-//
-// Versions are defined by backup_version.php
+// IT IS USED ONLY FOR UPGRADES FROM BEFORE MOODLE 1.7, ALL 
+// LATER CHANGES SHOULD USE upgrade.php IN THIS DIRECTORY.
 //
 // This file is tailored to PostgreSQL
 
@@ -28,6 +17,8 @@ function news_items_upgrade($oldversion=0) {
         $result = true; //Nothing to do
     }
 
+    //////  DO NOT ADD NEW THINGS HERE!!  USE upgrade.php and the lib/ddllib.php functions.
+
     //Finally, return result
     return $result;
 }

blocks/news_items/db/upgrade.php

@@ -0,0 +1,38 @@
+<?php  //$Id$
+
+// This file keeps track of upgrades to 
+// the news_items block
+//
+// Sometimes, changes between versions involve
+// alterations to database structures and other
+// major things that may break installations.
+//
+// The upgrade function in this file will attempt
+// to perform all the necessary actions to upgrade
+// your older installtion to the current version.
+//
+// If there's something it cannot do itself, it
+// will tell you what you need to do.
+//
+// The commands in here will all be database-neutral,
+// using the functions defined in lib/ddllib.php
+
+function xmldb_block_news_items_upgrade($oldversion=0) {
+
+    global $CFG, $THEME, $db;
+
+    $result = true;
+
+/// And upgrade begins here. For each one, you'll need one 
+/// block of code similar to the next one. Please, delete 
+/// this comment lines once this file start handling proper
+/// upgrade code.
+
+/// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php
+///     $result = result of "/lib/ddllib.php" function calls
+/// }
+
+    return $result;
+}
+
+?>