fixed bad newlines and changed firstname lastname to call to fullname function

diff --git a/enrol/internal/enrol.html b/enrol/internal/enrol.html
index 539458691c8eb8f8a49f97a4a577892aa79eec9b..d10af05b5dc8425c4f16b08f9e01b98c994f78c6 100644 (file)
--- a/enrol/internal/enrol.html
+++ b/enrol/internal/enrol.html
@@ -1 +1,45 @@
-<table cellpadding="20" align="center">\r\r  <tr valign="top">\r    <td>\r      <p align="center">\r      <?php\r          if ($teacher) {\r              $site = get_site();\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    </td>\r  </tr>\r\r  <tr valign="top">\r    <td class="generalbox" bgcolor="<?php p($THEME->cellcontent) ?>">\r      <center><?php if (! empty($this->errormsg)) {formerr($this->errormsg);} ?></center>\r      <form name="form" method="post" action="enrol.php">\r        <table>\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($course->id) ?>" >\r            </td>\r          <tr>\r            <td width="50%">&nbsp;</td>\r            <td width="50%">\r              <table cellpadding="1" cellspacing="0" align="center">\r                <tr>\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  </tr>\r\r</table> 
\ No newline at end of file
+<table cellpadding="20" align="center">
+
+  <tr valign="top">
+    <td>
+      <p align="center">
+      <?php
+          if ($teacher) {
+              $site = get_site();
+              $teachername = "<a href=\"../user/view.php?id=$teacher->id&course=$site->id\">".fullname($teacher)."</a>.";
+          } else {
+              $teachername = get_string("yourteacher", "", strtolower($course->teacher));
+          }
+          print_string("enrolmentkeyfrom", "", $teachername);
+       ?>
+       </p>
+    </td>
+  </tr>
+
+  <tr valign="top">
+    <td class="generalbox" bgcolor="<?php p($THEME->cellcontent) ?>">
+      <center><?php if (! empty($this->errormsg)) {formerr($this->errormsg);} ?></center>
+      <form name="form" method="post" action="enrol.php">
+        <table>
+          <tr>
+            <td width="50%" align="right"><p><?php print_string("enrolmentkey") ?>:</p></td>
+            <td width="50%">
+              <input type="password" name="password" size="20" value="<?php p($password) ?>" >
+              <input type="hidden" name="id" value="<?php p($course->id) ?>" >
+            </td>
+          <tr>
+            <td width="50%">&nbsp;</td>
+            <td width="50%">
+              <table cellpadding="1" cellspacing="0" align="center">
+                <tr>
+                    <td><input type="submit" value="<?php print_string("login") ?>">&nbsp;&nbsp;</form></td>
+                    <td><form action="<?php p($CFG->wwwroot)?>/index.php" method="post">
+                        <input type="submit" value="<?php print_string("cancel") ?>"></form></td>
+                </tr>
+              </table>
+            </td>
+        </table>
+    </td>
+  </tr>
+
+</table> 
\ No newline at end of file