standardizing params for edit question page. All pages now use courseid instead of...

diff --git a/lib/questionlib.php b/lib/questionlib.php
index cbec1c9058205e00c16f5c86bbea6bf49846d049..2a4f19352f70000b28c3702770df4ddee433dc02 100644 (file)
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -561,11 +561,11 @@ function questionbank_navigation_tabs(&$row, $context, $courseid) {
     }
     
     if (has_capability('moodle/question:managecategory', $context)) {
-        $row[] = new tabobject('categories', "$CFG->wwwroot/question/category.php?id=$courseid", get_string('categories', 'quiz'), get_string('editqcats', 'quiz'));
+        $row[] = new tabobject('categories', "$CFG->wwwroot/question/category.php?courseid=$courseid", get_string('categories', 'quiz'), get_string('editqcats', 'quiz'));
     }
     
     if (has_capability('moodle/question:import', $context)) {
-        $row[] = new tabobject('import', "$CFG->wwwroot/question/import.php?course=$courseid", get_string('import', 'quiz'), get_string('importquestions', 'quiz'));
+        $row[] = new tabobject('import', "$CFG->wwwroot/question/import.php?courseid=$courseid", get_string('import', 'quiz'), get_string('importquestions', 'quiz'));
     }
     
     if (has_capability('moodle/question:export', $context)) {

diff --git a/question/category.php b/question/category.php
index 5a89f0bec2c223953dcc1cef96e494eb99921410..530cd6c8143e3f7d7f778d89b1291a6dd530ee2f 100644 (file)
--- a/question/category.php
+++ b/question/category.php
@@ -15,7 +15,7 @@
     // get values from form
     $param = new stdClass();
 
-    $id = required_param('id', PARAM_INT);   // course id
+    $id = required_param('courseid', PARAM_INT);   // course id
     $param->page = optional_param('page', 1, PARAM_INT);
 
     $param->moveup = optional_param('moveup', 0, PARAM_INT);

diff --git a/question/category_class.php b/question/category_class.php
index f17ab509c9d30b3e8cb714677f422a398aa20c94..4d1625af01874c49d82ee14d284e5bbde6732202 100644 (file)
--- a/question/category_class.php
+++ b/question/category_class.php
@@ -143,7 +143,7 @@ class question_category_object {
 
         $this->editlist = new question_category_list('ul', '', true, $page);
 
-        $this->add_page_params(array('id'=>$COURSE->id, 'page' => $this->page));
+        $this->add_page_params(array('courseid'=>$COURSE->id, 'page' => $this->page));
         $this->pageurl = strip_querystring(qualified_me());//default
         
         $this->initialize();
@@ -284,7 +284,7 @@ class question_category_object {
         echo '<form action="category.php" method="post">';
         echo '<fieldset class="invisiblefieldset" style="display: block">';
         echo "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />";
-        echo '<input type="hidden" name="id" value="'. $COURSE->id . '" />';
+        echo '<input type="hidden" name="courseid" value="'. $COURSE->id . '" />';
         echo '<input type="hidden" name="addcategory" value="true" />';
         print_table($this->newtable);
         echo '</fieldset>';

diff --git a/question/import.php b/question/import.php
index 76947665cfefa4a734119131052cc1b58374eca7..3c5241416a146a189de8eb9127b3edcc50c4c402 100644 (file)
--- a/question/import.php
+++ b/question/import.php
@@ -19,7 +19,7 @@
     $params->choosefile = optional_param('choosefile','',PARAM_PATH);
     $categoryid = optional_param('category', 0, PARAM_INT);
     $catfromfile = optional_param('catfromfile', 0, PARAM_BOOL );
-    $courseid = optional_param('course', 0, PARAM_INT);
+    $courseid = optional_param('courseid', 0, PARAM_INT);
     $format = optional_param('format','',PARAM_FILE);
     $params->matchgrades = optional_param('matchgrades','',PARAM_ALPHA);
     $params->stoponerror = optional_param('stoponerror', 0, PARAM_BOOL);