Renaming question/questiontypes/ to question/types/ as requested by Martin
authorgustav_delius <gustav_delius>
Fri, 24 Mar 2006 19:54:13 +0000 (19:54 +0000)
committergustav_delius <gustav_delius>
Fri, 24 Mar 2006 19:54:13 +0000 (19:54 +0000)
119 files changed:
lib/questionlib.php
question/format/qti2/qt_common.php
question/question.php
question/type/calculated/db/mysql.php [moved from question/questiontypes/calculated/db/mysql.php with 78% similarity]
question/type/calculated/db/mysql.sql [moved from question/questiontypes/calculated/db/mysql.sql with 100% similarity]
question/type/calculated/db/postgre7.php [moved from question/questiontypes/calculated/db/postgre7.php with 80% similarity]
question/type/calculated/db/postgre7.sql [moved from question/questiontypes/calculated/db/postgre7.sql with 100% similarity]
question/type/calculated/editquestion.html [moved from question/questiontypes/calculated/editquestion.html with 100% similarity]
question/type/calculated/editquestion.php [moved from question/questiontypes/calculated/editquestion.php with 97% similarity]
question/type/calculated/icon.gif [moved from question/questiontypes/calculated/icon.gif with 100% similarity]
question/type/calculated/questiontype.php [moved from question/questiontypes/calculated/questiontype.php with 99% similarity]
question/type/calculated/version.php [moved from question/questiontypes/calculated/version.php with 100% similarity]
question/type/datasetdependent/abstractqtype.php [moved from question/questiontypes/datasetdependent/abstractqtype.php with 99% similarity]
question/type/datasetdependent/categorydatasetdefinitions.php [moved from question/questiontypes/datasetdependent/categorydatasetdefinitions.php with 100% similarity]
question/type/datasetdependent/datasetdefinitions.php [moved from question/questiontypes/datasetdependent/datasetdefinitions.php with 87% similarity]
question/type/datasetdependent/datasetitems.php [moved from question/questiontypes/datasetdependent/datasetitems.php with 100% similarity]
question/type/datasetdependent/questiondatasets.html [moved from question/questiontypes/datasetdependent/questiondatasets.html with 100% similarity]
question/type/description/editquestion.html [moved from question/questiontypes/description/editquestion.html with 100% similarity]
question/type/description/editquestion.php [moved from question/questiontypes/description/editquestion.php with 57% similarity]
question/type/description/icon.gif [moved from question/questiontypes/description/icon.gif with 100% similarity]
question/type/description/question.html [moved from question/questiontypes/description/question.html with 100% similarity]
question/type/description/questiontype.php [moved from question/questiontypes/description/questiontype.php with 96% similarity]
question/type/essay/db/mysql.php [moved from question/questiontypes/essay/db/mysql.php with 79% similarity]
question/type/essay/db/mysql.sql [moved from question/questiontypes/essay/db/mysql.sql with 100% similarity]
question/type/essay/db/postgre7.php [moved from question/questiontypes/essay/db/postgre7.php with 78% similarity]
question/type/essay/db/postgre7.sql [moved from question/questiontypes/essay/db/postgre7.sql with 100% similarity]
question/type/essay/editquestion.html [moved from question/questiontypes/essay/editquestion.html with 100% similarity]
question/type/essay/editquestion.php [moved from question/questiontypes/essay/editquestion.php with 83% similarity]
question/type/essay/icon.gif [moved from question/questiontypes/essay/icon.gif with 100% similarity]
question/type/essay/questiontype.php [moved from question/questiontypes/essay/questiontype.php with 100% similarity]
question/type/essay/version.php [moved from question/questiontypes/essay/version.php with 100% similarity]
question/type/match/db/mysql.php [moved from question/questiontypes/match/db/mysql.php with 79% similarity]
question/type/match/db/mysql.sql [moved from question/questiontypes/match/db/mysql.sql with 100% similarity]
question/type/match/db/postgre7.php [moved from question/questiontypes/match/db/postgre7.php with 78% similarity]
question/type/match/db/postgre7.sql [moved from question/questiontypes/match/db/postgre7.sql with 100% similarity]
question/type/match/display.html [moved from question/questiontypes/match/display.html with 100% similarity]
question/type/match/editquestion.html [moved from question/questiontypes/match/editquestion.html with 100% similarity]
question/type/match/editquestion.php [moved from question/questiontypes/match/editquestion.php with 93% similarity]
question/type/match/icon.gif [moved from question/questiontypes/match/icon.gif with 100% similarity]
question/type/match/questiontype.php [moved from question/questiontypes/match/questiontype.php with 99% similarity]
question/type/match/version.php [moved from question/questiontypes/match/version.php with 100% similarity]
question/type/multianswer/db/mysql.php [moved from question/questiontypes/multianswer/db/mysql.php with 78% similarity]
question/type/multianswer/db/mysql.sql [moved from question/questiontypes/multianswer/db/mysql.sql with 100% similarity]
question/type/multianswer/db/postgre7.php [moved from question/questiontypes/multianswer/db/postgre7.php with 78% similarity]
question/type/multianswer/db/postgre7.sql [moved from question/questiontypes/multianswer/db/postgre7.sql with 100% similarity]
question/type/multianswer/editquestion.html [moved from question/questiontypes/multianswer/editquestion.html with 100% similarity]
question/type/multianswer/editquestion.php [moved from question/questiontypes/multianswer/editquestion.php with 96% similarity]
question/type/multianswer/icon.gif [moved from question/questiontypes/multianswer/icon.gif with 100% similarity]
question/type/multianswer/questiontype.php [moved from question/questiontypes/multianswer/questiontype.php with 100% similarity]
question/type/multianswer/version.php [moved from question/questiontypes/multianswer/version.php with 100% similarity]
question/type/multichoice/backuplib.php [moved from question/questiontypes/multichoice/backuplib.php with 100% similarity]
question/type/multichoice/db/mysql.php [moved from question/questiontypes/multichoice/db/mysql.php with 78% similarity]
question/type/multichoice/db/mysql.sql [moved from question/questiontypes/multichoice/db/mysql.sql with 100% similarity]
question/type/multichoice/db/postgre7.php [moved from question/questiontypes/multichoice/db/postgre7.php with 78% similarity]
question/type/multichoice/db/postgre7.sql [moved from question/questiontypes/multichoice/db/postgre7.sql with 100% similarity]
question/type/multichoice/display.html [moved from question/questiontypes/multichoice/display.html with 100% similarity]
question/type/multichoice/editquestion.html [moved from question/questiontypes/multichoice/editquestion.html with 100% similarity]
question/type/multichoice/editquestion.php [moved from question/questiontypes/multichoice/editquestion.php with 91% similarity]
question/type/multichoice/icon.gif [moved from question/questiontypes/multichoice/icon.gif with 100% similarity]
question/type/multichoice/questiontype.php [moved from question/questiontypes/multichoice/questiontype.php with 99% similarity]
question/type/multichoice/version.php [moved from question/questiontypes/multichoice/version.php with 100% similarity]
question/type/numerical/db/mysql.php [moved from question/questiontypes/numerical/db/mysql.php with 78% similarity]
question/type/numerical/db/mysql.sql [moved from question/questiontypes/numerical/db/mysql.sql with 100% similarity]
question/type/numerical/db/postgre7.php [moved from question/questiontypes/numerical/db/postgre7.php with 78% similarity]
question/type/numerical/db/postgre7.sql [moved from question/questiontypes/numerical/db/postgre7.sql with 100% similarity]
question/type/numerical/editquestion.html [moved from question/questiontypes/numerical/editquestion.html with 100% similarity]
question/type/numerical/editquestion.php [moved from question/questiontypes/numerical/editquestion.php with 93% similarity]
question/type/numerical/icon.gif [moved from question/questiontypes/numerical/icon.gif with 100% similarity]
question/type/numerical/questiontype.php [moved from question/questiontypes/numerical/questiontype.php with 99% similarity]
question/type/numerical/version.php [moved from question/questiontypes/numerical/version.php with 100% similarity]
question/type/question.html [moved from question/questiontypes/question.html with 100% similarity]
question/type/questiontype.php [moved from question/questiontypes/questiontype.php with 99% similarity]
question/type/random/editquestion.html [moved from question/questiontypes/random/editquestion.html with 100% similarity]
question/type/random/editquestion.php [moved from question/questiontypes/random/editquestion.php with 56% similarity]
question/type/random/icon.gif [moved from question/questiontypes/random/icon.gif with 100% similarity]
question/type/random/questiontype.php [moved from question/questiontypes/random/questiontype.php with 100% similarity]
question/type/randomsamatch/db/mysql.php [moved from question/questiontypes/randomsamatch/db/mysql.php with 78% similarity]
question/type/randomsamatch/db/mysql.sql [moved from question/questiontypes/randomsamatch/db/mysql.sql with 100% similarity]
question/type/randomsamatch/db/postgre7.php [moved from question/questiontypes/randomsamatch/db/postgre7.php with 78% similarity]
question/type/randomsamatch/db/postgre7.sql [moved from question/questiontypes/randomsamatch/db/postgre7.sql with 100% similarity]
question/type/randomsamatch/editquestion.html [moved from question/questiontypes/randomsamatch/editquestion.html with 100% similarity]
question/type/randomsamatch/editquestion.php [moved from question/questiontypes/randomsamatch/editquestion.php with 87% similarity]
question/type/randomsamatch/icon.gif [moved from question/questiontypes/randomsamatch/icon.gif with 100% similarity]
question/type/randomsamatch/questiontype.php [moved from question/questiontypes/randomsamatch/questiontype.php with 100% similarity]
question/type/randomsamatch/version.php [moved from question/questiontypes/randomsamatch/version.php with 100% similarity]
question/type/rqp/db/mysql.php [moved from question/questiontypes/rqp/db/mysql.php with 79% similarity]
question/type/rqp/db/mysql.sql [moved from question/questiontypes/rqp/db/mysql.sql with 100% similarity]
question/type/rqp/db/postgre7.php [moved from question/questiontypes/rqp/db/postgre7.php with 79% similarity]
question/type/rqp/db/postgre7.sql [moved from question/questiontypes/rqp/db/postgre7.sql with 100% similarity]
question/type/rqp/editquestion.html [moved from question/questiontypes/rqp/editquestion.html with 100% similarity]
question/type/rqp/editquestion.php [moved from question/questiontypes/rqp/editquestion.php with 90% similarity]
question/type/rqp/icon.gif [moved from question/questiontypes/rqp/icon.gif with 100% similarity]
question/type/rqp/lib.php [moved from question/questiontypes/rqp/lib.php with 100% similarity]
question/type/rqp/questiontype.php [moved from question/questiontypes/rqp/questiontype.php with 99% similarity]
question/type/rqp/remote.php [moved from question/questiontypes/rqp/remote.php with 98% similarity]
question/type/rqp/rqp.php [moved from question/questiontypes/rqp/rqp.php with 100% similarity]
question/type/rqp/types.php [moved from question/questiontypes/rqp/types.php with 96% similarity]
question/type/rqp/version.php [moved from question/questiontypes/rqp/version.php with 100% similarity]
question/type/shortanswer/backuplib.php [moved from question/questiontypes/shortanswer/backuplib.php with 100% similarity]
question/type/shortanswer/db/mysql.php [moved from question/questiontypes/shortanswer/db/mysql.php with 78% similarity]
question/type/shortanswer/db/mysql.sql [moved from question/questiontypes/shortanswer/db/mysql.sql with 100% similarity]
question/type/shortanswer/db/postgre7.php [moved from question/questiontypes/shortanswer/db/postgre7.php with 78% similarity]
question/type/shortanswer/db/postgre7.sql [moved from question/questiontypes/shortanswer/db/postgre7.sql with 100% similarity]
question/type/shortanswer/display.html [moved from question/questiontypes/shortanswer/display.html with 100% similarity]
question/type/shortanswer/editquestion.html [moved from question/questiontypes/shortanswer/editquestion.html with 100% similarity]
question/type/shortanswer/editquestion.php [moved from question/questiontypes/shortanswer/editquestion.php with 90% similarity]
question/type/shortanswer/icon.gif [moved from question/questiontypes/shortanswer/icon.gif with 100% similarity]
question/type/shortanswer/questiontype.php [moved from question/questiontypes/shortanswer/questiontype.php with 99% similarity]
question/type/shortanswer/version.php [moved from question/questiontypes/shortanswer/version.php with 100% similarity]
question/type/truefalse/db/mysql.php [moved from question/questiontypes/truefalse/db/mysql.php with 78% similarity]
question/type/truefalse/db/mysql.sql [moved from question/questiontypes/truefalse/db/mysql.sql with 100% similarity]
question/type/truefalse/db/postgre7.php [moved from question/questiontypes/truefalse/db/postgre7.php with 78% similarity]
question/type/truefalse/db/postgre7.sql [moved from question/questiontypes/truefalse/db/postgre7.sql with 100% similarity]
question/type/truefalse/display.html [moved from question/questiontypes/truefalse/display.html with 100% similarity]
question/type/truefalse/editquestion.html [moved from question/questiontypes/truefalse/editquestion.html with 100% similarity]
question/type/truefalse/editquestion.php [moved from question/questiontypes/truefalse/editquestion.php with 90% similarity]
question/type/truefalse/icon.gif [moved from question/questiontypes/truefalse/icon.gif with 100% similarity]
question/type/truefalse/questiontype.php [moved from question/questiontypes/truefalse/questiontype.php with 99% similarity]
question/type/truefalse/version.php [moved from question/questiontypes/truefalse/version.php with 100% similarity]

