mirror of
https://github.com/moodle/moodle.git
synced 2025-02-15 21:36:58 +01:00
a9efae50e3
There was a mistake in the text format upgrade in the question bank. The wrong conversions were performed, and the wrong arguments were passed to text_to_html in the conversions that were done. Also, not all the calls to format_text had been updated to use the values in the new format columns. I think this change fixes everything, but I have only had very limited time to test it. I am committing it anyway, because that seems to me to be the best way to maximise testing. I think that the new code is certainly better than the old code was.
380 lines
14 KiB
PHP
380 lines
14 KiB
PHP
<?php
|
|
|
|
// This file keeps track of upgrades to
|
|
// the quiz module
|
|
//
|
|
// 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 installation 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 methods of database_manager class
|
|
//
|
|
// Please do not forget to use upgrade_set_timeout()
|
|
// before any action that may take longer time to finish.
|
|
|
|
function xmldb_quiz_upgrade($oldversion) {
|
|
global $CFG, $DB;
|
|
|
|
$dbman = $DB->get_manager();
|
|
|
|
//===== 1.9.0 upgrade line ======//
|
|
|
|
if ($oldversion < 2008062000) {
|
|
|
|
/// Define table quiz_report to be created
|
|
$table = new xmldb_table('quiz_report');
|
|
|
|
/// Adding fields to table quiz_report
|
|
$table->add_field('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null);
|
|
$table->add_field('name', XMLDB_TYPE_CHAR, '255', null, null, null, null);
|
|
$table->add_field('displayorder', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null);
|
|
|
|
/// Adding keys to table quiz_report
|
|
$table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
|
|
|
|
/// Conditionally launch create table for quiz_report
|
|
if (!$dbman->table_exists($table)) {
|
|
$dbman->create_table($table);
|
|
}
|
|
|
|
upgrade_mod_savepoint(true, 2008062000, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2008062001) {
|
|
$reporttoinsert = new stdClass();
|
|
$reporttoinsert->name = 'overview';
|
|
$reporttoinsert->displayorder = 10000;
|
|
$DB->insert_record('quiz_report', $reporttoinsert);
|
|
|
|
$reporttoinsert = new stdClass();
|
|
$reporttoinsert->name = 'responses';
|
|
$reporttoinsert->displayorder = 9000;
|
|
$DB->insert_record('quiz_report', $reporttoinsert);
|
|
|
|
$reporttoinsert = new stdClass();
|
|
$reporttoinsert->name = 'regrade';
|
|
$reporttoinsert->displayorder = 7000;
|
|
$DB->insert_record('quiz_report', $reporttoinsert);
|
|
|
|
$reporttoinsert = new stdClass();
|
|
$reporttoinsert->name = 'grading';
|
|
$reporttoinsert->displayorder = 6000;
|
|
$DB->insert_record('quiz_report', $reporttoinsert);
|
|
|
|
upgrade_mod_savepoint(true, 2008062001, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2008072402) {
|
|
|
|
/// Define field lastcron to be added to quiz_report
|
|
$table = new xmldb_table('quiz_report');
|
|
$field = new xmldb_field('lastcron', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'displayorder');
|
|
|
|
/// Conditionally launch add field lastcron
|
|
if (!$dbman->field_exists($table, $field)) {
|
|
$dbman->add_field($table, $field);
|
|
}
|
|
|
|
/// Define field cron to be added to quiz_report
|
|
$field = new xmldb_field('cron', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'lastcron');
|
|
|
|
/// Conditionally launch add field cron
|
|
if (!$dbman->field_exists($table, $field)) {
|
|
$dbman->add_field($table, $field);
|
|
}
|
|
|
|
/// quiz savepoint reached
|
|
upgrade_mod_savepoint(true, 2008072402, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2008072900) {
|
|
/// Delete the regrade report - it is now part of the overview report.
|
|
$DB->delete_records('quiz_report', array('name' => 'regrade'));
|
|
|
|
/// quiz savepoint reached
|
|
upgrade_mod_savepoint(true, 2008072900, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2008081500) {
|
|
/// Define table quiz_question_versions to be dropped
|
|
$table = new xmldb_table('quiz_question_versions');
|
|
|
|
/// Launch drop table for quiz_question_versions
|
|
$dbman->drop_table($table);
|
|
|
|
/// quiz savepoint reached
|
|
upgrade_mod_savepoint(true, 2008081500, 'quiz');
|
|
}
|
|
|
|
/// Changing the type of all the columns that store grades to be NUMBER(10, 5) or similar.
|
|
if ($oldversion < 2008081501) {
|
|
$table = new xmldb_table('quiz');
|
|
$field = new xmldb_field('sumgrades', XMLDB_TYPE_NUMBER, '10, 5', null, null, null, null, 'questions');
|
|
$dbman->change_field_type($table, $field);
|
|
upgrade_mod_savepoint(true, 2008081501, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2008081502) {
|
|
$table = new xmldb_table('quiz');
|
|
$field = new xmldb_field('grade', XMLDB_TYPE_NUMBER, '10, 5', null, null, null, null, 'sumgrades');
|
|
$dbman->change_field_type($table, $field);
|
|
upgrade_mod_savepoint(true, 2008081502, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2008081503) {
|
|
$table = new xmldb_table('quiz_attempts');
|
|
$field = new xmldb_field('sumgrades', XMLDB_TYPE_NUMBER, '10, 5', null, null, null, null, 'attempt');
|
|
$dbman->change_field_type($table, $field);
|
|
upgrade_mod_savepoint(true, 2008081503, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2008081504) {
|
|
$table = new xmldb_table('quiz_feedback');
|
|
$field = new xmldb_field('mingrade', XMLDB_TYPE_NUMBER, '10, 5', null, null, null, null, 'feedbacktext');
|
|
$dbman->change_field_type($table, $field);
|
|
upgrade_mod_savepoint(true, 2008081504, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2008081505) {
|
|
$table = new xmldb_table('quiz_feedback');
|
|
$field = new xmldb_field('maxgrade', XMLDB_TYPE_NUMBER, '10, 5', null, null, null, null, 'mingrade');
|
|
$dbman->change_field_type($table, $field);
|
|
upgrade_mod_savepoint(true, 2008081505, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2008081506) {
|
|
$table = new xmldb_table('quiz_grades');
|
|
$field = new xmldb_field('grade', XMLDB_TYPE_NUMBER, '10, 5', null, null, null, null, 'userid');
|
|
$dbman->change_field_type($table, $field);
|
|
upgrade_mod_savepoint(true, 2008081506, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2008081507) {
|
|
$table = new xmldb_table('quiz_question_instances');
|
|
$field = new xmldb_field('grade', XMLDB_TYPE_NUMBER, '12, 7', null, null, null, null, 'question');
|
|
$dbman->change_field_type($table, $field);
|
|
upgrade_mod_savepoint(true, 2008081507, 'quiz');
|
|
}
|
|
|
|
/// Move all of the quiz config settings from $CFG to the config_plugins table.
|
|
if ($oldversion < 2008082200) {
|
|
foreach (get_object_vars($CFG) as $name => $value) {
|
|
if (strpos($name, 'quiz_') === 0) {
|
|
$shortname = substr($name, 5);
|
|
if ($shortname == 'fix_adaptive') {
|
|
// Special case - remove old inconsistency.
|
|
$shortname == 'fix_optionflags';
|
|
}
|
|
set_config($shortname, $value, 'quiz');
|
|
unset_config($name);
|
|
}
|
|
}
|
|
upgrade_mod_savepoint(true, 2008082200, 'quiz');
|
|
}
|
|
|
|
/// Now that the quiz is no longer responsible for creating all the question
|
|
/// bank tables, and some of the tables are now the responsibility of the
|
|
/// datasetdependent question type, which did not have a version.php file before,
|
|
/// we need to say that these tables are already installed, otherwise XMLDB
|
|
/// will try to create them again and give an error.
|
|
if ($oldversion < 2008082600) {
|
|
// Since MDL-16505 was fixed, and we eliminated the datasetdependent
|
|
// question type, this is now a no-op.
|
|
upgrade_mod_savepoint(true, 2008082600, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2008112101) {
|
|
|
|
/// Define field lastcron to be added to quiz_report
|
|
$table = new xmldb_table('quiz_report');
|
|
$field = new xmldb_field('capability', XMLDB_TYPE_CHAR, '255', null, null, null, null, 'cron');
|
|
|
|
/// Conditionally launch add field lastcron
|
|
if (!$dbman->field_exists($table, $field)) {
|
|
$dbman->add_field($table, $field);
|
|
}
|
|
|
|
/// quiz savepoint reached
|
|
upgrade_mod_savepoint(true, 2008112101, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2009010700) {
|
|
|
|
/// Define field showuserpicture to be added to quiz
|
|
$table = new xmldb_table('quiz');
|
|
$field = new xmldb_field('showuserpicture', XMLDB_TYPE_INTEGER, '4', null, XMLDB_NOTNULL, null, '0', 'delay2');
|
|
|
|
/// Conditionally launch add field showuserpicture
|
|
if (!$dbman->field_exists($table, $field)) {
|
|
$dbman->add_field($table, $field);
|
|
}
|
|
|
|
/// quiz savepoint reached
|
|
upgrade_mod_savepoint(true, 2009010700, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2009030900) {
|
|
/// If there are no quiz settings set to advanced yet, the set up the default
|
|
/// advanced fields from Moodle 2.0.
|
|
$quizconfig = get_config('quiz');
|
|
$arealreadyadvanced = false;
|
|
foreach (array($quizconfig) as $name => $value) {
|
|
if (strpos($name, 'fix_') === 0 && !empty($value)) {
|
|
$arealreadyadvanced = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (!$arealreadyadvanced) {
|
|
set_config('fix_penaltyscheme', 1, 'quiz');
|
|
set_config('fix_attemptonlast', 1, 'quiz');
|
|
set_config('fix_questiondecimalpoints', 1, 'quiz');
|
|
set_config('fix_password', 1, 'quiz');
|
|
set_config('fix_subnet', 1, 'quiz');
|
|
set_config('fix_delay1', 1, 'quiz');
|
|
set_config('fix_delay2', 1, 'quiz');
|
|
set_config('fix_popup', 1, 'quiz');
|
|
}
|
|
|
|
/// quiz savepoint reached
|
|
upgrade_mod_savepoint(true, 2009030900, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2009031000) {
|
|
/// Add new questiondecimaldigits setting, separate form the overall decimaldigits one.
|
|
$table = new xmldb_table('quiz');
|
|
$field = new xmldb_field('questiondecimalpoints', XMLDB_TYPE_INTEGER, '4', null, XMLDB_NOTNULL, null, '2', 'decimalpoints');
|
|
if (!$dbman->field_exists($table, $field)) {
|
|
$dbman->add_field($table, $field);
|
|
}
|
|
|
|
/// quiz savepoint reached
|
|
upgrade_mod_savepoint(true, 2009031000, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2009031001) {
|
|
/// Convert quiz.timelimit from minutes to seconds.
|
|
$DB->execute('UPDATE {quiz} SET timelimit = timelimit * 60');
|
|
$default = get_config('quiz', 'timelimit');
|
|
set_config('timelimit', 60 * $default, 'quiz');
|
|
|
|
/// quiz savepoint reached
|
|
upgrade_mod_savepoint(true, 2009031001, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2009042000) {
|
|
|
|
/// Define field introformat to be added to quiz
|
|
$table = new xmldb_table('quiz');
|
|
$field = new xmldb_field('introformat', XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'intro');
|
|
|
|
if (!$dbman->field_exists($table, $field)) {
|
|
$dbman->add_field($table, $field);
|
|
}
|
|
|
|
// conditionally migrate to html format in intro
|
|
if ($CFG->texteditors !== 'textarea') {
|
|
$rs = $DB->get_recordset('quiz', array('introformat' => FORMAT_MOODLE), '', 'id,intro,introformat');
|
|
foreach ($rs as $q) {
|
|
$q->intro = text_to_html($q->intro, false, false, true);
|
|
$q->introformat = FORMAT_HTML;
|
|
$DB->update_record('quiz', $q);
|
|
upgrade_set_timeout();
|
|
}
|
|
$rs->close();
|
|
}
|
|
|
|
/// quiz savepoint reached
|
|
upgrade_mod_savepoint(true, 2009042000, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2010030501) {
|
|
/// Define table quiz_overrides to be created
|
|
$table = new xmldb_table('quiz_overrides');
|
|
|
|
/// Adding fields to table quiz_overrides
|
|
$table->add_field('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null);
|
|
$table->add_field('quiz', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0');
|
|
$table->add_field('groupid', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null);
|
|
$table->add_field('userid', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null);
|
|
$table->add_field('timeopen', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null);
|
|
$table->add_field('timeclose', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null);
|
|
$table->add_field('timelimit', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null);
|
|
$table->add_field('attempts', XMLDB_TYPE_INTEGER, '6', XMLDB_UNSIGNED, null, null, null);
|
|
$table->add_field('password', XMLDB_TYPE_CHAR, '255', null, null, null, null);
|
|
|
|
/// Adding keys to table quiz_overrides
|
|
$table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
|
|
$table->add_key('quiz', XMLDB_KEY_FOREIGN, array('quiz'), 'quiz', array('id'));
|
|
$table->add_key('groupid', XMLDB_KEY_FOREIGN, array('groupid'), 'groups', array('id'));
|
|
$table->add_key('userid', XMLDB_KEY_FOREIGN, array('userid'), 'user', array('id'));
|
|
|
|
/// Conditionally launch create table for quiz_overrides
|
|
if (!$dbman->table_exists($table)) {
|
|
$dbman->create_table($table);
|
|
}
|
|
|
|
/// quiz savepoint reached
|
|
upgrade_mod_savepoint(true, 2010030501, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2010051800) {
|
|
|
|
// Define field showblocks to be added to quiz
|
|
$table = new xmldb_table('quiz');
|
|
$field = new xmldb_field('showblocks', XMLDB_TYPE_INTEGER, '4', null, XMLDB_NOTNULL, null, '0', 'showuserpicture');
|
|
|
|
// Conditionally launch add field showblocks
|
|
if (!$dbman->field_exists($table, $field)) {
|
|
$dbman->add_field($table, $field);
|
|
}
|
|
|
|
// quiz savepoint reached
|
|
upgrade_mod_savepoint(true, 2010051800, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2010080600) {
|
|
|
|
// Define field feedbacktextformat to be added to quiz_feedback
|
|
$table = new xmldb_table('quiz_feedback');
|
|
$field = new xmldb_field('feedbacktextformat', XMLDB_TYPE_INTEGER, '2', null, XMLDB_NOTNULL, null, '0', 'feedbacktext');
|
|
|
|
// Conditionally launch add field feedbacktextformat
|
|
if (!$dbman->field_exists($table, $field)) {
|
|
$dbman->add_field($table, $field);
|
|
}
|
|
|
|
// This column defaults to FORMAT_MOODLE, which is correct.
|
|
|
|
// quiz savepoint reached
|
|
upgrade_mod_savepoint(true, 2010080600, 'quiz');
|
|
}
|
|
|
|
if ($oldversion < 2010102000) {
|
|
|
|
// Define field showblocks to be added to quiz
|
|
// Repeat this step, because the column was missing from install.xml for a time.
|
|
$table = new xmldb_table('quiz');
|
|
$field = new xmldb_field('showblocks', XMLDB_TYPE_INTEGER, '4', null, XMLDB_NOTNULL, null, '0', 'showuserpicture');
|
|
|
|
// Conditionally launch add field showblocks
|
|
if (!$dbman->field_exists($table, $field)) {
|
|
$dbman->add_field($table, $field);
|
|
}
|
|
|
|
// quiz savepoint reached
|
|
upgrade_mod_savepoint(true, 2010102000, 'quiz');
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|