diff --git a/course/edit.php b/course/edit.php
index 5565402eea0..cdae65cf475 100644
--- a/course/edit.php
+++ b/course/edit.php
@@ -184,7 +184,7 @@
     print_footer($course);
 
     if ($usehtmleditor) {
-        use_html_editor();
+        use_html_editor("summary");
     }
 
     exit;
diff --git a/course/editsection.php b/course/editsection.php
index 274b3e15a34..16c5c744df9 100644
--- a/course/editsection.php
+++ b/course/editsection.php
@@ -58,7 +58,7 @@
     print_simple_box_end();
 
     if ($usehtmleditor) { 
-        use_html_editor();
+        use_html_editor("summary");
     }
     print_footer($course);
 
diff --git a/course/group.php b/course/group.php
index 0debfe12de5..65c9141c708 100644
--- a/course/group.php
+++ b/course/group.php
@@ -95,7 +95,7 @@
         include('group-edit.html');
 
         if ($usehtmleditor) {
-            use_html_editor();
+            use_html_editor("description");
         }
 
         print_footer();
diff --git a/course/mod.php b/course/mod.php
index 67bcbd129f6..124078571bd 100644
--- a/course/mod.php
+++ b/course/mod.php
@@ -527,6 +527,12 @@
 
     if (file_exists($modform)) {
 
+        if ($usehtmleditor = can_use_html_editor()) {
+            $defaultformat = FORMAT_HTML;
+        } else {
+            $defaultformat = FORMAT_MOODLE;
+        }
+
         $icon = "<img align=absmiddle height=16 width=16 src=\"$CFG->modpixpath/$module->name/icon.gif\">&nbsp;";
 
         print_heading_with_help($pageheading, "mods", $module->name, $icon);
@@ -534,6 +540,10 @@
         include_once($modform);
         print_simple_box_end();
 
+        if ($usehtmleditor and empty($nohtmleditorneeded)) { 
+            use_html_editor();
+        }
+
     } else {
         notice("This module cannot be added to this course yet! (No file found at: $modform)", "$CFG->wwwroot/course/view.php?id=$course->id");
     }
diff --git a/lib/weblib.php b/lib/weblib.php
index 88b8fab9394..4144d00527c 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1649,11 +1649,11 @@ function use_html_editor($name="") {
 
     echo "<script language=\"javascript\" type=\"text/javascript\" defer=\"1\">\n";
     if (empty($name)) {
-        echo "HTMLArea.replaceAll();";
+        echo "HTMLArea.replaceAll();\n";
     } else {
-        echo "HTMLArea.replace('$name')";
+        echo "HTMLArea.replace('$name');\n";
     }
-    echo "</script>";
+    echo "</script>\n";
 }
 
 
diff --git a/mod/assignment/mod.html b/mod/assignment/mod.html
index b5ab9c85e32..c4c9d0e7faa 100644
--- a/mod/assignment/mod.html
+++ b/mod/assignment/mod.html
@@ -1,9 +1,4 @@
 <?php
-    if ($usehtmleditor = can_use_richtext_editor()) {
-        $defaultformat = FORMAT_HTML;
-    } else {
-        $defaultformat = FORMAT_MOODLE;
-    }
     if (empty($form->name)) {
         $form->name = "";
     }
@@ -30,15 +25,15 @@
     }
 ?>
 
-<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
-<table cellpadding=5>
-<tr valign=top>
+<form name="form" method="post" action="mod.php">
+<table cellpadding="5">
+<tr valign="top">
     <td align=right><p><b><?php print_string("assignmentname", "assignment") ?>:</b></p></td>
     <td>
         <input type="text" name="name" size=60 value="<?php p($form->name) ?>">
     </td>
 </tr>
-<tr valign=top>
+<tr valign="top">
     <td align=right><p><b><?php print_string("description", "assignment") ?>:</b></p>
     <font size="1">
      <?php
@@ -59,23 +54,27 @@
     <?php
        print_textarea($usehtmleditor, 20, 60, 680, 400, "description", $form->description);
     
