';
echo '
';
-$questionbank->display('editq', $contexts, $thispageurl, $cm,
+$questionbank->display('editq',
$pagevars['qpage'],
$pagevars['qperpage'], $pagevars['qsortorder'],
$pagevars['qsortorderdecoded'],
diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index c708dbd33c0..3e5c93158a7 100644
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -1014,8 +1014,8 @@ function quiz_question_tostring(&$question,$showicon=false,$showquestiontext=tru
class quiz_question_bank_view extends question_bank_view {
protected $quizhasattempts = false;
- public function __construct() {
-
+ public function __construct($contexts, $pageurl, $cm = null) {
+ parent::__construct($contexts, $pageurl, $cm);
}
/**
@@ -1040,42 +1040,11 @@ class quiz_question_bank_view extends question_bank_view {
* category Chooses the category
* displayoptions Sets display options
*/
- function display($tabname, $contexts, $pageurl, $cm, $page, $perpage, $sortorder,
+ public function display($tabname, $page, $perpage, $sortorder,
$sortorderdecoded, $cat, $recurse, $showhidden, $showquestiontext){
global $COURSE, $DB;
- if (optional_param('deleteselected', false, PARAM_BOOL)){ // teacher still has to confirm
- // make a list of all the questions that are selected
- $rawquestions = $_REQUEST; // This code is called by both POST forms and GET links, so cannot use data_submitted.
- $questionlist = ''; // comma separated list of ids of questions to be deleted
- $questionnames = ''; // string with names of questions separated by
with - // an asterix in front of those that are in use - $inuse = false; // set to true if at least one of the questions is in use - foreach ($rawquestions as $key => $value) { // Parse input for question ids - if (preg_match('!^q([0-9]+)$!', $key, $matches)) { - $key = $matches[1]; - $questionlist .= $key.','; - question_require_capability_on($key, 'edit'); - if ($DB->record_exists('quiz_question_instances', array('question' => $key))) { - $questionnames .= '* '; - $inuse = true; - } - $questionnames .= $DB->get_field('question', 'name', array('id' => $key)) . '
'; - } - } - if (!$questionlist) { // no questions were selected - redirect($pageurl->out()); - } - $questionlist = rtrim($questionlist, ','); - - // Add an explanation about questions in use - if ($inuse) { - $questionnames .= '
'.get_string('questionsinuse', 'quiz'); - } - notice_yesno(get_string("deletequestionscheck", "quiz", $questionnames), - $pageurl->out_action(array('deleteselected'=>$questionlist, 'confirm'=>md5($questionlist))), - $pageurl->out_action()); - + if ($this->process_actions_needing_ui()) { return; } @@ -1112,17 +1081,17 @@ class quiz_question_bank_view extends question_bank_view { print_box_start('generalbox questionbank'); - $this->display_category_form($contexts->having_one_edit_tab_cap($tabname), - $pageurl, $cat, $recurse, $showhidden, $showquestiontext); + $this->display_category_form($this->contexts->having_one_edit_tab_cap($tabname), + $this->baseurl, $cat, $recurse, $showhidden, $showquestiontext); // continues with list of questions - $this->display_question_list($contexts->having_one_edit_tab_cap($tabname), $pageurl, $cat, isset($cm) ? $cm : null, + $this->display_question_list($this->contexts->having_one_edit_tab_cap($tabname), $this->baseurl, $cat, $this->cm, $recurse, $page, $perpage, $showhidden, $sortorder, $sortorderdecoded, $showquestiontext, - $contexts->having_cap('moodle/question:add')); + $this->contexts->having_cap('moodle/question:add')); echo '
\n"; } -} -/** - * Add an arbitrary element to array at a specified index, pushing the rest - * back. - * - * @param array $array The array to operate on - * @param mixed $value The element to add - * @param integer $at The position at which to add the element - * @return array - */ -function array_add_at($array,$value,$at){ - $beginpart=array_slice($array, 0,$at); - $endpart=array_slice($array, $at, (count($array)-$at) ); - $beginpart[]=$value; - $result=array_merge($beginpart,$endpart); - return $result; + protected function display_question_sort_options($pageurl, $sortorder){ + //sort options + $html = "
with + // an asterix in front of those that are in use + $inuse = false; // set to true if at least one of the questions is in use + foreach ($rawquestions as $key => $value) { // Parse input for question ids + if (preg_match('!^q([0-9]+)$!', $key, $matches)) { + $key = $matches[1]; + $questionlist .= $key.','; + question_require_capability_on($key, 'edit'); + if ($DB->record_exists('quiz_question_instances', array('question' => $key))) { + $questionnames .= '* '; + $inuse = true; + } + $questionnames .= $DB->get_field('question', 'name', array('id' => $key)) . '
'; + } + } + if (!$questionlist) { // no questions were selected + redirect($this->baseurl->out()); + } + $questionlist = rtrim($questionlist, ','); + + // Add an explanation about questions in use + if ($inuse) { + $questionnames .= '
'.get_string('questionsinuse', 'quiz'); + } + notice_yesno(get_string("deletequestionscheck", "quiz", $questionnames), + $pageurl->out_action(array('deleteselected'=>$questionlist, 'confirm'=>md5($questionlist))), + $pageurl->out_action()); + + return true; + } + } } /** diff --git a/question/edit.php b/question/edit.php index 53804e0916e..de3bf6e9f52 100644 --- a/question/edit.php +++ b/question/edit.php @@ -34,8 +34,8 @@ require_once("editlib.php"); list($thispageurl, $contexts, $cmid, $cm, $module, $pagevars) = question_edit_setup('questions'); - $questionbank = new question_bank_view(); - $questionbank->process_actions($thispageurl, $cm); + $questionbank = new question_bank_view($contexts, $thispageurl, $cm); + $questionbank->process_actions(); // TODO log this page view. @@ -72,7 +72,7 @@ echo '
with - // an asterix in front of those that are in use - $inuse = false; // set to true if at least one of the questions is in use - foreach ($rawquestions as $key => $value) { // Parse input for question ids - if (preg_match('!^q([0-9]+)$!', $key, $matches)) { - $key = $matches[1]; - $questionlist .= $key.','; - question_require_capability_on($key, 'edit'); - if ($DB->record_exists('quiz_question_instances', array('question' => $key))) { - $questionnames .= '* '; - $inuse = true; - } - $questionnames .= $DB->get_field('question', 'name', array('id' => $key)) . '
'; - } - } - if (!$questionlist) { // no questions were selected - redirect($pageurl->out()); - } - $questionlist = rtrim($questionlist, ','); - - // Add an explanation about questions in use - if ($inuse) { - $questionnames .= '
'.get_string('questionsinuse', 'quiz'); - } - notice_yesno(get_string("deletequestionscheck", "quiz", $questionnames), - $pageurl->out_action(array('deleteselected'=>$questionlist, 'confirm'=>md5($questionlist))), - $pageurl->out_action()); - + if ($this->process_actions_needing_ui()) { return; } @@ -1112,17 +1081,17 @@ class quiz_question_bank_view extends question_bank_view { print_box_start('generalbox questionbank'); - $this->display_category_form($contexts->having_one_edit_tab_cap($tabname), - $pageurl, $cat, $recurse, $showhidden, $showquestiontext); + $this->display_category_form($this->contexts->having_one_edit_tab_cap($tabname), + $this->baseurl, $cat, $recurse, $showhidden, $showquestiontext); // continues with list of questions - $this->display_question_list($contexts->having_one_edit_tab_cap($tabname), $pageurl, $cat, isset($cm) ? $cm : null, + $this->display_question_list($this->contexts->having_one_edit_tab_cap($tabname), $this->baseurl, $cat, $this->cm, $recurse, $page, $perpage, $showhidden, $sortorder, $sortorderdecoded, $showquestiontext, - $contexts->having_cap('moodle/question:add')); + $this->contexts->having_cap('moodle/question:add')); echo '
\n"; } -} -/** - * Add an arbitrary element to array at a specified index, pushing the rest - * back. - * - * @param array $array The array to operate on - * @param mixed $value The element to add - * @param integer $at The position at which to add the element - * @return array - */ -function array_add_at($array,$value,$at){ - $beginpart=array_slice($array, 0,$at); - $endpart=array_slice($array, $at, (count($array)-$at) ); - $beginpart[]=$value; - $result=array_merge($beginpart,$endpart); - return $result; + protected function display_question_sort_options($pageurl, $sortorder){ + //sort options + $html = "
";
+ // POST method should only be used for parameters that change data
+ // or if POST method has to be used, the user must be redirected immediately to
+ // non-POSTed page to not break the back button
+ $html .= '\n";
+ $html .= "
\n";
+ echo $html;
+ }
+
+ public function process_actions() {
+ global $CFG, $COURSE, $DB;
+ /// Now, check for commands on this page and modify variables as necessary
+ if (optional_param('move', false, PARAM_BOOL) and confirm_sesskey()) { /// Move selected questions to new category
+ $category = required_param('category', PARAM_SEQUENCE);
+ list($tocategoryid, $contextid) = explode(',', $category);
+ if (! $tocategory = $DB->get_record('question_categories', array('id' => $tocategoryid, 'contextid' => $contextid))) {
+ print_error('cannotfindcate', 'question');
+ }
+ $tocontext = get_context_instance_by_id($contextid);
+ require_capability('moodle/question:add', $tocontext);
+ $rawdata = (array) data_submitted();
+ $questionids = array();
+ foreach ($rawdata as $key => $value) { // Parse input for question ids
+ if (preg_match('!^q([0-9]+)$!', $key, $matches)) {
+ $key = $matches[1];
+ $questionids[] = $key;
+ }
+ }
+ if ($questionids){
+ list($usql, $params) = $DB->get_in_or_equal($questionids);
+ $sql = "SELECT q.*, c.contextid FROM {question} q, {question_categories} c WHERE q.id $usql AND c.id = q.category";
+ if (!$questions = $DB->get_records_sql($sql, $params)){
+ print_error('questiondoesnotexist', 'question', $pageurl->out());
+ }
+ $checkforfiles = false;
+ foreach ($questions as $question){
+ //check capabilities
+ question_require_capability_on($question, 'move');
+ $fromcontext = get_context_instance_by_id($question->contextid);
+ if (get_filesdir_from_context($fromcontext) != get_filesdir_from_context($tocontext)){
+ $checkforfiles = true;
+ }
+ }
+ $returnurl = $pageurl->out(false, array('category'=>"$tocategoryid,$contextid"));
+ if (!$checkforfiles){
+ if (!question_move_questions_to_category(implode(',', $questionids), $tocategory->id)) {
+ print_error('errormovingquestions', 'question', $returnurl, $questionids);
+ }
+ redirect($returnurl);
+ } else {
+ $movecontexturl = new moodle_url($CFG->wwwroot.'/question/contextmoveq.php',
+ array('returnurl' => $returnurl,
+ 'ids'=>$questionidlist,
+ 'tocatid'=> $tocategoryid));
+ if ($cm){
+ $movecontexturl->param('cmid', $cm->id);
+ } else {
+ $movecontexturl->param('courseid', $COURSE->id);
+ }
+ redirect($movecontexturl->out());
+ }
+ }
+ }
+
+ if (optional_param('deleteselected', false, PARAM_BOOL)) { // delete selected questions from the category
+ if (($confirm = optional_param('confirm', '', PARAM_ALPHANUM)) and confirm_sesskey()) { // teacher has already confirmed the action
+ $deleteselected = required_param('deleteselected');
+ if ($confirm == md5($deleteselected)) {
+ if ($questionlist = explode(',', $deleteselected)) {
+ // for each question either hide it if it is in use or delete it
+ foreach ($questionlist as $questionid) {
+ question_require_capability_on($questionid, 'edit');
+ if ($DB->record_exists('quiz_question_instances', array('question' => $questionid))) {
+ if (!$DB->set_field('question', 'hidden', 1, array('id' => $questionid))) {
+ question_require_capability_on($questionid, 'edit');
+ print_error('cannothidequestion', 'question');
+ }
+ } else {
+ delete_question($questionid);
+ }
+ }
+ }
+ redirect($pageurl->out());
+ } else {
+ print_error('invalidconfirm', 'question');
+ }
+ }
+ }
+
+ // Unhide a question
+ if(($unhide = optional_param('unhide', '', PARAM_INT)) and confirm_sesskey()) {
+ question_require_capability_on($unhide, 'edit');
+ if(!$DB->set_field('question', 'hidden', 0, array('id', $unhide))) {
+ print_error('cannotunhidequestion', 'question');
+ }
+ redirect($pageurl->out());
+ }
+ }
+
+ public function process_actions_needing_ui() {
+ if (optional_param('deleteselected', false, PARAM_BOOL)) {
+ // make a list of all the questions that are selected
+ $rawquestions = $_REQUEST; // This code is called by both POST forms and GET links, so cannot use data_submitted.
+ $questionlist = ''; // comma separated list of ids of questions to be deleted
+ $questionnames = ''; // string with names of questions separated by with + // an asterix in front of those that are in use + $inuse = false; // set to true if at least one of the questions is in use + foreach ($rawquestions as $key => $value) { // Parse input for question ids + if (preg_match('!^q([0-9]+)$!', $key, $matches)) { + $key = $matches[1]; + $questionlist .= $key.','; + question_require_capability_on($key, 'edit'); + if ($DB->record_exists('quiz_question_instances', array('question' => $key))) { + $questionnames .= '* '; + $inuse = true; + } + $questionnames .= $DB->get_field('question', 'name', array('id' => $key)) . '
'; + } + } + if (!$questionlist) { // no questions were selected + redirect($this->baseurl->out()); + } + $questionlist = rtrim($questionlist, ','); + + // Add an explanation about questions in use + if ($inuse) { + $questionnames .= '
'.get_string('questionsinuse', 'quiz'); + } + notice_yesno(get_string("deletequestionscheck", "quiz", $questionnames), + $pageurl->out_action(array('deleteselected'=>$questionlist, 'confirm'=>md5($questionlist))), + $pageurl->out_action()); + + return true; + } + } } /** diff --git a/question/edit.php b/question/edit.php index 53804e0916e..de3bf6e9f52 100644 --- a/question/edit.php +++ b/question/edit.php @@ -34,8 +34,8 @@ require_once("editlib.php"); list($thispageurl, $contexts, $cmid, $cm, $module, $pagevars) = question_edit_setup('questions'); - $questionbank = new question_bank_view(); - $questionbank->process_actions($thispageurl, $cm); + $questionbank = new question_bank_view($contexts, $thispageurl, $cm); + $questionbank->process_actions(); // TODO log this page view. @@ -72,7 +72,7 @@ echo '
';
+ } else {
+ return ' 
';
+ }
}
/**
@@ -149,16 +233,14 @@ abstract class question_bank_column_base {
}
protected function display_start($question, $rowclasses) {
- echo '
',
0, 0, $this->strpreview, QUESTION_PREVIEW_POPUP_OPTIONS);
}
@@ -464,21 +552,19 @@ class question_bank_preview_action_column extends question_bank_action_column_ba
class question_bank_move_action_column extends question_bank_action_column_base {
protected $strmove;
- protected $questionurl;
- public function __construct($questionurl) {
- parent::__construct();
- $this->questionurl = $questionurl;
+ public function init() {
+ parent::init();
$this->strmove = get_string('move');
}
- protected function get_css_classes($question, $rowclasses) {
+ protected function get_name() {
return 'editaction';
}
protected function display_content($question, $rowclasses) {
if (question_has_capability_on($question, 'move')) {
- $this->print_icon('move', $this->strmove, $this->questionurl->out(false, array('id' => $question->id)));
+ $this->print_icon('move', $this->strmove, $this->qbank->edit_question_url($question->id));
}
}
}
@@ -489,26 +575,24 @@ class question_bank_move_action_column extends question_bank_action_column_base
class question_bank_delete_action_column extends question_bank_action_column_base {
protected $strdelete;
protected $strrestore;
- protected $questionurl;
- public function __construct($questionurl) {
- parent::__construct();
- $this->questionurl = $questionurl;
+ public function init() {
+ parent::init();
$this->strdelete = get_string('delete');
$this->strrestore = get_string('restore');
}
- protected function get_css_classes($question, $rowclasses) {
+ protected function get_name() {
return 'deleteaction';
}
protected function display_content($question, $rowclasses) {
if (question_has_capability_on($question, 'edit')) {
if ($question->hidden) {
- $this->print_icon('restore', $this->strrestore, $pageurl->out(false, array('unhide' => $question->id)));
+ $this->print_icon('restore', $this->strrestore, $this->qbank->base_url()->out(false, array('unhide' => $question->id)));
} else {
$this->print_icon('restore', $this->strrestore,
- $pageurl->out(false, array('deleteselected' => $question->id, 'q' . $question->id => 1)));
+ $this->qbank->base_url()->out(false, array('deleteselected' => $question->id, 'q' . $question->id => 1)));
}
}
}
@@ -536,8 +620,46 @@ class question_bank_delete_action_column extends question_bank_action_column_bas
* + outputting table headers.
*/
class question_bank_view {
- public function __construct() {
+ protected $baseurl;
+ protected $editquestionurl;
+ protected $quizorcourseid;
+ protected $contexts;
+ protected $cm;
+ public function __construct($contexts, $pageurl, $cm = null) {
+ global $CFG, $COURSE;
+
+ $this->contexts = $contexts;
+ $this->baseurl = $pageurl;
+ $this->cm = $cm;
+
+ if (!empty($cm) && $cm->modname == 'quiz') {
+ $this->quizorcourseid = '&quizid=' . $cm->instance;
+ } else {
+ $this->quizorcourseid = '&courseid=' .$COURSE->id;
+ }
+
+ // Create the url of the new question page to forward to.
+ $this->editquestionurl = new moodle_url("$CFG->wwwroot/question/question.php",
+ array('returnurl' => $pageurl->out()));
+ if ($cm !== null){
+ $this->editquestionurl->param('cmid', $cm->id);
+ } else {
+ $this->editquestionurl->param('courseid', $COURSE->id);
+ }
+ }
+
+ public function base_url($questionid) {
+ return $baseurl;
+ }
+
+ public function edit_question_url($questionid) {
+ return $this->editquestionurl->out(false, array('id' => $questionid));
+ }
+
+ public function preview_question_url($questionid) {
+ global $CFG;
+ return $CFG->wwwroot . '/question/preview.php?id=' . $question->id . $this->quizorcourseid;
}
/**
@@ -552,42 +674,11 @@ class question_bank_view {
* category Chooses the category
* displayoptions Sets display options
*/
- function display($tabname, $contexts, $pageurl, $cm, $page, $perpage, $sortorder,
+ public function display($tabname, $page, $perpage, $sortorder,
$sortorderdecoded, $cat, $recurse, $showhidden, $showquestiontext){
global $COURSE, $DB;
- if (optional_param('deleteselected', false, PARAM_BOOL)){ // teacher still has to confirm
- // make a list of all the questions that are selected
- $rawquestions = $_REQUEST; // This code is called by both POST forms and GET links, so cannot use data_submitted.
- $questionlist = ''; // comma separated list of ids of questions to be deleted
- $questionnames = ''; // string with names of questions separated by