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) 
 {
@@ -144,4 +144,4 @@ function get_file_dimensions($file) {
     }
 }
 
-?>
\ No newline at end of file
+?>

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/questiontypes/calculated/db/mysql.php → 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/questiontypes/calculated/db/postgre7.php → 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/questiontypes/calculated/editquestion.php → 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/questiontypes/calculated/questiontype.php → 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/questiontypes/datasetdependent/abstractqtype.php → 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/questiontypes/datasetdependent/datasetdefinitions.php → 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/questiontypes/description/editquestion.php → question/type/description/editquestion.php

 <?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");
 
 ?>