-       echo "<p align=right>";
-       helpbutton("textformat", get_string("formattexttype"));
-       print_string("formattexttype");
-       echo ":&nbsp;";
-       if (!$form->format) {
-           $form->format = $defaultformat;
+       if ($usehtmleditor) {
+           echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'" />';
+       } else {
+           echo '<p align="right">';
+           helpbutton("textformat", get_string("formattexttype"));
+           print_string("formattexttype");
+           echo ':&nbsp;';
+           if (!$form->format) {
+               $form->format = $defaultformat;
+           }
+           choose_from_menu(format_text_menu(), "format", $form->format, ""); 
+           echo '</p>';
        }
-       choose_from_menu(format_text_menu(), "format", $form->format, ""); 
-       echo "</p>";
     ?>
     </td>
 </tr>
-<tr valign=top>
+<tr valign="top">
     <td align=right><p><b><?php print_string("assignmenttype", "assignment") ?>:</b></p></td>
     <td>
     <?php
-       require("$CFG->dirroot/mod/assignment/lib.php");
+       require_once("$CFG->dirroot/mod/assignment/lib.php");
        asort($ASSIGNMENT_TYPE);
        choose_from_menu($ASSIGNMENT_TYPE, "type", $form->type, "");
        helpbutton("assignmenttype", get_string("assignmenttype", "assignment"), "assignment");
@@ -119,21 +118,14 @@
 </table>
 <br />
 <center>
-<input type="hidden" name=course     value="<?php p($form->course) ?>">
-<input type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>">
-<input type="hidden" name=section       value="<?php p($form->section) ?>">
-<input type="hidden" name=module     value="<?php p($form->module) ?>">
-<input type="hidden" name=modulename value="<?php p($form->modulename) ?>">
-<input type="hidden" name=instance   value="<?php p($form->instance) ?>">
-<input type="hidden" name=mode       value="<?php p($form->mode) ?>">
-<input type="submit" value="<?php print_string("savechanges") ?>">
-<input type="submit" name=cancel value="<?php print_string("cancel") ?>">
+<input type="hidden" name=course     value="<?php p($form->course) ?>" />
+<input type="hidden" name=coursemodule  value="<?php p($form->coursemodule) ?>" />
+<input type="hidden" name=section       value="<?php p($form->section) ?>" />
+<input type="hidden" name=module     value="<?php p($form->module) ?>" />
+<input type="hidden" name=modulename value="<?php p($form->modulename) ?>" />
+<input type="hidden" name=instance   value="<?php p($form->instance) ?>" />
+<input type="hidden" name=mode       value="<?php p($form->mode) ?>" />
+<input type="submit" value="<?php print_string("savechanges") ?>" />
+<input type="submit" name=cancel value="<?php print_string("cancel") ?>" />
 </center>
 </form>
-
-<?php 
-   if ($usehtmleditor) { 
-       print_richedit_javascript("form", "description", "yes");
-   }
-?>
-
diff --git a/mod/assignment/version.php b/mod/assignment/version.php
index 4941aa98b52..3fc0cdc0557 100644
--- a/mod/assignment/version.php
+++ b/mod/assignment/version.php
@@ -6,7 +6,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004040100;
-$module->requires = 2004013101;  // Requires this Moodle version
+$module->requires = 2004052501;  // Requires this Moodle version
 $module->cron     = 60;
 
 ?>
diff --git a/mod/attendance/lib.php b/mod/attendance/lib.php
index 276da0d09e7..f37b96264bc 100755
--- a/mod/attendance/lib.php
+++ b/mod/attendance/lib.php
@@ -40,10 +40,11 @@ function attendance_add_instance($attendance) {
        $attendance->day = make_timestamp($attendance->theyear, 
 			   $attendance->themonth, $attendance->theday);
      }
+     $attendance->notes = $attendance->name;
      $attendance->name=userdate($attendance->day, get_string("strftimedate"));
-	 if (isset($attendance->notes)) { 
-	 	$attendance->name = $attendance->name . " - " . $attendance->notes;
-	 }
+	 if ($attendance->notes) { 
+	 	$attendance->name = $attendance->name . " - " .  $attendance->notes;
+	 }  
 	  $attendance->edited = 0;
 if ($attendance->dynsection) { 
 	if ($mod->course) {
@@ -78,10 +79,10 @@ function attendance_update_instance($attendance) {
 
      $attendance->day = make_timestamp($attendance->theyear, 
 			$attendance->themonth, $attendance->theday); 
+     $attendance->notes = $attendance->name;
      $attendance->name=userdate($attendance->day, get_string("strftimedate"));
 	 if ($attendance->notes) { 
-	 	$attendance->name = $attendance->name . " - " . 
-	 	  $attendance->notes;
+	 	$attendance->name = $attendance->name . " - " .  $attendance->notes;
 	 }  
   if ($attendance->dynsection) { 
 	    //get info about the course
diff --git a/mod/attendance/mod.html b/mod/attendance/mod.html
index 578c4e82819..75a5e9e5a25 100755
--- a/mod/attendance/mod.html
+++ b/mod/attendance/mod.html
@@ -4,6 +4,7 @@
 <!-- RJJ I'm using inline CSS styles for some stuff in this page because I want to centralize -->
 <!-- the logic and styles in a single directory -->
 <?php @include_once("$CFG->dirroot/mod/attendance/lib.php");
+      $nohtmleditorneeded = true;
     //require_once("lib.php")
 
 // error_reporting(E_ALL);
@@ -20,8 +21,6 @@ if (empty($form->id)) {
     ?>
 <FORM name="form" method="post" action="<?php echo $ME ?>">
 <CENTER>
-<INPUT type="submit" value="<?php  print_string("savechanges") ?>">
-<INPUT type="submit" name="cancel" value="<?php  print_string("cancel") ?>">
 <TABLE cellpadding=5>
 
 <!-- <?php  $options[0] = get_string("no"); $options[1] = get_string("yes"); ?> -->
@@ -30,9 +29,9 @@ if (empty($form->id)) {
 <!--     <TD align=left><?php  choose_from_menu($options, "roll", $form->roll, "") ?></td> -->
 <!-- </tr> -->
 <tr valign=top>
-    <td align=right><p><b><?php print_string("notes", "attendance") ?>:</b></p></td>
+    <td align=right><p><b><?php print_string("name") ?>:</b></p></td>
     <td colspan="3">
-        <input type="text" name="notes" size=60 value="<?php p($form->notes)?>">
+        <input type="text" name="name" size=60 value="<?php p($form->notes)?>">
     </td>
 </tr>
 
diff --git a/mod/attendance/version.php b/mod/attendance/version.php
index 872742bd13e..5013856bd9d 100644
--- a/mod/attendance/version.php
+++ b/mod/attendance/version.php
@@ -6,7 +6,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004050301;  // The current module version (Date: YYYYMMDDXX)
-$module->requires = 2004013101;  // Requires this Moodle version
+$module->requires = 2004052501;  // Requires this Moodle version
 $module->cron     = 3600;        // Period for cron to check this module (secs)
 
 ?>
diff --git a/mod/chat/mod.html b/mod/chat/mod.html
index 4024248db2d..9c93912a87b 100644
--- a/mod/chat/mod.html
+++ b/mod/chat/mod.html
@@ -12,7 +12,7 @@
         $form->studentlogs = 0;
     }
 ?>
-<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
+<form name="form" method="post" action="mod.php">
 <table cellpadding=5>
 <tr>
 <tr valign=top>
@@ -35,7 +35,7 @@
     </font>
     </td>
     <td>
-        <textarea name="intro" rows=4 cols=50 wrap="virtual"><?php p($form->intro) ?></textarea>
+        <?php print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro); ?>
     </td>
 </tr>
 <tr valign=top>
diff --git a/mod/chat/version.php b/mod/chat/version.php
index 56f054ea51b..a9366a5718c 100644
--- a/mod/chat/version.php
+++ b/mod/chat/version.php
@@ -6,7 +6,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004043000;   // The (date) version of this module
-$module->requires = 2004013101;  // Requires this Moodle version
+$module->requires = 2004052501;  // Requires this Moodle version
 $module->cron     = 300;          // How often should cron check this module (seconds)?
 
 ?>
diff --git a/mod/choice/mod.html b/mod/choice/mod.html
index 169ef37c89f..64c5c32cdcc 100644
--- a/mod/choice/mod.html
+++ b/mod/choice/mod.html
@@ -33,16 +33,8 @@
         $form->showunanswered = 0;
     }
 
-    if ($usehtmleditor = can_use_richtext_editor()) {
-        $defaultformat = FORMAT_HTML;
-        $onsubmit = "onsubmit=\"copyrichtext(document.form.text);\"";
-    } else {
-        $defaultformat = FORMAT_MOODLE;
-        $onsubmit = "";
-    }
-
 ?>
-<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
+<form name="form" method="post" action="mod.php">
 
 <table cellpadding=5>
 
@@ -74,15 +66,19 @@
     <?php 
        print_textarea($usehtmleditor, 20, 60, 680, 400, "text", $form->text);
     
-       echo "<p align=right>";
-       helpbutton("textformat", get_string("formattexttype"));
-       print_string("formattexttype");
-       echo ":&nbsp;";
-       if (!$form->format) {
-           $form->format = $defaultformat;
+       if ($usehtmleditor) {
+           echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'" />';
+       } else {
+           echo "<p align=right>";
+           helpbutton("textformat", get_string("formattexttype"));
+           print_string("formattexttype");
+           echo ":&nbsp;";
+           if (!$form->format) {
+               $form->format = $defaultformat;
+           }
+           choose_from_menu(format_text_menu(), "format", $form->format, ""); 
+           echo "</p>";
        }
-       choose_from_menu(format_text_menu(), "format", $form->format, ""); 
-       echo "</p>";
     ?>
     </td>
 </tr>
@@ -167,9 +163,3 @@
 <input type="submit" name=cancel value="<?php print_string("cancel") ?>">
 </center>
 </form>
-
-<?php
-   if ($usehtmleditor) { 
-       print_richedit_javascript("form", "text", "yes");
-   }
-?>
diff --git a/mod/choice/version.php b/mod/choice/version.php
index 08aa622b248..f648d98bf96 100644
--- a/mod/choice/version.php
+++ b/mod/choice/version.php
@@ -6,7 +6,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004021700;
-$module->requires = 2004013101;  // Requires this Moodle version
+$module->requires = 2004052501;  // Requires this Moodle version
 $module->cron     = 0;
 
 ?>
diff --git a/mod/dialogue/mod.html b/mod/dialogue/mod.html
index 2f3831bd6f0..176e97610b1 100644
--- a/mod/dialogue/mod.html
+++ b/mod/dialogue/mod.html
@@ -1,13 +1,4 @@
 <?php
-	// set the defaults...
-    if ($usehtmleditor = can_use_richtext_editor()) {
-        $defaultformat = FORMAT_HTML;
-        $onsubmit = "onsubmit=\"copyrichtext(document.form.description);\"";
-    } else {
-        $defaultformat = FORMAT_MOODLE;
-        $onsubmit = "";
-    }
-	// ...and fill the form if needed
     if (!isset($form->name)) {
         $form->name = "";
     }
@@ -29,7 +20,7 @@
 print_heading_with_help(get_string("furtherinformation", "dialogue"), "info", "dialogue"); 
 ?>
 
-<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
+<form name="form" method="post" action="mod.php">
 <table cellpadding=5>
 <tr valign=top>
     <td align=right><p><b><?php print_string("dialoguename", "dialogue") ?>:</b></p></td>
@@ -50,7 +41,7 @@ print_heading_with_help(get_string("furtherinformation", "dialogue"), "info", "d
     
     </TD>
     <td>
-        <textarea name="intro" rows=15 cols=30 wrap="virtual"><?php p($form->intro) ?></textarea>
+        <?php print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro); ?>
     </td>
 </tr>
 <tr valign=top>
diff --git a/mod/dialogue/version.php b/mod/dialogue/version.php
index 660a96ab37b..330286cfe17 100644
--- a/mod/dialogue/version.php
+++ b/mod/dialogue/version.php
@@ -6,7 +6,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004013101;
-$module->requires = 2004013101;  // Requires this Moodle version
+$module->requires = 2004052501;  // Requires this Moodle version
 $module->cron     = 60;
 
 ?>
diff --git a/mod/exercise/mod.html b/mod/exercise/mod.html
index 999b74e7bdd..c0b7f21a20e 100644
--- a/mod/exercise/mod.html
+++ b/mod/exercise/mod.html
@@ -22,6 +22,8 @@
     if (empty($form->deadline)) {
         $form->deadline = "";
     }
+
+    $nohtmleditorneeded = true;
 ?>
 
 <form name="form" method="post" action="mod.php">
@@ -49,7 +51,7 @@
             $grades[$i] = $i;
         }
         choose_from_menu($grades, "grade", "$form->grade", "");
-       helpbutton("grade", get_string("maximumgrade", "exercise"), "exercise");
+        helpbutton("grade", get_string("maximumgrade", "exercise"), "exercise");
         ?>
     </td>
 </tr>
@@ -83,7 +85,7 @@
             $numbers[$i] = $i;
         }
         choose_from_menu($numbers, "nelements", "$form->nelements", "");
-       helpbutton("nelements", get_string("numberofassessmentelements", "exercise"), "exercise");
+        helpbutton("nelements", get_string("numberofassessmentelements", "exercise"), "exercise");
         ?>
     </td>
 </tr>
diff --git a/mod/exercise/version.php b/mod/exercise/version.php
index 660a96ab37b..330286cfe17 100644
--- a/mod/exercise/version.php
+++ b/mod/exercise/version.php
@@ -6,7 +6,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004013101;
-$module->requires = 2004013101;  // Requires this Moodle version
+$module->requires = 2004052501;  // Requires this Moodle version
 $module->cron     = 60;
 
 ?>
diff --git a/mod/forum/mod.html b/mod/forum/mod.html
index d6a02edc677..e6384b1c196 100644
--- a/mod/forum/mod.html
+++ b/mod/forum/mod.html
@@ -30,7 +30,7 @@
         $form->rssarticles = 0;
     }
 ?>
-<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
+<form name="form" method="post" action="mod.php">
 <table cellpadding=5>
 <tr>
 <tr valign=top>
@@ -77,7 +77,7 @@
     </font>
     </td>
     <td>
-        <textarea name="intro" rows=4 cols=50 wrap="virtual"><?php p($form->intro) ?></textarea>
+        <?php print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro); ?>
     </td>
 </tr>
 
diff --git a/mod/forum/post.php b/mod/forum/post.php
index 3cb52a5ece1..eff9c639399 100644
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -403,7 +403,7 @@
     print_simple_box_end();
 
     if ($usehtmleditor) {
-        use_html_editor();
+        use_html_editor("message");
     }
 
     print_footer($course);
diff --git a/mod/forum/version.php b/mod/forum/version.php
index deeca2dd08d..26d6969e97c 100644
--- a/mod/forum/version.php
+++ b/mod/forum/version.php
@@ -6,7 +6,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004050300;
-$module->requires = 2004050300;  // Requires this Moodle version
+$module->requires = 2004052501;  // Requires this Moodle version
 $module->cron     = 60;
 
 ?>
diff --git a/mod/glossary/comment.php b/mod/glossary/comment.php
index 9b36d84e14f..2c4e8dd9162 100644
--- a/mod/glossary/comment.php
+++ b/mod/glossary/comment.php
@@ -178,7 +178,7 @@
             include("comment.html");
 
             if ($usehtmleditor) { 
-                use_html_editor();
+                use_html_editor("text");
             }
         }
     }
