Renaming question/questiontypes/ to question/types/ as requested by Martin

lib/questionlib.php

@@ -105,7 +105,7 @@ require_once("$CFG->dirroot/question/type/questiontype.php");
 * These files in turn instantiate the corresponding question type class
 * and add them to the $QTYPES array
 */
-$qtypenames= get_list_of_plugins('question/questiontypes');
+$qtypenames= get_list_of_plugins('question/type');
 foreach($qtypenames as $qtypename) {
     // Instanciates all plug-in question types
     $qtypefilepath= "$CFG->dirroot/question/type/$qtypename/questiontype.php";

question/format/qti2/qt_common.php

@@ -11,7 +11,7 @@
  *
  * @param int courseid
  * @return array containing filenames
- * @calledfrom questiontypes/<typename>/editquestion.php 
+ * @calledfrom type/<typename>/editquestion.php 
  */
 function get_course_media_files($courseid) 
 {

question/question.php

@@ -346,7 +346,7 @@
 
     echo '<br />';
     print_simple_box_start('center');
-    require_once('questiontypes/'.$QTYPES[$qtype]->name().'/editquestion.php');
+    require_once('type/'.$QTYPES[$qtype]->name().'/editquestion.php');
     print_simple_box_end();
 
     if ($usehtmleditor) {

question/type/calculated/db/mysql.php

@@ -7,7 +7,7 @@ function qtype_calculated_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/calculated/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/calculated/db/mysql.sql");
         return $result;
     }
 

question/type/calculated/db/postgre7.php

@@ -7,7 +7,7 @@ function qtype_calculated_upgrade($oldversion=0) {
     require_once("$CFG->libdir/questionlib.php");
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/calculated/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/calculated/db/postgres7.sql");
         return $result;
     }
 

question/type/calculated/editquestion.php

@@ -83,7 +83,7 @@ if (empty($form)) {
         }
     }
     print_heading_with_help(get_string("editingcalculated", "quiz"), "calculated", "quiz");
-    require("$CFG->dirroot/question/questiontypes/calculated/editquestion.html");
+    require("$CFG->dirroot/question/type/calculated/editquestion.html");
 } else { // $form is not empty
     /*********************************************************/
     /*****    Any subsequent page of the question wizard    **/

question/type/calculated/questiontype.php

@@ -6,7 +6,7 @@
 
 /// QUESTION TYPE CLASS //////////////////
 
-require_once("$CFG->dirroot/question/questiontypes/datasetdependent/abstractqtype.php");
+require_once("$CFG->dirroot/question/type/datasetdependent/abstractqtype.php");
 
 class question_calculated_qtype extends question_dataset_dependent_questiontype {
 
@@ -318,7 +318,7 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
 
     function create_virtual_qtype() {
         global $CFG;
-        require_once("$CFG->dirroot/question/questiontypes/numerical/questiontype.php");
+        require_once("$CFG->dirroot/question/type/numerical/questiontype.php");
         return new question_numerical_qtype();
     }
 

question/type/datasetdependent/abstractqtype.php

@@ -156,11 +156,11 @@ class question_dataset_dependent_questiontype extends default_questiontype {
         // See where we're coming from
         switch($form->wizardpage) {
             case 'question':
-                require("$CFG->dirroot/question/questiontypes/datasetdependent/datasetdefinitions.php");
+                require("$CFG->dirroot/question/type/datasetdependent/datasetdefinitions.php");
                 break;
             case 'datasetdefinitions':
             case 'datasetitems':
-                require("$CFG->dirroot/question/questiontypes/datasetdependent/datasetitems.php");
+                require("$CFG->dirroot/question/type/datasetdependent/datasetitems.php");
                 break;
             default:
                 error('Incorrect or no wizard page specified!');

question/type/datasetdependent/datasetdefinitions.php

@@ -14,5 +14,5 @@ $datasets = $this->construct_dataset_menus(
 
 // Print the page
 print_heading_with_help(get_string("choosedatasetproperties", "quiz"), "questiondatasets", "quiz");
-require("$CFG->dirroot/question/questiontypes/datasetdependent/questiondatasets.html");
+require("$CFG->dirroot/question/type/datasetdependent/questiondatasets.html");
 ?>

question/type/description/editquestion.php

@@ -1,6 +1,6 @@
 <?php // $Id$
 
     print_heading_with_help(get_string("editingdescription", "quiz"), "description", "quiz");
-    require("$CFG->dirroot/question/questiontypes/description/editquestion.html");
+    require("$CFG->dirroot/question/type/description/editquestion.html");
 
 ?>

question/type/description/questiontype.php

@@ -46,7 +46,7 @@ class description_qtype extends default_questiontype {
                          $formatoptions, $cmoptions->course);
         $image = get_question_image($question, $cmoptions->course);
 
-        include "$CFG->dirroot/question/questiontypes/description/question.html";
+        include "$CFG->dirroot/question/type/description/question.html";
     }
 
     function actual_number_of_questions($question) {

question/type/essay/db/mysql.php

@@ -7,7 +7,7 @@ function qtype_essay_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/essay/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/essay/db/mysql.sql");
         return $result;
     }
 

question/type/essay/db/postgre7.php

@@ -7,7 +7,7 @@ function qtype_essay_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/essay/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/essay/db/postgres7.sql");
         return $result;
     }
 

question/type/essay/editquestion.php

@@ -11,6 +11,6 @@
     }
 
     print_heading_with_help(get_string("editingessay", "quiz"), "essay", "quiz");
-    require("$CFG->dirroot/question/questiontypes/essay/editquestion.html");
+    require("$CFG->dirroot/question/type/essay/editquestion.html");
 
 ?>

question/type/match/db/mysql.php

@@ -7,7 +7,7 @@ function qtype_match_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/match/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/match/db/mysql.sql");
         return $result;
     }
 

question/type/match/db/postgre7.php

@@ -7,7 +7,7 @@ function qtype_match_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/match/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/match/db/postgres7.sql");
         return $result;
     }
 

