MDL-14679 fixed references to mod.html

diff --git a/course/lib.php b/course/lib.php
index 42526b02ddc03c8d1991026e644985af04cf3690..ff393bdd3b9e71c731370fce2884bdcad39c91ae 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -2573,7 +2573,7 @@ function course_in_meta ($course) {
 
 
 /**
- * Print standard form elements on module setup forms in mod/.../mod.html
+ * Print standard form elements on module setup forms in mod/.../mod_form.php
  */
 function print_standard_coursemodule_settings($form, $features=null) {
     global $DB;
@@ -2588,7 +2588,7 @@ function print_standard_coursemodule_settings($form, $features=null) {
 }
 
 /**
- * Print groupmode form element on module setup forms in mod/.../mod.html
+ * Print groupmode form element on module setup forms in mod/.../mod_form.php
  */
 function print_groupmode_setting($form, $course=NULL) {
     global $DB;
@@ -2622,7 +2622,7 @@ function print_groupmode_setting($form, $course=NULL) {
 }
 
 /**
- * Print groupmode form element on module setup forms in mod/.../mod.html
+ * Print groupmode form element on module setup forms in mod/.../mod_form.php
  */
 function print_grouping_settings($form, $course=NULL) {
     global $DB;
@@ -2662,7 +2662,7 @@ function print_grouping_settings($form, $course=NULL) {
 }
 
 /**
- * Print visibility setting form element on module setup forms in mod/.../mod.html
+ * Print visibility setting form element on module setup forms in mod/.../mod_form.php
  */
 function print_visible_setting($form, $course=NULL) {
     global $DB;

diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php
index 974f0e146f5d7fa57ebe33ea037a338241b7682a..d0ea7acef5d371f6d9b0e68a8397fcfe85cc51b8 100644 (file)
--- a/course/moodleform_mod.php
+++ b/course/moodleform_mod.php
@@ -2,7 +2,7 @@
 require_once ($CFG->libdir.'/formslib.php');
 /**
  * This class adds extra methods to form wrapper specific to be used for module
- * add / update forms (mod/{modname}.mod_form.php replaces deprecated mod/{modname}/mod.html
+ * add / update forms (mod/{modname}.mod_form.php replaces deprecated mod/{modname}/mod_form.php
  *
  */
 class moodleform_mod extends moodleform {

diff --git a/mod/README.txt b/mod/README.txt
index 5e54d21397b87a2f2878cdc8d1b6f1326ee1dae7..6dadbc92bafbe8712e77ba58cfeb658e300b510e 100644 (file)
--- a/mod/README.txt
+++ b/mod/README.txt
@@ -6,7 +6,7 @@ These are main modules in Moodle, allowing various activities.
 
 Each of these modules contains a number of expected components:
 
-  mod.html: a form to setup/update a module instance
+  mod_form.php: a form to setup/update a module instance
 
   version.php: defines some meta-info and provides upgrading code
 

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index ca1d18abb9f6f6d1ed6dbd5e71d8ea3a7d1047f6..12ca8e82863f9af02b46a26772553e34cd60d628 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -332,13 +332,13 @@ class assignment_base {
      * Create a new assignment activity
      *
      * Given an object containing all the necessary data,
-     * (defined by the form in mod.html) this function
+     * (defined by the form in mod_form.php) this function
      * will create a new instance and return the id number
      * of the new instance.
      * The due data is added to the calendar
      * This is common to all assignment types.
      *
-     * @param $assignment object The data from the form on mod.html
+     * @param $assignment object The data from the form on mod_form.php
      * @return int The id of the assignment
      */
     function add_instance($assignment) {
@@ -414,12 +414,12 @@ class assignment_base {
      * Updates a new assignment activity
      *
      * Given an object containing all the necessary data,
-     * (defined by the form in mod.html) this function
+     * (defined by the form in mod_form.php) this function
      * will update the assignment instance and return the id number
      * The due date is updated in the calendar
      * This is common to all assignment types.
      *
-     * @param $assignment object The data from the form on mod.html
+     * @param $assignment object The data from the form on mod_form.php
      * @return int The assignment id
      */
     function update_instance($assignment) {

diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index 8eb40b4f98f8ea730225fc4182ecb86d00bc33a2..c88b4fa4a17f48147b551f27ab725577f78da79b 100644 (file)
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -24,7 +24,7 @@ $CHAT_DUMMY_DATA = "<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!--
 
 function chat_add_instance($chat) {
 /// Given an object containing all the necessary data,
-/// (defined by the form in mod.html) this function
+/// (defined by the form in mod_form.php) this function
 /// will create a new instance and return the id number
 /// of the new instance.
 
@@ -53,7 +53,7 @@ function chat_add_instance($chat) {
 
 function chat_update_instance($chat) {
 /// Given an object containing all the necessary data,
-/// (defined by the form in mod.html) this function
+/// (defined by the form in mod_form.php) this function
 /// will update an existing instance with new data.
 
     $chat->timemodified = time();

diff --git a/mod/choice/lib.php b/mod/choice/lib.php
index 4f3fd5354a9307e75d18c8c45ef7ca45bc8aa458..a46916a6db513db7ab09b6351506cd52c3b4a424 100644 (file)
--- a/mod/choice/lib.php
+++ b/mod/choice/lib.php
@@ -49,7 +49,7 @@ function choice_user_complete($course, $user, $mod, $choice) {
 
 function choice_add_instance($choice) {
 // Given an object containing all the necessary data,
-// (defined by the form in mod.html) this function
+// (defined by the form in mod_form.php) this function
 // will create a new instance and return the id number
 // of the new instance.
 
@@ -82,7 +82,7 @@ function choice_add_instance($choice) {
 
 function choice_update_instance($choice) {
 // Given an object containing all the necessary data,
-// (defined by the form in mod.html) this function
+// (defined by the form in mod_form.php) this function
 // will update an existing instance with new data.
 
     $choice->id = $choice->instance;

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 284cf87d487cc0901f881a4ff4ebe167142e55b2..cd117113615e1de76c966612ed8866f3b21e1ea5 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -30,7 +30,7 @@ define ('FORUM_AGGREGATE_SUM', 5);
 
 /**
  * Given an object containing all the necessary data,
- * (defined by the form in mod.html) this function
+ * (defined by the form in mod_form.php) this function
  * will create a new instance and return the id number
  * of the new instance.
  * @param object $forum add forum instance (with magic quotes)
@@ -88,7 +88,7 @@ function forum_add_instance($forum) {
 
 /**
  * Given an object containing all the necessary data,
- * (defined by the form in mod.html) this function
+ * (defined by the form in mod_form.php) this function
  * will update an existing instance with new data.
  * @param object $forum forum instance (with magic quotes)
  * @return bool success

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 99347b8d77472857f73c85987394e4ffe157ca4a..74b41a56e8bc0dce9fe8ba5e5fcee95ea9d79d7e 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -22,7 +22,7 @@ define("GLOSSARY_APPROVAL_VIEW", 7);
 
 function glossary_add_instance($glossary) {
 /// Given an object containing all the necessary data,
-/// (defined by the form in mod.html) this function
+/// (defined by the form in mod_form.php) this function
 /// will create a new instance and return the id number
 /// of the new instance.
 
@@ -64,7 +64,7 @@ function glossary_add_instance($glossary) {
 
 function glossary_update_instance($glossary) {
 /// Given an object containing all the necessary data,
-/// (defined by the form in mod.html) this function
+/// (defined by the form in mod_form.php) this function
 /// will update an existing instance with new data.
     global $CFG;
 

diff --git a/mod/hotpot/lib.php b/mod/hotpot/lib.php
index 803f1ec3d1a790645c787f6abe31af34d1e5e776..905b2df367549e7f1a237070a3775f1ef13c703e 100644 (file)
--- a/mod/hotpot/lib.php
+++ b/mod/hotpot/lib.php
@@ -183,7 +183,7 @@ define("HOTPOT_MAX_EVENT_LENGTH", "432000");   // 5 days maximum
 //  true (or non-zero number):
 //        continue to $hotpot->redirect (if set) OR hotpot/view.php (to displsay quiz)
 
-// $hotpot is an object containing the values of the form in mod.html
+// $hotpot is an object containing the values of the form in mod_form.php
 // i.e. all the fields in the 'hotpot' table, plus the following:
 //  $hotpot->course       : an id in the 'course' table
 //  $hotpot->coursemodule : an id in the 'course_modules' table

diff --git a/mod/label/lib.php b/mod/label/lib.php
index fbfa48b160b3d3fafdba49a04c0e839ed55f4676..f8a3524140283b41b814cf83c59222db7ffcd385 100644 (file)
--- a/mod/label/lib.php
+++ b/mod/label/lib.php
@@ -7,7 +7,7 @@ define("LABEL_MAX_NAME_LENGTH", 50);
 
 function label_add_instance($label) {
 /// Given an object containing all the necessary data, 
-/// (defined by the form in mod.html) this function 
+/// (defined by the form in mod_form.php) this function 
 /// will create a new instance and return the id number 
 /// of the new instance.
     $textlib = textlib_get_instance();
@@ -24,7 +24,7 @@ function label_add_instance($label) {
 
 function label_update_instance($label) {
 /// Given an object containing all the necessary data, 
-/// (defined by the form in mod.html) this function 
+/// (defined by the form in mod_form.php) this function 
 /// will update an existing instance with new data.
     $textlib = textlib_get_instance();
 

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index d8402c18aad77bbc1a5807b65c80efb3941ef6d8..eae9c351221a5c3fc4e4afc205e4a15d5c835c8b 100644 (file)
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -59,7 +59,7 @@ define("QUIZ_MAX_EVENT_LENGTH", 5*24*60*60);   // 5 days maximum
 
 /**
  * Given an object containing all the necessary data,
- * (defined by the form in mod.html) this function
+ * (defined by the form in mod_form.php) this function
  * will create a new instance and return the id number
  * of the new instance.
  *
@@ -90,7 +90,7 @@ function quiz_add_instance($quiz) {
 
 /**
  * Given an object containing all the necessary data,
- * (defined by the form in mod.html) this function
+ * (defined by the form in mod_form.php) this function
  * will update an existing instance with new data.
  *
  * @param object $quiz the data that came from the form.

diff --git a/mod/resource/lib.php b/mod/resource/lib.php
index 252426f3a35716692c877d3273aa354d0a0e57c9..9faff6245ef60b5784f79d5966d0aab753c71a12 100644 (file)
--- a/mod/resource/lib.php
+++ b/mod/resource/lib.php
@@ -206,7 +206,7 @@ class resource_base {
 
     function add_instance($resource) {
     // Given an object containing all the necessary data,
-    // (defined by the form in mod.html) this function
+    // (defined by the form in mod_form.php) this function
     // will create a new instance and return the id number
     // of the new instance.
 
@@ -218,7 +218,7 @@ class resource_base {
 
     function update_instance($resource) {
     // Given an object containing all the necessary data,
-    // (defined by the form in mod.html) this function
+    // (defined by the form in mod_form.php) this function
     // will update an existing instance with new data.
 
         $resource->id = $resource->instance;

diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index 3361e65aa3feb4d8ac22d7d1daa6ceb37746a0fa..1a5eb46913cef3c567d70dc2a5d69ed94b5fb987 100755 (executable)
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -2,7 +2,7 @@
 
 /**
 * Given an object containing all the necessary data,
-* (defined by the form in mod.html) this function
+* (defined by the form in mod_form.php) this function
 * will create a new instance and return the id number
 * of the new instance.
 *
@@ -61,13 +61,13 @@ function scorm_add_instance($scorm) {
 
         return $id;
     } else {
-        error(get_string('badpackage','scorm'));
+        print_error('badpackage','scorm');
     }
 }
 
 /**
 * Given an object containing all the necessary data,
-* (defined by the form in mod.html) this function
+* (defined by the form in mod_form.php) this function
 * will update an existing instance with new data.
 *
 * @param mixed $scorm Form data

diff --git a/mod/survey/lib.php b/mod/survey/lib.php
index cf0ce82abe8e9d562379bc331121fb9b31b63805..085f6c62010ad00a533feb458d58ebbf9dca51da 100644 (file)
--- a/mod/survey/lib.php
+++ b/mod/survey/lib.php
@@ -26,7 +26,7 @@ define("SURVEY_CIQ",                     "5");
 
 function survey_add_instance($survey) {
 // Given an object containing all the necessary data, 
-// (defined by the form in mod.html) this function 
+// (defined by the form in mod_form.php) this function 
 // will create a new instance and return the id number 
 // of the new instance.
 
@@ -45,7 +45,7 @@ function survey_add_instance($survey) {
 
 function survey_update_instance($survey) {
 // Given an object containing all the necessary data, 
-// (defined by the form in mod.html) this function 
+// (defined by the form in mod_form.php) this function 
 // will update an existing instance with new data.
 
     if (!$template = get_record("survey", "id", $survey->template)) {

diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index cdb9e84b139ba2d3f794dd687c514ddaba91e28f..43a6b8feb0c9a325dd962e0aa06259a58219dc41 100644 (file)
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -57,7 +57,7 @@ function wiki_get_students($wiki, $groups='', $sort='u.lastaccess', $fields='u.*
 
 function wiki_add_instance($wiki) {
 /// Given an object containing all the necessary data,
-/// (defined by the form in mod.html) this function
+/// (defined by the form in mod_form.php) this function
 /// will create a new instance and return the id number
 /// of the new instance.
 
@@ -74,7 +74,7 @@ function wiki_add_instance($wiki) {
 
 function wiki_update_instance($wiki) {
 /// Given an object containing all the necessary data,
-/// (defined by the form in mod.html) this function
+/// (defined by the form in mod_form.php) this function
 /// will update an existing instance with new data.
 
     /// Determine the pagename for this wiki.

diff --git a/theme/chameleon/pix/mod/README.txt b/theme/chameleon/pix/mod/README.txt
index 5e54d21397b87a2f2878cdc8d1b6f1326ee1dae7..6dadbc92bafbe8712e77ba58cfeb658e300b510e 100644 (file)
--- a/theme/chameleon/pix/mod/README.txt
+++ b/theme/chameleon/pix/mod/README.txt
@@ -6,7 +6,7 @@ These are main modules in Moodle, allowing various activities.
 
 Each of these modules contains a number of expected components:
 
-  mod.html: a form to setup/update a module instance
+  mod_form.php: a form to setup/update a module instance
 
   version.php: defines some meta-info and provides upgrading code