diff --git a/mod/glossary/mod.html b/mod/glossary/mod.html
index b6e82c79497..150a989c9f7 100644
--- a/mod/glossary/mod.html
+++ b/mod/glossary/mod.html
@@ -1,7 +1,5 @@
 <?PHP  // $Id$
 
-global $CFG;
-
 if (!isset($form->studentcanpost)) {
     $form->studentcanpost = $CFG->glossary_studentspost;
 }
@@ -74,7 +72,7 @@ if (!isset($form->showspecial)) {
      </font>
     </td>
     <td>
-        <textarea name="intro" rows=5 cols=50 wrap="virtual"><?php p($form->intro) ?></textarea>
+        <?php print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro); ?>
     </td>
 </tr>
 <TR valign=top>
diff --git a/mod/glossary/version.php b/mod/glossary/version.php
index 44a1ac8702c..0c6d8f9d4f4 100644
--- a/mod/glossary/version.php
+++ b/mod/glossary/version.php
@@ -6,7 +6,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004051400;  // The current module version (Date: YYYYMMDDXX)
-$module->requires = 2004050300;  // Requires this Moodle version
+$module->requires = 2004052501;  // Requires this Moodle version
 $module->cron     = 0;           // Period for cron to check this module (secs)
 
 $release = "0.5 development";   // User-friendly version number