index 7e7b068..921f146 100644 (file)
@@ -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";
index 4fd53d0..f39682d 100644 (file)
@@ -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
+?>
index 63f8fad..49ff99c 100644 (file)
 
     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) {
similarity index 78%
rename from question/questiontypes/calculated/db/mysql.php
rename to question/type/calculated/db/mysql.php
index f0f6687..1f06121 100644 (file)
@@ -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;
     }
 
similarity index 80%
rename from question/questiontypes/calculated/db/postgre7.php
rename to question/type/calculated/db/postgre7.php
index cc7dc75..561fa1c 100644 (file)
@@ -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;
     }
 
@@ -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    **/
@@ -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();
     }
 
@@ -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!');
@@ -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");
 ?>
@@ -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");
 
 ?>
@@ -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) {
similarity index 79%
rename from question/questiontypes/essay/db/mysql.php
rename to question/type/essay/db/mysql.php
index 903793f..f6e1986 100644 (file)
@@ -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;
     }
 
similarity index 78%
rename from question/questiontypes/essay/db/postgre7.php
rename to question/type/essay/db/postgre7.php
index 7283040..c990635 100644 (file)
@@ -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;
     }
 
similarity index 83%
rename from question/questiontypes/essay/editquestion.php
rename to question/type/essay/editquestion.php
index 4caa90f..2f87d64 100644 (file)
@@ -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");
 
 ?>