question/type/match/editquestion.php

@@ -32,6 +32,6 @@
     $yesnooptions[1] = get_string("yes");
 
     print_heading_with_help(get_string("editingmatch", "quiz"), "match", "quiz");
-    require("$CFG->dirroot/question/questiontypes/match/editquestion.html");
+    require("$CFG->dirroot/question/type/match/editquestion.html");
 
 ?>

question/type/match/questiontype.php

@@ -272,7 +272,7 @@ class question_match_qtype extends default_questiontype {
 
             $anss[] = clone($a);
         }
-        include("$CFG->dirroot/question/questiontypes/match/display.html");
+        include("$CFG->dirroot/question/type/match/display.html");
     }
 
     function grade_responses(&$question, &$state, $cmoptions) {

question/type/multianswer/db/mysql.php

@@ -7,7 +7,7 @@ function qtype_multianswer_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/multianswer/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/multianswer/db/mysql.sql");
         return $result;
     }
 

question/type/multianswer/db/postgre7.php

@@ -7,7 +7,7 @@ function qtype_multianswer_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/multianswer/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/multianswer/db/postgres7.sql");
         return $result;
     }
 

question/type/multianswer/editquestion.php

@@ -49,6 +49,6 @@
     }
     print_heading_with_help(get_string('editingmultianswer', 'quiz'),
                                        'multianswer', 'quiz');
-    require("$CFG->dirroot/question/questiontypes/multianswer/editquestion.html");
+    require("$CFG->dirroot/question/type/multianswer/editquestion.html");
 
 ?>

question/type/multichoice/db/mysql.php

@@ -7,7 +7,7 @@ function qtype_multichoice_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/multichoice/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/multichoice/db/mysql.sql");
         return $result;
     }
 

question/type/multichoice/db/postgre7.php

@@ -7,7 +7,7 @@ function qtype_multichoice_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/multichoice/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/multichoice/db/postgres7.sql");
         return $result;
     }
 

question/type/multichoice/editquestion.php

@@ -30,6 +30,6 @@
     $yesnooptions[1] = get_string("yes");
 
     print_heading_with_help(get_string("editingmultichoice", "quiz"), "multichoice", "quiz");
-    require("$CFG->dirroot/question/questiontypes/multichoice/editquestion.html");
+    require("$CFG->dirroot/question/type/multichoice/editquestion.html");
 
 ?>

question/type/multichoice/questiontype.php

@@ -314,7 +314,7 @@ class question_multichoice_qtype extends default_questiontype {
 
             $anss[] = clone($a);
         }
-        include("$CFG->dirroot/question/questiontypes/multichoice/display.html");
+        include("$CFG->dirroot/question/type/multichoice/display.html");
     }
 
     function grade_responses(&$question, &$state, $cmoptions) {

question/type/numerical/db/mysql.php

@@ -7,7 +7,7 @@ function qtype_numerical_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/numerical/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/numerical/db/mysql.sql");
         return $result;
     }
 

question/type/numerical/db/postgre7.php

@@ -7,7 +7,7 @@ function qtype_numerical_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/numerical/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/numerical/db/postgres7.sql");
         return $result;
     }
 

question/type/numerical/editquestion.php

@@ -22,6 +22,6 @@
     }
 
     print_heading_with_help(get_string("editingnumerical", "quiz"), "numerical", "quiz");
-    require("$CFG->dirroot/question/questiontypes/numerical/editquestion.html");
+    require("$CFG->dirroot/question/type/numerical/editquestion.html");
 
 ?>

question/type/numerical/questiontype.php

@@ -14,7 +14,7 @@
 /// This question type behaves like shortanswer in most cases.
 /// Therefore, it extends the shortanswer question type...
 
