MDL-6773 - eliminate duplicate code for getting a list of question categories. Merged...

diff --git a/lib/questionlib.php b/lib/questionlib.php
index 0823db1f46a0d7b551d510ca23500b61ea8ab8bb..20e217541c95dabbc62015cae76b0e947d7521a6 100644 (file)
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -1545,35 +1545,13 @@ function add_indented_names($categories) {
  * @param integer $selected optionally, the id of a category to be selected by default in the dropdown.
  */
 function question_category_select_menu($courseid, $published = false, $only_editable = false, $selected = "") {
-    global $CFG;
-
-    // get sql fragment for published
-    $publishsql="";
-    if ($published) {
-        $publishsql = " OR publish = 1";
-    }
-
-    $categories = get_records_sql("
-            SELECT cat.*, c.shortname AS coursename
-            FROM {$CFG->prefix}question_categories cat, {$CFG->prefix}course c
-            WHERE c.id = cat.course AND (cat.course = $courseid $publishsql)
-            ORDER BY cat.parent, cat.sortorder, cat.name ASC");
-
-    $categories = add_indented_names($categories);
-
-    echo "<select name=\"category\">\n";
-    foreach ($categories as $category) {
-        $cid = $category->id;
-        $cname = question_category_coursename($category, $courseid);
-        $seltxt = "";
-        if ($cid==$selected) {
-            $seltxt = "selected=\"selected\"";
-        }
-        if ((!$only_editable) || has_capability('moodle/question:managecategory', get_context_instance(CONTEXT_COURSE, $category->course))) {
-            echo "    <option value=\"$cid\" $seltxt>$cname</option>\n";
-        }
+    $categoriesarray = question_category_options($courseid, $published, $only_editable);
+    if ($selected) {
+        $nothing = '';
+    } else {
+        $nothing = 'choose';
     }
-    echo "</select>\n";
+    choose_from_menu($categoriesarray, 'category', $selected, $nothing);
 }
 
 /**
@@ -1601,6 +1579,8 @@ function question_category_options($courseid, $published = false, $only_editable
             FROM {$CFG->prefix}question_categories cat, {$CFG->prefix}course c
             WHERE c.id = cat.course AND (cat.course = $courseid $publishsql)
             ORDER BY cat.parent, cat.sortorder, cat.name ASC");
+    $categories = add_indented_names($categories);
+
     $categoriesarray = array();
     foreach ($categories as $category) {
         $cid = $category->id;

diff --git a/question/editlib.php b/question/editlib.php
index 63128de33970e64cf50102311814d8868e64c4f7..4c9907c05d4d690abf37831d075bbd62433c5576 100644 (file)
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -93,40 +93,6 @@ function get_default_question_category($courseid) {
     return $category;
 }
 
-/**
- * Return a list of categories nicely formatted
- * @param int courseid id of course 
- * @param bool published true=include all published categories
- * @return array formatted category names
- */
-function question_category_menu($courseid, $published=false) {
-/// Returns the list of categories
-    $publish = "";
-    if ($published) {
-        $publish = "OR publish = '1'";
-    }
-
-    if (!has_capability('moodle/question:manage', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
-        $categories = get_records_select("question_categories", "course = '$courseid' $publish", 'parent, sortorder, name ASC');
-    } else {
-        $categories = get_records_select("question_categories", '', 'parent, sortorder, name ASC');
-    }
-    if (!$categories) {
-        return false;
-    }
-    $categories = add_indented_names($categories);
-
-    foreach ($categories as $category) {
-       if ($catcourse = get_record("course", "id", $category->course)) {
-           if ($category->publish && ($category->course != $courseid)) {
-               $category->indentedname .= " ($catcourse->shortname)";
-           }
-           $catmenu[$category->id] = $category->indentedname;
-       }
-    }
-    return $catmenu;
-}
-
 /**
  * prints a form to choose categories
  */

diff --git a/question/format/coursetestmanager/format.php b/question/format/coursetestmanager/format.php
index 59aa6ddbdb1f5b19d6e96a3799c1e1f34c79ac24..ee38b5b08a2ad13069b8a9d070930ba39d9297e7 100755 (executable)
--- a/question/format/coursetestmanager/format.php
+++ b/question/format/coursetestmanager/format.php
@@ -116,7 +116,7 @@ class qformat_coursetestmanager extends qformat_default {
                 // don't have to do this on linux, since it's alreay been done in the test above
         if (PHP_OS == "WINNT") { $question_categories = $this->getquestioncategories($filename); }
         // print the intermediary form
-            if (!$categories = question_category_menu($course->id, true)) {
+            if (!$categories = question_category_options($course->id, true)) {
                 error("No categories!");
             }
             print_heading_with_help($strimportquestions, "import", "quiz");

diff --git a/question/import.php b/question/import.php
index 3e0601e19547af5e7aa5f478da75006cc1ac8e8b..987bdb99def4cafb95ee38992e56a19d915e5633 100644 (file)
--- a/question/import.php
+++ b/question/import.php
@@ -10,8 +10,9 @@
 */
 
     require_once("../config.php");
-    require_once( "editlib.php" );
-    require_once($CFG->dirroot.'/lib/uploadlib.php');
+    require_once("editlib.php" );
+    require_once($CFG->libdir . '/uploadlib.php');
+    require_once($CFG->libdir . '/questionlib.php');
 
     // get parameters
     $params = new stdClass;