MDL-7861, xhtml problems with survey

diff --git a/mod/survey/details.php b/mod/survey/details.php
index ba0cecb55f353ba348a51bdf2094f1e11bfd66e2..540d90b2764c7e193f4d32481e83f1312e545e35 100644 (file)
--- a/mod/survey/details.php
+++ b/mod/survey/details.php
@@ -54,7 +54,9 @@
         " -> ".stripslashes_safe($lastform->name)." ($streditingasurvey)");
 
         if (!$lastform->name or !$lastform->template) {
-            error(get_string("filloutallfields"), $_SERVER["HTTP_REFERER"]);
+            // $_SERVER["HTTP_REFERER"] breaks xhtml, urlencode breaks continue button,
+            // removing $_SERVER["HTTP_REFERER"]
+            error(get_string("filloutallfields"));
         }
         $mform = new mod_survey_details_form($CFG->wwwroot.'/course/mod.php', array('lastform'=>stripslashes_safe($lastform)));
         $mform->display();

diff --git a/mod/survey/mod.html b/mod/survey/mod.html
index 9fffc9efd84c3cc1274a59b7bd235fa6ae2c5f63..506cd6ec383b358057bf6ec8e07f22d1edd727f6 100644 (file)
--- a/mod/survey/mod.html
+++ b/mod/survey/mod.html
@@ -12,6 +12,7 @@
 ?>
 
 <form id="form" method="post" action="../mod/survey/details.php">
+<fieldset class="invisiblefieldset">
 <table cellpadding="5">
 <tr valign="top">
     <td align="right"><b><?php  print_string("surveyname", "survey") ?>:</b></td>
@@ -37,7 +38,7 @@
 </tr>
 <?php print_standard_coursemodule_settings($form); ?>
 </table>
-<center>
+<div class="centerpara">
 <input type="hidden" name="intro"   value="<?php p($form->intro) ?>" />
 <input type="hidden" name="course"     value="<?php p($form->course) ?>" />
 <input type="hidden" name="sesskey"    value="<?php p($form->sesskey) ?>" />
@@ -49,5 +50,6 @@
 <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>
+</div>
+</fieldset>
 </form>

diff --git a/mod/survey/view.php b/mod/survey/view.php
index 6345827db111d26f2f18293db5c17474f6838783..e2fce800a6b99a6d28069a3873bdc549ca784a44 100644 (file)
--- a/mod/survey/view.php
+++ b/mod/survey/view.php
@@ -159,7 +159,7 @@
 
 <br />
 <script type="text/javascript">
-<![CDATA[
+<!--
 function checkform() {
 
     var error=false;
@@ -184,7 +184,6 @@ function checkform() {
 <?php echo "document.write('<input type=\"button\" value=\"".get_string("clicktocontinuecheck", "survey")."\" onClick=\"checkform()\" />');";  ?>
 
 // END -->    
-]]>
 </script>
 
 <noscript>