mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-34862' of git://github.com/timhunt/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2012-08-15 03:30:56 +02:00
commit 7ccede7af8
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
question/engine/questionusage.php
View File

@ -63,7 +63,7 @@ class question_usage_by_activity {
*/ */
protected $preferredbehaviour = null; protected $preferredbehaviour = null;
/** @var object the context this usage belongs to. */ /** @var context the context this usage belongs to. */
protected $context; protected $context;
/** @var string plugin name of the plugin this usage belongs to. */ /** @var string plugin name of the plugin this usage belongs to. */
@ -104,7 +104,7 @@ class question_usage_by_activity {
return $this->preferredbehaviour; return $this->preferredbehaviour;
} }
/** @return object the context this usage belongs to. */ /** @return context the context this usage belongs to. */
public function get_owning_context() { public function get_owning_context() {
return $this->context; return $this->context;
} }

14
question/preview.php
View File

@ -75,14 +75,10 @@ $options->set_from_request();
$PAGE->set_url(question_preview_url($id, $options->behaviour, $options->maxmark, $PAGE->set_url(question_preview_url($id, $options->behaviour, $options->maxmark,
$options, $options->variant, $context)); $options, $options->variant, $context));
// Get and validate exitsing preview, or start a new one. // Get and validate existing preview, or start a new one.
$previewid = optional_param('previewid', 0, PARAM_INT); $previewid = optional_param('previewid', 0, PARAM_INT);
if ($previewid) { if ($previewid) {
if (!isset($SESSION->question_previews[$previewid])) {
print_error('notyourpreview', 'question');
}
try { try {
$quba = question_engine::load_questions_usage_by_activity($previewid); $quba = question_engine::load_questions_usage_by_activity($previewid);
@ -94,6 +90,10 @@ if ($previewid) {
$options->maxmark, $options, $options->variant, $context), null, $e); $options->maxmark, $options, $options->variant, $context), null, $e);
} }
if ($quba->get_owning_context()->instanceid != $USER->id) {
print_error('notyourpreview', 'question');
}
$slot = $quba->get_first_question_number(); $slot = $quba->get_first_question_number();
$usedquestion = $quba->get_question($slot); $usedquestion = $quba->get_question($slot);
if ($usedquestion->id != $question->id) { if ($usedquestion->id != $question->id) {
@ -104,7 +104,7 @@ if ($previewid) {
} else { } else {
$quba = question_engine::make_questions_usage_by_activity( $quba = question_engine::make_questions_usage_by_activity(
'core_question_preview', $context); 'core_question_preview', context_user::instance($USER->id));
$quba->set_preferred_behaviour($options->behaviour); $quba->set_preferred_behaviour($options->behaviour);
$slot = $quba->add_question($question, $options->maxmark); $slot = $quba->add_question($question, $options->maxmark);
@ -119,8 +119,6 @@ if ($previewid) {
$transaction = $DB->start_delegated_transaction(); $transaction = $DB->start_delegated_transaction();
question_engine::save_questions_usage_by_activity($quba); question_engine::save_questions_usage_by_activity($quba);
$transaction->allow_commit(); $transaction->allow_commit();
$SESSION->question_previews[$quba->get_id()] = true;
} }
$options->behaviour = $quba->get_preferred_behaviour(); $options->behaviour = $quba->get_preferred_behaviour();
$options->maxmark = $quba->get_question_max_mark($slot); $options->maxmark = $quba->get_question_max_mark($slot);