-require_once("$CFG->dirroot/question/questiontypes/shortanswer/questiontype.php");
+require_once("$CFG->dirroot/question/type/shortanswer/questiontype.php");
 
 class question_numerical_qtype extends question_shortanswer_qtype {
 

question/type/questiontype.php

@@ -476,7 +476,7 @@ class default_questiontype {
 
         $history = $this->history($question, $state, $number, $cmoptions, $options);
 
-        include "$CFG->dirroot/question/questiontypes/question.html";
+        include "$CFG->dirroot/question/type/question.html";
     }
 
     /*
@@ -843,7 +843,7 @@ class default_questiontype {
     *                  get_string($name, 'quiz') will be called.
     * ->link           The filename part of the URL for the link. The full URL
     *                  is contructed as
-    *                  "$CFG->wwwroot/question/questiontypes/{$this->name()}/$link?sesskey=$sesskey"
+    *                  "$CFG->wwwroot/question/type/{$this->name()}/$link?sesskey=$sesskey"
     *                  [but with the relavant calls to the s and rawurlencode
     *                  functions] where $sesskey is the sesskey for the user.
     * @return array    Array of objects describing the configuration options to

question/type/random/editquestion.php

@@ -1,6 +1,6 @@
 <?php // $Id$
 
     print_heading_with_help(get_string("editingrandom", "quiz"), "random", "quiz");
-    require("$CFG->dirroot/question/questiontypes/random/editquestion.html");
+    require("$CFG->dirroot/question/type/random/editquestion.html");
 
 ?>

question/type/randomsamatch/db/mysql.php

@@ -7,7 +7,7 @@ function qtype_randomsamatch_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/randomsamatch/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/randomsamatch/db/mysql.sql");
         return $result;
     }
 

question/type/randomsamatch/db/postgre7.php

@@ -7,7 +7,7 @@ function qtype_randomsamatch_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/randomsamatch/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/randomsamatch/db/postgres7.sql");
         return $result;
     }
 

question/type/randomsamatch/editquestion.php

@@ -14,6 +14,6 @@
     $yesnooptions[1] = get_string("yes");
 
     print_heading_with_help(get_string("editingrandomsamatch", "quiz"), "randomsamatch", "quiz");
-    require("$CFG->dirroot/question/questiontypes/randomsamatch/editquestion.html");
+    require("$CFG->dirroot/question/type/randomsamatch/editquestion.html");
 
 ?>

question/type/rqp/db/mysql.php

@@ -7,7 +7,7 @@ function qtype_rqp_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/rqp/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/rqp/db/mysql.sql");
         return $result;
     }
 

question/type/rqp/db/postgre7.php

@@ -7,7 +7,7 @@ function qtype_rqp_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/rqp/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/rqp/db/postgres7.sql");
         return $result;
     }
 

question/type/rqp/editquestion.php

@@ -1,6 +1,6 @@
 <?php // $Id$
 
-    require_once($CFG->dirroot . '/question/questiontypes/rqp/lib.php');
+    require_once($CFG->dirroot . '/question/type/rqp/lib.php');
 
     if (empty($question->id)) {
         if (!isset($typeid)) {

question/type/rqp/questiontype.php

@@ -10,8 +10,8 @@
 * @package quiz
 */
 
-require_once($CFG->dirroot . '/question/questiontypes/rqp/lib.php');
-require_once($CFG->dirroot . '/question/questiontypes/rqp/remote.php');
+require_once($CFG->dirroot . '/question/type/rqp/lib.php');
+require_once($CFG->dirroot . '/question/type/rqp/remote.php');
 
 /**
 * RQP question type class

question/type/rqp/remote.php

@@ -10,7 +10,7 @@
 */
 
 // Load functions for the RQP-SOAP binding
-require_once($CFG->dirroot . '/question/questiontypes/rqp/rqp.php');
+require_once($CFG->dirroot . '/question/type/rqp/rqp.php');
 
 // Remote item processing flags (cached from server)
 define('REMOTE_TEMPLATE', 4);

question/type/rqp/types.php

@@ -4,8 +4,8 @@
 
     require_once('../../../../config.php');
     require_once($CFG->libdir.'/tablelib.php');
-    require_once($CFG->dirroot . '/question/questiontypes/rqp/lib.php');
-    require_once($CFG->dirroot . '/question/questiontypes/rqp/remote.php');
+    require_once($CFG->dirroot . '/question/type/rqp/lib.php');
+    require_once($CFG->dirroot . '/question/type/rqp/remote.php');
     
     $info = optional_param('info', 0, PARAM_INT); // id of server for which to show info
     $delete = optional_param('delete', 0, PARAM_INT); // id of server to delete
@@ -115,7 +115,7 @@
 
     $table->define_columns(array('name', 'url', 'action'));
     $table->define_headers(array(get_string('name'), get_string('serverurl', 'quiz'), get_string('action')));
-    $table->define_baseurl($CFG->wwwroot.'/question/questiontypes/rqp/types.php');
+    $table->define_baseurl($CFG->wwwroot.'/question/type/rqp/types.php');
 
     //$table->sortable(true);
 

question/type/shortanswer/db/mysql.php

@@ -7,7 +7,7 @@ function qtype_shortanswer_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/shortanswer/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/shortanswer/db/mysql.sql");
         return $result;
     }