Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MDL-34257 quiz 'secure' mode: PAGE initialisation order issues.

  • Loading branch information...
commit 0e708c34760ee274990e1c5bad96583301a6cc79 1 parent 8f8e28c
@timhunt timhunt authored nebgor committed
View
4 mod/quiz/attempt.php
@@ -76,8 +76,9 @@
// Check the access rules.
$accessmanager = $attemptobj->get_access_manager(time());
-$messages = $accessmanager->prevent_access();
+$accessmanager->setup_attempt_page($PAGE);
$output = $PAGE->get_renderer('mod_quiz');
+$messages = $accessmanager->prevent_access();
if (!$attemptobj->is_preview_user() && $messages) {
print_error('attempterror', 'quiz', $attemptobj->view_url(),
$output->access_messages($messages));
@@ -120,7 +121,6 @@
$headtags = $attemptobj->get_html_head_contributions($page);
$PAGE->set_title(format_string($attemptobj->get_quiz_name()));
$PAGE->set_heading($attemptobj->get_course()->fullname);
-$accessmanager->setup_attempt_page($PAGE);
if ($attemptobj->is_last_page($page)) {
$nextpage = -1;
View
3  mod/quiz/review.php
@@ -52,6 +52,8 @@
// Create an object to manage all the other (non-roles) access rules.
$accessmanager = $attemptobj->get_access_manager(time());
+$accessmanager->setup_attempt_page($PAGE);
+
$options = $attemptobj->get_display_options(true);
// Check permissions.
@@ -103,7 +105,6 @@
$headtags = $attemptobj->get_html_head_contributions($page, $showall);
$PAGE->set_title(format_string($attemptobj->get_quiz_name()));
$PAGE->set_heading($attemptobj->get_course()->fullname);
-$accessmanager->setup_attempt_page($PAGE);
// Summary table start. ============================================================================
View
4 mod/quiz/summary.php
@@ -52,8 +52,9 @@
// Check access.
$accessmanager = $attemptobj->get_access_manager(time());
-$messages = $accessmanager->prevent_access();
+$accessmanager->setup_attempt_page($PAGE);
$output = $PAGE->get_renderer('mod_quiz');
+$messages = $accessmanager->prevent_access();
if (!$attemptobj->is_preview_user() && $messages) {
print_error('attempterror', 'quiz', $attemptobj->view_url(),
$output->access_messages($messages));
@@ -89,7 +90,6 @@
$PAGE->navbar->add(get_string('summaryofattempt', 'quiz'));
$PAGE->set_title(format_string($attemptobj->get_quiz_name()));
$PAGE->set_heading($attemptobj->get_course()->fullname);
-$accessmanager->setup_attempt_page($PAGE);
// Display the page.
echo $output->summary_page($attemptobj, $displayoptions);
View
3  theme/base/config.php
@@ -162,7 +162,8 @@
// The pagelayout used for safebrowser and securewindow.
'secure' => array(
'file' => 'general.php',
- 'regions' => array(),
+ 'regions' => array('side-pre'),
+ 'defaultregion' => 'side-pre',
'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nologinlinks'=>true),
),
);
Please sign in to comment.
Something went wrong with that request. Please try again.