mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-12540 - Quiz sometimes outputs content before <head> when previewing - breaks HTML strict. Merged from MOODLE_19_STABLE.

Browse Source
This commit is contained in:
tjhunt 2007-12-11 15:04:31 +00:00
parent 93beeb7254
commit d8d9497719
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mod/quiz/attempt.php
View File

@ -79,6 +79,9 @@
$strquizzes = get_string("modulenameplural", "quiz");
$popup = $quiz->popup && !$ispreviewing; // Controls whether this is shown in a javascript-protected window.
/// We intentionally do not check open and close times here. Instead we do it lower down.
/// This is to deal with what happens when someone submits close to the exact moment when the quiz closes.
/// Check number of attempts
$numberofpreviousattempts = count_records_select('quiz_attempts', "quiz = '{$quiz->id}' AND " .
"userid = '{$USER->id}' AND timefinish > 0 AND preview != 1");
@ -87,12 +90,8 @@
}
/// Check subnet access
if ($quiz->subnet and !address_in_subnet(getremoteaddr(), $quiz->subnet)) {
if ($ispreviewing) {
notify(get_string('subnetnotice', 'quiz'));
} else {
error(get_string("subneterror", "quiz"), "view.php?id=$cm->id");
}
if (!$ispreviewing && $quiz->subnet && !address_in_subnet(getremoteaddr(), $quiz->subnet)) {
error(get_string("subneterror", "quiz"), "view.php?id=$cm->id");
}
/// Check password access
@ -374,17 +373,6 @@
quiz_send_notification_emails($course, $quiz, $attempt, $context, $cm);
}
/// Check access to quiz page
// check the quiz times
if ($timestamp < $quiz->timeopen || ($quiz->timeclose and $timestamp > $quiz->timeclose)) {
if ($ispreviewing) {
notify(get_string('notavailabletostudents', 'quiz'));
} else {
notice(get_string('notavailable', 'quiz'), "view.php?id={$cm->id}");
}
}
if ($finishattempt) {
if (!empty($SESSION->passwordcheckedquizzes[$quiz->id])) {
unset($SESSION->passwordcheckedquizzes[$quiz->id]);
@ -392,6 +380,11 @@
redirect($CFG->wwwroot . '/mod/quiz/review.php?attempt='.$attempt->id, 0);
}
// Now is the right time to check the open and close times.
if (!$ispreviewing && ($timestamp < $quiz->timeopen || ($quiz->timeclose && $timestamp > $quiz->timeclose))) {
error(get_string('notavailable', 'quiz'), "view.php?id={$cm->id}");
}
/// Print the quiz page ////////////////////////////////////////////////////////
// Print the page header
@ -422,9 +415,16 @@
$buttonoptions['q'] = $quiz->id;
$buttonoptions['forcenew'] = true;
print_single_button($CFG->wwwroot.'/mod/quiz/attempt.php', $buttonoptions, get_string('startagain', 'quiz'));
/// Notices about restrictions that would affect students.
if ($quiz->popup) {
notify(get_string('popupnotice', 'quiz'));
}
if ($timestamp < $quiz->timeopen || ($quiz->timeclose && $timestamp > $quiz->timeclose)) {
notify(get_string('notavailabletostudents', 'quiz'));
}
if ($quiz->subnet && !address_in_subnet(getremoteaddr(), $quiz->subnet)) {
notify(get_string('subnetnotice', 'quiz'));
}
} else {
if ($quiz->attempts != 1) {
print_heading(format_string($quiz->name).' - '.$strattemptnum);