Skip to content

GitLab

Commit f9a508d5 authored by Dries's avatar Dries
Browse files
Options 

- Fixed more than 30 HTML and XML well-formedness errors.
parent 362cccab
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 110 deletions
includes/common.inc
View file @ f9a508d5
......@@ -10,7 +10,7 @@ function conf_init() {
** default value 'conf'.
*/
$file = strtolower(strtr($HTTP_HOST ."". substr($REQUEST_URI, 0, strrpos($REQUEST_URI, "/")), "/:", ".."));
$file = strtolower(strtr($HTTP_HOST . substr($REQUEST_URI, 0, strrpos($REQUEST_URI, "/")), "/:", ".."));
while (strlen($file) > 4) {
if (file_exists("includes/$file.php")) {
......@@ -526,7 +526,9 @@ function form_textarea($title, $name, $value, $cols, $rows, $description = 0) {
function form_select($title, $name, $value, $options, $description = 0, $extra = 0) {
if (count($options) > 0) {
foreach ($options as $key=>$choice) $select .= "<option value=\"$key\"". (is_array($value) ? (in_array($key, $value) ? " selected" : "") : ($key == $value ? " selected" : "")) .">". check_form($choice) ."</option>";
foreach ($options as $key => $choice) {
$select .= "<option value=\"$key\"". (is_array($value) ? (in_array($key, $value) ? " selected=\"selected\"" : "") : ($key == $value ? " selected=\"selected\"" : "")) .">". check_form($choice) ."</option>";
}
return form_item($title, "<select name=\"edit[$name]\"". ($extra ? " $extra" : "") .">$select</select>", $description);
}
}
......@@ -637,6 +639,7 @@ function page_footer() {
$config = conf_init();
unset($conf);
include_once "includes/$config.php";
include_once "includes/database.inc";
include_once "includes/xmlrpc.inc";
......
misc/linux-font-test.html
View file @ f9a508d5
......@@ -19,19 +19,19 @@
</style>
</head>
<body>
<span class="f5">5pt abcdefghijklmnopqrstuvwxyz</span><br>
<span class="f6">6pt abcdefghijklmnopqrstuvwxyz</span><br>
<span class="f7">7pt abcdefghijklmnopqrstuvwxyz</span><br>
<span class="f8">8pt abcdefghijklmnopqrstuvwxyz</span><br>
<span class="f9">9pt abcdefghijklmnopqrstuvwxyz</span><br>
<span class="f10">10pt abcdefghijklmnopqrstuvwxyz</span><br>
<span class="f11">11pt abcdefghijklmnopqrstuvwxyz</span><br>
<span class="f12">12pt abcdefghijklmnopqrstuvwxyz</span><br>
<span class="f13">13pt abcdefghijklmnopqrstuvwxyz</span><br>
<span class="f14">14pt abcdefghijklmnopqrstuvwxyz</span><br>
<span class="f15">15pt abcdefghijklmnopqrstuvwxyz</span><br>
<span class="f16">16pt abcdefghijklmnopqrstuvwxyz</span><br>
<span class="f17">17pt abcdefghijklmnopqrstuvwxyz</span><br>
<span class="f18">18pt abcdefghijklmnopqrstuvwxyz</span><br>
<span class="f5">5pt abcdefghijklmnopqrstuvwxyz</span><br />
<span class="f6">6pt abcdefghijklmnopqrstuvwxyz</span><br />
<span class="f7">7pt abcdefghijklmnopqrstuvwxyz</span><br />
<span class="f8">8pt abcdefghijklmnopqrstuvwxyz</span><br />
<span class="f9">9pt abcdefghijklmnopqrstuvwxyz</span><br />
<span class="f10">10pt abcdefghijklmnopqrstuvwxyz</span><br />
<span class="f11">11pt abcdefghijklmnopqrstuvwxyz</span><br />
<span class="f12">12pt abcdefghijklmnopqrstuvwxyz</span><br />
<span class="f13">13pt abcdefghijklmnopqrstuvwxyz</span><br />
<span class="f14">14pt abcdefghijklmnopqrstuvwxyz</span><br />
<span class="f15">15pt abcdefghijklmnopqrstuvwxyz</span><br />
<span class="f16">16pt abcdefghijklmnopqrstuvwxyz</span><br />
<span class="f17">17pt abcdefghijklmnopqrstuvwxyz</span><br />
<span class="f18">18pt abcdefghijklmnopqrstuvwxyz</span><br />
</body>
</html>
modules/comment.module
View file @ f9a508d5
......@@ -290,7 +290,7 @@ function comment_moderation($comment) {
$options .= " <option value=\"$key\"". ($moderate->score == $key ? " selected=\"selected\"" : "") .">$value</option>\n";
}
$output .= "<select name=\"moderate[comment][$comment->cid]\">$options</select><br />". ($comment->score ? $comment->score : "--") ." / $comment->votes";
$output .= "<select name=\"moderate[comment][$comment->cid]\">$options</select><br />". ($comment->score ? $comment->score : "--") ." / $comment->votes";
return $output;
}
......@@ -299,21 +299,21 @@ function comment_threshold($threshold) {
// XXX: disabled for now
return "";
for ($i = 0; $i < 6; $i++) $options .= " <option value=\"$i\"". ($threshold == $i ? " SELECTED" : "") .">". t("Visibility") ." - $i</option>";
for ($i = 0; $i < 6; $i++) $options .= " <option value=\"$i\"". ($threshold == $i ? " selected=\"selected\"" : "") .">". t("Visibility") ." - $i</option>";
return "<select name=\"threshold\">$options</select>\n";
}
function comment_mode($mode) {
global $cmodes;
foreach ($cmodes as $key => $value) $options .= " <option value=\"$key\"". ($mode == $key ? " SELECTED" : "") .">$value</option>\n";
foreach ($cmodes as $key => $value) $options .= " <option value=\"$key\"". ($mode == $key ? " selected=\"selected\"" : "") .">$value</option>\n";
return "<select name=\"mode\">$options</select>\n";
}
function comment_order($order) {
global $corder;
foreach ($corder as $key=>$value) $options .= " <option value=\"$key\"". ($order == $key ? " SELECTED" : "") .">$value</option>\n";
foreach ($corder as $key=>$value) $options .= " <option value=\"$key\"". ($order == $key ? " selected=\"selected\"" : "") .">$value</option>\n";
return "<select name=\"order\">$options</select>\n";
}
......@@ -353,19 +353,19 @@ function comment_links($comment, $return = 1) {
$links = array();
if ($return) {
$links[] = "<a href=\"node.php?id=$comment->nid#$comment->cid\"><font color=\"$theme->type\">". t("return") ."</font></a>";
$links[] = "<a href=\"node.php?id=$comment->nid#$comment->cid\"><span style=\"color: $theme->type;\">". t("return") ."</span></a>";
}
if (user_access("administer comments")) {
$links[] = "<a href=\"admin.php?mod=comment&op=edit&id=$comment->cid\" title=\"". t("Administer this comment.") ."\"><font color=\"$theme->type\">". t("administer") ."</font></a>";
$links[] = "<a href=\"admin.php?mod=comment&op=edit&id=$comment->cid\" title=\"". t("Administer this comment.") ."\"><span style=\"color: $theme->type;\">". t("administer") ."</span></a>";
}
if (user_access("post comments")) {
if (comment_access("edit", $comment)) {
$links[] = "<a href=\"module.php?mod=comment&op=edit&id=$comment->cid\"><font color=\"$theme->type\" title=\"". t("Make changes to your comment.") ."\">". t("edit your comment") ."</font></a>";
$links[] = "<a href=\"module.php?mod=comment&op=edit&id=$comment->cid\" title=\"". t("Make changes to your comment.") ."\"><span style=\"color: $theme->type\">". t("edit your comment") ."</span></a>";
}
else {
$links[] = "<a href=\"module.php?mod=comment&op=reply&id=$comment->nid&pid=$comment->cid\" title=\"". t("Reply to this comment.") ."\"><font color=\"$theme->type\">". t("reply to this comment") ."</font></a>";
$links[] = "<a href=\"module.php?mod=comment&op=reply&id=$comment->nid&pid=$comment->cid\" title=\"". t("Reply to this comment.") ."\"><span style=\"color: $theme->type;\">". t("reply to this comment") ."</span></a>";
}
}
......@@ -377,7 +377,7 @@ function comment_view($comment, $folded = 0) {
global $theme, $id;
if (comment_is_new($comment)) {
$comment->subject = "$comment->subject <font color=\"red\">*</font>";
$comment->subject = "$comment->subject <span style=\"color: red;\">*</span>";
}
if ($folded) {
......
modules/comment/comment.module
View file @ f9a508d5
......@@ -290,7 +290,7 @@ function comment_moderation($comment) {
$options .= " <option value=\"$key\"". ($moderate->score == $key ? " selected=\"selected\"" : "") .">$value</option>\n";
}
$output .= "<select name=\"moderate[comment][$comment->cid]\">$options</select><br />". ($comment->score ? $comment->score : "--") ." / $comment->votes";
$output .= "<select name=\"moderate[comment][$comment->cid]\">$options</select><br />". ($comment->score ? $comment->score : "--") ." / $comment->votes";
return $output;
}
......@@ -299,21 +299,21 @@ function comment_threshold($threshold) {
// XXX: disabled for now
return "";
for ($i = 0; $i < 6; $i++) $options .= " <option value=\"$i\"". ($threshold == $i ? " SELECTED" : "") .">". t("Visibility") ." - $i</option>";
for ($i = 0; $i < 6; $i++) $options .= " <option value=\"$i\"". ($threshold == $i ? " selected=\"selected\"" : "") .">". t("Visibility") ." - $i</option>";
return "<select name=\"threshold\">$options</select>\n";
}
function comment_mode($mode) {
global $cmodes;
foreach ($cmodes as $key => $value) $options .= " <option value=\"$key\"". ($mode == $key ? " SELECTED" : "") .">$value</option>\n";
foreach ($cmodes as $key => $value) $options .= " <option value=\"$key\"". ($mode == $key ? " selected=\"selected\"" : "") .">$value</option>\n";
return "<select name=\"mode\">$options</select>\n";
}
function comment_order($order) {
global $corder;
foreach ($corder as $key=>$value) $options .= " <option value=\"$key\"". ($order == $key ? " SELECTED" : "") .">$value</option>\n";
foreach ($corder as $key=>$value) $options .= " <option value=\"$key\"". ($order == $key ? " selected=\"selected\"" : "") .">$value</option>\n";
return "<select name=\"order\">$options</select>\n";
}
......@@ -353,19 +353,19 @@ function comment_links($comment, $return = 1) {
$links = array();
if ($return) {
$links[] = "<a href=\"node.php?id=$comment->nid#$comment->cid\"><font color=\"$theme->type\">". t("return") ."</font></a>";
$links[] = "<a href=\"node.php?id=$comment->nid#$comment->cid\"><span style=\"color: $theme->type;\">". t("return") ."</span></a>";
}
if (user_access("administer comments")) {
$links[] = "<a href=\"admin.php?mod=comment&op=edit&id=$comment->cid\" title=\"". t("Administer this comment.") ."\"><font color=\"$theme->type\">". t("administer") ."</font></a>";
$links[] = "<a href=\"admin.php?mod=comment&op=edit&id=$comment->cid\" title=\"". t("Administer this comment.") ."\"><span style=\"color: $theme->type;\">". t("administer") ."</span></a>";
}
if (user_access("post comments")) {
if (comment_access("edit", $comment)) {
$links[] = "<a href=\"module.php?mod=comment&op=edit&id=$comment->cid\"><font color=\"$theme->type\" title=\"". t("Make changes to your comment.") ."\">". t("edit your comment") ."</font></a>";
$links[] = "<a href=\"module.php?mod=comment&op=edit&id=$comment->cid\" title=\"". t("Make changes to your comment.") ."\"><span style=\"color: $theme->type\">". t("edit your comment") ."</span></a>";
}
else {
$links[] = "<a href=\"module.php?mod=comment&op=reply&id=$comment->nid&pid=$comment->cid\" title=\"". t("Reply to this comment.") ."\"><font color=\"$theme->type\">". t("reply to this comment") ."</font></a>";
$links[] = "<a href=\"module.php?mod=comment&op=reply&id=$comment->nid&pid=$comment->cid\" title=\"". t("Reply to this comment.") ."\"><span style=\"color: $theme->type;\">". t("reply to this comment") ."</span></a>";
}
}
......@@ -377,7 +377,7 @@ function comment_view($comment, $folded = 0) {
global $theme, $id;
if (comment_is_new($comment)) {
$comment->subject = "$comment->subject <font color=\"red\">*</font>";
$comment->subject = "$comment->subject <span style=\"color: red;\">*</span>";
}
if ($folded) {
......
modules/queue.module
View file @ f9a508d5
......@@ -20,7 +20,7 @@ function queue_perm() {
function queue_link($type) {
if ($type == "menu" && user_access("access submission queue")) {
$links[] = "<a href=\"module.php?mod=queue\" title=\"". t("Moderate the content in the submission queue.") ."\">". t("submission queue") ."</a> (<font color=\"red\">". queue_count() ."</font>)";
$links[] = "<a href=\"module.php?mod=queue\" title=\"". t("Moderate the content in the submission queue.") ."\">". t("submission queue") ."</a> (<span style=\"color: red;\">". queue_count() ."</span>)";
}
return $links ? $links : array();
......@@ -80,7 +80,7 @@ function queue_overview() {
$result = db_query("SELECT n.*, u.name, u.uid FROM node n LEFT JOIN users u ON n.uid = u.uid WHERE n.moderate = 1");
$output .= "<table border=\"0\" cellspacing=\"4\" cellpadding=\"4\">";
$output .= " <tr><th>". t("Subject") ."</th><th>". t("Author") ."</th><th>". t("Type") ."</TH><TH>". t("Score") ."</th></tr>";
$output .= " <tr><th>". t("Subject") ."</th><th>". t("Author") ."</th><th>". t("Type") ."</th><th>". t("Score") ."</th></tr>";
while ($node = db_fetch_object($result)) {
if ($user->uid == $node->uid || field_get($node->users, $user->uid)) {
$output .= " <tr><td><a href=\"module.php?mod=queue&op=view&id=$node->nid\">". check_output($node->title) ."</a></td><td align=\"center\">". format_name($node) ."</td><td align=\"center\">". module_invoke($node->type, "node", "name") ."</td><td align=\"center\">". queue_score($node->nid) ."</td></tr>";
......@@ -90,7 +90,7 @@ function queue_overview() {
}
if ($node->teaser) {
$output .= " <tr><td colspan=\"4\"><div style=\"margin-left: 40px; margin-bottom: 20px; font-size: 10px;\">". check_output($node->teaser, 1) ."</div></td></tr>";
$output .= " <tr><td colspan=\"4\"><div style=\"margin-left: 40px; margin-bottom: 20px;\">". check_output($node->teaser, 1) ."</div></td></tr>";
}
}
$output .= "</table>";
......@@ -178,15 +178,15 @@ function queue_block() {
$node = db_fetch_object(db_query("SELECT * FROM node WHERE nid = '$id'"));
}
if ($node->moderate == 1) {
foreach (explode(",", $node->users) as $vote) {
if ($vote) {
$data = explode("=", $vote);
$account = user_load(array("uid" => $data[0]));
$output .= format_name($account) ." voted '$data[1]'.<br />";
}
}
$block[0]["subject"] = t("Moderation results");
foreach (explode(",", $node->users) as $vote) {
if ($vote) {
$data = explode("=", $vote);
$account = user_load(array("uid" => $data[0]));
$output .= format_name($account) ." voted '$data[1]'.<br />";
}
}
$block[0]["subject"] = t("Moderation results");
$block[0]["content"] = $output ? $output : t("This node has not been moderated yet.");
$block[0]["info"] = t("Moderation results");
}
......
modules/search.module
View file @ f9a508d5
......@@ -40,13 +40,13 @@ function search_page() {
** Construct the search form:
*/
$form .= " <input size=\"50\" value=\"". check_form($keys) ."\" name=\"keys\" type=\"text\">";
$form .= " <input type=\"submit\" value=\"". t("Search") ."\"><br />";
$form .= " <input size=\"50\" value=\"". check_form($keys) ."\" name=\"keys\" type=\"text\" />";
$form .= " <input type=\"submit\" value=\"". t("Search") ."\" /><br />";
$form .= t("Restrict search to") .": ";
foreach (module_list() as $name) {
if (module_hook($name, "user") || module_hook($name, "search")) {
$form .= " <input type=\"checkbox\" name=\"edit[type][$name]\" ". ($edit["type"][$name] ? " checked=\"checked\"" : "") ."/> ". t($name);
$form .= " <input type=\"checkbox\" name=\"edit[type][$name]\"". ($edit["type"][$name] ? " checked=\"checked\"" : "") ." /> ". t($name);
}
}
......
modules/search/search.module
View file @ f9a508d5
......@@ -40,13 +40,13 @@ function search_page() {
** Construct the search form:
*/
$form .= " <input size=\"50\" value=\"". check_form($keys) ."\" name=\"keys\" type=\"text\">";
$form .= " <input type=\"submit\" value=\"". t("Search") ."\"><br />";
$form .= " <input size=\"50\" value=\"". check_form($keys) ."\" name=\"keys\" type=\"text\" />";
$form .= " <input type=\"submit\" value=\"". t("Search") ."\" /><br />";
$form .= t("Restrict search to") .": ";
foreach (module_list() as $name) {
if (module_hook($name, "user") || module_hook($name, "search")) {
$form .= " <input type=\"checkbox\" name=\"edit[type][$name]\" ". ($edit["type"][$name] ? " checked=\"checked\"" : "") ."/> ". t($name);
$form .= " <input type=\"checkbox\" name=\"edit[type][$name]\"". ($edit["type"][$name] ? " checked=\"checked\"" : "") ." /> ". t($name);
}
}
......
modules/tracker.module
View file @ f9a508d5
......@@ -34,7 +34,7 @@ function tracker_comments($id = 0) {
$output .= "<ul>";
while ($comment = db_fetch_object($cresult)) {
$output .= " <li><a href=\"node.php?id=$node->nid&cid=$comment->cid&pid=$comment->pid#$comment->cid\">". check_output($comment->subject) ."</a> (". t("replies") .": ". comment_num_replies($comment->cid) .")</li>\n";
$output .= " <li><a href=\"node.php?id=$node->nid&cid=$comment->cid&pid=$comment->pid#$comment->cid\">". check_output($comment->subject) ."</a> (". t("replies") .": ". comment_num_replies($comment->cid) .") ". (comment_is_new($comment) ? "<span style=\"color: red;\">*</span>" : "") ."</li>\n";
}
$output .= " </ul>\n";
}
......
modules/tracker/tracker.module
View file @ f9a508d5
......@@ -34,7 +34,7 @@ function tracker_comments($id = 0) {
$output .= "<ul>";
while ($comment = db_fetch_object($cresult)) {
$output .= " <li><a href=\"node.php?id=$node->nid&cid=$comment->cid&pid=$comment->pid#$comment->cid\">". check_output($comment->subject) ."</a> (". t("replies") .": ". comment_num_replies($comment->cid) .")</li>\n";
$output .= " <li><a href=\"node.php?id=$node->nid&cid=$comment->cid&pid=$comment->pid#$comment->cid\">". check_output($comment->subject) ."</a> (". t("replies") .": ". comment_num_replies($comment->cid) .") ". (comment_is_new($comment) ? "<span style=\"color: red;\">*</span>" : "") ."</li>\n";
}
$output .= " </ul>\n";
}
......
modules/user.module
View file @ f9a508d5
......@@ -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");
}
}
}
......
modules/user/user.module
View file @ f9a508d5
......@@ -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 {