diff --git a/mod/journal/edit.php b/mod/journal/edit.php
index cec5fcd98da..b2310da6688 100644
--- a/mod/journal/edit.php
+++ b/mod/journal/edit.php
@@ -90,7 +90,7 @@
 	include("edit.html");
 
     if ($usehtmleditor) {
-        use_html_editor();
+        use_html_editor("text");
     }
 
     print_footer($course);
diff --git a/mod/journal/mod.html b/mod/journal/mod.html
index 2c9e3f8071b..48e1c61c2dd 100644
--- a/mod/journal/mod.html
+++ b/mod/journal/mod.html
@@ -1,10 +1,4 @@
 <?php
-    if ($usehtmleditor = can_use_richtext_editor()) {
-        $defaultformat = FORMAT_HTML;
-    } else {
-        $defaultformat = FORMAT_MOODLE;
-    }
-
     if (!isset($form->name)) {
         $form->name = "";
     }
@@ -23,7 +17,7 @@
     }
 ?>
 
-<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
+<form name="form" method="post" action="mod.php">
 <table cellpadding=5>
 <tr valign=top>
     <td align=right><p><b><?php print_string("journalname", "journal") ?>:</b></p></td>
@@ -53,15 +47,19 @@
     <?php
        print_textarea($usehtmleditor, 20, 60, 680, 400, "intro", $form->intro);
 