similarity index 79%
rename from question/questiontypes/match/db/mysql.php
rename to question/type/match/db/mysql.php
index 29ae165..9327a9a 100644 (file)
@@ -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;
     }
 
similarity index 78%
rename from question/questiontypes/match/db/postgre7.php
rename to question/type/match/db/postgre7.php
index c8d0d16..70e1b44 100644 (file)
@@ -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;
     }
 
similarity index 93%
rename from question/questiontypes/match/editquestion.php
rename to question/type/match/editquestion.php
index b36d324..bd85367 100644 (file)
@@ -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");
 
 ?>
similarity index 99%
rename from question/questiontypes/match/questiontype.php
rename to question/type/match/questiontype.php
index 6fb8296..3205eae 100644 (file)
@@ -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) {
similarity index 78%
rename from question/questiontypes/multianswer/db/mysql.php
rename to question/type/multianswer/db/mysql.php
index 32337c0..d87ecde 100644 (file)
@@ -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;
     }
 
@@ -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;
     }
 
@@ -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");
 
 ?>
similarity index 78%
rename from question/questiontypes/multichoice/db/mysql.php
rename to question/type/multichoice/db/mysql.php
index d717705..1ad38a0 100644 (file)
@@ -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;
     }
 
@@ -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;
     }
 
