- Fixed more than 30 HTML and XML well-formedness errors.

1 files changed, 17 insertions, 28 deletions

diff --git a/modules/user/user.module b/modules/user/user.module
index 6a86d8bce..c538b5d09 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -279,11 +279,6 @@ function user_fields() {
 
 function user_help() {
  ?>
-  <style type="text/css">
-<!--
-p {  padding-left: 24px}
--->
-</style>
 <h3>Introduction</h3>
 <p>Drupal offers a powerful and open user system. This system allows users to
   register, login, logout, maintain user profiles, etc. No participant can use
@@ -484,10 +479,10 @@ function user_block() {
 
     $output .= "<div align=\"center\">\n";
     $output .= " <form action=\"module.php?mod=user&op=login\" method=\"post\">\n";
-    $output .= "  <b>". t("Username") .":</b><br /><input name=\"edit[name]\" size=\"15\"><p />\n";
-    $output .= "  <b>". t("Password") .":</b><br /><input name=\"edit[pass]\" size=\"15\" TYPE=\"password\"><br />\n";
+    $output .= "  <b>". t("Username") .":</b><br /><input name=\"edit[name]\" size=\"15\" /><p />\n";
+    $output .= "  <b>". t("Password") .":</b><br /><input name=\"edit[pass]\" size=\"15\" type=\"password\" /><br />\n";
     $output .= form_checkbox(t("Remember me"), "remember_me", 1, 0);
-    $output .= "  <input type=\"submit\" value=\"". t("Log in") ."\"><br />\n";
+    $output .= "  <input type=\"submit\" value=\"". t("Log in") ."\" /><br />\n";
     if (variable_get("account_register", 1)) $output .= "  <a href=\"module.php?mod=user\" title=\"". t("Create a new user account.") ."\">". t("REGISTER") ."</a>\n";
     $output .= " </form>\n";
     $output .= "</div>\n";
@@ -586,21 +581,15 @@ function user_help_da() {
   $site = variable_get("site_name", "this web site");
 
   $output = "
-    <style type=\"text/css\">
-    <!--
-    p {  padding-left: 24px}
-    -->
-    </style>
-    <br />
-    <h3>Distributed Authentication<a name=\"da\"> </a></h3>
-  <p>One of the more tedious moments in visiting a new web site is filling out the
+   <h3>Distributed Authentication<a name=\"da\"></a></h3>
+   <p>One of the more tedious moments in visiting a new web site is filling out the
     registration form. Here at %s, you do not have to fill out a registration form
     if you are already a member of ";
     $output .= implode(", ", user_auth_help_links());
     $output .= ".  This capability is called <i>Distributed
     Authentication</i>, and is unique to <a href=\"http://www.drupal.org\">Drupal</a>,
     the software which powers %s.</p>
-  <p>Distributed Authentication enables a new user to input a username and password into the login box,
+   <p>Distributed Authentication enables a new user to input a username and password into the login box,
     and immediately be recognized, even if that user never registered at %s. This
     works because Drupal knows how to communicate with external registration databases.
     For example, lets say that new user 'Joe' is already a registered member of
@@ -619,7 +608,7 @@ function user_help_da() {
 
   foreach (module_list() as $module) {
     if (module_hook($module, "auth")) {
-      $output .= "<h4><A NAME=\"$module\"></A>" . module_invoke($module, "info", "name") . "</h4>";
+      $output .= "<h4><a name=\"$module\"></a>" . module_invoke($module, "info", "name") . "</h4>";
       $output .= module_invoke($module, "auth_help");
     }
   }
@@ -753,7 +742,7 @@ function user_login($edit = array()) {
   */
 
   if ($error) {
-    $output .= "<p><font color=\"red\">". check_output($error) ."</font></p>";
+    $output .= "<p><span style=\"color: red;\">". check_output($error) ."</span></p>";
   }
 
   /*
@@ -907,7 +896,7 @@ function user_register($edit = array()) {
   else {
 
     if ($error) {
-      $output .= "<p><font color=\"red\">". check_output($error) ."</font></p>";
+      $output .= "<p><span style=\"color: red;\">". check_output($error) ."</span></p>";
     }
 
     $output .= form_textfield(t("Username"), "name", $edit["name"], 30, 64, t("Your full name or your prefered username: only letters, numbers and spaces are allowed."));
@@ -990,7 +979,7 @@ function user_edit($edit = array()) {
     }
 
     if ($error) {
-      $output .= "<p><font color=\"red\">". check_output($error) ."</font></p>";
+      $output .= "<p><span style=\"color: red;\">". check_output($error) ."</span></p>";
     }
 
     $output .= form_textfield(t("Username"), "name", $user->name, 30, 55, t("Your full name or your prefered username: only letters, numbers and spaces are allowed."));
@@ -1016,7 +1005,7 @@ function user_edit($edit = array()) {
     $output .= form_select(t("Timezone"), "timezone", $user->timezone, $zones, t("Select what time you currently have and your timezone settings will be set appropriate."));
     $output .= form_select(t("Language"), "language", $user->language, $languages, t("Selecting a different language will change the language of the site."));
     $output .= form_textarea(t("Signature"), "signature", $user->signature, 70, 3, t("Your signature will be publicly displayed at the end of your comments.") ."<br />". t("Allowed HTML tags") .": ". htmlspecialchars(variable_get("allowed_html", "")));
-    $output .= form_item(t("Password"), "<input type=\"password\" name=\"edit[pass1]\" size=\"12\" maxlength=\"24\"> <input type=\"password\" name=\"edit[pass2]\" size=\"12\" maxlength=\"24\">", t("Enter your new password twice if you want to change your current password or leave it blank if you are happy with your current password."));
+    $output .= form_item(t("Password"), "<input type=\"password\" name=\"edit[pass1]\" size=\"12\" maxlength=\"24\" /> <input type=\"password\" name=\"edit[pass2]\" size=\"12\" maxlength=\"24\" />", t("Enter your new password twice if you want to change your current password or leave it blank if you are happy with your current password."));
     $output .= form_submit(t("Save user information"));
 
     $output = form($output);
@@ -1046,10 +1035,10 @@ function user_view($uid = 0) {
     foreach (module_list() as $module) {
       if (module_hook($module, "auth")) {
         if ($module != "drupal") {
-          $output .= "<a href=\"module.php?mod=user&op=help#$module\">". form_item(module_invoke($module, "info", "name") . " ID</a>", check_output($result[$module]));
+          $output .= form_item(module_invoke($module, "info", "name") . " ID", check_output($result[$module]));
         }
         else {
-          $output .= "<a href=\"module.php?mod=user&op=help#$module\">". form_item(module_invoke($module, "info", "name") . " ID</a>", check_output($user->name) . "@$HTTP_HOST");
+          $output .= form_item(module_invoke($module, "info", "name") . " ID", check_output($user->name) . "@$HTTP_HOST");
         }
       }
     }
@@ -1206,7 +1195,7 @@ function user_admin_create($edit = array()) {
   else {
 
     if ($error) {
-      $output .= "<p><font color=\"red\">". check_output($error) ."</font></p>";
+      $output .= "<p><span style=\"color: red;\">". check_output($error) ."</span></p>";
     }
 
     $output .= form_textfield("Username", "name", $edit["name"], 30, 55);
@@ -1332,7 +1321,7 @@ function user_admin_perm($edit = array()) {
     $output .= " <tr>";
     $output .= "  <td>". check_output($perm) ."</td>";
     foreach ($roles as $name => $value) {
-      $output .= "  <td align=\"center\"><input type=\"checkbox\" name=\"edit[$name][$perm]\"". (strstr($value, $perm) ? " checked=\"checked\"" : "") ."></td>";
+      $output .= "  <td align=\"center\"><input type=\"checkbox\" name=\"edit[$name][$perm]\"". (strstr($value, $perm) ? " checked=\"checked\"" : "") ." /></td>";
     }
     $output .= " </tr>";
   }
@@ -1424,10 +1413,10 @@ function user_admin_edit($edit = array()) {
       foreach (module_list() as $module) {
         if (module_hook($module, "auth")) {
           if ($module != "drupal") {
-            $output .= form_item("<a href=\"module.php?mod=user&op=help#$module\">". module_invoke($module, "info", "name") . " ID</a>", check_output($result[$module]));
+            $output .= form_item(module_invoke($module, "info", "name") . " ID", check_output($result[$module]));
           }
           else {
-            $output .= form_item("<a href=\"module.php?mod=user&op=help#$module\">". module_invoke($module, "info", "name") . " ID</a>", check_output($account->name) ."@$HTTP_HOST");
+            $output .= form_item(module_invoke($module, "info", "name") . " ID", check_output($account->name) ."@$HTTP_HOST");
           }
         }
       }