WebSVN – Moodle – Diff – /question/editlib.php

                                         WHERE qc.id {$usql} {$npsql} {$version}
                                      ORDER BY qc.id, q.qtype, q.name", $params);
     // Iterate through questions, getting stuff we need.
     $qresults = [];
-    foreach($questions as $key => $question) {
+    foreach ($questions as $question) {
+        $question->export_process = $export;
-        $question->export_process = $export;
+        $question->categoryobject = $category;
         $qtype = question_bank::get_qtype($question->qtype, false);
         if ($export && $qtype->name() === 'missingtype') {
             // Unrecognised question type. Skip this question when exporting.
             continue;
 /**
  * Common setup for all pages for editing questions.
  * @param string $baseurl the name of the script calling this funciton. For examle 'qusetion/edit.php'.
  * @param string $edittab code for this edit tab
- * @param bool $requirecmid require cmid? default false
+ * @param bool $requirecmid This parameter has been deprecated since 4.5 and should not be used anymore.
  * @param bool $unused no longer used, do no pass
  * @return array $thispageurl, $contexts, $cmid, $cm, $module, $pagevars
  */
-function question_edit_setup($edittab, $baseurl, $requirecmid = false, $unused = null) {
+function question_edit_setup($edittab, $baseurl, $requirecmid = null, $unused = null) {
     global $PAGE;
-    if ($unused !== null) {
+    if ($unused !== null || $requirecmid !== null) {
         debugging('Deprecated argument passed to question_edit_setup()', DEBUG_DEVELOPER);
-    }
+    }
-    $params = [];
-    if ($requirecmid) {
-        $params['cmid'] = required_param('cmid', PARAM_INT);
-    } else {
-        $params['cmid'] = optional_param('cmid', null, PARAM_INT);
-    }
     if (!$params['cmid']) {
-        $params['courseid'] = required_param('courseid', PARAM_INT);
+    $params = [];
     $params['cmid'] = required_param('cmid', PARAM_INT);
 /**
  * Common function for building the generic resources required by the
  * editing questions pages.
- *
- * Either a cmid or a course id must be provided as keys in $params or
+ *
- * an exception will be thrown. All other params are optional and will have
+ * A cmid must be provided as a key in $params or an exception will be thrown.
- * sane default applied if not provided.
+ * All other params are optional and will have sane default applied if not provided.
+ *
  * The acceptable keys for $params are:
  * [
- *      'cmid' => PARAM_INT,
- *      'courseid' => PARAM_INT,
+ *      'cmid' => PARAM_INT,
  *      'qpage' => PARAM_INT,
  *      'cat' => PARAM_SEQUENCE,
  *      'category' => PARAM_SEQUENCE,
  *      'qperpage' => PARAM_INT,
         'sortdata' => [],
         'filter' => null
     ];
     $paramtypes = [
         'cmid' => PARAM_INT,
-        'courseid' => PARAM_INT,
         'qpage' => PARAM_INT,
         'cat' => PARAM_SEQUENCE,
         'category' => PARAM_SEQUENCE,
         'qperpage' => PARAM_INT,
         'cpage' => PARAM_INT,
     if (!empty($params['filter'])) {
         if (!is_array($params['filter'])) {
             $params['filter'] = json_decode($params['filter'], true);
         }
+        $cleanparams['filter'] = [];
+        foreach ($params['filter'] as $filterkey => $filtervalue) {
+            if ($filterkey == 'jointype') {
+                $cleanparams['filter']['jointype'] = clean_param($filtervalue, PARAM_INT);
+            } else {
+                if (!array_key_exists('name', $filtervalue)) {
+                    $filtervalue['name'] = $filterkey;
+                }
+                $cleanfilter = [
+                    'name' => clean_param($filtervalue['name'], PARAM_ALPHANUM),
+                    'jointype' => clean_param($filtervalue['jointype'], PARAM_INT),
+                    'values' => $filtervalue['values'],
+                    'filteroptions' => $filtervalue['filteroptions'] ?? [],
+                ];
+                $cleanparams['filter'][$filterkey] = $cleanfilter;
+            }
         $cleanparams['filter'] = $params['filter'];
+    }
     if (isset($params['sortdata'])) {
         $cleanparams['sortdata'] = clean_param_array($params['sortdata'], PARAM_INT);
-    }
+    }
     $cmid = $cleanparams['cmid'];
-    $courseid = $cleanparams['courseid'];
+    $cmid = $cleanparams['cmid'];
     $qpage = $cleanparams['qpage'] ?: -1;
     $cat = $cleanparams['cat'] ?: 0;
     $category = $cleanparams['category'] ?: 0;
     $qperpage = $cleanparams['qperpage'];
     $cpage = $cleanparams['cpage'] ?: 1;
-    if (is_null($cmid) && is_null($courseid)) {
-        throw new \moodle_exception('Must provide a cmid or courseid');
+    if (is_null($cmid)) {
-    }
+        throw new \moodle_exception('Must provide a cmid');
+    }
-    if ($cmid) {
-        list($module, $cm) = get_module_from_cmid($cmid);
-        $courseid = $cm->course;
-        $thispageurl->params(compact('cmid'));
-        $thiscontext = context_module::instance($cmid);
-    } else {
         $module = null;
-        $cm = null;
+    list($module, $cm) = get_module_from_cmid($cmid);
-        $thispageurl->params(compact('courseid'));
+    $courseid = $cm->course;
-        $thiscontext = context_course::instance($courseid);
+    $thispageurl->params(compact('cmid'));
                 'qperpage', $qperpage, DEFAULT_QUESTIONS_PER_PAGE, $thispageurl);
     } else {
         $pagevars['qperpage'] = $qperpage ?? $defaultquestionsperpage;
+    }
-    $defaultcategory = question_make_default_categories($contexts->all());
+    $defaultcategory = question_get_default_category($contexts->lowest()->id, true);
     $contextlistarr = [];
     foreach ($contexts->having_one_edit_tab_cap($edittab) as $context){

Proyectos de Subversion Moodle

(root)/question/editlib.php – Rev 1 → 1441