@@ -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");
 
 ?>
@@ -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) {
similarity index 78%
rename from question/questiontypes/numerical/db/mysql.php
rename to question/type/numerical/db/mysql.php
index ec184a6..8a455ce 100644 (file)
@@ -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;
     }
 
similarity index 78%
rename from question/questiontypes/numerical/db/postgre7.php
rename to question/type/numerical/db/postgre7.php
index 5657caf..bc37784 100644 (file)
@@ -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;
     }
 
similarity index 93%
rename from question/questiontypes/numerical/editquestion.php
rename to question/type/numerical/editquestion.php
index ea20ecd..e746437 100644 (file)
@@ -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");
 
 ?>
similarity index 99%
rename from question/questiontypes/numerical/questiontype.php
rename to question/type/numerical/questiontype.php
index 74c34d9..f3f12c4 100644 (file)
@@ -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 {
 
similarity index 99%
rename from question/questiontypes/questiontype.php
rename to question/type/questiontype.php
index a84b45f..e70d93e 100644 (file)
@@ -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
similarity index 56%
rename from question/questiontypes/random/editquestion.php
rename to question/type/random/editquestion.php
index 80d2301..03e0ea2 100644 (file)
@@ -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");
 
 ?>
similarity index 78%
rename from question/questiontypes/randomsamatch/db/mysql.php
rename to question/type/randomsamatch/db/mysql.php
index cb57d53..6057208 100644 (file)
@@ -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;
     }
 