-       echo "<p align=right>";
-       helpbutton("textformat", get_string("formattexttype"));
-       print_string("formattexttype");
-       echo ":&nbsp;";
-       if (!$form->introformat) {
-           $form->introformat = $defaultformat;
+       if ($usehtmleditor) {
+           echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'" />';
+       } else {
+           echo "<p align=right>";
+           helpbutton("textformat", get_string("formattexttype"));
+           print_string("formattexttype");
+           echo ":&nbsp;";
+           if (!$form->introformat) {
+               $form->introformat = $defaultformat;
+           }
+           choose_from_menu(format_text_menu(), "introformat", $form->introformat, "");
+           echo "</p>";
        }
-       choose_from_menu(format_text_menu(), "introformat", $form->introformat, "");
-       echo "</p>";
     ?>
     </td>
 </tr>
@@ -107,11 +105,3 @@
 <input type="submit" name=cancel value="<?php print_string("cancel") ?>">
 </form>
 </center>
-
-
-<?php 
-   if ($usehtmleditor) { 
-       print_richedit_javascript("form", "intro", "yes");
-   }
-?>
-
diff --git a/mod/journal/version.php b/mod/journal/version.php
index b36114e5975..f4d4408bac5 100644
--- a/mod/journal/version.php
+++ b/mod/journal/version.php
@@ -6,7 +6,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004020500;
-$module->requires = 2004013101;  // Requires this Moodle version
+$module->requires = 2004052501;  // Requires this Moodle version
 $module->cron     = 60;
 
 ?>
diff --git a/mod/label/mod.html b/mod/label/mod.html
index c72afecc20a..93d3af09c9a 100644
--- a/mod/label/mod.html
+++ b/mod/label/mod.html
@@ -1,14 +1,6 @@
 <!-- This page defines the form to create or edit an instance of this module -->
 <!-- It is used from /course/mod.php.  The whole instance is available as $form. -->
 
-<?php
-    if ($usehtmleditor = can_use_html_editor()) {
-        $defaultformat = FORMAT_HTML;
-    } else {
-        $defaultformat = FORMAT_MOODLE;
-    }
-?>
-
 <form name="form" method="post" action="mod.php">
 <center>
 <table cellpadding=5>
@@ -46,9 +38,3 @@
 <input type="submit" value="<?php  print_string("savechanges") ?>">
 </center>
 </form>
-
-<?php 
-   if ($usehtmleditor) { 
-       use_html_editor();
-   }
-?>
diff --git a/mod/label/version.php b/mod/label/version.php
index f95b2e1e9e6..e26dc308eac 100644
--- a/mod/label/version.php
+++ b/mod/label/version.php
@@ -6,7 +6,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004021900;  // The current module version (Date: YYYYMMDDXX)
-$module->requires = 2004013101;  // Requires this Moodle version
+$module->requires = 2004052501;  // Requires this Moodle version
 $module->cron     = 0;           // Period for cron to check this module (secs)
 
 ?>
diff --git a/mod/lesson/mod.html b/mod/lesson/mod.html
index 224bfc6df57..92d58bcc564 100644
--- a/mod/lesson/mod.html
+++ b/mod/lesson/mod.html
@@ -2,7 +2,8 @@
 <!-- It is used from /course/mod.php.  The whole instance is available as $form. -->
 <?php
 
-require("$CFG->dirroot/mod/lesson/lib.php");  // for parameter array
+    require_once("$CFG->dirroot/mod/lesson/lib.php");  // for parameter array
+    $nohtmleditorneeded = true;
 
 // set the defaults
     if (empty($form->name)) {
@@ -38,6 +39,7 @@ require("$CFG->dirroot/mod/lesson/lib.php");  // for parameter array
     if (!isset($form->deadline)) {
         $form->deadline = 0;
     }
+
 ?>
 
 <FORM name="form" method="post" action="<?php echo $ME ?>">
diff --git a/mod/lesson/version.php b/mod/lesson/version.php
index 45896bdd513..b55aa0f8be3 100644
--- a/mod/lesson/version.php
+++ b/mod/lesson/version.php
@@ -6,7 +6,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004032700;  // The current module version (Date: YYYYMMDDXX)
-$module->requires = 2004013101;  // Requires this Moodle version
+$module->requires = 2004052501;  // Requires this Moodle version
 $module->cron     = 0;           // Period for cron to check this module (secs)
 
 ?>
diff --git a/mod/quiz/mod.html b/mod/quiz/mod.html
index 0f5df5bcc4c..247b16fd592 100644
--- a/mod/quiz/mod.html
+++ b/mod/quiz/mod.html
@@ -60,11 +60,25 @@
     </td>
 </tr>
 <tr valign=top>
-    <td align=right><p><b><?php print_string("introduction", "quiz") ?>:</b></p></td>
+    <td align=right><p><b><?php print_string("introduction", "quiz") ?>:</b></p>
+      <br />
+    <font size="1">
+     <?php
+        if ($usehtmleditor) {
+           helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
+        } else {
+           helpbutton("text", get_string("helptext"), "moodle", true, true); 
+           echo '<br />';
+           emoticonhelpbutton("form", "description");
+           echo '<br />';
+        } 
+      ?>
+      <br />
+      </font>
+    </td>
     <td>
-        <textarea name="intro" rows=4 cols=50 wrap="virtual"><?php p($form->intro) ?></textarea>
         <?php 
-           helpbutton("text", get_string("helptext")); 
+           print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro);
         ?>
     </td>
 </tr>
diff --git a/mod/quiz/report/fullstat/report.php b/mod/quiz/report/fullstat/report.php
index 192c313c7f1..4bd366e9a31 100755
--- a/mod/quiz/report/fullstat/report.php
+++ b/mod/quiz/report/fullstat/report.php
@@ -91,7 +91,7 @@ class quiz_report extends quiz_default_report {
     $user_resps = qr_quiz_responses($thisquizid);
 //    //print_object($user_resps);
     foreach($user_resps as $thiskey => $thisresp){
-        $userdata[$thisresp->userid][$thisresp->attemptno]['response'][$thisresp->question]=$thisresp->answer;
+        $userdata[$thisresp->userid][$thisresp->attemptno]['response'][$thisresp->question]=s($thisresp->answer);
         $userdata[$thisresp->userid][$thisresp->attemptno]['grade']=$thisresp->sumgrades;
         $userdata[$thisresp->userid][$thisresp->attemptno]['name']=fullname($thisresp);
         $userdata[$thisresp->userid][$thisresp->attemptno]['attemptid']=$thisresp->aid;
diff --git a/mod/quiz/version.php b/mod/quiz/version.php
index 85a13d3074b..c3d4958db34 100644
--- a/mod/quiz/version.php
+++ b/mod/quiz/version.php
@@ -6,7 +6,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004051700;   // The (date) version of this module
-$module->requires = 2004013101;   // Requires this Moodle version
+$module->requires = 2004052501;   // Requires this Moodle version
 $module->cron     = 0;            // How often should cron check this module (seconds)?
 
 ?>
diff --git a/mod/resource/details.php b/mod/resource/details.php
index 0836c1572b3..f2e38e4e424 100644
--- a/mod/resource/details.php
+++ b/mod/resource/details.php
@@ -451,7 +451,7 @@
         </form>
 <?php
         if ($usehtmleditor and $form->type == HTML) {
-            use_html_editor();
+            use_html_editor("alltext");
         }
         print_simple_box_end();
         print_footer($course);
diff --git a/mod/resource/mod.html b/mod/resource/mod.html
index 1ae7bb196b3..28831b939d9 100644
--- a/mod/resource/mod.html
+++ b/mod/resource/mod.html
@@ -14,6 +14,7 @@
     if (empty($form->alltext)) {
         $form->alltext = "";
     }
+    $nohtmleditorneeded = true;
 ?>
 
 
@@ -54,7 +55,7 @@
      </font>
     </td>
     <td>
-        <textarea name="summary" rows=5 cols=50 wrap="virtual"><?php p($form->summary) ?></textarea>
+        <?php print_textarea(false, 7, 50, 680, 400, "summary", $form->summary); ?>
     </td>
 </tr>
 </table>
diff --git a/mod/resource/version.php b/mod/resource/version.php
index 023a4396456..b99b92a0bfb 100644
--- a/mod/resource/version.php
+++ b/mod/resource/version.php
@@ -6,7 +6,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004013101;
-$module->requires = 2004051600;  // Requires this Moodle version
+$module->requires = 2004052501;  // Requires this Moodle version
 $module->cron     = 0;
 
 ?>
diff --git a/mod/scorm/mod.html b/mod/scorm/mod.html
index 07f2ef093fe..ad7db3c9308 100755
--- a/mod/scorm/mod.html
+++ b/mod/scorm/mod.html
@@ -52,7 +52,7 @@
      	  	</font>
 	    </td>
 	    <td>
-		<textarea name="summary" rows=5 cols=50 wrap="virtual"><?php p($form->summary) ?></textarea>
+        <?php print_textarea($usehtmleditor, 20, 50, 680, 400, "summary", $form->summary); ?>
 	    </td>
 	</tr>
 	<tr valign=top>
diff --git a/mod/scorm/version.php b/mod/scorm/version.php
index e3ee06f79de..826d36bff6b 100755
--- a/mod/scorm/version.php
+++ b/mod/scorm/version.php
@@ -6,6 +6,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004040900;   // The (date) version of this module
+$module->requires = 2004051600;   // The version of Moodle that is required
 $module->cron     = 0;            // How often should cron check this module (seconds)?
 
 ?>
diff --git a/mod/survey/mod.html b/mod/survey/mod.html
index 60f3902201a..06e8e9143da 100644
--- a/mod/survey/mod.html
+++ b/mod/survey/mod.html
@@ -8,6 +8,7 @@
     if (!isset($form->intro)) {
         $form->intro = "";
     }
+    $nohtmleditorneeded = true;
 ?>
 
 <form name="form" method="post" action="../mod/survey/details.php">
diff --git a/mod/survey/version.php b/mod/survey/version.php
index 9bea0284091..fbddeddc2fb 100644
--- a/mod/survey/version.php
+++ b/mod/survey/version.php
@@ -6,7 +6,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004021900;
-$module->requires = 2004013101;  // Requires this Moodle version
+$module->requires = 2004051600;  // Requires this Moodle version
 $module->cron     = 0;
 
 ?>
diff --git a/mod/workshop/mod.html b/mod/workshop/mod.html
index 26d09a369f6..cec406c85da 100644
--- a/mod/workshop/mod.html
+++ b/mod/workshop/mod.html
@@ -1,12 +1,4 @@
 <?php
-	// set the defaults...
-    if ($usehtmleditor = can_use_richtext_editor()) {
-        $defaultformat = FORMAT_HTML;
-        $onsubmit = "onsubmit=\"copyrichtext(document.form.description);\"";
-    } else {
-        $defaultformat = FORMAT_MOODLE;
-        $onsubmit = "";
-    }
 	// ...and fill the form if needed
     if (empty($form->name)) {
         $form->name = "";
@@ -49,7 +41,7 @@
     }
 ?>
 
-<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
+<form name="form" method="post" action="mod.php">
 <table cellpadding=5>
 <tr valign=top>
     <td align=right><P><B><?php  print_string("title", "workshop") ?>:</B></P></TD>
@@ -58,25 +50,39 @@
     </td>
 </tr>
 <tr valign=top>
-    <td align=right><P><B><?php  print_string("description", "workshop") ?>:</B></P></TD>
+    <td align=right><p><b><?php  print_string("description", "workshop") ?>:</b></p>
+    <font size="1">
+     <?php
+        helpbutton("writing", get_string("helpwriting"), "moodle", true, true);
+        echo "<br />";
+        if ($usehtmleditor) {
+           helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
+        } else {
+           helpbutton("text", get_string("helptext"), "moodle", true, true);
+           echo "<br />";
+           emoticonhelpbutton("form", "description", "moodle", true, true);
+           echo "<br />";
+        } 
+      ?>
+      <br />
+    </font>
     <td>
     <?php  
        print_textarea($usehtmleditor, 20, 60, 595, 400, "description", $form->description);
     
-       if ($usehtmleditor) { 
-           helpbutton("richtext", get_string("helprichtext"));
-       } else { 
-           helpbutton("text", get_string("helptext"));
+       if ($usehtmleditor) {
+           echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'" />';
+       } else {
+           echo '<p align="right">';
+           helpbutton("textformat", get_string("formattexttype"));
+           print_string("formattexttype");
+           echo ':&nbsp;';
+           if (!$form->format) {
+               $form->format = $defaultformat;
+           }
+           choose_from_menu(format_text_menu(), "format", $form->format, ""); 
+           echo '</p>';
        }
-       echo "<P align=right>";
-       print_string("formattexttype");
-       echo ":&nbsp;";
-       if (!$form->format) {
-           $form->format = $defaultformat;
-       }
-       choose_from_menu(format_text_menu(), "format", $form->format, ""); 
-       helpbutton("textformat", get_string("formattexttype"));
-       echo "</P>";
     ?>
     </td>
 </tr>
@@ -242,10 +248,3 @@
 
 </CENTER>
 </FORM>
-
-<?php  
-   if ($usehtmleditor) { 
-       print_richedit_javascript("form", "description", "no");
-   }
-?>
-
diff --git a/mod/workshop/version.php b/mod/workshop/version.php
index 0072334947d..48be810ae8f 100644
--- a/mod/workshop/version.php
+++ b/mod/workshop/version.php
@@ -6,7 +6,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 $module->version  = 2004052100;
-$module->requires = 2004013101;  // Requires this Moodle version
+$module->requires = 2004051600;  // Requires this Moodle version
 $module->cron     = 60;
 
 ?>
diff --git a/version.php b/version.php
index 066c01e37be..c597bb9c4e9 100644
--- a/version.php
+++ b/version.php
@@ -5,8 +5,7 @@
 // database to determine whether upgrades should
 // be performed (see lib/db/*.php)
 
-$version = 2004052500;   // The current version is a date (YYYYMMDDXX)
+$version = 2004052501;   // The current version is a date (YYYYMMDDXX)
 
-$release = "1.3 Stable (001)";   // User-friendly version number
-                                 // Bugfix sequence number between brackets
+$release = "1.3 Stable +2";   // User-friendly version number
 ?>