diff --git a/includes/common.inc b/includes/common.inc
index 1e4c249a7f9257414f5a72dae6bbdcc45d55769c..228e6d3394464cdcca112151bf89287d99ad078f 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -808,7 +808,7 @@ function form($form, $method = "post", $action = 0, $options = 0) {
if (!$action) {
$action = request_uri();
}
- return "<form action=\"$action\" method=\"$method\"". ($options ? " $options" : "") .">\n$form</form>\n";
+ return "<form action=\"$action\" method=\"$method\"". ($options ? " $options" : "") .">\n$form\n</form>\n";
}
function form_item($title, $value, $description = 0) {
@@ -825,7 +825,7 @@ function form_checkbox($title, $name, $value = 1, $checked = 0, $description = 0
function form_textfield($title, $name, $value, $size, $maxlength, $description = 0) {
$size = $size ? " size=\"$size\"" : "";
- return form_item($title, "<input maxlength=\"$maxlength\" class=\"form-text\" name=\"edit[$name]\"$size value=\"". check_form($value) ."\" />", $description);
+ return form_item($title, "<input type=\"text\" maxlength=\"$maxlength\" class=\"form-text\" name=\"edit[$name]\"$size value=\"". check_form($value) ."\" />", $description);
}
function form_password($title, $name, $value, $size, $maxlength, $description = 0) {
diff --git a/includes/theme.inc b/includes/theme.inc
index 66ea4a4ac22e9e2980dbf23336fb2fbcb3e350fe..8c4148a48d8a56171c36b03addb81f11a0e38951 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -25,11 +25,11 @@ function header($title = "") {
$output .= "<html><head><title>". $title ? $title : variable_get(site_name, "drupal") ."</title>";
$output .= theme_head($main);
$output .= "</head><body bgcolor=\"$this->background\" text=\"$this->foreground". theme_onload_attribute(). "\">";
- $output .= "<table border=\"0\" cellspacing=\"4\" cellpadding=\"4\"><tr><td valign=\"top\" width=\"170\">";
+ $output .= "<table border=\"0\" cellspacing=\"4\" cellpadding=\"4\"><tr><td style=\"vertical-align: top; width: 170px;\">";
print $output;
$this->box(t("Navigation"), @implode("<br />", link_page())); theme_blocks("all", $this);
- print "</td><td valign=\"top\">";
+ print "</td><td style=\"vertical-align: top;\">";
}
diff --git a/modules/admin.module b/modules/admin.module
index 1f81d4c63836e24575a325ca5575696e20ef203a..fe4d271f8c73d592d1072a29975150021a39c89e 100644
--- a/modules/admin.module
+++ b/modules/admin.module
@@ -57,7 +57,7 @@ function admin_page() {
** Body:
*/
- print "<div id=\"logo\"><a href=\"http://drupal.org/\"><img src=\"misc/druplicon-small.gif\" alt=\"Druplicon - Drupal logo\" /></a></div>";
+ print "<div id=\"logo\"><a href=\"http://drupal.org/\"><img src=\"misc/druplicon-small.gif\" alt=\"Druplicon - Drupal logo\" title=\"Druplicon - Drupal logo\" /></a></div>";
print "<div id=\"main\">";
if ($path = menu_path()) {
diff --git a/modules/aggregator.module b/modules/aggregator.module
index 3b4fcdeff4657184ff331d2912f4cf785feb7e18..2b80d20c931da8fa546041bb6c74c9a3763693fb 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -71,7 +71,7 @@ function import_format_item($item, $feed = 0) {
global $user;
if ($user->uid && user_access("maintain personal blog")) {
- $output .= "<div class=\"icon\">". l("<img src=\"". theme("image", "blog.gif") ."\" border=\"0\" width=\"12\" height=\"12\" alt=\"". t("blog it") ."\" />", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."), "class" => "blog-it")) ."</div>";
+ $output .= "<div class=\"icon\">". l("<img src=\"". theme("image", "blog.gif") ."\" width=\"12\" height=\"12\" alt=\"". t("blog it") ."\" title=\"". t("blog it") ."\" style=\"border: 0px; />", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."), "class" => "blog-it")) ."</div>";
}
// external link
@@ -136,13 +136,13 @@ function import_block($op, $delta) {
case "feed":
$feed = db_fetch_object(db_query("SELECT * FROM feed WHERE fid = %d", $id));
$block["subject"] = $feed->title;
- $block["content"] .= import_feed_block($feed) ."<div align=\"right\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
+ $block["content"] .= import_feed_block($feed) ."<div style=\"text-align: right;\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
break;
case "bundle":
$bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = %d", $id));
$block["subject"] = $bundle->title;
- $block["content"] .= import_bundle_block($bundle->attributes) ."<div align=\"right\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
+ $block["content"] .= import_bundle_block($bundle->attributes) ."<div style=\"text-align: right;\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
break;
}
@@ -157,7 +157,7 @@ function import_get_bundles($attributes = 0) {
$result = db_query("SELECT * FROM bundle ORDER BY title");
while ($bundle = db_fetch_object($result)) {
$block["bundle:$bundle->bid"]["subject"] = $bundle->title;
- $block["bundle:$bundle->bid"]["content"] = import_bundle_block($bundle->attributes) ."<div align=\"right\">".
+ $block["bundle:$bundle->bid"]["content"] = import_bundle_block($bundle->attributes) ."<div style=\"text-align: right;\">".
l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news.")))
."</div>";
$block["bundle:$bundle->bid"]["info"] = "$bundle->title bundle";
@@ -173,7 +173,7 @@ function import_get_feeds($attributes = 0) {
$result = db_query("SELECT * FROM feed ORDER BY fid");
while ($feed = db_fetch_object($result)) {
$block["feed:$feed->fid"]["subject"] = $feed->title;
- $block["feed:$feed->fid"]["content"] = import_feed_block($feed) ."<div align=\"right\">".
+ $block["feed:$feed->fid"]["content"] = import_feed_block($feed) ."<div style=\"text-align: right;\">".
l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news.")))
."</div>";
$block["feed:$feed->fid"]["info"] = "$feed->title feed";
@@ -574,7 +574,7 @@ function import_page_info() {
$links[] = l(t("administer news feeds"), "admin/syndication/news", array("title" => t("View the news feed administrative pages.")));
}
- return "<div align=\"center\">". theme("links", $links) ."</div>";
+ return "<div style=\"text-align: center;\">". theme("links", $links) ."</div>";
}
function import_page_last() {
@@ -590,7 +590,7 @@ function import_page_last() {
$links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a> · ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
+ $output .= "<tr><td><a href=\"$item->link\">$item->title</a> · ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
@@ -614,7 +614,7 @@ function import_page_feed($fid) {
$header .= "<p><b>". t("Website") .":</b><div style=\"margin-left: 20px;\"><a href=\"$feed->link\">$feed->link</a></div></p>";
$header .= "<p><b>". t("Description") .":</b><div style=\"margin-left: 20px;\">$feed->description</div></p>";
- $header .= "<p><b>". t("Last update") .":</b><div style=\"margin-left: 20px;\">". format_interval(time() - $feed->timestamp) ." ". t("ago") ." <a href=\"$feed->url\"><img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" alt=\"\" /></a><br /><br /></div></p>\n";
+ $header .= "<p><b>". t("Last update") .":</b><div style=\"margin-left: 20px; text-align: right;\">". format_interval(time() - $feed->timestamp) ." ". t("ago") ." <a href=\"$feed->url\"><img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" alt=\"\" title=\"\" /></a><br /><br /></div></p>\n";
$result = db_query_range("SELECT * FROM item WHERE fid = %d ORDER BY iid DESC", $fid, 0, variable_get("import_page_limit", 75));
@@ -626,7 +626,7 @@ function import_page_feed($fid) {
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a></td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
+ $output .= "<tr><td><a href=\"$item->link\">$item->title</a></td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
$output .= "<tr><td colspan=\"2\"><div style=\"margin-left: 20px;\">$item->description</div><br /></td></tr>";
@@ -664,7 +664,7 @@ function import_page_bundle($bid) {
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a> · ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
+ $output .= "<tr><td><a href=\"$item->link\">$item->title</a> · ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
@@ -693,7 +693,7 @@ function import_page_sources() {
$output .= "<div style=\"margin-left: 20px;\">$feed->description</div><br />";
}
- $output .= l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />", "import/fd", array("title" => t("View the list of syndicated web sites in XML format."))) ."<br />";
+ $output .= "<div style=\"text-align: right\">" . l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" />", "import/fd", array("title" => t("View the list of syndicated web sites in XML format."))) . "</div><br />";
theme("header");
theme("box", t("News feeds"), import_page_info());
@@ -740,7 +740,7 @@ function import_page_blocks($blocks) {
for ($t = 0; $t < 3; $t++) {
$i = 1;
- print " <td width=\"33%\" valign=\"top\">\n";
+ print " <td style=\"vertical-align: top; width: 33%;\">\n";
while ($block = each($blocks)) {
theme("box", $block["value"]["subject"], $block["value"]["content"]);
if ($i == ceil(count($blocks) / 3)) {
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 3b4fcdeff4657184ff331d2912f4cf785feb7e18..2b80d20c931da8fa546041bb6c74c9a3763693fb 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -71,7 +71,7 @@ function import_format_item($item, $feed = 0) {
global $user;
if ($user->uid && user_access("maintain personal blog")) {
- $output .= "<div class=\"icon\">". l("<img src=\"". theme("image", "blog.gif") ."\" border=\"0\" width=\"12\" height=\"12\" alt=\"". t("blog it") ."\" />", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."), "class" => "blog-it")) ."</div>";
+ $output .= "<div class=\"icon\">". l("<img src=\"". theme("image", "blog.gif") ."\" width=\"12\" height=\"12\" alt=\"". t("blog it") ."\" title=\"". t("blog it") ."\" style=\"border: 0px; />", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."), "class" => "blog-it")) ."</div>";
}
// external link
@@ -136,13 +136,13 @@ function import_block($op, $delta) {
case "feed":
$feed = db_fetch_object(db_query("SELECT * FROM feed WHERE fid = %d", $id));
$block["subject"] = $feed->title;
- $block["content"] .= import_feed_block($feed) ."<div align=\"right\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
+ $block["content"] .= import_feed_block($feed) ."<div style=\"text-align: right;\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
break;
case "bundle":
$bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = %d", $id));
$block["subject"] = $bundle->title;
- $block["content"] .= import_bundle_block($bundle->attributes) ."<div align=\"right\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
+ $block["content"] .= import_bundle_block($bundle->attributes) ."<div style=\"text-align: right;\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
break;
}
@@ -157,7 +157,7 @@ function import_get_bundles($attributes = 0) {
$result = db_query("SELECT * FROM bundle ORDER BY title");
while ($bundle = db_fetch_object($result)) {
$block["bundle:$bundle->bid"]["subject"] = $bundle->title;
- $block["bundle:$bundle->bid"]["content"] = import_bundle_block($bundle->attributes) ."<div align=\"right\">".
+ $block["bundle:$bundle->bid"]["content"] = import_bundle_block($bundle->attributes) ."<div style=\"text-align: right;\">".
l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news.")))
."</div>";
$block["bundle:$bundle->bid"]["info"] = "$bundle->title bundle";
@@ -173,7 +173,7 @@ function import_get_feeds($attributes = 0) {
$result = db_query("SELECT * FROM feed ORDER BY fid");
while ($feed = db_fetch_object($result)) {
$block["feed:$feed->fid"]["subject"] = $feed->title;
- $block["feed:$feed->fid"]["content"] = import_feed_block($feed) ."<div align=\"right\">".
+ $block["feed:$feed->fid"]["content"] = import_feed_block($feed) ."<div style=\"text-align: right;\">".
l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news.")))
."</div>";
$block["feed:$feed->fid"]["info"] = "$feed->title feed";
@@ -574,7 +574,7 @@ function import_page_info() {
$links[] = l(t("administer news feeds"), "admin/syndication/news", array("title" => t("View the news feed administrative pages.")));
}
- return "<div align=\"center\">". theme("links", $links) ."</div>";
+ return "<div style=\"text-align: center;\">". theme("links", $links) ."</div>";
}
function import_page_last() {
@@ -590,7 +590,7 @@ function import_page_last() {
$links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a> · ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
+ $output .= "<tr><td><a href=\"$item->link\">$item->title</a> · ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
@@ -614,7 +614,7 @@ function import_page_feed($fid) {
$header .= "<p><b>". t("Website") .":</b><div style=\"margin-left: 20px;\"><a href=\"$feed->link\">$feed->link</a></div></p>";
$header .= "<p><b>". t("Description") .":</b><div style=\"margin-left: 20px;\">$feed->description</div></p>";
- $header .= "<p><b>". t("Last update") .":</b><div style=\"margin-left: 20px;\">". format_interval(time() - $feed->timestamp) ." ". t("ago") ." <a href=\"$feed->url\"><img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" alt=\"\" /></a><br /><br /></div></p>\n";
+ $header .= "<p><b>". t("Last update") .":</b><div style=\"margin-left: 20px; text-align: right;\">". format_interval(time() - $feed->timestamp) ." ". t("ago") ." <a href=\"$feed->url\"><img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" alt=\"\" title=\"\" /></a><br /><br /></div></p>\n";
$result = db_query_range("SELECT * FROM item WHERE fid = %d ORDER BY iid DESC", $fid, 0, variable_get("import_page_limit", 75));
@@ -626,7 +626,7 @@ function import_page_feed($fid) {
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a></td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
+ $output .= "<tr><td><a href=\"$item->link\">$item->title</a></td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
$output .= "<tr><td colspan=\"2\"><div style=\"margin-left: 20px;\">$item->description</div><br /></td></tr>";
@@ -664,7 +664,7 @@ function import_page_bundle($bid) {
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a> · ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
+ $output .= "<tr><td><a href=\"$item->link\">$item->title</a> · ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
@@ -693,7 +693,7 @@ function import_page_sources() {
$output .= "<div style=\"margin-left: 20px;\">$feed->description</div><br />";
}
- $output .= l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />", "import/fd", array("title" => t("View the list of syndicated web sites in XML format."))) ."<br />";
+ $output .= "<div style=\"text-align: right\">" . l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" />", "import/fd", array("title" => t("View the list of syndicated web sites in XML format."))) . "</div><br />";
theme("header");
theme("box", t("News feeds"), import_page_info());
@@ -740,7 +740,7 @@ function import_page_blocks($blocks) {
for ($t = 0; $t < 3; $t++) {
$i = 1;
- print " <td width=\"33%\" valign=\"top\">\n";
+ print " <td style=\"vertical-align: top; width: 33%;\">\n";
while ($block = each($blocks)) {
theme("box", $block["value"]["subject"], $block["value"]["content"]);
if ($i == ceil(count($blocks) / 3)) {
diff --git a/modules/block.module b/modules/block.module
index e408e07301680e23633ae2620a142b1900f6e01e..aebde7488cd86c8e8ea8bcbe4473d039fd3e1ae6 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -163,7 +163,7 @@ function block_admin_preview() {
while ($block = db_fetch_object($result)) {
$block_data = module_invoke($block->module, "block", "list");
$name = $block_data[$block->delta]["info"];
- $lblocks .= " <tr><td nowrap=\"nowrap\">". ($block->status == 2 ? "<b>$name</b>" : $name) ."</td><td>$block->weight</td></tr>\n";
+ $lblocks .= " <tr><td>". ($block->status == 2 ? "<b>$name</b>" : $name) ."</td><td>$block->weight</td></tr>\n";
}
$lblocks .= "</table>\n";
@@ -178,9 +178,9 @@ function block_admin_preview() {
$output .= "<h3>". t("Themes with both left and right sidebars") .":</h3>\n";
$output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
- $output .= " <tr><td align=\"center\" colspan=\"3\">header</td></tr>\n";
- $output .= " <tr><td>\n". ($lblocks ? $lblocks : " ") ."</td><td width=\"300\"> </td><td>\n". ($rblocks ? $rblocks : " ") ."</td></tr>\n";
- $output .= " <tr><td align=\"center\" colspan=\"3\">footer</td></tr>\n";
+ $output .= " <tr><td colspan=\"3\" style=\"text-align: center;\">header</td></tr>\n";
+ $output .= " <tr><td>\n". ($lblocks ? $lblocks : " ") ."</td><td style=\"width: 300px;\"> </td><td>\n". ($rblocks ? $rblocks : " ") ."</td></tr>\n";
+ $output .= " <tr><td colspan=\"3\" style=\"text-align: center;\">footer</td></tr>\n";
$output .= "</table>\n";
$result = db_query("SELECT * FROM blocks WHERE status > 0 ORDER BY weight");
@@ -194,16 +194,16 @@ function block_admin_preview() {
$output .= "<h3>". t("Themes with right-sidebar only") .":</h3>\n";
$output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
- $output .= " <tr><td align=\"center\" colspan=\"2\">header</td></tr>\n";
- $output .= " <tr><td width=\"400\"> </td><td>\n". ($blocks ? $blocks : " ") ."</td></tr>\n";
- $output .= " <tr><td align=\"center\" colspan=\"2\">footer</td></tr>\n";
+ $output .= " <tr><td colspan=\"2\" style=\"text-align: center;\">header</td></tr>\n";
+ $output .= " <tr><td style=\"width: 400px;\"> </td><td>\n". ($blocks ? $blocks : " ") ."</td></tr>\n";
+ $output .= " <tr><td colspan=\"2\" style=\"text-align: center;\">footer</td></tr>\n";
$output .= "</table>\n";
$output .= "<h3>". t("Themes with left-sidebar only") .":</h3>\n";
$output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
- $output .= " <tr><td align=\"center\" colspan=\"2\">header</td></tr>\n";
- $output .= " <tr><td>\n". ($blocks ? $blocks : " ") ."</td><td width=\"400\"> </td></tr>\n";
- $output .= " <tr><td align=\"center\" colspan=\"2\">footer</td></tr>\n";
+ $output .= " <tr><td colspan=\"2\" style=\"text-align: center;\">header</td></tr>\n";
+ $output .= " <tr><td>\n". ($blocks ? $blocks : " ") ."</td><td style=\"width: 400px;\"> </td></tr>\n";
+ $output .= " <tr><td colspan=\"2\" style=\"text-align: center;\">footer</td></tr>\n";
$output .= "</table>\n";
print $output;
diff --git a/modules/block/block.module b/modules/block/block.module
index e408e07301680e23633ae2620a142b1900f6e01e..aebde7488cd86c8e8ea8bcbe4473d039fd3e1ae6 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -163,7 +163,7 @@ function block_admin_preview() {
while ($block = db_fetch_object($result)) {
$block_data = module_invoke($block->module, "block", "list");
$name = $block_data[$block->delta]["info"];
- $lblocks .= " <tr><td nowrap=\"nowrap\">". ($block->status == 2 ? "<b>$name</b>" : $name) ."</td><td>$block->weight</td></tr>\n";
+ $lblocks .= " <tr><td>". ($block->status == 2 ? "<b>$name</b>" : $name) ."</td><td>$block->weight</td></tr>\n";
}
$lblocks .= "</table>\n";
@@ -178,9 +178,9 @@ function block_admin_preview() {
$output .= "<h3>". t("Themes with both left and right sidebars") .":</h3>\n";
$output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
- $output .= " <tr><td align=\"center\" colspan=\"3\">header</td></tr>\n";
- $output .= " <tr><td>\n". ($lblocks ? $lblocks : " ") ."</td><td width=\"300\"> </td><td>\n". ($rblocks ? $rblocks : " ") ."</td></tr>\n";
- $output .= " <tr><td align=\"center\" colspan=\"3\">footer</td></tr>\n";
+ $output .= " <tr><td colspan=\"3\" style=\"text-align: center;\">header</td></tr>\n";
+ $output .= " <tr><td>\n". ($lblocks ? $lblocks : " ") ."</td><td style=\"width: 300px;\"> </td><td>\n". ($rblocks ? $rblocks : " ") ."</td></tr>\n";
+ $output .= " <tr><td colspan=\"3\" style=\"text-align: center;\">footer</td></tr>\n";
$output .= "</table>\n";
$result = db_query("SELECT * FROM blocks WHERE status > 0 ORDER BY weight");
@@ -194,16 +194,16 @@ function block_admin_preview() {
$output .= "<h3>". t("Themes with right-sidebar only") .":</h3>\n";
$output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
- $output .= " <tr><td align=\"center\" colspan=\"2\">header</td></tr>\n";
- $output .= " <tr><td width=\"400\"> </td><td>\n". ($blocks ? $blocks : " ") ."</td></tr>\n";
- $output .= " <tr><td align=\"center\" colspan=\"2\">footer</td></tr>\n";
+ $output .= " <tr><td colspan=\"2\" style=\"text-align: center;\">header</td></tr>\n";
+ $output .= " <tr><td style=\"width: 400px;\"> </td><td>\n". ($blocks ? $blocks : " ") ."</td></tr>\n";
+ $output .= " <tr><td colspan=\"2\" style=\"text-align: center;\">footer</td></tr>\n";
$output .= "</table>\n";
$output .= "<h3>". t("Themes with left-sidebar only") .":</h3>\n";
$output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n";
- $output .= " <tr><td align=\"center\" colspan=\"2\">header</td></tr>\n";
- $output .= " <tr><td>\n". ($blocks ? $blocks : " ") ."</td><td width=\"400\"> </td></tr>\n";
- $output .= " <tr><td align=\"center\" colspan=\"2\">footer</td></tr>\n";
+ $output .= " <tr><td colspan=\"2\" style=\"text-align: center;\">header</td></tr>\n";
+ $output .= " <tr><td>\n". ($blocks ? $blocks : " ") ."</td><td style=\"width: 400px;\"> </td></tr>\n";
+ $output .= " <tr><td colspan=\"2\" style=\"text-align: center;\">footer</td></tr>\n";
$output .= "</table>\n";
print $output;
diff --git a/modules/blog.module b/modules/blog.module
index 7b96ddc89b63e99189468802ecdde5a094d7d456..571bc96facb8579a52743df797ec2b8114f11a3e 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -119,7 +119,7 @@ function blog_page_user($uid = 0) {
node_view(node_load(array("nid" => $node->nid)), 1);
}
print pager_display(NULL, variable_get("default_nodes_main", 10));
- print l("<img align=\"right\" src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed/$account->uid", array("title" => t("View the XML version of %username's blog", array ("%username" => $account->name))));
+ print "<div style=\"text-align: right\">" . l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" alt=\"\" title=\"\" />", "blog/feed/$account->uid", array("title" => t("View the XML version of %username's blog", array ("%username" => $account->name)))) . "</div>";
}
function blog_page_last() {
@@ -131,7 +131,7 @@ function blog_page_last() {
$output = node_view(node_load(array("nid" => $node->nid)), 1);
}
$output .= pager_display(NULL, variable_get("default_nodes_main", 10));
- $output .= l("<img align=\"right\" src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed", array("title" => t("Read the XML version of all blogs.")));
+ $output .= "<div style=\"text-align: right;\">". l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" alt=\"\" title=\"\" />", "blog/feed", array("title" => t("Read the XML version of all blogs."))) ."</div>";
return $output;
}
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index 7b96ddc89b63e99189468802ecdde5a094d7d456..571bc96facb8579a52743df797ec2b8114f11a3e 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -119,7 +119,7 @@ function blog_page_user($uid = 0) {
node_view(node_load(array("nid" => $node->nid)), 1);
}
print pager_display(NULL, variable_get("default_nodes_main", 10));
- print l("<img align=\"right\" src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed/$account->uid", array("title" => t("View the XML version of %username's blog", array ("%username" => $account->name))));
+ print "<div style=\"text-align: right\">" . l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" alt=\"\" title=\"\" />", "blog/feed/$account->uid", array("title" => t("View the XML version of %username's blog", array ("%username" => $account->name)))) . "</div>";
}
function blog_page_last() {
@@ -131,7 +131,7 @@ function blog_page_last() {
$output = node_view(node_load(array("nid" => $node->nid)), 1);
}
$output .= pager_display(NULL, variable_get("default_nodes_main", 10));
- $output .= l("<img align=\"right\" src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed", array("title" => t("Read the XML version of all blogs.")));
+ $output .= "<div style=\"text-align: right;\">". l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" alt=\"\" title=\"\" />", "blog/feed", array("title" => t("Read the XML version of all blogs."))) ."</div>";
return $output;
}
diff --git a/modules/book.module b/modules/book.module
index 2f4c0ec6ac7741f5558d0894c9376d9075708627..fef661c9c4ed15fdd85087fbb1a64b36c3e13324 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -368,7 +368,6 @@ function book_body($node) {
}
function book_view($node, $main = 0) {
- global $mod;
/*
** Always display the most recently approved revision of a node
@@ -376,7 +375,7 @@ function book_view($node, $main = 0) {
** the moderation queue.
*/
- if ($node->moderate && $mod != "queue") {
+ if ($node->moderate && arg(0) != "queue") {
$revision = book_revision_load($node, array("moderate" => 0, "status" => 1));
if ($revision) {
@@ -777,7 +776,7 @@ function book_help() {
$output .= "<p>A book page is a special node type that allows you to embed PHP within the body of the page. This capability is only offerred to administrators, since malicious users could abuse this power. In addiiton, book pages contain a <i>log message</i> field which helps your users understand the motivation behind an edit of a book page. Each edited version of a book page is stored as a new revision of a node. This capability makes it easy to revert to an old version of a page, should that be desirable.</p>";
$output .= "<p>Like other node types, book submissions and edits may be subject to moderation, depending on your configuration. Similarly, books use ". l("permissions", "admin/user/permission") ." to determine who may read and write to them. Only administrators are allowed to create new books, which are really just nodes whose parent is <i><root></i>. To include an existing node in your book, click on the \"administer\"-link in that node. At the bottom of this administration page, click on the <i>edit book outline</i> button. This enables you to place the node wherever you'd like within the book hierarchy. To add a new node into your book, use the <i>create book page</i> link.</p>";
$output .= "<p>Administrators may review the hierarchy of their books by clicking on the ". l("collaborative book", "admin/node/book")." link in the adminstration pages. There, nodes may be edited, reorganized, removed from book, and deleted. This behavior may change in the future. When a parent node is deleted, it may leave behind child nodes. These nodes are now <i>orphans</i>. Administrators should periodically ". l("review their books for orphans", "admin/node/book/orphan") ." and reaffiliate those pages as desired. Finally, administrators may also ". l("export their books", "book/print") ." to a single, flat HTML page which is suitable for printing.</p>";
- $output .= "<a name=\"faq\"></a><h3>Maintaining a FAQ using a collaborative book</h3>";
+ $output .= "<a id=\"faq\"></a><h3>Maintaining a FAQ using a collaborative book</h3>";
$output .= "<p>Collaborative books let you easily set up a Frequently Asked Questions section on your web site. The main benefit is that you don't have to write all the questions/answers by yourself - let the community do it for you!</p>";
$output .= "<p>In order to set up the FAQ, you have to create a new book which will hold all your content. To do so, click on <i>create book page</i> in your user box. Give it a thoughtful title, and body. A title like \"Estonia Travel - FAQ\" is nice. You may always edit these fields later. You will probably want to designate <i><root></i> as the parent of this page. Leave the <i>log message</i> and <i>type</i> fields blank for now. After you have submitted this book page, you are ready to begin filling up your book with questions that are frequently asked.</p>";
$output .= "<p>Whenever you come across a post which you want to include in your FAQ, click on the <i>administer</i> link. Then click on the <i>edit book outline</i> button at the bottom of the page. Then place the relevant post wherever is most appropriate in your book by selecting a <i>parent</i>. Books are quite flexible. They can have sections like <i>Flying to Estonia</i>, <i>Eating in Estonia</i> and so on. As you get more experienced with the <i>collaborative book</i>, you can reorganize posts in your book so that it stays organized.</p>";
diff --git a/modules/book/book.module b/modules/book/book.module
index 2f4c0ec6ac7741f5558d0894c9376d9075708627..fef661c9c4ed15fdd85087fbb1a64b36c3e13324 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -368,7 +368,6 @@ function book_body($node) {
}
function book_view($node, $main = 0) {
- global $mod;
/*
** Always display the most recently approved revision of a node
@@ -376,7 +375,7 @@ function book_view($node, $main = 0) {
** the moderation queue.
*/
- if ($node->moderate && $mod != "queue") {
+ if ($node->moderate && arg(0) != "queue") {
$revision = book_revision_load($node, array("moderate" => 0, "status" => 1));
if ($revision) {
@@ -777,7 +776,7 @@ function book_help() {
$output .= "<p>A book page is a special node type that allows you to embed PHP within the body of the page. This capability is only offerred to administrators, since malicious users could abuse this power. In addiiton, book pages contain a <i>log message</i> field which helps your users understand the motivation behind an edit of a book page. Each edited version of a book page is stored as a new revision of a node. This capability makes it easy to revert to an old version of a page, should that be desirable.</p>";
$output .= "<p>Like other node types, book submissions and edits may be subject to moderation, depending on your configuration. Similarly, books use ". l("permissions", "admin/user/permission") ." to determine who may read and write to them. Only administrators are allowed to create new books, which are really just nodes whose parent is <i><root></i>. To include an existing node in your book, click on the \"administer\"-link in that node. At the bottom of this administration page, click on the <i>edit book outline</i> button. This enables you to place the node wherever you'd like within the book hierarchy. To add a new node into your book, use the <i>create book page</i> link.</p>";
$output .= "<p>Administrators may review the hierarchy of their books by clicking on the ". l("collaborative book", "admin/node/book")." link in the adminstration pages. There, nodes may be edited, reorganized, removed from book, and deleted. This behavior may change in the future. When a parent node is deleted, it may leave behind child nodes. These nodes are now <i>orphans</i>. Administrators should periodically ". l("review their books for orphans", "admin/node/book/orphan") ." and reaffiliate those pages as desired. Finally, administrators may also ". l("export their books", "book/print") ." to a single, flat HTML page which is suitable for printing.</p>";
- $output .= "<a name=\"faq\"></a><h3>Maintaining a FAQ using a collaborative book</h3>";
+ $output .= "<a id=\"faq\"></a><h3>Maintaining a FAQ using a collaborative book</h3>";
$output .= "<p>Collaborative books let you easily set up a Frequently Asked Questions section on your web site. The main benefit is that you don't have to write all the questions/answers by yourself - let the community do it for you!</p>";
$output .= "<p>In order to set up the FAQ, you have to create a new book which will hold all your content. To do so, click on <i>create book page</i> in your user box. Give it a thoughtful title, and body. A title like \"Estonia Travel - FAQ\" is nice. You may always edit these fields later. You will probably want to designate <i><root></i> as the parent of this page. Leave the <i>log message</i> and <i>type</i> fields blank for now. After you have submitted this book page, you are ready to begin filling up your book with questions that are frequently asked.</p>";
$output .= "<p>Whenever you come across a post which you want to include in your FAQ, click on the <i>administer</i> link. Then click on the <i>edit book outline</i> button at the bottom of the page. Then place the relevant post wherever is most appropriate in your book by selecting a <i>parent</i>. Books are quite flexible. They can have sections like <i>Flying to Estonia</i>, <i>Eating in Estonia</i> and so on. As you get more experienced with the <i>collaborative book</i>, you can reorganize posts in your book so that it stays organized.</p>";
diff --git a/modules/cloud.module b/modules/cloud.module
index e2fa4fddf7dab4be2a0327bd40340bcc2a5a8bbf..bc22c6067022bcd7420ccceec9ea16c944350bc4 100644
--- a/modules/cloud.module
+++ b/modules/cloud.module
@@ -198,7 +198,7 @@ function cloud_block($op = "list", $delta = 0) {
}
else {
$block["subject"] = t("Site cloud");
- $block["content"] = cloud_list(20) ."<div align=\"right\">". l(t("more"), "cloud", array("title" => t("Monitor other sites in the cloud."))) ."</div>";
+ $block["content"] = cloud_list(20) ."<div style=\"text-align: right;\">". l(t("more"), "cloud", array("title" => t("Monitor other sites in the cloud."))) ."</div>";
return $block;
}
}
diff --git a/modules/comment.module b/modules/comment.module
index 17e687a296d53e257514fab3c24ef5de9ba51780..40a8b44087dda61fb60125fc9a0a12c23d481e30 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -140,7 +140,7 @@ function comment_access($op, $comment) {
function comment_form($edit) {
global $user;
- $form .= "<a name=\"comment\"></a>\n";
+ $form .= "<a id=\"comment\"></a>\n";
// name field:
$form .= form_item(t("Your name"), format_name($user));
@@ -414,10 +414,10 @@ function comment_view($comment, $links = "", $visible = 1) {
if (node_is_new($comment->nid, $comment->timestamp)) {
$comment->new = 1;
- print "<a name=\"new\"></a>\n";
+ print "<a id=\"new\"></a>\n";
}
- print "<a name=\"$comment->cid\"></a>\n";
+ print "<a id=\"$comment->cid\"></a>\n";
if ($visible) {
$comment->comment = check_output($comment->comment);
@@ -469,7 +469,7 @@ function comment_render($node, $cid = 0) {
$comments_per_page = $user->comments_per_page ? $user->comments_per_page : variable_get("comment_default_per_page", "50");
}
- print "<a name=\"comment\"></a>\n";
+ print "<a id=\"comment\"></a>\n";
if ($cid) {
@@ -478,7 +478,7 @@ function comment_render($node, $cid = 0) {
** Single comment view
*/
- print "<form method=\"post\" action=\"". url("comment") ."\">\n";
+ print "<form method=\"post\" action=\"". url("comment") ."\"><div>\n";
print form_hidden("nid", $nid);
$result = db_query("SELECT c.cid, c.pid, c.nid, c.subject, c.comment, c.timestamp, u.uid, u.name, u.data, c.score, c.users FROM comments c LEFT JOIN users u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0 GROUP BY c.cid, c.pid, c.nid, c.subject, c.comment, c.timestamp, u.uid, u.name, u.data, c.score, c.users", $cid);
@@ -488,9 +488,9 @@ function comment_render($node, $cid = 0) {
}
if ((comment_user_can_moderate($node)) && $user->uid != $comment->uid && !(comment_already_moderated($user->uid, $comment->users))) {
- print "<div align=\"center\">". form_submit(t("Moderate comment")) ."</div><br />";
+ print "<div style=\"text-align: center;\">". form_submit(t("Moderate comment")) ."</div><br />";
}
- print "</form>";
+ print "</div></form>";
}
else {
@@ -521,13 +521,13 @@ function comment_render($node, $cid = 0) {
$comment_num = db_num_rows($result);
if ($comment_num && ((variable_get("comment_controls", 0) == 0) || (variable_get("comment_controls", 0) == 2))) {
- print "<form method=\"post\" action=\"". url("comment") ."\">\n";
+ print "<form method=\"post\" action=\"". url("comment") ."\"><div>\n";
theme("box", "", theme("comment_controls", $threshold, $mode, $order, $nid, $comment_page, $comment_num, $comments_per_page));
print form_hidden("nid", $nid);
- print "</form>";
+ print "</div></form>";
}
- print "<form method=\"post\" action=\"". url("comment") ."\">\n";
+ print "<form method=\"post\" action=\"". url("comment") ."\"><div>\n";
print form_hidden("nid", $nid);
if ($comment_num) {
@@ -582,7 +582,7 @@ function comment_render($node, $cid = 0) {
theme("comment_flat_expanded", $comments, $threshold_min);
if (comment_user_can_moderate($node) && $show_moderate_button) {
- print "<div align=\"center\">". form_submit(t("Moderate comments")) ."</div><br />";
+ print "<div style=\"text-align: center;\">". form_submit(t("Moderate comments")) ."</div><br />";
}
}
else if ($mode == 3) {
@@ -635,18 +635,18 @@ function comment_render($node, $cid = 0) {
}
if (comment_user_can_moderate($node) && $show_moderate_button) {
- print "<div align=\"center\">". form_submit(t("Moderate comments")) ."</div><br />";
+ print "<div style=\"text-align: center;\">". form_submit(t("Moderate comments")) ."</div><br />";
}
}
}
- print "</form>";
+ print "</div></form>";
if ($comment_num && ((variable_get("comment_controls", 0) == 1) || (variable_get("comment_controls", 0) == 2))) {
- print "<form method=\"post\" action=\"". url("comment") ."\">\n";
+ print "<form method=\"post\" action=\"". url("comment") ."\"><div>\n";
theme("box", t("Control panel"), theme("comment_controls", $threshold, $mode, $order, $nid, $comment_page, $comment_num, $comments_per_page));
print form_hidden("nid", $nid);
- print "</form>";
+ print "</div></form>";
}
}
@@ -1293,7 +1293,7 @@ function comment_thread_max($comment, $threshold, $level = 0) {
*/
if ($level) {
- print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr><td width=\"". ($level * 25) ."\"> </td><td>\n";
+ print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr><td style=\"width: ". ($level * 25) ."px;\"> </td><td>\n";
}
comment_view($comment, comment_links($comment, 0), comment_visible($comment, $threshold));
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 17e687a296d53e257514fab3c24ef5de9ba51780..40a8b44087dda61fb60125fc9a0a12c23d481e30 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -140,7 +140,7 @@ function comment_access($op, $comment) {
function comment_form($edit) {
global $user;
- $form .= "<a name=\"comment\"></a>\n";
+ $form .= "<a id=\"comment\"></a>\n";
// name field:
$form .= form_item(t("Your name"), format_name($user));
@@ -414,10 +414,10 @@ function comment_view($comment, $links = "", $visible = 1) {
if (node_is_new($comment->nid, $comment->timestamp)) {
$comment->new = 1;
- print "<a name=\"new\"></a>\n";
+ print "<a id=\"new\"></a>\n";
}
- print "<a name=\"$comment->cid\"></a>\n";
+ print "<a id=\"$comment->cid\"></a>\n";
if ($visible) {
$comment->comment = check_output($comment->comment);
@@ -469,7 +469,7 @@ function comment_render($node, $cid = 0) {
$comments_per_page = $user->comments_per_page ? $user->comments_per_page : variable_get("comment_default_per_page", "50");
}
- print "<a name=\"comment\"></a>\n";
+ print "<a id=\"comment\"></a>\n";
if ($cid) {
@@ -478,7 +478,7 @@ function comment_render($node, $cid = 0) {
** Single comment view
*/
- print "<form method=\"post\" action=\"". url("comment") ."\">\n";
+ print "<form method=\"post\" action=\"". url("comment") ."\"><div>\n";
print form_hidden("nid", $nid);
$result = db_query("SELECT c.cid, c.pid, c.nid, c.subject, c.comment, c.timestamp, u.uid, u.name, u.data, c.score, c.users FROM comments c LEFT JOIN users u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0 GROUP BY c.cid, c.pid, c.nid, c.subject, c.comment, c.timestamp, u.uid, u.name, u.data, c.score, c.users", $cid);
@@ -488,9 +488,9 @@ function comment_render($node, $cid = 0) {
}
if ((comment_user_can_moderate($node)) && $user->uid != $comment->uid && !(comment_already_moderated($user->uid, $comment->users))) {
- print "<div align=\"center\">". form_submit(t("Moderate comment")) ."</div><br />";
+ print "<div style=\"text-align: center;\">". form_submit(t("Moderate comment")) ."</div><br />";
}
- print "</form>";
+ print "</div></form>";
}
else {
@@ -521,13 +521,13 @@ function comment_render($node, $cid = 0) {
$comment_num = db_num_rows($result);
if ($comment_num && ((variable_get("comment_controls", 0) == 0) || (variable_get("comment_controls", 0) == 2))) {
- print "<form method=\"post\" action=\"". url("comment") ."\">\n";
+ print "<form method=\"post\" action=\"". url("comment") ."\"><div>\n";
theme("box", "", theme("comment_controls", $threshold, $mode, $order, $nid, $comment_page, $comment_num, $comments_per_page));
print form_hidden("nid", $nid);
- print "</form>";
+ print "</div></form>";
}
- print "<form method=\"post\" action=\"". url("comment") ."\">\n";
+ print "<form method=\"post\" action=\"". url("comment") ."\"><div>\n";
print form_hidden("nid", $nid);
if ($comment_num) {
@@ -582,7 +582,7 @@ function comment_render($node, $cid = 0) {
theme("comment_flat_expanded", $comments, $threshold_min);
if (comment_user_can_moderate($node) && $show_moderate_button) {
- print "<div align=\"center\">". form_submit(t("Moderate comments")) ."</div><br />";
+ print "<div style=\"text-align: center;\">". form_submit(t("Moderate comments")) ."</div><br />";
}
}
else if ($mode == 3) {
@@ -635,18 +635,18 @@ function comment_render($node, $cid = 0) {
}
if (comment_user_can_moderate($node) && $show_moderate_button) {
- print "<div align=\"center\">". form_submit(t("Moderate comments")) ."</div><br />";
+ print "<div style=\"text-align: center;\">". form_submit(t("Moderate comments")) ."</div><br />";
}
}
}
- print "</form>";
+ print "</div></form>";
if ($comment_num && ((variable_get("comment_controls", 0) == 1) || (variable_get("comment_controls", 0) == 2))) {
- print "<form method=\"post\" action=\"". url("comment") ."\">\n";
+ print "<form method=\"post\" action=\"". url("comment") ."\"><div>\n";
theme("box", t("Control panel"), theme("comment_controls", $threshold, $mode, $order, $nid, $comment_page, $comment_num, $comments_per_page));
print form_hidden("nid", $nid);
- print "</form>";
+ print "</div></form>";
}
}
@@ -1293,7 +1293,7 @@ function comment_thread_max($comment, $threshold, $level = 0) {
*/
if ($level) {
- print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr><td width=\"". ($level * 25) ."\"> </td><td>\n";
+ print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr><td style=\"width: ". ($level * 25) ."px;\"> </td><td>\n";
}
comment_view($comment, comment_links($comment, 0), comment_visible($comment, $threshold));
diff --git a/modules/forum.module b/modules/forum.module
index 268746f3015a14f5a768d21f9426c68d5eca2f28..cb6b158863174877fd2e39d2c6ce250f2f935f61 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -92,7 +92,7 @@ function forum_block($op = "list", $delta = 0) {
$content .= node_title_list(db_query_range("SELECT n.nid, n.title, u.uid, u.name FROM node n LEFT JOIN forum f ON n.nid = f.nid LEFT JOIN users u ON n.uid = u.uid WHERE n.type = 'forum' ORDER BY n.nid DESC", 0, variable_get("forum_block_num", "5")), t("New forum topics:"));
if ($content) {
- $content .= "<div id=\"forum_more\" align=\"right\">". l(t("more"), "forum", array("title" => t("Read the latest forum topics."))) ."</div>";
+ $content .= "<div id=\"forum_more\" style=\"text-align: right;\">". l(t("more"), "forum", array("title" => t("Read the latest forum topics."))) ."</div>";
}
cache_set("forum:block", $content, time() + variable_get("cache_clear", 120));
@@ -214,7 +214,7 @@ function forum_form(&$node, &$help, &$error) {
while($icon = readdir($dir)) {
if ($icon == '.' || $icon == '..') {continue;}
if ($node->icon == $icon) {$checked = "checked";} else {$checked = "";}
- $radio .= "<input type=\"radio\" name=\"edit[icon_num]\" value=\"$icon_num\" $checked /><img src=\"$icon_path$icon\" alt=\"\" /> \n";
+ $radio .= "<input type=\"radio\" name=\"edit[icon_num]\" value=\"$icon_num\" $checked /><img src=\"$icon_path$icon\" alt=\"\" title=\"\" /> \n";
$icon_num++;
}
closedir($dir);
@@ -226,7 +226,7 @@ function forum_form(&$node, &$help, &$error) {
while($icon = readdir($dir)) {
if ($icon == '.' || $icon == '..') {continue;}
if ($node->icon_num == $icon_num) {$checked = "checked";} else {$checked = "";}
- $radio .= "<input type=\"radio\" name=\"edit[icon_num]\" value=\"$icon_num\" $checked /><img src=\"$icon_path$icon\" alt=\"\" /> \n";
+ $radio .= "<input type=\"radio\" name=\"edit[icon_num]\" value=\"$icon_num\" $checked /><img src=\"$icon_path$icon\" alt=\"\" title=\"\" /> \n";
$icon_num++;
}
closedir($dir);
@@ -535,7 +535,7 @@ function forum_theme_list($forums, $parents, $tid) {
$t[] = l(t("Discussion forum"), "forum");
$output .= "<table border=\"0\" cellpadding=\"5\">\n";
- $output .= " <tr><th colspan=\"3\" align=\"left\">".implode(" : ", array_reverse($t)) ."</th>";
+ $output .= " <tr><th colspan=\"3\" style=\"text-align: left;\">".implode(" : ", array_reverse($t)) ."</th>";
if ($forums) {
$output .= "<th>". t("topics") ."</th><th>". t("posts") ."</th><th>". t("last post") ."</th></tr>";
@@ -548,7 +548,7 @@ function forum_theme_list($forums, $parents, $tid) {
if ($user->uid) $new_topics = $forum->num_topics - $forum->old_topics;
$icon = _forum_get_folder_icon($new_topics);
$output .= " <tr><td> </td><td>$icon</td>";
- $output .= "<td><table border=\"0\"><tr><td width=\"". ($forum->depth * 20) ."\"> </td><td>". l($forum->name, "forum/$forum->tid") ."<div style=\"padding-top: 5px;\">". check_output($forum->description);
+ $output .= "<td><table border=\"0\"><tr><td style=\"width: ". ($forum->depth * 20) ."px;\"> </td><td>". l($forum->name, "forum/$forum->tid") ."<div style=\"padding-top: 5px;\">". check_output($forum->description);
$links = array();
if ($forum->last_post) {
@@ -563,7 +563,7 @@ function forum_theme_list($forums, $parents, $tid) {
}
$output .= "</div></td></tr></table></td>";
- $output .= "<td align=\"center\">".$forum->num_topics.($new_topics ? "<br />(".t("%a new", array("%a" => $new_topics)).")" : "")."</td><td align=\"center\">".$forum->num_posts."</td><td align=\"center\">"._forum_format($forum->last_post)."</td></tr>";
+ $output .= "<td style=\"text-align: center;\">".$forum->num_topics.($new_topics ? "<br />(".t("%a new", array("%a" => $new_topics)).")" : "")."</td><td style=\"text-align: center;\">".$forum->num_posts."</td><td style=\"text-align: center;\">"._forum_format($forum->last_post)."</td></tr>";
}
}
}
@@ -615,8 +615,8 @@ function forum_theme_topic_list($tid, $topics, $sortby, $forum_per_page, $offset
<tr>
<td>"._forum_get_folder_icon($topic->new, $topic->num_comments, $topic->comment_mode)."</td>
<td>"._forum_get_icon($topic)."</td>
- <td valign=\"top\">$topic->title</td>
- <td align=\"center\" valign=\"top\" colspan=\"3\">". l(t("This topic has been moved"), "forum/$topic->tid")."</td>
+ <td style=\"vertical-align: top;\">$topic->title</td>
+ <td style=\"text-align: center; vertical-align: top;\" colspan=\"3\">". l(t("This topic has been moved"), "forum/$topic->tid")."</td>
</tr>";
}
else {
@@ -624,10 +624,10 @@ function forum_theme_topic_list($tid, $topics, $sortby, $forum_per_page, $offset
<tr>
<td>"._forum_get_folder_icon($topic->new, $topic->num_comments, $topic->comment_mode)."</td>
<td>"._forum_get_icon($topic)."</td>
- <td valign=\"top\">". l($topic->title, "node/view/$topic->nid") ."</td>
- <td align=\"center\" valign=\"top\" nowrap=\"nowrap\">".$topic->num_comments.($topic->new_replies ? " (".t("%a new", array("%a" => $topic->new_replies)).")" : "")."</td>
- <td align=\"center\">"._forum_format($topic)."</td>
- <td align=\"center\">"._forum_format($topic->last_reply)."</td>
+ <td style=\"vertical-align: top;\">". l($topic->title, "node/view/$topic->nid") ."</td>
+ <td style=\"text-align: center; vertical-align: top;\">".$topic->num_comments.($topic->new_replies ? " (".t("%a new", array("%a" => $topic->new_replies)).")" : "")."</td>
+ <td style=\"text-align: center;\">"._forum_format($topic)."</td>
+ <td style=\"text-align: center;\">"._forum_format($topic->last_reply)."</td>
</tr>";
}
}
@@ -636,12 +636,12 @@ function forum_theme_topic_list($tid, $topics, $sortby, $forum_per_page, $offset
}
$output .= "<hr />";
- $output .= "<div align=\"center\">" .t("%a topics, %b topics per page, page %c of %d", array("%a" => $pager_total[0], "%b" => $forum_per_page, "%c" => $offset, "%d" => ceil($pager_total[0]/$forum_per_page))) ."</div>";
+ $output .= "<div style=\"text-align: center;\">" .t("%a topics, %b topics per page, page %c of %d", array("%a" => $pager_total[0], "%b" => $forum_per_page, "%c" => $offset, "%d" => ceil($pager_total[0]/$forum_per_page))) ."</div>";
$output .= (($pager = pager_display(NULL, $forum_per_page, 0, "default")) ? "$pager" : "");
if (user_access("create forum topics")) {
- $output .= "<div align=\"center\" style=\"font-style: bold;\">". l(t("create new forum topic"), "node/add/forum/$tid") ."</div>";
+ $output .= "<div style=\"text-align: center; font-style: bold;\">". l(t("create new forum topic"), "node/add/forum/$tid") ."</div>";
}
return $output;
@@ -677,7 +677,7 @@ function _forum_get_folder_icon($new_posts, $num_posts = 0, $comment_mode = 0) {
// default
$file = $base_path."/".$icon.".gif";
- return "<img src=\"$file\" alt=\"\" />";
+ return "<img src=\"$file\" alt=\"\" title=\"\" />";
}
else {
return " ";
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 268746f3015a14f5a768d21f9426c68d5eca2f28..cb6b158863174877fd2e39d2c6ce250f2f935f61 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -92,7 +92,7 @@ function forum_block($op = "list", $delta = 0) {
$content .= node_title_list(db_query_range("SELECT n.nid, n.title, u.uid, u.name FROM node n LEFT JOIN forum f ON n.nid = f.nid LEFT JOIN users u ON n.uid = u.uid WHERE n.type = 'forum' ORDER BY n.nid DESC", 0, variable_get("forum_block_num", "5")), t("New forum topics:"));
if ($content) {
- $content .= "<div id=\"forum_more\" align=\"right\">". l(t("more"), "forum", array("title" => t("Read the latest forum topics."))) ."</div>";
+ $content .= "<div id=\"forum_more\" style=\"text-align: right;\">". l(t("more"), "forum", array("title" => t("Read the latest forum topics."))) ."</div>";
}
cache_set("forum:block", $content, time() + variable_get("cache_clear", 120));
@@ -214,7 +214,7 @@ function forum_form(&$node, &$help, &$error) {
while($icon = readdir($dir)) {
if ($icon == '.' || $icon == '..') {continue;}
if ($node->icon == $icon) {$checked = "checked";} else {$checked = "";}
- $radio .= "<input type=\"radio\" name=\"edit[icon_num]\" value=\"$icon_num\" $checked /><img src=\"$icon_path$icon\" alt=\"\" /> \n";
+ $radio .= "<input type=\"radio\" name=\"edit[icon_num]\" value=\"$icon_num\" $checked /><img src=\"$icon_path$icon\" alt=\"\" title=\"\" /> \n";
$icon_num++;
}
closedir($dir);
@@ -226,7 +226,7 @@ function forum_form(&$node, &$help, &$error) {
while($icon = readdir($dir)) {
if ($icon == '.' || $icon == '..') {continue;}
if ($node->icon_num == $icon_num) {$checked = "checked";} else {$checked = "";}
- $radio .= "<input type=\"radio\" name=\"edit[icon_num]\" value=\"$icon_num\" $checked /><img src=\"$icon_path$icon\" alt=\"\" /> \n";
+ $radio .= "<input type=\"radio\" name=\"edit[icon_num]\" value=\"$icon_num\" $checked /><img src=\"$icon_path$icon\" alt=\"\" title=\"\" /> \n";
$icon_num++;
}
closedir($dir);
@@ -535,7 +535,7 @@ function forum_theme_list($forums, $parents, $tid) {
$t[] = l(t("Discussion forum"), "forum");
$output .= "<table border=\"0\" cellpadding=\"5\">\n";
- $output .= " <tr><th colspan=\"3\" align=\"left\">".implode(" : ", array_reverse($t)) ."</th>";
+ $output .= " <tr><th colspan=\"3\" style=\"text-align: left;\">".implode(" : ", array_reverse($t)) ."</th>";
if ($forums) {
$output .= "<th>". t("topics") ."</th><th>". t("posts") ."</th><th>". t("last post") ."</th></tr>";
@@ -548,7 +548,7 @@ function forum_theme_list($forums, $parents, $tid) {
if ($user->uid) $new_topics = $forum->num_topics - $forum->old_topics;
$icon = _forum_get_folder_icon($new_topics);
$output .= " <tr><td> </td><td>$icon</td>";
- $output .= "<td><table border=\"0\"><tr><td width=\"". ($forum->depth * 20) ."\"> </td><td>". l($forum->name, "forum/$forum->tid") ."<div style=\"padding-top: 5px;\">". check_output($forum->description);
+ $output .= "<td><table border=\"0\"><tr><td style=\"width: ". ($forum->depth * 20) ."px;\"> </td><td>". l($forum->name, "forum/$forum->tid") ."<div style=\"padding-top: 5px;\">". check_output($forum->description);
$links = array();
if ($forum->last_post) {
@@ -563,7 +563,7 @@ function forum_theme_list($forums, $parents, $tid) {
}
$output .= "</div></td></tr></table></td>";
- $output .= "<td align=\"center\">".$forum->num_topics.($new_topics ? "<br />(".t("%a new", array("%a" => $new_topics)).")" : "")."</td><td align=\"center\">".$forum->num_posts."</td><td align=\"center\">"._forum_format($forum->last_post)."</td></tr>";
+ $output .= "<td style=\"text-align: center;\">".$forum->num_topics.($new_topics ? "<br />(".t("%a new", array("%a" => $new_topics)).")" : "")."</td><td style=\"text-align: center;\">".$forum->num_posts."</td><td style=\"text-align: center;\">"._forum_format($forum->last_post)."</td></tr>";
}
}
}
@@ -615,8 +615,8 @@ function forum_theme_topic_list($tid, $topics, $sortby, $forum_per_page, $offset
<tr>
<td>"._forum_get_folder_icon($topic->new, $topic->num_comments, $topic->comment_mode)."</td>
<td>"._forum_get_icon($topic)."</td>
- <td valign=\"top\">$topic->title</td>
- <td align=\"center\" valign=\"top\" colspan=\"3\">". l(t("This topic has been moved"), "forum/$topic->tid")."</td>
+ <td style=\"vertical-align: top;\">$topic->title</td>
+ <td style=\"text-align: center; vertical-align: top;\" colspan=\"3\">". l(t("This topic has been moved"), "forum/$topic->tid")."</td>
</tr>";
}
else {
@@ -624,10 +624,10 @@ function forum_theme_topic_list($tid, $topics, $sortby, $forum_per_page, $offset
<tr>
<td>"._forum_get_folder_icon($topic->new, $topic->num_comments, $topic->comment_mode)."</td>
<td>"._forum_get_icon($topic)."</td>
- <td valign=\"top\">". l($topic->title, "node/view/$topic->nid") ."</td>
- <td align=\"center\" valign=\"top\" nowrap=\"nowrap\">".$topic->num_comments.($topic->new_replies ? " (".t("%a new", array("%a" => $topic->new_replies)).")" : "")."</td>
- <td align=\"center\">"._forum_format($topic)."</td>
- <td align=\"center\">"._forum_format($topic->last_reply)."</td>
+ <td style=\"vertical-align: top;\">". l($topic->title, "node/view/$topic->nid") ."</td>
+ <td style=\"text-align: center; vertical-align: top;\">".$topic->num_comments.($topic->new_replies ? " (".t("%a new", array("%a" => $topic->new_replies)).")" : "")."</td>
+ <td style=\"text-align: center;\">"._forum_format($topic)."</td>
+ <td style=\"text-align: center;\">"._forum_format($topic->last_reply)."</td>
</tr>";
}
}
@@ -636,12 +636,12 @@ function forum_theme_topic_list($tid, $topics, $sortby, $forum_per_page, $offset
}
$output .= "<hr />";
- $output .= "<div align=\"center\">" .t("%a topics, %b topics per page, page %c of %d", array("%a" => $pager_total[0], "%b" => $forum_per_page, "%c" => $offset, "%d" => ceil($pager_total[0]/$forum_per_page))) ."</div>";
+ $output .= "<div style=\"text-align: center;\">" .t("%a topics, %b topics per page, page %c of %d", array("%a" => $pager_total[0], "%b" => $forum_per_page, "%c" => $offset, "%d" => ceil($pager_total[0]/$forum_per_page))) ."</div>";
$output .= (($pager = pager_display(NULL, $forum_per_page, 0, "default")) ? "$pager" : "");
if (user_access("create forum topics")) {
- $output .= "<div align=\"center\" style=\"font-style: bold;\">". l(t("create new forum topic"), "node/add/forum/$tid") ."</div>";
+ $output .= "<div style=\"text-align: center; font-style: bold;\">". l(t("create new forum topic"), "node/add/forum/$tid") ."</div>";
}
return $output;
@@ -677,7 +677,7 @@ function _forum_get_folder_icon($new_posts, $num_posts = 0, $comment_mode = 0) {
// default
$file = $base_path."/".$icon.".gif";
- return "<img src=\"$file\" alt=\"\" />";
+ return "<img src=\"$file\" alt=\"\" title=\"\" />";
}
else {
return " ";
diff --git a/modules/help.module b/modules/help.module
index 7f20964093e3d9c112c0872370ad1f5ad3b987c1..d07e77ff9793d426e49f835803e404ab3988008a 100644
--- a/modules/help.module
+++ b/modules/help.module
@@ -47,7 +47,7 @@ function help_admin() {
foreach (module_list() as $name) {
if (module_hook($name, "help")) {
- print "<h2><a name=\"$name\">". ucfirst($name) ." module</a></h2>";
+ print "<h2><a id=\"$name\">". ucfirst($name) ." module</a></h2>";
print module_invoke($name, "help");
}
}
diff --git a/modules/help/help.module b/modules/help/help.module
index 7f20964093e3d9c112c0872370ad1f5ad3b987c1..d07e77ff9793d426e49f835803e404ab3988008a 100644
--- a/modules/help/help.module
+++ b/modules/help/help.module
@@ -47,7 +47,7 @@ function help_admin() {
foreach (module_list() as $name) {
if (module_hook($name, "help")) {
- print "<h2><a name=\"$name\">". ucfirst($name) ." module</a></h2>";
+ print "<h2><a id=\"$name\">". ucfirst($name) ." module</a></h2>";
print module_invoke($name, "help");
}
}
diff --git a/modules/import.module b/modules/import.module
index 3b4fcdeff4657184ff331d2912f4cf785feb7e18..2b80d20c931da8fa546041bb6c74c9a3763693fb 100644
--- a/modules/import.module
+++ b/modules/import.module
@@ -71,7 +71,7 @@ function import_format_item($item, $feed = 0) {
global $user;
if ($user->uid && user_access("maintain personal blog")) {
- $output .= "<div class=\"icon\">". l("<img src=\"". theme("image", "blog.gif") ."\" border=\"0\" width=\"12\" height=\"12\" alt=\"". t("blog it") ."\" />", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."), "class" => "blog-it")) ."</div>";
+ $output .= "<div class=\"icon\">". l("<img src=\"". theme("image", "blog.gif") ."\" width=\"12\" height=\"12\" alt=\"". t("blog it") ."\" title=\"". t("blog it") ."\" style=\"border: 0px; />", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."), "class" => "blog-it")) ."</div>";
}
// external link
@@ -136,13 +136,13 @@ function import_block($op, $delta) {
case "feed":
$feed = db_fetch_object(db_query("SELECT * FROM feed WHERE fid = %d", $id));
$block["subject"] = $feed->title;
- $block["content"] .= import_feed_block($feed) ."<div align=\"right\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
+ $block["content"] .= import_feed_block($feed) ."<div style=\"text-align: right;\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>";
break;
case "bundle":
$bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = %d", $id));
$block["subject"] = $bundle->title;
- $block["content"] .= import_bundle_block($bundle->attributes) ."<div align=\"right\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
+ $block["content"] .= import_bundle_block($bundle->attributes) ."<div style=\"text-align: right;\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>";
break;
}
@@ -157,7 +157,7 @@ function import_get_bundles($attributes = 0) {
$result = db_query("SELECT * FROM bundle ORDER BY title");
while ($bundle = db_fetch_object($result)) {
$block["bundle:$bundle->bid"]["subject"] = $bundle->title;
- $block["bundle:$bundle->bid"]["content"] = import_bundle_block($bundle->attributes) ."<div align=\"right\">".
+ $block["bundle:$bundle->bid"]["content"] = import_bundle_block($bundle->attributes) ."<div style=\"text-align: right;\">".
l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news.")))
."</div>";
$block["bundle:$bundle->bid"]["info"] = "$bundle->title bundle";
@@ -173,7 +173,7 @@ function import_get_feeds($attributes = 0) {
$result = db_query("SELECT * FROM feed ORDER BY fid");
while ($feed = db_fetch_object($result)) {
$block["feed:$feed->fid"]["subject"] = $feed->title;
- $block["feed:$feed->fid"]["content"] = import_feed_block($feed) ."<div align=\"right\">".
+ $block["feed:$feed->fid"]["content"] = import_feed_block($feed) ."<div style=\"text-align: right;\">".
l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news.")))
."</div>";
$block["feed:$feed->fid"]["info"] = "$feed->title feed";
@@ -574,7 +574,7 @@ function import_page_info() {
$links[] = l(t("administer news feeds"), "admin/syndication/news", array("title" => t("View the news feed administrative pages.")));
}
- return "<div align=\"center\">". theme("links", $links) ."</div>";
+ return "<div style=\"text-align: center;\">". theme("links", $links) ."</div>";
}
function import_page_last() {
@@ -590,7 +590,7 @@ function import_page_last() {
$links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a> · ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
+ $output .= "<tr><td><a href=\"$item->link\">$item->title</a> · ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
@@ -614,7 +614,7 @@ function import_page_feed($fid) {
$header .= "<p><b>". t("Website") .":</b><div style=\"margin-left: 20px;\"><a href=\"$feed->link\">$feed->link</a></div></p>";
$header .= "<p><b>". t("Description") .":</b><div style=\"margin-left: 20px;\">$feed->description</div></p>";
- $header .= "<p><b>". t("Last update") .":</b><div style=\"margin-left: 20px;\">". format_interval(time() - $feed->timestamp) ." ". t("ago") ." <a href=\"$feed->url\"><img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" alt=\"\" /></a><br /><br /></div></p>\n";
+ $header .= "<p><b>". t("Last update") .":</b><div style=\"margin-left: 20px; text-align: right;\">". format_interval(time() - $feed->timestamp) ." ". t("ago") ." <a href=\"$feed->url\"><img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" alt=\"\" title=\"\" /></a><br /><br /></div></p>\n";
$result = db_query_range("SELECT * FROM item WHERE fid = %d ORDER BY iid DESC", $fid, 0, variable_get("import_page_limit", 75));
@@ -626,7 +626,7 @@ function import_page_feed($fid) {
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a></td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
+ $output .= "<tr><td><a href=\"$item->link\">$item->title</a></td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
$output .= "<tr><td colspan=\"2\"><div style=\"margin-left: 20px;\">$item->description</div><br /></td></tr>";
@@ -664,7 +664,7 @@ function import_page_bundle($bid) {
$links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a> · ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td align=\"right\" nowrap=\"nowrap\" valign=\"top\">". theme("links", $links) ."</td></tr>\n";
+ $output .= "<tr><td><a href=\"$item->link\">$item->title</a> · ". l($item->ftitle, "import/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
}
if ($item->description) {
@@ -693,7 +693,7 @@ function import_page_sources() {
$output .= "<div style=\"margin-left: 20px;\">$feed->description</div><br />";
}
- $output .= l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />", "import/fd", array("title" => t("View the list of syndicated web sites in XML format."))) ."<br />";
+ $output .= "<div style=\"text-align: right\">" . l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" />", "import/fd", array("title" => t("View the list of syndicated web sites in XML format."))) . "</div><br />";
theme("header");
theme("box", t("News feeds"), import_page_info());
@@ -740,7 +740,7 @@ function import_page_blocks($blocks) {
for ($t = 0; $t < 3; $t++) {
$i = 1;
- print " <td width=\"33%\" valign=\"top\">\n";
+ print " <td style=\"vertical-align: top; width: 33%;\">\n";
while ($block = each($blocks)) {
theme("box", $block["value"]["subject"], $block["value"]["content"]);
if ($i == ceil(count($blocks) / 3)) {
diff --git a/modules/node.module b/modules/node.module
index e17fde80e7bbdae076ea19b43f07e40a7665b4c5..c0f2bae62a415d08bf521ee75ffcd5dacd653d72 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -850,7 +850,7 @@ function node_block($op = "list", $delta = 0) {
}
else {
$block["subject"] = t("Syndicate");
- $block["content"] = "<div align=\"center\">". l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"XML\" />", "node/feed", array("title" => t("Read the XML version of this page."))) ."</div>";
+ $block["content"] = "<div style=\"text-align: center;\">". l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" alt=\"XML\" title=\"XML\" />", "node/feed", array("title" => t("Read the XML version of this page."))) ."</div>";
return $block;
}
diff --git a/modules/node/node.module b/modules/node/node.module
index e17fde80e7bbdae076ea19b43f07e40a7665b4c5..c0f2bae62a415d08bf521ee75ffcd5dacd653d72 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -850,7 +850,7 @@ function node_block($op = "list", $delta = 0) {
}
else {
$block["subject"] = t("Syndicate");
- $block["content"] = "<div align=\"center\">". l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"XML\" />", "node/feed", array("title" => t("Read the XML version of this page."))) ."</div>";
+ $block["content"] = "<div style=\"text-align: center;\">". l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" alt=\"XML\" title=\"XML\" />", "node/feed", array("title" => t("Read the XML version of this page."))) ."</div>";
return $block;
}
diff --git a/modules/page.module b/modules/page.module
index 96c932c9e838cac87dd5499a6412c7798a4695ac..de77eb2fae8d4640369b63d77c87c093b2441711 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -115,7 +115,7 @@ function page_view($node, $main = 0) {
** Add the node specific links:
*/
- theme("box", $node->title, "$node->body<div align=\"right\">". theme("links", link_node($node, $main)) ."</div>");
+ theme("box", $node->title, "$node->body<div style=\"text-align: right;\">". theme("links", link_node($node, $main)) ."</div>");
}
}
diff --git a/modules/page/page.module b/modules/page/page.module
index 96c932c9e838cac87dd5499a6412c7798a4695ac..de77eb2fae8d4640369b63d77c87c093b2441711 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -115,7 +115,7 @@ function page_view($node, $main = 0) {
** Add the node specific links:
*/
- theme("box", $node->title, "$node->body<div align=\"right\">". theme("links", link_node($node, $main)) ."</div>");
+ theme("box", $node->title, "$node->body<div style=\"text-align: right;\">". theme("links", link_node($node, $main)) ."</div>");
}
}
diff --git a/modules/poll.module b/modules/poll.module
index f799bf5e1d0246a903b3e85429a987fb2670065e..a95b1311527e5971d79703ac05727056c3047811 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -178,7 +178,7 @@ function poll_link($type, $node = 0, $main) {
// Disable
$url = eregi_replace("pollresults\[$node->nid\]=1", "pollresults[$node->nid]=0", request_uri());
- $links[] = "<a href=\"$url\">". t("voting form") . "</a>";
+ $links[] = "<a href=\"". htmlentities($url) ."\">". t("voting form") . "</a>";
}
else {
// Enable
@@ -189,7 +189,7 @@ function poll_link($type, $node = 0, $main) {
$url = request_uri() . (strstr(request_uri(), "?") ? "&" : "?") ."pollresults[$node->nid]=1";
}
- $links[] = "<a href=\"$url\">". t("view results") . "</a>";
+ $links[] = "<a href=\"". htmlentities($url) ."\">". t("view results") . "</a>";
}
}
}
@@ -258,7 +258,7 @@ function poll_view_voting(&$node, $main, $block, $links) {
$url = request_uri();
- $output .= "<div class=\"poll\"><form action=\"$url\" method=\"post\">";
+ $output .= "<div class=\"poll\"><form action=\"". htmlentities($url) ."\" method=\"post\">";
$output .= "<div class=\"vote-form\">";
$output .= "<div class=\"choices\">";
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index f799bf5e1d0246a903b3e85429a987fb2670065e..a95b1311527e5971d79703ac05727056c3047811 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -178,7 +178,7 @@ function poll_link($type, $node = 0, $main) {
// Disable
$url = eregi_replace("pollresults\[$node->nid\]=1", "pollresults[$node->nid]=0", request_uri());
- $links[] = "<a href=\"$url\">". t("voting form") . "</a>";
+ $links[] = "<a href=\"". htmlentities($url) ."\">". t("voting form") . "</a>";
}
else {
// Enable
@@ -189,7 +189,7 @@ function poll_link($type, $node = 0, $main) {
$url = request_uri() . (strstr(request_uri(), "?") ? "&" : "?") ."pollresults[$node->nid]=1";
}
- $links[] = "<a href=\"$url\">". t("view results") . "</a>";
+ $links[] = "<a href=\"". htmlentities($url) ."\">". t("view results") . "</a>";
}
}
}
@@ -258,7 +258,7 @@ function poll_view_voting(&$node, $main, $block, $links) {
$url = request_uri();
- $output .= "<div class=\"poll\"><form action=\"$url\" method=\"post\">";
+ $output .= "<div class=\"poll\"><form action=\"". htmlentities($url) ."\" method=\"post\">";
$output .= "<div class=\"vote-form\">";
$output .= "<div class=\"choices\">";
diff --git a/modules/profile.module b/modules/profile.module
index a8acb7ca107b547a6136d1fe083ac7aea96d4251..e24d9fff60a40ef955ef2fcd33b3eb1e8a4c5b5f 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -57,10 +57,10 @@ function profile_settings() {
$output .= "<tr><th>field</th><th>enable</th><th>public</th><th>required</th><th>show in registration form</th></tr>\n";
foreach ($profile_fields as $key => $field) {
$output .= "<tr><td>$field[1]</td>";
- $output .= "<td align=\"center\">". form_checkbox("", "profile_private_fields][", $key, in_array($key, $profile_private_fields)) ."</td>";
- $output .= "<td align=\"center\">". form_checkbox("", "profile_public_fields][", $key, in_array($key, $profile_public_fields)) ."</td>";
- $output .= "<td align=\"center\">". form_checkbox("", "profile_required_fields][", $key, in_array($key, $profile_required_fields)) ."</td>";
- $output .= "<td align=\"center\">". form_checkbox("", "profile_register_fields][", $key, in_array($key, $profile_register_fields)) ."</td>";
+ $output .= "<td style=\"text-align: center;\">". form_checkbox("", "profile_private_fields][", $key, in_array($key, $profile_private_fields)) ."</td>";
+ $output .= "<td style=\"text-align: center;\">". form_checkbox("", "profile_public_fields][", $key, in_array($key, $profile_public_fields)) ."</td>";
+ $output .= "<td style=\"text-align: center;\">". form_checkbox("", "profile_required_fields][", $key, in_array($key, $profile_required_fields)) ."</td>";
+ $output .= "<td style=\"text-align: center;\">". form_checkbox("", "profile_register_fields][", $key, in_array($key, $profile_register_fields)) ."</td>";
$output .= "</tr>\n";
}
$output .= "</table>\n";
@@ -127,7 +127,7 @@ function _profile_form($edit, $mode) {
if ($edit["profile_avatar"] && $edit["uid"]) {
$file = profile_avatar_path($edit["uid"], $edit["profile_avatar"]);
if ($file) {
- $output .= "<img src=\"$file\" alt=\"\" /><br />";
+ $output .= "<img src=\"$file\" alt=\"\" title=\"\" /><br />";
}
}
$output .= form_file($profile_fields["avatar"][1], "profile_avatar", 64, $profile_fields["avatar"][2]);
@@ -192,7 +192,7 @@ function _profile_user_view(&$user, $mode) {
if ($t == "profile_avatar") {
$file = profile_avatar_path($user->uid, $user->profile_avatar);
if (file_exists($file)) {
- $output .= form_item(t("Avatar"), "<img src=\"$file\" alt=\"\" />");
+ $output .= form_item(t("Avatar"), "<img src=\"$file\" alt=\"\" title=\"\" />");
}
}
@@ -264,7 +264,7 @@ function _profile_edit_birth($edit = "") {
$output .= " ";
$output .= _profile_select("profile_birthmonth", $edit->profile_birthmonth, $profile_months);
$output .= " ";
- $output .= "<input maxlength=\"4\" name=\"edit[profile_birthyear]\" size=\"5\" value=\"$edit->profile_birthyear\" />";
+ $output .= "<input type=\"text\" maxlength=\"4\" name=\"edit[profile_birthyear]\" size=\"5\" value=\"$edit->profile_birthyear\" />";
return $output;
}
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index a8acb7ca107b547a6136d1fe083ac7aea96d4251..e24d9fff60a40ef955ef2fcd33b3eb1e8a4c5b5f 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -57,10 +57,10 @@ function profile_settings() {
$output .= "<tr><th>field</th><th>enable</th><th>public</th><th>required</th><th>show in registration form</th></tr>\n";
foreach ($profile_fields as $key => $field) {
$output .= "<tr><td>$field[1]</td>";
- $output .= "<td align=\"center\">". form_checkbox("", "profile_private_fields][", $key, in_array($key, $profile_private_fields)) ."</td>";
- $output .= "<td align=\"center\">". form_checkbox("", "profile_public_fields][", $key, in_array($key, $profile_public_fields)) ."</td>";
- $output .= "<td align=\"center\">". form_checkbox("", "profile_required_fields][", $key, in_array($key, $profile_required_fields)) ."</td>";
- $output .= "<td align=\"center\">". form_checkbox("", "profile_register_fields][", $key, in_array($key, $profile_register_fields)) ."</td>";
+ $output .= "<td style=\"text-align: center;\">". form_checkbox("", "profile_private_fields][", $key, in_array($key, $profile_private_fields)) ."</td>";
+ $output .= "<td style=\"text-align: center;\">". form_checkbox("", "profile_public_fields][", $key, in_array($key, $profile_public_fields)) ."</td>";
+ $output .= "<td style=\"text-align: center;\">". form_checkbox("", "profile_required_fields][", $key, in_array($key, $profile_required_fields)) ."</td>";
+ $output .= "<td style=\"text-align: center;\">". form_checkbox("", "profile_register_fields][", $key, in_array($key, $profile_register_fields)) ."</td>";
$output .= "</tr>\n";
}
$output .= "</table>\n";
@@ -127,7 +127,7 @@ function _profile_form($edit, $mode) {
if ($edit["profile_avatar"] && $edit["uid"]) {
$file = profile_avatar_path($edit["uid"], $edit["profile_avatar"]);
if ($file) {
- $output .= "<img src=\"$file\" alt=\"\" /><br />";
+ $output .= "<img src=\"$file\" alt=\"\" title=\"\" /><br />";
}
}
$output .= form_file($profile_fields["avatar"][1], "profile_avatar", 64, $profile_fields["avatar"][2]);
@@ -192,7 +192,7 @@ function _profile_user_view(&$user, $mode) {
if ($t == "profile_avatar") {
$file = profile_avatar_path($user->uid, $user->profile_avatar);
if (file_exists($file)) {
- $output .= form_item(t("Avatar"), "<img src=\"$file\" alt=\"\" />");
+ $output .= form_item(t("Avatar"), "<img src=\"$file\" alt=\"\" title=\"\" />");
}
}
@@ -264,7 +264,7 @@ function _profile_edit_birth($edit = "") {
$output .= " ";
$output .= _profile_select("profile_birthmonth", $edit->profile_birthmonth, $profile_months);
$output .= " ";
- $output .= "<input maxlength=\"4\" name=\"edit[profile_birthyear]\" size=\"5\" value=\"$edit->profile_birthyear\" />";
+ $output .= "<input type=\"text\" maxlength=\"4\" name=\"edit[profile_birthyear]\" size=\"5\" value=\"$edit->profile_birthyear\" />";
return $output;
}
diff --git a/modules/queue.module b/modules/queue.module
index fcf4b96a1146e441520e6a167c1a872ad29c4efa..b6270c512f972fad2e0e6d9390c60c03cc58e359 100644
--- a/modules/queue.module
+++ b/modules/queue.module
@@ -94,10 +94,10 @@ function queue_overview() {
$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>". l($node->title, "queue/$node->nid") ."</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>";
+ $output .= " <tr><td>". l($node->title, "queue/$node->nid") ."</td><td style=\"text-align: center;\">". format_name($node) ."</td><td style=\"text-align: center;\">". module_invoke($node->type, "node", "name") ."</td><td style=\"text-align: center;\">". queue_score($node->nid) ."</td></tr>";
}
else {
- $output .= " <tr><td>". l($node->title, "queue/$node->nid") ."</td><td align=\"center\">". format_name($node) ."</td><td align=\"center\">". module_invoke($node->type, "node", "name") ."</td><td align=\"center\">". l(t("vote"), "queue/$node->nid") ."</td></tr>";
+ $output .= " <tr><td>". l($node->title, "queue/$node->nid") ."</td><td style=\"text-align: center;\">". format_name($node) ."</td><td style=\"text-align: center;\">". module_invoke($node->type, "node", "name") ."</td><td style=\"text-align: center;\">". l(t("vote"), "queue/$node->nid") ."</td></tr>";
}
if ($node->teaser) {
diff --git a/modules/statistics.module b/modules/statistics.module
index b8bab8277179125b77e84dad0b742f5552014a15..0ca5b51faad9c24422d2b394e21614c983031344 100644
--- a/modules/statistics.module
+++ b/modules/statistics.module
@@ -761,7 +761,7 @@ function statistics_page_user($uid = 0, $date = 0, $all = 0) {
if ($displaycount = variable_get("statistics_userpage_all_cnt", "10")) {
- $output = "<table border=\"0\" cellpadding=\"4\" cellspacing=\"4\" width=\100%\">";
+ $output = "<table border=\"0\" cellpadding=\"4\" cellspacing=\"4\" width=\"100%\">";
$output .= statistics_summary("totalcount", $displaycount);
$output .= "</table>";
@@ -769,7 +769,7 @@ function statistics_page_user($uid = 0, $date = 0, $all = 0) {
}
if ($displaycount = variable_get("statistics_userpage_last_cnt", "10")) {
- $output = "<table border=\"0\" cellpadding=\"4\" cellspacing=\"4\" width=\100%\">";
+ $output = "<table border=\"0\" cellpadding=\"4\" cellspacing=\"4\" width=\"100%\">";
$output .= statistics_summary("timestamp", $displaycount);
$output .= "</table>";
@@ -787,9 +787,9 @@ function statistics_summary($dbfield, $dbrows) {
$content = node_load(array("nid" => $nid["nid"]));
$links = link_node($content, 1);
- $output .= "<tr><td><b>". l($nid["title"], "node/view/". $nid["nid"], array("title" => t("View this posting."))) ."</b></td><td align=\"right\"><small>". t("Submitted by %a on %b", array("%a" => format_name($content), "%b" => format_date($content->created, "large"))) ."</small></td></tr>";
+ $output .= "<tr><td><b>". l($nid["title"], "node/view/". $nid["nid"], array("title" => t("View this posting."))) ."</b></td><td style=\"text-align: right;\"><small>". t("Submitted by %a on %b", array("%a" => format_name($content), "%b" => format_date($content->created, "large"))) ."</small></td></tr>";
$output .= "<tr><td colspan=\"2\"><div style=\"margin-left: 20px;\">". check_output($content->teaser) ."</div></td></tr>";
- $output .= "<tr><td align=\"right\" colspan=\"2\">[ ". theme("links", $links) ." ]<br /><br /></td></tr>";
+ $output .= "<tr><td style=\"text-align: right;\" colspan=\"2\">[ ". theme("links", $links) ." ]<br /><br /></td></tr>";
}
return $output;
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index b8bab8277179125b77e84dad0b742f5552014a15..0ca5b51faad9c24422d2b394e21614c983031344 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -761,7 +761,7 @@ function statistics_page_user($uid = 0, $date = 0, $all = 0) {
if ($displaycount = variable_get("statistics_userpage_all_cnt", "10")) {
- $output = "<table border=\"0\" cellpadding=\"4\" cellspacing=\"4\" width=\100%\">";
+ $output = "<table border=\"0\" cellpadding=\"4\" cellspacing=\"4\" width=\"100%\">";
$output .= statistics_summary("totalcount", $displaycount);
$output .= "</table>";
@@ -769,7 +769,7 @@ function statistics_page_user($uid = 0, $date = 0, $all = 0) {
}
if ($displaycount = variable_get("statistics_userpage_last_cnt", "10")) {
- $output = "<table border=\"0\" cellpadding=\"4\" cellspacing=\"4\" width=\100%\">";
+ $output = "<table border=\"0\" cellpadding=\"4\" cellspacing=\"4\" width=\"100%\">";
$output .= statistics_summary("timestamp", $displaycount);
$output .= "</table>";
@@ -787,9 +787,9 @@ function statistics_summary($dbfield, $dbrows) {
$content = node_load(array("nid" => $nid["nid"]));
$links = link_node($content, 1);
- $output .= "<tr><td><b>". l($nid["title"], "node/view/". $nid["nid"], array("title" => t("View this posting."))) ."</b></td><td align=\"right\"><small>". t("Submitted by %a on %b", array("%a" => format_name($content), "%b" => format_date($content->created, "large"))) ."</small></td></tr>";
+ $output .= "<tr><td><b>". l($nid["title"], "node/view/". $nid["nid"], array("title" => t("View this posting."))) ."</b></td><td style=\"text-align: right;\"><small>". t("Submitted by %a on %b", array("%a" => format_name($content), "%b" => format_date($content->created, "large"))) ."</small></td></tr>";
$output .= "<tr><td colspan=\"2\"><div style=\"margin-left: 20px;\">". check_output($content->teaser) ."</div></td></tr>";
- $output .= "<tr><td align=\"right\" colspan=\"2\">[ ". theme("links", $links) ." ]<br /><br /></td></tr>";
+ $output .= "<tr><td style=\"text-align: right;\" colspan=\"2\">[ ". theme("links", $links) ." ]<br /><br /></td></tr>";
}
return $output;
diff --git a/modules/system.module b/modules/system.module
index 9834d7e0584c7fd3812cd39d3d12ef27b6e2131c..ee73e317a80d69bc3c28a714d396b5ba59b28129 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -3,8 +3,8 @@
function system_help() {
$output .= "<p>Drupal comes with system-wide defaults but the setting-module provides control over many Drupal preferences, behaviours including visual and operational settings.</p>";
- $output .= "<h3><a name=\"cron\">Cron</a></h3>". system_help_cron();
- $output .= "<h3><a name=\"cache\">Cache</a></h3>". system_help_cache();
+ $output .= "<h3><a id=\"cron\">Cron</a></h3>". system_help_cron();
+ $output .= "<h3><a id=\"cache\">Cache</a></h3>". system_help_cache();
return t("$output");
}
@@ -134,7 +134,7 @@ function system_view_general() {
function system_view_module($name) {
if (module_hook($name, "settings")) {
- $output .= "<h3><a name=\"$name\">". ucfirst(t("$name")) ." ". t("settings") ."</a></h3>". module_invoke($name, "settings") ."<hr />\n";
+ $output .= "<h3><a id=\"$name\">". ucfirst(t("$name")) ." ". t("settings") ."</a></h3>". module_invoke($name, "settings") ."<hr />\n";
}
return $output;
}
diff --git a/modules/system/system.module b/modules/system/system.module
index 9834d7e0584c7fd3812cd39d3d12ef27b6e2131c..ee73e317a80d69bc3c28a714d396b5ba59b28129 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -3,8 +3,8 @@
function system_help() {
$output .= "<p>Drupal comes with system-wide defaults but the setting-module provides control over many Drupal preferences, behaviours including visual and operational settings.</p>";
- $output .= "<h3><a name=\"cron\">Cron</a></h3>". system_help_cron();
- $output .= "<h3><a name=\"cache\">Cache</a></h3>". system_help_cache();
+ $output .= "<h3><a id=\"cron\">Cron</a></h3>". system_help_cron();
+ $output .= "<h3><a id=\"cache\">Cache</a></h3>". system_help_cache();
return t("$output");
}
@@ -134,7 +134,7 @@ function system_view_general() {
function system_view_module($name) {
if (module_hook($name, "settings")) {
- $output .= "<h3><a name=\"$name\">". ucfirst(t("$name")) ." ". t("settings") ."</a></h3>". module_invoke($name, "settings") ."<hr />\n";
+ $output .= "<h3><a id=\"$name\">". ucfirst(t("$name")) ." ". t("settings") ."</a></h3>". module_invoke($name, "settings") ."<hr />\n";
}
return $output;
}
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index a301dfc85d0242e395ff9051d30d4d401b84c345..7a35e046004c35c02051c105d81c8060b51fe214 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -803,10 +803,10 @@ function taxonomy_help() {
$output .= "<p><b>Notes</b></p><ul><li>The term <i>Milk</i> appears within both <i>Dairy</i> and <i>Drink</i>. This is an example of <i>multiple parents</i> for a term.</li><li>In Drupal the order of siblings (e.g. <i>Beef</i>, <i>Chicken</i>, <i>Lamb</i>) in a taxonomy may be controlled with the <i>weight</i> parameter.</li></ul>";
$output .= "<h3>Vocabularies</h3><p>When you create a controlled vocabulary you are creating a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each node of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to <a href=\"http://www.slashdot.com/\">Slashdot's</a> sections. For more complex implementations, you might create a hierarchical list of categories such as <i>Food</i> taxonomy shown above.</p>";
$output .= "<h4>Setting up a vocabulary</h4><p>When setting up a controlled vocabulary, if you select the <i>hierarchy</i> option, you will be defining a taxonomy or a thesaurus. If you select the <i>related terms</i> option, you are allowing the definition of related terms, think <i>see also</i>, as in a thesaurus. Selecting <i>multiple select</i> will allow you to describe a node using more than one term. That node will then appear in each term's page, thus increasing the chance that a user will find it.</p>";
- $output .= "<p>When setting up a controlled vocabulary you are asked for: <ul><li><b>Vocabulary name</b> (Required) -- The name for this vocabulary. Example: <i>Dairy</i>.</li><li><b>Description</b> (Optional) -- Description of the vocabulary, this can be used by modules and feeds.</li><li><b>Types</b> (Required) -- The list of node types you want to associate this vocabulary with. Some available types are: blog, book, forum, page, story.</li><li><a name=\"relatedterms\"></a><b>Related terms</b> -- Allows relationships between terms within this vocabulary. Think of these as <i>see also</i>-references.</li><li><a name=\"hierarchy\"></a><b>Hierarchy</b> -- Allows a tree-like taxonomy, as in our <i>Foods</i> example above</li><li><b>Multiple select</b> -- Allows nodes to be described using more than one term. Nodes may then appear on multiple taxonomy pages.</li><li><b>Required</b> -- Each node has to have a term in this vacabulary associated with it.</li><li><b>Weight</b> -- The over all weight for this vocaulary in listings with multiple vacabularies.</ul></p>";
+ $output .= "<p>When setting up a controlled vocabulary you are asked for: <ul><li><b>Vocabulary name</b> (Required) -- The name for this vocabulary. Example: <i>Dairy</i>.</li><li><b>Description</b> (Optional) -- Description of the vocabulary, this can be used by modules and feeds.</li><li><b>Types</b> (Required) -- The list of node types you want to associate this vocabulary with. Some available types are: blog, book, forum, page, story.</li><li><a id=\"relatedterms\"></a><b>Related terms</b> -- Allows relationships between terms within this vocabulary. Think of these as <i>see also</i>-references.</li><li><a id=\"hierarchy\"></a><b>Hierarchy</b> -- Allows a tree-like taxonomy, as in our <i>Foods</i> example above</li><li><b>Multiple select</b> -- Allows nodes to be described using more than one term. Nodes may then appear on multiple taxonomy pages.</li><li><b>Required</b> -- Each node has to have a term in this vacabulary associated with it.</li><li><b>Weight</b> -- The over all weight for this vocaulary in listings with multiple vacabularies.</ul></p>";
$output .= "<h4>Adding terms to a vocabulary</h4><p>Once done defining the vocabulary, you have to add terms to it to make it useful. The options you see when adding a term to a vocabulary will depend on what you selected for <i>related terms</i>, <i>hierarchy </i>and <i>multiple select</i>. These options are:</p>";
- $output .= "<p><ul><li><b>Term name</b> (Required) -- The name for this term. Example: <i>Milk</i></li><li><b>Description</b> (Optional) -- Description of the term that may be used by modules and feeds. This is synonymous with a 'scope note'.</li><li><b><a name=\"parent\"></a>Parent</b> (Required) -- Select the term under which this term is a subset -- the branch of the hierarchy that this term belongs under. This is also known as the \"Broader term\" indicator used in thesauri.</li><li><b><a name=\"synonyms\"></a>Synonyms</b> (Optional) -- Enter synonyms for this term, one synonym per line. Synonyms can be used for variant spellings, acronyms, and other terms that have the same meaning as the added term, but which are not explicitly listed in this thesaurus (i.e. <i>unauthorized terms</i>)</li><li><b>Weight</b> (Optional) -- The weight is used to sort the terms of this vocabulary.</li></ul></p>";
- $output .= "<h3><a name=\"taxonomyURL\"></a>Displaying nodes organized by term(s)</h3><p>In order to view the nodes associated with a term or a collection of terms, you should browse to a properly formed Taxonomy URL. For example, ". l("taxonomy/page/or/1,2","taxonomy/pages/or/1,2") .". Taxonomy URLs always contain one or more term IDs (tid) at the end of the URL (a.k.a the <i>querystring</i>). You may learn the term ID for a given term by hovering over that term in the ". l("taxonomy overview", "admin/taxonomy") ." page and noting the number at the end or the URL. To build a Taxonomy URL start with \"taxonomy/page\". Now add the querystring parameter, either <i>or</i>, which chooses nodes tagged with <b>any</b> of the given term IDs, or <i>and</i>, which chooses nodes tagged with <b>all</b> of the given Term IDs. Thus <i>or</i> is less specific than <i>and</i>. Finally add a comma seperated list of term IDs.</p>";
+ $output .= "<p><ul><li><b>Term name</b> (Required) -- The name for this term. Example: <i>Milk</i></li><li><b>Description</b> (Optional) -- Description of the term that may be used by modules and feeds. This is synonymous with a 'scope note'.</li><li><b><a id=\"parent\"></a>Parent</b> (Required) -- Select the term under which this term is a subset -- the branch of the hierarchy that this term belongs under. This is also known as the \"Broader term\" indicator used in thesauri.</li><li><b><a id=\"synonyms\"></a>Synonyms</b> (Optional) -- Enter synonyms for this term, one synonym per line. Synonyms can be used for variant spellings, acronyms, and other terms that have the same meaning as the added term, but which are not explicitly listed in this thesaurus (i.e. <i>unauthorized terms</i>)</li><li><b>Weight</b> (Optional) -- The weight is used to sort the terms of this vocabulary.</li></ul></p>";
+ $output .= "<h3><a id=\"taxonomyURL\"></a>Displaying nodes organized by term(s)</h3><p>In order to view the nodes associated with a term or a collection of terms, you should browse to a properly formed Taxonomy URL. For example, ". l("taxonomy/page/or/1,2","taxonomy/pages/or/1,2") .". Taxonomy URLs always contain one or more term IDs (tid) at the end of the URL (a.k.a the <i>querystring</i>). You may learn the term ID for a given term by hovering over that term in the ". l("taxonomy overview", "admin/taxonomy") ." page and noting the number at the end or the URL. To build a Taxonomy URL start with \"taxonomy/page\". Now add the querystring parameter, either <i>or</i>, which chooses nodes tagged with <b>any</b> of the given term IDs, or <i>and</i>, which chooses nodes tagged with <b>all</b> of the given Term IDs. Thus <i>or</i> is less specific than <i>and</i>. Finally add a comma seperated list of term IDs.</p>";
$output .= "<h3>RSS feeds</h3><p>Every term, or collection of terms, provides an <a href=\"http://backend.userland.com/stories/rss\">RSS</a> feed to which interested users may subscribe. The URL format for a sample RSS feed is ". l("node/feed/or/1,2","node/feed/or/1,2") .". Built like a Taxonomy URL, ". l("see above", "admin/taxonomy/help#taxonomyURL") ." it starts with \"node/feed\", then has the querystring parameter, and finally the Term IDs.</p>";
return t($output);
}
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index a301dfc85d0242e395ff9051d30d4d401b84c345..7a35e046004c35c02051c105d81c8060b51fe214 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -803,10 +803,10 @@ function taxonomy_help() {
$output .= "<p><b>Notes</b></p><ul><li>The term <i>Milk</i> appears within both <i>Dairy</i> and <i>Drink</i>. This is an example of <i>multiple parents</i> for a term.</li><li>In Drupal the order of siblings (e.g. <i>Beef</i>, <i>Chicken</i>, <i>Lamb</i>) in a taxonomy may be controlled with the <i>weight</i> parameter.</li></ul>";
$output .= "<h3>Vocabularies</h3><p>When you create a controlled vocabulary you are creating a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each node of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to <a href=\"http://www.slashdot.com/\">Slashdot's</a> sections. For more complex implementations, you might create a hierarchical list of categories such as <i>Food</i> taxonomy shown above.</p>";
$output .= "<h4>Setting up a vocabulary</h4><p>When setting up a controlled vocabulary, if you select the <i>hierarchy</i> option, you will be defining a taxonomy or a thesaurus. If you select the <i>related terms</i> option, you are allowing the definition of related terms, think <i>see also</i>, as in a thesaurus. Selecting <i>multiple select</i> will allow you to describe a node using more than one term. That node will then appear in each term's page, thus increasing the chance that a user will find it.</p>";
- $output .= "<p>When setting up a controlled vocabulary you are asked for: <ul><li><b>Vocabulary name</b> (Required) -- The name for this vocabulary. Example: <i>Dairy</i>.</li><li><b>Description</b> (Optional) -- Description of the vocabulary, this can be used by modules and feeds.</li><li><b>Types</b> (Required) -- The list of node types you want to associate this vocabulary with. Some available types are: blog, book, forum, page, story.</li><li><a name=\"relatedterms\"></a><b>Related terms</b> -- Allows relationships between terms within this vocabulary. Think of these as <i>see also</i>-references.</li><li><a name=\"hierarchy\"></a><b>Hierarchy</b> -- Allows a tree-like taxonomy, as in our <i>Foods</i> example above</li><li><b>Multiple select</b> -- Allows nodes to be described using more than one term. Nodes may then appear on multiple taxonomy pages.</li><li><b>Required</b> -- Each node has to have a term in this vacabulary associated with it.</li><li><b>Weight</b> -- The over all weight for this vocaulary in listings with multiple vacabularies.</ul></p>";
+ $output .= "<p>When setting up a controlled vocabulary you are asked for: <ul><li><b>Vocabulary name</b> (Required) -- The name for this vocabulary. Example: <i>Dairy</i>.</li><li><b>Description</b> (Optional) -- Description of the vocabulary, this can be used by modules and feeds.</li><li><b>Types</b> (Required) -- The list of node types you want to associate this vocabulary with. Some available types are: blog, book, forum, page, story.</li><li><a id=\"relatedterms\"></a><b>Related terms</b> -- Allows relationships between terms within this vocabulary. Think of these as <i>see also</i>-references.</li><li><a id=\"hierarchy\"></a><b>Hierarchy</b> -- Allows a tree-like taxonomy, as in our <i>Foods</i> example above</li><li><b>Multiple select</b> -- Allows nodes to be described using more than one term. Nodes may then appear on multiple taxonomy pages.</li><li><b>Required</b> -- Each node has to have a term in this vacabulary associated with it.</li><li><b>Weight</b> -- The over all weight for this vocaulary in listings with multiple vacabularies.</ul></p>";
$output .= "<h4>Adding terms to a vocabulary</h4><p>Once done defining the vocabulary, you have to add terms to it to make it useful. The options you see when adding a term to a vocabulary will depend on what you selected for <i>related terms</i>, <i>hierarchy </i>and <i>multiple select</i>. These options are:</p>";
- $output .= "<p><ul><li><b>Term name</b> (Required) -- The name for this term. Example: <i>Milk</i></li><li><b>Description</b> (Optional) -- Description of the term that may be used by modules and feeds. This is synonymous with a 'scope note'.</li><li><b><a name=\"parent\"></a>Parent</b> (Required) -- Select the term under which this term is a subset -- the branch of the hierarchy that this term belongs under. This is also known as the \"Broader term\" indicator used in thesauri.</li><li><b><a name=\"synonyms\"></a>Synonyms</b> (Optional) -- Enter synonyms for this term, one synonym per line. Synonyms can be used for variant spellings, acronyms, and other terms that have the same meaning as the added term, but which are not explicitly listed in this thesaurus (i.e. <i>unauthorized terms</i>)</li><li><b>Weight</b> (Optional) -- The weight is used to sort the terms of this vocabulary.</li></ul></p>";
- $output .= "<h3><a name=\"taxonomyURL\"></a>Displaying nodes organized by term(s)</h3><p>In order to view the nodes associated with a term or a collection of terms, you should browse to a properly formed Taxonomy URL. For example, ". l("taxonomy/page/or/1,2","taxonomy/pages/or/1,2") .". Taxonomy URLs always contain one or more term IDs (tid) at the end of the URL (a.k.a the <i>querystring</i>). You may learn the term ID for a given term by hovering over that term in the ". l("taxonomy overview", "admin/taxonomy") ." page and noting the number at the end or the URL. To build a Taxonomy URL start with \"taxonomy/page\". Now add the querystring parameter, either <i>or</i>, which chooses nodes tagged with <b>any</b> of the given term IDs, or <i>and</i>, which chooses nodes tagged with <b>all</b> of the given Term IDs. Thus <i>or</i> is less specific than <i>and</i>. Finally add a comma seperated list of term IDs.</p>";
+ $output .= "<p><ul><li><b>Term name</b> (Required) -- The name for this term. Example: <i>Milk</i></li><li><b>Description</b> (Optional) -- Description of the term that may be used by modules and feeds. This is synonymous with a 'scope note'.</li><li><b><a id=\"parent\"></a>Parent</b> (Required) -- Select the term under which this term is a subset -- the branch of the hierarchy that this term belongs under. This is also known as the \"Broader term\" indicator used in thesauri.</li><li><b><a id=\"synonyms\"></a>Synonyms</b> (Optional) -- Enter synonyms for this term, one synonym per line. Synonyms can be used for variant spellings, acronyms, and other terms that have the same meaning as the added term, but which are not explicitly listed in this thesaurus (i.e. <i>unauthorized terms</i>)</li><li><b>Weight</b> (Optional) -- The weight is used to sort the terms of this vocabulary.</li></ul></p>";
+ $output .= "<h3><a id=\"taxonomyURL\"></a>Displaying nodes organized by term(s)</h3><p>In order to view the nodes associated with a term or a collection of terms, you should browse to a properly formed Taxonomy URL. For example, ". l("taxonomy/page/or/1,2","taxonomy/pages/or/1,2") .". Taxonomy URLs always contain one or more term IDs (tid) at the end of the URL (a.k.a the <i>querystring</i>). You may learn the term ID for a given term by hovering over that term in the ". l("taxonomy overview", "admin/taxonomy") ." page and noting the number at the end or the URL. To build a Taxonomy URL start with \"taxonomy/page\". Now add the querystring parameter, either <i>or</i>, which chooses nodes tagged with <b>any</b> of the given term IDs, or <i>and</i>, which chooses nodes tagged with <b>all</b> of the given Term IDs. Thus <i>or</i> is less specific than <i>and</i>. Finally add a comma seperated list of term IDs.</p>";
$output .= "<h3>RSS feeds</h3><p>Every term, or collection of terms, provides an <a href=\"http://backend.userland.com/stories/rss\">RSS</a> feed to which interested users may subscribe. The URL format for a sample RSS feed is ". l("node/feed/or/1,2","node/feed/or/1,2") .". Built like a Taxonomy URL, ". l("see above", "admin/taxonomy/help#taxonomyURL") ." it starts with \"node/feed\", then has the querystring parameter, and finally the Term IDs.</p>";
return t($output);
}
diff --git a/modules/user.module b/modules/user.module
index 4af5b703de55a3957c01be8330f98ce6e743bc48..99e28bdf424f8d47e08b45d0a36339b741341c90 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -1044,7 +1044,7 @@ function user_menu() {
$links[] = l(t("edit user information"), "user/edit");
$links[] = l(t("delete account"), "user/delete");
- return "<div align=\"center\">". implode(" · ", $links) ."</div>";
+ return "<div style=\"text-align: center;\">". implode(" · ", $links) ."</div>";
}
function user_view($uid = 0) {
@@ -1312,7 +1312,7 @@ function user_admin_access($edit = array()) {
$output .= "<h3>" . t("Check username") . "</h3>";
}
- $output .= "$message<input size=\"32\" maxlength=\"64\" name=\"edit[test]\" value=\"". $edit["test"] ."\" /><input type=\"submit\" name=\"op\" value=\"" . t("Check") . "\" />";
+ $output .= "$message<input type=\"text\" size=\"32\" maxlength=\"64\" name=\"edit[test]\" value=\"". $edit["test"] ."\" /><input type=\"submit\" name=\"op\" value=\"" . t("Check") . "\" />";
return form($output);
}
@@ -1436,7 +1436,7 @@ function user_admin_role($edit = array()) {
while ($role = db_fetch_object($result)) {
$rows[] = array($role->name, array("data" => l(t("edit role"), "admin/user/role/$role->rid"), "align" => "center"));
}
- $rows[] = array("<input size=\"32\" maxlength=\"64\" name=\"edit[name]\" />", "<input type=\"submit\" name=\"op\" value=\"". t("Add role") ."\" />");
+ $rows[] = array("<input type=\"text\" size=\"32\" maxlength=\"64\" name=\"edit[name]\" />", "<input type=\"submit\" name=\"op\" value=\"". t("Add role") ."\" />");
$output = table($header, $rows);
$output = form($output);
@@ -1641,7 +1641,7 @@ function user_help_users_da() {
$site = "<i>". variable_get("site_name", "this website"). "</i>";
$output = "
- <h3>Distributed authentication<a name=\"da\"></a></h3>
+ <h3>Distributed authentication<a id=\"da\"></a></h3>
<p>One of the more tedious moments in visiting a new website 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 ";
@@ -1669,7 +1669,7 @@ function user_help_users_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 id=\"$module\"></a>" . module_invoke($module, "info", "name") . "</h4>";
$output .= module_invoke($module, "auth_help");
}
}
@@ -1698,7 +1698,7 @@ function user_help_admin() {
function user_help_admin_da() {
- $output .= "<h3>Distributed authentication<a name=\"da\"> </a></h3><p>One of the more tedious moments in visiting a new website is filling out the registration form. The reg form provides helpful information to the website owner, but not much value for the user. The value for the end user is usually the ability to post a messages or receive personalized news, etc. Distributed authentication (DA) gives the user what they want without having to fill out the reg form. Removing this obstacle yields more registered and active users for the website.</p>";
+ $output .= "<h3>Distributed authentication<a id=\"da\"> </a></h3><p>One of the more tedious moments in visiting a new website is filling out the registration form. The reg form provides helpful information to the website owner, but not much value for the user. The value for the end user is usually the ability to post a messages or receive personalized news, etc. Distributed authentication (DA) gives the user what they want without having to fill out the reg form. Removing this obstacle yields more registered and active users for the website.</p>";
$output .= "<p>DA enables a new user to input a username and password into the login box and immediately be recognized, even if that user never registered on your site. This works because Drupal knows how to communicate with external registration databases. For example, lets say that your new user 'Joe' is already a registered member of Delphi Forums. If your Drupal has delphi.module installed, then Drupal will inform Joe on the registration and login screens that he may login with his Delphi ID instead of registering with your Drupal instance. Joe likes that idea, and logs in with a username of joe@remote.delphiforums.com and his usual Delphi password. Drupal then communicates with remote.delphiforums.com (usually using ". l("XML-RPC","www.xmlrpc.com") ." ". l("HTTP POST", "www.w3.org/Protocols/") .", or ". l("SOAP", "www.soapware.org") .") behind the scenes and asks "is this password for username=joe?" If Delphi replies yes, then Drupal will create a new local account for joe and log joe into it. Joe may keep on logging into your Drupal instance in the same manner, and he will be logged into the same joe@remote.delphiforums.com account.</p>";
$output .= "<p>One key element of DA is the 'authmap' table, which maps a user's authname (e.g. joe@remote.delphiforums.com) to his local UID (i.e. universal identification number). This map is checked whenever a user successfully logs into an external authentication source. Once Drupal knows that the current user is definately joe@remote.delphiforums.com (because Delphi says so), he looks up Joe's UID and logs Joe into that account.</p>";
$output .= "<p>To disable distributed authentication, simply ". l("disable", "admin/system/modules") ." or remove all DA modules. For a virgin install, that means removing/disabling <i>jabber.module</i> and <i>drupal.module</i></p>";
@@ -1749,7 +1749,7 @@ function user_help_devel_da() {
}
}</pre>";
$output .= "<p>The <i>_auth</i> function is the heart of any authentication module. This function is called whenever a user is attempting to login using your authentication module. For successful authentications, this function returns TRUE. Otherwise, it returns FALSE. This function always accepts 3 parameters, as shown above. These parameters are passed by the user system (user.module). The user system parses the username as typed by the user into 2 substrings - \$name and \$server. The parsing rules are:</p>";
- $output .= "<table width=\"80%\" border=\"0\" cellspacing=\"4\" cellpadding=\"4\" align=\"center\"><tr><th colspan=\"2\" align=\"left\">_auth function parameters</th></tr><tr><th>\$name</th><td>The substring before the final <i>'@'</i> character in the username field</td></tr><tr><th>\$pass</th><td>The whole string submitted by the user in the password field</td></tr><tr><th>\$server</th><td>The substring after the final <i>'@'</i> symbol in the username field</td></tr></table>";
+ $output .= "<table border=\"0\" cellspacing=\"4\" cellpadding=\"4\" style=\"margin: auto; width: 80%;\"><tr><th colspan=\"2\" style=\"text-align: left;\">_auth function parameters</th></tr><tr><th>\$name</th><td>The substring before the final <i>'@'</i> character in the username field</td></tr><tr><th>\$pass</th><td>The whole string submitted by the user in the password field</td></tr><tr><th>\$server</th><td>The substring after the final <i>'@'</i> symbol in the username field</td></tr></table>";
$output .= "<p>So now lets use that \$name, \$pass, and \$server which was passed to our <i>_auth</i> function. Blogger authenticates users via ". l("XML-RPC", "www.xmlrpc.org") .". Your module may authenticate using a different technique. Drupal doesn't reallly care how your module communicates with its registration source. It just <b>trusts</b> the module.</p>";
$output .= "<p>The lines above illustrate a typical ". l("XML-RPC", "www.xmlrpc.org") ." method call. Here we build up a message and send it to Blogger, storing the response in a variable called <i>\$response</i>. The message we pass conforms to the published ". l("Blogger XML-RPC Application Programmers Interface (API)", "plant.blogger.com/API") .". Your module will no doubt implement a different API. One peculiarity of this module is that we don't actually use the $server parameter. Blogger only accepts authentication at <i>plant.blogger.com</i>, so we hard-code that value into the <i>xmlrpc_client()</i> function. A more typical example might be the jabber module, which uses the <i>\$server</i> parameter to determine where to send the authentication request. Also of note is the '5' parameter in the <i>\$client->send\(\)</i> call. This is a timeout value in seconds. All authentication modules should implement a timeout on their external calls. This makes sure to return control to the user.module if your registration database has become inoperable or unreachable.</p>";
$output .= "<pre>
@@ -1790,7 +1790,7 @@ function user_help_devel_da() {
function user_help_devel_userhook() {
- $output .= "<h3><a name=\"userhook\">module_user()</a></h3><p>The <b>_user()</b> hook provides a mechanism for inserting text and form fields into the ". l("registration","user/register") .", ". l("user account view/edit", "user") .", and ". l("administer users", "admin/user") ." pages. This is useful if you want to add a custom field for your particular community. This is best illustrated by the ". l("profile.module", "cvs.drupal.org/viewcvs/drupal/modules/profile.module") .". The profile.module is meant to be customized for your needs. Please download it and hack away until it does what you need.</p>";
+ $output .= "<h3><a id=\"userhook\">module_user()</a></h3><p>The <b>_user()</b> hook provides a mechanism for inserting text and form fields into the ". l("registration","user/register") .", ". l("user account view/edit", "user") .", and ". l("administer users", "admin/user") ." pages. This is useful if you want to add a custom field for your particular community. This is best illustrated by the ". l("profile.module", "cvs.drupal.org/viewcvs/drupal/modules/profile.module") .". The profile.module is meant to be customized for your needs. Please download it and hack away until it does what you need.</p>";
$output .= "<p>Consider this simpler example from a fictional recipe community web site called Julia's Kitchen. Julia customizes her Drupal powered site by creating a new file called <i>julia.module</i>. That file does the following:<ul><li>new members must agree to Julia's Privacy Policy on the reg page.</li><li>members may list their favorite ingredients on their public user profile page</li></ul></p>";
diff --git a/modules/user/user.module b/modules/user/user.module
index 4af5b703de55a3957c01be8330f98ce6e743bc48..99e28bdf424f8d47e08b45d0a36339b741341c90 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1044,7 +1044,7 @@ function user_menu() {
$links[] = l(t("edit user information"), "user/edit");
$links[] = l(t("delete account"), "user/delete");
- return "<div align=\"center\">". implode(" · ", $links) ."</div>";
+ return "<div style=\"text-align: center;\">". implode(" · ", $links) ."</div>";
}
function user_view($uid = 0) {
@@ -1312,7 +1312,7 @@ function user_admin_access($edit = array()) {
$output .= "<h3>" . t("Check username") . "</h3>";
}
- $output .= "$message<input size=\"32\" maxlength=\"64\" name=\"edit[test]\" value=\"". $edit["test"] ."\" /><input type=\"submit\" name=\"op\" value=\"" . t("Check") . "\" />";
+ $output .= "$message<input type=\"text\" size=\"32\" maxlength=\"64\" name=\"edit[test]\" value=\"". $edit["test"] ."\" /><input type=\"submit\" name=\"op\" value=\"" . t("Check") . "\" />";
return form($output);
}
@@ -1436,7 +1436,7 @@ function user_admin_role($edit = array()) {
while ($role = db_fetch_object($result)) {
$rows[] = array($role->name, array("data" => l(t("edit role"), "admin/user/role/$role->rid"), "align" => "center"));
}
- $rows[] = array("<input size=\"32\" maxlength=\"64\" name=\"edit[name]\" />", "<input type=\"submit\" name=\"op\" value=\"". t("Add role") ."\" />");
+ $rows[] = array("<input type=\"text\" size=\"32\" maxlength=\"64\" name=\"edit[name]\" />", "<input type=\"submit\" name=\"op\" value=\"". t("Add role") ."\" />");
$output = table($header, $rows);
$output = form($output);
@@ -1641,7 +1641,7 @@ function user_help_users_da() {
$site = "<i>". variable_get("site_name", "this website"). "</i>";
$output = "
- <h3>Distributed authentication<a name=\"da\"></a></h3>
+ <h3>Distributed authentication<a id=\"da\"></a></h3>
<p>One of the more tedious moments in visiting a new website 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 ";
@@ -1669,7 +1669,7 @@ function user_help_users_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 id=\"$module\"></a>" . module_invoke($module, "info", "name") . "</h4>";
$output .= module_invoke($module, "auth_help");
}
}
@@ -1698,7 +1698,7 @@ function user_help_admin() {
function user_help_admin_da() {
- $output .= "<h3>Distributed authentication<a name=\"da\"> </a></h3><p>One of the more tedious moments in visiting a new website is filling out the registration form. The reg form provides helpful information to the website owner, but not much value for the user. The value for the end user is usually the ability to post a messages or receive personalized news, etc. Distributed authentication (DA) gives the user what they want without having to fill out the reg form. Removing this obstacle yields more registered and active users for the website.</p>";
+ $output .= "<h3>Distributed authentication<a id=\"da\"> </a></h3><p>One of the more tedious moments in visiting a new website is filling out the registration form. The reg form provides helpful information to the website owner, but not much value for the user. The value for the end user is usually the ability to post a messages or receive personalized news, etc. Distributed authentication (DA) gives the user what they want without having to fill out the reg form. Removing this obstacle yields more registered and active users for the website.</p>";
$output .= "<p>DA enables a new user to input a username and password into the login box and immediately be recognized, even if that user never registered on your site. This works because Drupal knows how to communicate with external registration databases. For example, lets say that your new user 'Joe' is already a registered member of Delphi Forums. If your Drupal has delphi.module installed, then Drupal will inform Joe on the registration and login screens that he may login with his Delphi ID instead of registering with your Drupal instance. Joe likes that idea, and logs in with a username of joe@remote.delphiforums.com and his usual Delphi password. Drupal then communicates with remote.delphiforums.com (usually using ". l("XML-RPC","www.xmlrpc.com") ." ". l("HTTP POST", "www.w3.org/Protocols/") .", or ". l("SOAP", "www.soapware.org") .") behind the scenes and asks "is this password for username=joe?" If Delphi replies yes, then Drupal will create a new local account for joe and log joe into it. Joe may keep on logging into your Drupal instance in the same manner, and he will be logged into the same joe@remote.delphiforums.com account.</p>";
$output .= "<p>One key element of DA is the 'authmap' table, which maps a user's authname (e.g. joe@remote.delphiforums.com) to his local UID (i.e. universal identification number). This map is checked whenever a user successfully logs into an external authentication source. Once Drupal knows that the current user is definately joe@remote.delphiforums.com (because Delphi says so), he looks up Joe's UID and logs Joe into that account.</p>";
$output .= "<p>To disable distributed authentication, simply ". l("disable", "admin/system/modules") ." or remove all DA modules. For a virgin install, that means removing/disabling <i>jabber.module</i> and <i>drupal.module</i></p>";
@@ -1749,7 +1749,7 @@ function user_help_devel_da() {
}
}</pre>";
$output .= "<p>The <i>_auth</i> function is the heart of any authentication module. This function is called whenever a user is attempting to login using your authentication module. For successful authentications, this function returns TRUE. Otherwise, it returns FALSE. This function always accepts 3 parameters, as shown above. These parameters are passed by the user system (user.module). The user system parses the username as typed by the user into 2 substrings - \$name and \$server. The parsing rules are:</p>";
- $output .= "<table width=\"80%\" border=\"0\" cellspacing=\"4\" cellpadding=\"4\" align=\"center\"><tr><th colspan=\"2\" align=\"left\">_auth function parameters</th></tr><tr><th>\$name</th><td>The substring before the final <i>'@'</i> character in the username field</td></tr><tr><th>\$pass</th><td>The whole string submitted by the user in the password field</td></tr><tr><th>\$server</th><td>The substring after the final <i>'@'</i> symbol in the username field</td></tr></table>";
+ $output .= "<table border=\"0\" cellspacing=\"4\" cellpadding=\"4\" style=\"margin: auto; width: 80%;\"><tr><th colspan=\"2\" style=\"text-align: left;\">_auth function parameters</th></tr><tr><th>\$name</th><td>The substring before the final <i>'@'</i> character in the username field</td></tr><tr><th>\$pass</th><td>The whole string submitted by the user in the password field</td></tr><tr><th>\$server</th><td>The substring after the final <i>'@'</i> symbol in the username field</td></tr></table>";
$output .= "<p>So now lets use that \$name, \$pass, and \$server which was passed to our <i>_auth</i> function. Blogger authenticates users via ". l("XML-RPC", "www.xmlrpc.org") .". Your module may authenticate using a different technique. Drupal doesn't reallly care how your module communicates with its registration source. It just <b>trusts</b> the module.</p>";
$output .= "<p>The lines above illustrate a typical ". l("XML-RPC", "www.xmlrpc.org") ." method call. Here we build up a message and send it to Blogger, storing the response in a variable called <i>\$response</i>. The message we pass conforms to the published ". l("Blogger XML-RPC Application Programmers Interface (API)", "plant.blogger.com/API") .". Your module will no doubt implement a different API. One peculiarity of this module is that we don't actually use the $server parameter. Blogger only accepts authentication at <i>plant.blogger.com</i>, so we hard-code that value into the <i>xmlrpc_client()</i> function. A more typical example might be the jabber module, which uses the <i>\$server</i> parameter to determine where to send the authentication request. Also of note is the '5' parameter in the <i>\$client->send\(\)</i> call. This is a timeout value in seconds. All authentication modules should implement a timeout on their external calls. This makes sure to return control to the user.module if your registration database has become inoperable or unreachable.</p>";
$output .= "<pre>
@@ -1790,7 +1790,7 @@ function user_help_devel_da() {
function user_help_devel_userhook() {
- $output .= "<h3><a name=\"userhook\">module_user()</a></h3><p>The <b>_user()</b> hook provides a mechanism for inserting text and form fields into the ". l("registration","user/register") .", ". l("user account view/edit", "user") .", and ". l("administer users", "admin/user") ." pages. This is useful if you want to add a custom field for your particular community. This is best illustrated by the ". l("profile.module", "cvs.drupal.org/viewcvs/drupal/modules/profile.module") .". The profile.module is meant to be customized for your needs. Please download it and hack away until it does what you need.</p>";
+ $output .= "<h3><a id=\"userhook\">module_user()</a></h3><p>The <b>_user()</b> hook provides a mechanism for inserting text and form fields into the ". l("registration","user/register") .", ". l("user account view/edit", "user") .", and ". l("administer users", "admin/user") ." pages. This is useful if you want to add a custom field for your particular community. This is best illustrated by the ". l("profile.module", "cvs.drupal.org/viewcvs/drupal/modules/profile.module") .". The profile.module is meant to be customized for your needs. Please download it and hack away until it does what you need.</p>";
$output .= "<p>Consider this simpler example from a fictional recipe community web site called Julia's Kitchen. Julia customizes her Drupal powered site by creating a new file called <i>julia.module</i>. That file does the following:<ul><li>new members must agree to Julia's Privacy Policy on the reg page.</li><li>members may list their favorite ingredients on their public user profile page</li></ul></p>";
diff --git a/modules/watchdog.module b/modules/watchdog.module
index fec7bd8674f330066083ef755c81fe7f10d79106..97cbf14ec2d462128bcb24080e03072e13f771a9 100644
--- a/modules/watchdog.module
+++ b/modules/watchdog.module
@@ -57,14 +57,14 @@ function watchdog_overview($type) {
while ($watchdog = db_fetch_object($result)) {
if ($background = $color[$watchdog->type]) {
- $data .= " <tr bgcolor=\"$background\"><td nowrap=\"nowrap\">". format_date($watchdog->timestamp, "small") ."</td><td>". substr(strip_tags($watchdog->message), 0, 64) ."</td><td align=\"center\">". format_name($watchdog) ."</td><td align=\"center\">$watchdog->link</td><td align=\"center\">". l(t("view details"), "admin/watchdog/view/$watchdog->wid") ."</td></tr>";
+ $data .= " <tr bgcolor=\"$background\"><td>". format_date($watchdog->timestamp, "small") ."</td><td>". substr(strip_tags($watchdog->message), 0, 64) ."</td><td style=\"text-align: center;\">". format_name($watchdog) ."</td><td style=\"text-align: center;\">$watchdog->link</td><td style=\"text-align: center;\">". l(t("view details"), "admin/watchdog/view/$watchdog->wid") ."</td></tr>";
}
}
$output .= "<table>";
$output .= " <tr><th>" . t("date") . "</th><th>" . t("event") . "</th><th>" . t("user") . "</th><th colspan=\"2\">" . t("operations") . "</th></tr>";
- $output .= ($data ? $data : "<tr><td align=\"center\" colspan=\"4\" nowrap=\"nowrap\">". t("No system messages currently available.") ."</td></tr>");
- $output .= (($pager = pager_display(NULL, 50, 0, "admin")) ? "<tr><td align=\"center\" colspan=\"4\">$pager</td></tr>" : "");
+ $output .= ($data ? $data : "<tr><td style=\"text-align: center;\" colspan=\"4\">". t("No system messages currently available.") ."</td></tr>");
+ $output .= (($pager = pager_display(NULL, 50, 0, "admin")) ? "<tr><td style=\"text-align: center;\" colspan=\"4\">$pager</td></tr>" : "");
$output .= "</table>";
return $output;
diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module
index fec7bd8674f330066083ef755c81fe7f10d79106..97cbf14ec2d462128bcb24080e03072e13f771a9 100644
--- a/modules/watchdog/watchdog.module
+++ b/modules/watchdog/watchdog.module
@@ -57,14 +57,14 @@ function watchdog_overview($type) {
while ($watchdog = db_fetch_object($result)) {
if ($background = $color[$watchdog->type]) {
- $data .= " <tr bgcolor=\"$background\"><td nowrap=\"nowrap\">". format_date($watchdog->timestamp, "small") ."</td><td>". substr(strip_tags($watchdog->message), 0, 64) ."</td><td align=\"center\">". format_name($watchdog) ."</td><td align=\"center\">$watchdog->link</td><td align=\"center\">". l(t("view details"), "admin/watchdog/view/$watchdog->wid") ."</td></tr>";
+ $data .= " <tr bgcolor=\"$background\"><td>". format_date($watchdog->timestamp, "small") ."</td><td>". substr(strip_tags($watchdog->message), 0, 64) ."</td><td style=\"text-align: center;\">". format_name($watchdog) ."</td><td style=\"text-align: center;\">$watchdog->link</td><td style=\"text-align: center;\">". l(t("view details"), "admin/watchdog/view/$watchdog->wid") ."</td></tr>";
}
}
$output .= "<table>";
$output .= " <tr><th>" . t("date") . "</th><th>" . t("event") . "</th><th>" . t("user") . "</th><th colspan=\"2\">" . t("operations") . "</th></tr>";
- $output .= ($data ? $data : "<tr><td align=\"center\" colspan=\"4\" nowrap=\"nowrap\">". t("No system messages currently available.") ."</td></tr>");
- $output .= (($pager = pager_display(NULL, 50, 0, "admin")) ? "<tr><td align=\"center\" colspan=\"4\">$pager</td></tr>" : "");
+ $output .= ($data ? $data : "<tr><td style=\"text-align: center;\" colspan=\"4\">". t("No system messages currently available.") ."</td></tr>");
+ $output .= (($pager = pager_display(NULL, 50, 0, "admin")) ? "<tr><td style=\"text-align: center;\" colspan=\"4\">$pager</td></tr>" : "");
$output .= "</table>";
return $output;
diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme
index 4952d1426771716741141926a8dde29db5b439c2..e8664fdc01ba8d814dea4569833256f706978869 100644
--- a/themes/marvin/marvin.theme
+++ b/themes/marvin/marvin.theme
@@ -43,7 +43,7 @@ function header($title = "") {
<td> </td>
</tr>
<tr>
- <td align="right" colspan="2">
+ <td colspan="2" style="text-align: right;">
<small>
<?php
print $this->links(link_page());
@@ -52,7 +52,7 @@ function header($title = "") {
</td>
</tr>
<tr>
- <td valign="top" width="85%">
+ <td style="vertical-align: top; width: 85%;">
<?php
}
@@ -63,7 +63,7 @@ function node($node, $main = 0) {
}
print "\n<!-- node: \"$node->title\" -->\n";
- print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\n";
+ print "<table cellpadding=\"0\" cellspacing=\"0\" style=\"border 0px; width: 100%;\">\n";
print " <tr><td colspan=\"2\"><img src=\"$this->path/images/drop.gif\" alt=\"\" /> <b>$node->title</b></td></tr>\n";
print " <tr valign=\"bottom\"><td colspan=\"2\" bgcolor=\"#000000\" width=\"100%\"><img src=\"$this->path/images/pixel.gif\" width=\"1\" height=\"1\" alt=\"\" /></td></tr>\n";
print " <tr><td nowrap=\"nowrap\"><font color=\"#7C7C7C\"><small>". t("Submitted by %a on %b", array("%a" => format_name($node), "%b" => format_date($node->created, "large"))); ?><?php print "</small></font></td><td align=\"right\" valign=\"top\" nowrap=\"nowrap\"><small>". $this->links($terms) ."</small></td></tr>\n";
diff --git a/update.php b/update.php
index 16f5a436165cd5d107af83eefd3e01bd92844047..abb4489e6ad1567652be606cfe497b09bdc12d56 100644
--- a/update.php
+++ b/update.php
@@ -801,7 +801,7 @@ function update_page_header($title) {
</style>
EOF;
$output .= "</head><body><a href=\"http://drupal.org/\">";
- $output .= "<img align=\"right\" src=\"misc/druplicon-small.gif\" alt=\"Druplicon - Drupal logo\" border=\"0\" /></a>";
+ $output .= "<div id=\"logo\"><a href=\"http://drupal.org/\"><img src=\"misc/druplicon-small.gif\" alt=\"Druplicon - Drupal logo\" title=\"Druplicon - Drupal logo\" /></a></div>";
$output .= "<div id=\"update\"><h1>$title</h1>";
return $output;
}