@@ -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;
     }
 
@@ -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");
 
 ?>
similarity index 79%
rename from question/questiontypes/rqp/db/mysql.php
rename to question/type/rqp/db/mysql.php
index 424d48f..49046ca 100644 (file)
@@ -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;
     }
 
similarity index 79%
rename from question/questiontypes/rqp/db/postgre7.php
rename to question/type/rqp/db/postgre7.php
index e27e225..3b68005 100644 (file)
@@ -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;
     }
 
similarity index 90%
rename from question/questiontypes/rqp/editquestion.php
rename to question/type/rqp/editquestion.php
index dd80d83..c9e70a9 100644 (file)
@@ -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)) {
similarity index 99%
rename from question/questiontypes/rqp/questiontype.php
rename to question/type/rqp/questiontype.php
index 3328b97..d4d71ab 100644 (file)
@@ -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
similarity index 98%
rename from question/questiontypes/rqp/remote.php
rename to question/type/rqp/remote.php
index 75bfd45..76e1c1c 100644 (file)
@@ -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);
similarity index 96%
rename from question/questiontypes/rqp/types.php
rename to question/type/rqp/types.php
index a38b6cb..47be8a0 100644 (file)
@@ -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
 
     $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);
 
similarity index 78%
rename from question/questiontypes/shortanswer/db/mysql.php
rename to question/type/shortanswer/db/mysql.php
index a21e44f..c8fe4af 100644 (file)
@@ -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;
     }
 
@@ -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/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/shortanswer/db/postgres7.sql");
         return $result;
     }
 
@@ -23,6 +23,6 @@
     }
 
     print_heading_with_help(get_string("editingshortanswer", "quiz"), "shortanswer", "quiz");
-    require("$CFG->dirroot/question/questiontypes/shortanswer/editquestion.html");
+    require("$CFG->dirroot/question/type/shortanswer/editquestion.html");
 
 ?>
@@ -163,7 +163,7 @@ class question_shortanswer_qtype extends default_questiontype {
                 }
             }
         }
-        include("$CFG->dirroot/question/questiontypes/shortanswer/display.html");
+        include("$CFG->dirroot/question/type/shortanswer/display.html");
     }
 
     // ULPGC ecastro
similarity index 78%
rename from question/questiontypes/truefalse/db/mysql.php
rename to question/type/truefalse/db/mysql.php
index 3a5a62b..4c18257 100644 (file)
@@ -7,7 +7,7 @@ function qtype_truefalse_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/truefalse/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/truefalse/db/mysql.sql");
         return $result;
     }
 
similarity index 78%
rename from question/questiontypes/truefalse/db/postgre7.php
rename to question/type/truefalse/db/postgre7.php
index 2f1cc01..12564e7 100644 (file)
@@ -7,7 +7,7 @@ function qtype_truefalse_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/truefalse/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/truefalse/db/postgres7.sql");
         return $result;
     }
 
similarity index 90%
rename from question/questiontypes/truefalse/editquestion.php
rename to question/type/truefalse/editquestion.php
index 81a775c..7de8d98 100644 (file)
@@ -23,6 +23,6 @@
     }
 
     print_heading_with_help(get_string("editingtruefalse", "quiz"), "truefalse", "quiz");
-    require("$CFG->dirroot/question/questiontypes/truefalse/editquestion.html");
+    require("$CFG->dirroot/question/type/truefalse/editquestion.html");
 
 ?>
similarity index 99%
rename from question/questiontypes/truefalse/questiontype.php
rename to question/type/truefalse/questiontype.php
index 4b97325..1144a82 100644 (file)
@@ -184,7 +184,7 @@ class question_truefalse_qtype extends default_questiontype {
             $feedback = format_text($chosenanswer->feedback, true, $formatoptions, $cmoptions->course);
         }
         
-        include("$CFG->dirroot/question/questiontypes/truefalse/display.html");
+        include("$CFG->dirroot/question/type/truefalse/display.html");
     }
 
     function grade_responses(&$question, &$state, $cmoptions) {