More robust enrolment screen

diff --git a/course/enrol.html b/course/enrol.html
index a9e1c74dd1f855c496617f9f2565ddfe93d231ae..1983f85f9ca71ed2047dd088c7aa2c72b59a35de 100644 (file)
--- a/course/enrol.html
+++ b/course/enrol.html
@@ -1,42 +1,47 @@
-<CENTER>\r
+<center>\r
 \r
-<table cellpadding=20>\r
-  <tr valign=top> \r
+<table cellpadding="20">\r
+  <tr valign="top">\r
     <td>\r
-    <P ALIGN=CENTER>\r
-       <? if ($teacher) {\r
-              $teacher->fullname = "$teacher->firstname $teacher->lastname";\r
-              $teachername = "<A HREF=../user/view.php?id=$teacher->id&course=$site->id>$teacher->fullname</A>.";\r
+    <p align="center">\r
+       <?php\r
+          if ($teacher) {\r
+              $teachername = "<a href=\"../user/view.php?id=$teacher->id&course=$site->id\">".\r
+                             "$teacher->firstname $teacher->lastname</a>.";\r
           } else {\r
               $teachername = get_string("yourteacher", "", strtolower($course->teacher));\r
           }\r
           print_string("enrolmentkeyfrom", "", $teachername);\r
        ?>\r
-       </P>\r
+       </p>\r
     </td>\r
+\r
   </tr>\r
-  <tr valign=top> \r
-    <td bgcolor="<?=$THEME->cellheading?>"> <CENTER><? formerr($errormsg) ?> </CENTER>\r
+  <tr valign=top>\r
+    <td bgcolor="<?php p($THEME->cellheading)?>"><center><?php if (isset ($errormsg)) {formerr($errormsg);} ?></center>\r
       <form name="form" method="post" action="enrol.php">\r
         <table>\r
-          <tr> \r
-            <td width=50% align=right><P><? print_string("enrolmentkey") ?>:</P></td>\r
-            <td width=50% > \r
-              <input type="password" name="password" size=20 value="<? p($password) ?>" >\r
-              <input type="hidden" name="id" value="<? p($id) ?>" >\r
+          <tr>\r
+            <td width="50%" align="right"><p><?php print_string("enrolmentkey") ?>:</p></td>\r
+            <td width="50%">\r
+              <input type="password" name="password" size="20" value="<?php p($password) ?>" >\r
+              <input type="hidden" name="id" value="<?php p($id) ?>" >\r
             </td>\r
-          <tr> \r
-            <td width=50%>&nbsp;</td>\r
-            <td width=50%> \r
-              <table cellpadding=1 cellspacing=0><tr>\r
-              <td><input type=submit value="<? print_string("login") ?>"></form></td>\r
-              <td><form action="<?=$CFG->wwwroot?>/index.php" method=post>\r
-                  <input type=submit value="<? print_string("cancel") ?>"></form></td>\r
-              </tr></table>\r
+          <tr>\r
+            <td width="50%">&nbsp;</td>\r
+            <td width="50%">\r
+              <table cellpadding="1" cellspacing="0" align="center">\r
+                <tr>\r
 \r
+                    <td><input type="submit" value="<?php print_string("login") ?>">&nbsp;&nbsp;</form></td>\r
+                    <td><form action="<?php p($CFG->wwwroot)?>/index.php" method=post>\r
+                        <input type="submit" value="<?php print_string("cancel") ?>"></form></td>\r
+                </tr>\r
+              </table>\r
             </td>\r
         </table>\r
     </td>\r
+\r
   </tr>\r
 </table>\r
 \r

diff --git a/course/enrol.php b/course/enrol.php
index e9b64a2df3ef061a955d93d2fbb8457710306ca3..cd50904de862c113240333a5d6d6bcecf380faec 100644 (file)
--- a/course/enrol.php
+++ b/course/enrol.php
@@ -84,6 +84,9 @@
     }
 
     $teacher = get_teacher($course->id);
+    if (!isset($password)) {
+        $password = "";
+    }
 
     $strloginto = get_string("loginto", "", $course->shortname);
     $strcourses = get_string("courses");