- blog.module:

   + fixed visual glitch with 'read more' link (blog comments)
   + made it possible to delete your last blog item
   + fixed timestamp bug when previewing a new blog
   + fixed potential problem with blog_save()
   + fixed a few HTML/XHTML tinkos.

- statistics.module:
   + "yoursite.com" should no longer show up under "external referrers"
   + fixed "Referers of the last 31 years 37 weeks 1 hour 46 min 40 sec" bug
   + xhtml-ified

- node.inc:
   + fixed watchdog message

- import.module:
   + small block improvement

8 files changed, 104 insertions, 114 deletions

diff --git a/includes/node.inc b/includes/node.inc
index b882d0740..1653415d1 100644
--- a/includes/node.inc
+++ b/includes/node.inc
@@ -51,7 +51,7 @@ function node_del($conditions) {
       db_query("DELETE FROM node WHERE nid = '$node->nid'");
       db_query("DELETE FROM $node->type WHERE lid = '$node->lid' AND nid = '$node->nid'");
       db_query("DELETE FROM comments WHERE lid = '$node->nid'");
-      watchdog("message", "node: deleted '$node->title'");
+      watchdog("special", "node: deleted '$node->title'");
       return $node;
     }
   }
diff --git a/modules/aggregator.module b/modules/aggregator.module
index 9808fe200..3d03c5d3e 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -105,7 +105,7 @@ function import_feed_block($feed) {
 }
 
 function import_block() {
-  return import_get_bundles();
+  return array_merge(import_get_bundles(), import_get_feeds());
 }
 
 function import_get_bundles($attributes = 0) {
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 9808fe200..3d03c5d3e 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -105,7 +105,7 @@ function import_feed_block($feed) {
 }
 
 function import_block() {
-  return import_get_bundles();
+  return array_merge(import_get_bundles(), import_get_feeds());
 }
 
 function import_get_bundles($attributes = 0) {
diff --git a/modules/blog.module b/modules/blog.module
index d8b36536d..5106da1f2 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -8,17 +8,13 @@ class Blog {
     $this->title = $blog[title];
     $this->body = $blog[body];
     $this->userid = $blog[userid] ? $blog[userid] : $user->userid;
-    $this->timestamp = $blog[timestamp];
+    $this->timestamp = $blog[timestamp] ? $blog[timestamp] : time();
   }
 }
 
 function blog_help() {
  ?>
   <p>Drupal's blog module allows registered users to maintain an online blog or diary.  It provides easy-to-write and easy-to-read online diaries or journals that can be filled with daily thoughts, poetry, boneless blabber, spiritual theories, intimate details, valuable experiences, cynical rants, semi-coherent comments, writing experiments, artistic babblings, critics on current facts, fresh insights, diverse dreams, chronicles and mumbling madness available for public consumption.</p>
-  <p>TODO</p>:
-  <p>Add an entry on the account display for another user, linked to module.php?mod=blog&name=$userid</p>
-  <p>Provide links on other "Noded" module displays to allow the node to be blogged module.php?mod=blog&type=blog&id=$nid . Currently these are available on blogs and import displays.</p>
-  <p>Combine the calendar display class with the node calendar display class.</p>
  <?php
 }
 
@@ -34,7 +30,7 @@ function blog_page_all($num = 20) {
   while ($blog = db_fetch_object($result))  {
     $output .= blog_format_link($blog) ." ";
     $output .= "<a href=\"module.php?mod=blog&name=". urlencode($blog->userid) ."\"><img src=\"misc/earth.gif\" border= \"0\" width=\"11\" height=\"11\" alt=\"". t("This blog") ."\" /></a> ";
-    $output .= format_username($blog->userid) ." ". t("on") ." ". format_date($blog->timestamp) .":<br />";
+    $output .= format_username($blog->userid) .", ". format_date($blog->timestamp, "small") .":<br />";
     $output .= "<blockquote><b>". check_input($blog->title) ."</b><br />" . check_output($blog->body, 1) ."</blockquote>\n";
   }
 
@@ -64,7 +60,7 @@ function blog_page_user($userid = 0, $date = 0) {
     ** Display the last blogs for this user:
     */
 
-    $result = db_query("SELECT n.nid, n.timestamp FROM node n LEFT JOIN users u ON u.id = n.author WHERE n.type = 'blog' AND u.userid = '". check_input($userid) ."' AND n.timestamp > ". (time() - 2592000) ." ORDER BY n.timestamp DESC LIMIT 15");
+    $result = db_query("SELECT n.nid, n.timestamp FROM node n LEFT JOIN users u ON u.id = n.author WHERE n.type = 'blog' AND u.userid = '". check_input($userid) ."' AND n.timestamp > ". (time() - 2592000) ." ORDER BY n.timestamp DESC LIMIT 20");
     while ($blog = db_fetch_object($result)) {
       if ($date != date("ndy", $blog->timestamp)) {
         $date = date("ndy", $blog->timestamp);
@@ -111,35 +107,35 @@ function blog_status() {
 function blog_remove($nid) {
   global $status, $user;
 
-  node_save(array(nid => $nid), array(status => $status[dumped]));
-  $blog = node_get_object(array(type => "blog", nid => "$nid"));
-  if ((user_access("administer blogs")) or ($blog->userid == $user->userid)) {
-    node_del(array(type => "blog", nid => $nid, lid => $blog->lid));
+  $blog = node_get_object(array(nid => $nid, type => "blog"));
+
+  if ($blog && $blog->author == $user->id) {
+    node_save(array(nid => $nid), array(status => $status[dumped]));
+    node_del(array(type => "blog", nid => $nid));
   }
 }
 
 function blog_format_link($blog) {
   global $user;
 
-  if ($user && user_access("post blogs")) {
-    return "<a href=\"submit.php?mod=blog&type=blog&id=$blog->nid\"><img src=\"misc/blog.gif\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\"></a> ";
+  if ($user->id && user_access("post blogs")) {
+    return "<a href=\"submit.php?mod=blog&type=blog&id=$blog->nid\"><img src=\"misc/blog.gif\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("blog this item") ."\" /></a> ";
   }
 }
 
-function blog_view($node) {
+function blog_view($node, $main = 0) {
   global $status, $theme;
 
   $userid = urlencode($node->userid);
 
-  $header .= "<table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n";
-  $header .= " <tr>\n";
-  $header .= "  <td><b><a href=\"module.php?mod=blog&op=view&name=$userid\">". $node->userid ."'s ". t("blog") ."</a></b></td>\n";
-  $header .= "  <td align=\"right\"><b><a href=\"module.php?mod=blog&op=view&name=$userid&date=$node->timestamp\">". format_date($node->timestamp, custom, "d-M-Y") ."</a></b></td>\n";
-  $header .= " </tr>\n";
-  $header .= "</table>\n";
+  $header .= "<table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">";
+  $header .= " <tr>";
+  $header .= "  <td><b><a href=\"module.php?mod=blog&op=view&name=$userid\">". $node->userid ."'s ". t("blog") ."</a></b></td>";
+  $header .= "  <td align=\"right\"><b><a href=\"module.php?mod=blog&op=view&name=$userid&date=$node->timestamp\">". format_date($node->timestamp, custom, "d-M-Y") ."</a></b></td>";
+  $header .= " </tr>";
+  $header .= "</table>";
 
-  $output .= "<p>". check_output($node->body, 1) ."</p>\n";
-  $output .= "<p>[ ". implode(" | ", link_node($node)) ."]</p>\n";
+  $output .= check_output($node->body, 1) ."<p>[ ". implode(" | ", link_node($node)) ." ]</p>";
 
   $theme->box($header, $output);
 }
@@ -150,6 +146,7 @@ function blog_form($edit = array()) {
   if ($user->id) {
 
     if ($mod == "node" || $edit[type] == "blog") {
+      // do nothing
     }
     else if ($type == "blog") {
       $item = node_get_object(array(type => "blog", nid => $id));
@@ -162,7 +159,7 @@ function blog_form($edit = array()) {
       $edit["body"] = "<a href=\"$item->link\">$item->title</a> - ". check_output($item->description) ." [<a href=\"$item->flink\">$item->ftitle</a>]\n";
     }
 
-    if ($edit[title]) {
+    if ($edit["title"]) {
       $form .= blog_view(new Blog(node_preview($edit)));
     }
 
@@ -188,9 +185,7 @@ function blog_form($edit = array()) {
       $form .= form_submit(t("Submit"));
     }
 
-    $output .= form($REQUEST_URI, $form);
-
-    return $output;
+    return form($REQUEST_URI, $form);
   }
   else {
     return message_access();
@@ -201,11 +196,11 @@ function blog_save($edit) {
   global $status, $user;
 
   if ($user->id && (user_access("administer blogs") || user_access("post blogs"))) {
-    if (!$edit["nid"]) {
-      node_save($edit, array(attributes => node_attributes_save("blog", $edit), author => $user->id, body, comment => variable_get("blog_comment", 0), moderate => variable_get("blog_moderate", ""), promote => variable_get("blog_promote", 0), score => 0, status => variable_get("blog_status", $status[queued]), timestamp => time(), title, type => "blog", votes => 0));
+    if ($edit["nid"]) {
+      node_save($edit, array(title, body, type => "blog"));
     }
     else {
-      node_save($edit, array(title, body, type => "blog"));
+      node_save($edit, array(attributes => node_attributes_save("blog", $edit), author => $user->id, body, comment => variable_get("blog_comment", 0), moderate => variable_get("blog_moderate", ""), promote => variable_get("blog_promote", 0), score => 0, status => variable_get("blog_status", $status[posted]), timestamp => time(), title, type => "blog", votes => 0));
     }
   }
 }
@@ -223,7 +218,7 @@ function blog_edit_history($nid) {
   //  $edate = mktime(23, 59, 59, date("m", $blog->timestamp), date("d", $blog->timestamp), date("Y", $blog->timestamp));
   //  $result = db_query("SELECT n.title, b.body, n.timestamp, n.nid FROM blog b LEFT JOIN node n ON b.nid = n.nid WHERE n.author = '$user->id' AND n.timestamp > '$sdate' AND n.timestamp < '$edate' ORDER BY b.lid DESC LIMIT 100");
 
-  $result = db_query("SELECT n.nid, n.title, n.timestamp, b.body FROM blog b LEFT JOIN node n ON b.nid = n.nid WHERE n.author = '". check_input($user->id) ."' AND n.nid < '". check_input($nid) ."' ORDER BY b.lid DESC LIMIT 15");
+  $result = db_query("SELECT n.nid, n.title, n.timestamp, b.body FROM blog b LEFT JOIN node n ON b.nid = n.nid WHERE n.author = '". check_input($user->id) ."' AND n.nid <= '". check_input($nid) ."' ORDER BY b.lid DESC LIMIT 15");
 
   $output .= "<table cellpadding=\"3\" cellspacing=\"3\" border=\"0\" width=\"100%\">";
   while ($blog = db_fetch_object($result)) {
@@ -251,7 +246,7 @@ function blog_page() {
 }
 
 function blog_user() {
-  global $op, $id, $name, $date, $edit, $theme, $user;
+  global $op, $id, $edit, $theme, $user;
 
   if (user_access("post blogs")) {
     switch ($op) {
@@ -285,7 +280,7 @@ function blog_link($type) {
   }
 
   if ($type == "menu" && user_access("post blogs")) {
-    $links[] = "<a href=\"submit.php?mod=blog\">". t("edit your blog") ."</a>";
+    $links[] = "<a href=\"submit.php?mod=blog\">". t("add blog entry") ."</a>";
     $links[] = "<a href=\"module.php?mod=blog&op=view&name=". urlencode($user->userid) ."\">". t("view your blog") ."</a>";
   }
 
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index d8b36536d..5106da1f2 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -8,17 +8,13 @@ class Blog {
     $this->title = $blog[title];
     $this->body = $blog[body];
     $this->userid = $blog[userid] ? $blog[userid] : $user->userid;
-    $this->timestamp = $blog[timestamp];
+    $this->timestamp = $blog[timestamp] ? $blog[timestamp] : time();
   }
 }
 
 function blog_help() {
  ?>
   <p>Drupal's blog module allows registered users to maintain an online blog or diary.  It provides easy-to-write and easy-to-read online diaries or journals that can be filled with daily thoughts, poetry, boneless blabber, spiritual theories, intimate details, valuable experiences, cynical rants, semi-coherent comments, writing experiments, artistic babblings, critics on current facts, fresh insights, diverse dreams, chronicles and mumbling madness available for public consumption.</p>
-  <p>TODO</p>:
-  <p>Add an entry on the account display for another user, linked to module.php?mod=blog&name=$userid</p>
-  <p>Provide links on other "Noded" module displays to allow the node to be blogged module.php?mod=blog&type=blog&id=$nid . Currently these are available on blogs and import displays.</p>
-  <p>Combine the calendar display class with the node calendar display class.</p>
  <?php
 }
 
@@ -34,7 +30,7 @@ function blog_page_all($num = 20) {
   while ($blog = db_fetch_object($result))  {
     $output .= blog_format_link($blog) ." ";
     $output .= "<a href=\"module.php?mod=blog&name=". urlencode($blog->userid) ."\"><img src=\"misc/earth.gif\" border= \"0\" width=\"11\" height=\"11\" alt=\"". t("This blog") ."\" /></a> ";
-    $output .= format_username($blog->userid) ." ". t("on") ." ". format_date($blog->timestamp) .":<br />";
+    $output .= format_username($blog->userid) .", ". format_date($blog->timestamp, "small") .":<br />";
     $output .= "<blockquote><b>". check_input($blog->title) ."</b><br />" . check_output($blog->body, 1) ."</blockquote>\n";
   }
 
@@ -64,7 +60,7 @@ function blog_page_user($userid = 0, $date = 0) {
     ** Display the last blogs for this user:
     */
 
-    $result = db_query("SELECT n.nid, n.timestamp FROM node n LEFT JOIN users u ON u.id = n.author WHERE n.type = 'blog' AND u.userid = '". check_input($userid) ."' AND n.timestamp > ". (time() - 2592000) ." ORDER BY n.timestamp DESC LIMIT 15");
+    $result = db_query("SELECT n.nid, n.timestamp FROM node n LEFT JOIN users u ON u.id = n.author WHERE n.type = 'blog' AND u.userid = '". check_input($userid) ."' AND n.timestamp > ". (time() - 2592000) ." ORDER BY n.timestamp DESC LIMIT 20");
     while ($blog = db_fetch_object($result)) {
       if ($date != date("ndy", $blog->timestamp)) {
         $date = date("ndy", $blog->timestamp);
@@ -111,35 +107,35 @@ function blog_status() {
 function blog_remove($nid) {
   global $status, $user;
 
-  node_save(array(nid => $nid), array(status => $status[dumped]));
-  $blog = node_get_object(array(type => "blog", nid => "$nid"));
-  if ((user_access("administer blogs")) or ($blog->userid == $user->userid)) {
-    node_del(array(type => "blog", nid => $nid, lid => $blog->lid));
+  $blog = node_get_object(array(nid => $nid, type => "blog"));
+
+  if ($blog && $blog->author == $user->id) {
+    node_save(array(nid => $nid), array(status => $status[dumped]));
+    node_del(array(type => "blog", nid => $nid));
   }
 }
 
 function blog_format_link($blog) {
   global $user;
 
-  if ($user && user_access("post blogs")) {
-    return "<a href=\"submit.php?mod=blog&type=blog&id=$blog->nid\"><img src=\"misc/blog.gif\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\"></a> ";
+  if ($user->id && user_access("post blogs")) {
+    return "<a href=\"submit.php?mod=blog&type=blog&id=$blog->nid\"><img src=\"misc/blog.gif\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("blog this item") ."\" /></a> ";
   }
 }
 
-function blog_view($node) {
+function blog_view($node, $main = 0) {
   global $status, $theme;
 
   $userid = urlencode($node->userid);
 
-  $header .= "<table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n";
-  $header .= " <tr>\n";
-  $header .= "  <td><b><a href=\"module.php?mod=blog&op=view&name=$userid\">". $node->userid ."'s ". t("blog") ."</a></b></td>\n";
-  $header .= "  <td align=\"right\"><b><a href=\"module.php?mod=blog&op=view&name=$userid&date=$node->timestamp\">". format_date($node->timestamp, custom, "d-M-Y") ."</a></b></td>\n";
-  $header .= " </tr>\n";
-  $header .= "</table>\n";
+  $header .= "<table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">";
+  $header .= " <tr>";
+  $header .= "  <td><b><a href=\"module.php?mod=blog&op=view&name=$userid\">". $node->userid ."'s ". t("blog") ."</a></b></td>";
+  $header .= "  <td align=\"right\"><b><a href=\"module.php?mod=blog&op=view&name=$userid&date=$node->timestamp\">". format_date($node->timestamp, custom, "d-M-Y") ."</a></b></td>";
+  $header .= " </tr>";
+  $header .= "</table>";
 
-  $output .= "<p>". check_output($node->body, 1) ."</p>\n";
-  $output .= "<p>[ ". implode(" | ", link_node($node)) ."]</p>\n";
+  $output .= check_output($node->body, 1) ."<p>[ ". implode(" | ", link_node($node)) ." ]</p>";
 
   $theme->box($header, $output);
 }
@@ -150,6 +146,7 @@ function blog_form($edit = array()) {
   if ($user->id) {
 
     if ($mod == "node" || $edit[type] == "blog") {
+      // do nothing
     }
     else if ($type == "blog") {
       $item = node_get_object(array(type => "blog", nid => $id));
@@ -162,7 +159,7 @@ function blog_form($edit = array()) {
       $edit["body"] = "<a href=\"$item->link\">$item->title</a> - ". check_output($item->description) ." [<a href=\"$item->flink\">$item->ftitle</a>]\n";
     }
 
-    if ($edit[title]) {
+    if ($edit["title"]) {
       $form .= blog_view(new Blog(node_preview($edit)));
     }
 
@@ -188,9 +185,7 @@ function blog_form($edit = array()) {
       $form .= form_submit(t("Submit"));
     }
 
-    $output .= form($REQUEST_URI, $form);
-
-    return $output;
+    return form($REQUEST_URI, $form);
   }
   else {
     return message_access();
@@ -201,11 +196,11 @@ function blog_save($edit) {
   global $status, $user;
 
   if ($user->id && (user_access("administer blogs") || user_access("post blogs"))) {
-    if (!$edit["nid"]) {
-      node_save($edit, array(attributes => node_attributes_save("blog", $edit), author => $user->id, body, comment => variable_get("blog_comment", 0), moderate => variable_get("blog_moderate", ""), promote => variable_get("blog_promote", 0), score => 0, status => variable_get("blog_status", $status[queued]), timestamp => time(), title, type => "blog", votes => 0));
+    if ($edit["nid"]) {
+      node_save($edit, array(title, body, type => "blog"));
     }
     else {
-      node_save($edit, array(title, body, type => "blog"));
+      node_save($edit, array(attributes => node_attributes_save("blog", $edit), author => $user->id, body, comment => variable_get("blog_comment", 0), moderate => variable_get("blog_moderate", ""), promote => variable_get("blog_promote", 0), score => 0, status => variable_get("blog_status", $status[posted]), timestamp => time(), title, type => "blog", votes => 0));
     }
   }
 }
@@ -223,7 +218,7 @@ function blog_edit_history($nid) {
   //  $edate = mktime(23, 59, 59, date("m", $blog->timestamp), date("d", $blog->timestamp), date("Y", $blog->timestamp));
   //  $result = db_query("SELECT n.title, b.body, n.timestamp, n.nid FROM blog b LEFT JOIN node n ON b.nid = n.nid WHERE n.author = '$user->id' AND n.timestamp > '$sdate' AND n.timestamp < '$edate' ORDER BY b.lid DESC LIMIT 100");
 
-  $result = db_query("SELECT n.nid, n.title, n.timestamp, b.body FROM blog b LEFT JOIN node n ON b.nid = n.nid WHERE n.author = '". check_input($user->id) ."' AND n.nid < '". check_input($nid) ."' ORDER BY b.lid DESC LIMIT 15");
+  $result = db_query("SELECT n.nid, n.title, n.timestamp, b.body FROM blog b LEFT JOIN node n ON b.nid = n.nid WHERE n.author = '". check_input($user->id) ."' AND n.nid <= '". check_input($nid) ."' ORDER BY b.lid DESC LIMIT 15");
 
   $output .= "<table cellpadding=\"3\" cellspacing=\"3\" border=\"0\" width=\"100%\">";
   while ($blog = db_fetch_object($result)) {
@@ -251,7 +246,7 @@ function blog_page() {
 }
 
 function blog_user() {
-  global $op, $id, $name, $date, $edit, $theme, $user;
+  global $op, $id, $edit, $theme, $user;
 
   if (user_access("post blogs")) {
     switch ($op) {
@@ -285,7 +280,7 @@ function blog_link($type) {
   }
 
   if ($type == "menu" && user_access("post blogs")) {
-    $links[] = "<a href=\"submit.php?mod=blog\">". t("edit your blog") ."</a>";
+    $links[] = "<a href=\"submit.php?mod=blog\">". t("add blog entry") ."</a>";
     $links[] = "<a href=\"module.php?mod=blog&op=view&name=". urlencode($user->userid) ."\">". t("view your blog") ."</a>";
   }
 
diff --git a/modules/import.module b/modules/import.module
index 9808fe200..3d03c5d3e 100644
--- a/modules/import.module
+++ b/modules/import.module
@@ -105,7 +105,7 @@ function import_feed_block($feed) {
 }
 
 function import_block() {
-  return import_get_bundles();
+  return array_merge(import_get_bundles(), import_get_feeds());
 }
 
 function import_get_bundles($attributes = 0) {
diff --git a/modules/statistics.module b/modules/statistics.module
index f5acfaacc..e5eb7465f 100644
--- a/modules/statistics.module
+++ b/modules/statistics.module
@@ -1,9 +1,7 @@
 <?php
 
-if (variable_get("referer", 0)) {
-  if ($referer = getenv("HTTP_REFERER")) {
-    db_query("INSERT INTO referer (URL, timestamp) values ('". check_input($referer) ."', '". time() ."')");
-  }
+if (variable_get("referer", 0) && $referer = getenv("HTTP_REFERER")) {
+  db_query("INSERT INTO referer (URL, timestamp) values ('". check_input($referer) ."', '". time() ."')");
 }
 
 function statistics_cron() {
@@ -23,7 +21,7 @@ function statistics_link($type) {
 }
 
 function statistics_conf_options() {
-  $period = array(3600 => format_interval(3600), 10800 => format_interval(10800), 21600 => format_interval(21600), 32400 => format_interval(32400), 43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600), 2419200 => format_interval(2419200), 1000000000 => "Never");
+  $period = array(3600 => format_interval(3600), 10800 => format_interval(10800), 21600 => format_interval(21600), 32400 => format_interval(32400), 43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600), 2419200 => format_interval(2419200), 4838400 => format_interval(4838400), 9676800 => format_interval(9676800));
   $output .= form_select("Track referers", "referer", variable_get("referer", 0), array("Disabled", "Enabled"), "If enabled, Drupal will count how many times your website is referred to by other websites.");
   $output .= form_select("Discard referers older than", "referer_clear", variable_get("referer_clear", 604800), $period, "The time referer entries should be kept.  Older entries will be automatically discarded.  Requires crontab.");
   return $output;
@@ -32,12 +30,12 @@ function statistics_conf_options() {
 function statistics_table_1($query) {
   $result = db_query($query);
 
-  $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\">\n";
-  $output .= " <TR><TH>URL</TH><TH>date</TH></TR>\n";
+  $output .= "<table border=\"1\" cellpadding=\"3\" cellspacing=\"0\">\n";
+  $output .= " <tr><th>URL</th><th>date</th></tr>\n";
   while ($referer = db_fetch_object($result)) {
-    $output .= "<TR><TD><A HREF=\"". check_output($referer->url) ."\">". substr(check_output($referer->url), 0, 100) ."</A></TD><TD>". format_date($referer->timestamp, "small") ."</TD></TR>";
+    $output .= "<tr><td><a href=\"". check_output($referer->url) ."\">". substr(check_output($referer->url), 0, 100) ."</a></td><td>". format_date($referer->timestamp, "small") ."</td></tr>";
   }
-  $output .= "</TABLE>\n";
+  $output .= "</table>\n";
 
   return $output;
 }
@@ -45,34 +43,36 @@ function statistics_table_1($query) {
 function statistics_table_2($query) {
   $result = db_query($query);
 
-  $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\">\n";
-  $output .= " <TR><TH>URL</TH><TH>number</TH></TR>\n";
+  $output .= "<table border=\"1\" cellpadding=\"3\" cellspacing=\"0\">\n";
+  $output .= " <tr><th>URL</th><th>number</th></tr>\n";
   while ($referer = db_fetch_object($result)) {
-    $output .= "<TR><TD><A HREF=\"". check_output($referer->url) ."\">". substr(check_output($referer->url), 0, 100) ."</A></TD><TD>". check_output($referer->count) ."</TD></TR>";
+    $output .= "<tr><td><a href=\"". check_output($referer->url) ."\">". substr(check_output($referer->url), 0, 100) ."</a></td><td>". check_output($referer->count) ."</td></tr>";
   }
-  $output .= "</TABLE>\n";
+  $output .= "</table>\n";
 
   return $output;
 }
 
 function statistics_referer_internal() {
-  $output .= "<H3>Most recent referers</H3>\n";
-  $output .= statistics_table_1("SELECT url, timestamp FROM referer WHERE url LIKE '". path_uri() ."%' ORDER BY timestamp DESC LIMIT 15");
+  global $HTTP_HOST;
+
+  $output .= "<h3>Most recent internal referers</h3>\n";
+  $output .= statistics_table_1("SELECT url, timestamp FROM referer WHERE url LIKE '%". check_input($HTTP_HOST) ."%' ORDER BY timestamp DESC LIMIT 15");
 
-  $output .= "<H3>Referers of the last ". format_interval(variable_get("referer_clear", 604800)) ."</H3>\n";
-  $output .= statistics_table_2("SELECT url, COUNT(url) AS count FROM referer WHERE url LIKE '". path_uri() ."%' GROUP BY url ORDER BY count DESC");
+  $output .= "<h3>Internal referers of the last ". format_interval(variable_get("referer_clear", 604800)) ."</h3>\n";
+  $output .= statistics_table_2("SELECT url, COUNT(url) AS count FROM referer WHERE url LIKE '%". check_input($HTTP_HOST) ."%' GROUP BY url ORDER BY count DESC");
 
   return $output;
 }
 
 function statistics_referer_external() {
-  $result = db_query("SELECT url, COUNT(url) AS count FROM referer WHERE url NOT LIKE '". path_uri() ."%' GROUP BY url ORDER BY count DESC");
+  global $HTTP_HOST;
 
-  $output .= "<H3>Most recent referers</H3>\n";
-  $output .= statistics_table_1("SELECT url, timestamp FROM referer WHERE url NOT LIKE '". path_uri() ."%' ORDER BY timestamp DESC LIMIT 15");
+  $output .= "<h3>Most recent external referers</h3>\n";
+  $output .= statistics_table_1("SELECT url, timestamp FROM referer WHERE url NOT LIKE '%". check_input($HTTP_HOST) ."%' ORDER BY timestamp DESC LIMIT 15");
 
-  $output .= "<H3>Referers of the last ". format_interval(variable_get("referer_clear", 604800)) ."</H3>\n";
-  $output .= statistics_table_2("SELECT url, COUNT(url) AS count FROM referer WHERE url NOT LIKE '". path_uri() ."%' GROUP BY url ORDER BY count DESC");
+  $output .= "<h3>External referers of the last ". format_interval(variable_get("referer_clear", 604800)) ."</h3>\n";
+  $output .= statistics_table_2("SELECT url, COUNT(url) AS count FROM referer WHERE url NOT LIKE '%". check_input($HTTP_HOST) ."%' GROUP BY url ORDER BY count DESC");
 
   return $output;
 }
@@ -82,7 +82,7 @@ function statistics_admin() {
 
   if (user_access("administer statistics")) {
 
-    print "<SMALL><A HREF=\"admin.php?mod=statistics&type=internal+referer\">internal referers</A> | <A HREF=\"admin.php?mod=statistics&type=external+referer\">external referers</A></SMALL><HR>\n";
+    print "<small><a href=\"admin.php?mod=statistics&type=internal+referer\">internal referers</a> | <a href=\"admin.php?mod=statistics&type=external+referer\">external referers</a></small><hr />\n";
 
     switch ($type) {
       case "internal referer":
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index f5acfaacc..e5eb7465f 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -1,9 +1,7 @@
 <?php
 
-if (variable_get("referer", 0)) {
-  if ($referer = getenv("HTTP_REFERER")) {
-    db_query("INSERT INTO referer (URL, timestamp) values ('". check_input($referer) ."', '". time() ."')");
-  }
+if (variable_get("referer", 0) && $referer = getenv("HTTP_REFERER")) {
+  db_query("INSERT INTO referer (URL, timestamp) values ('". check_input($referer) ."', '". time() ."')");
 }
 
 function statistics_cron() {
@@ -23,7 +21,7 @@ function statistics_link($type) {
 }
 
 function statistics_conf_options() {
-  $period = array(3600 => format_interval(3600), 10800 => format_interval(10800), 21600 => format_interval(21600), 32400 => format_interval(32400), 43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600), 2419200 => format_interval(2419200), 1000000000 => "Never");
+  $period = array(3600 => format_interval(3600), 10800 => format_interval(10800), 21600 => format_interval(21600), 32400 => format_interval(32400), 43200 => format_interval(43200), 86400 => format_interval(86400), 172800 => format_interval(172800), 259200 => format_interval(259200), 604800 => format_interval(604800), 1209600 => format_interval(1209600), 2419200 => format_interval(2419200), 4838400 => format_interval(4838400), 9676800 => format_interval(9676800));
   $output .= form_select("Track referers", "referer", variable_get("referer", 0), array("Disabled", "Enabled"), "If enabled, Drupal will count how many times your website is referred to by other websites.");
   $output .= form_select("Discard referers older than", "referer_clear", variable_get("referer_clear", 604800), $period, "The time referer entries should be kept.  Older entries will be automatically discarded.  Requires crontab.");
   return $output;
@@ -32,12 +30,12 @@ function statistics_conf_options() {
 function statistics_table_1($query) {
   $result = db_query($query);
 
-  $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\">\n";
-  $output .= " <TR><TH>URL</TH><TH>date</TH></TR>\n";
+  $output .= "<table border=\"1\" cellpadding=\"3\" cellspacing=\"0\">\n";
+  $output .= " <tr><th>URL</th><th>date</th></tr>\n";
   while ($referer = db_fetch_object($result)) {
-    $output .= "<TR><TD><A HREF=\"". check_output($referer->url) ."\">". substr(check_output($referer->url), 0, 100) ."</A></TD><TD>". format_date($referer->timestamp, "small") ."</TD></TR>";
+    $output .= "<tr><td><a href=\"". check_output($referer->url) ."\">". substr(check_output($referer->url), 0, 100) ."</a></td><td>". format_date($referer->timestamp, "small") ."</td></tr>";
   }
-  $output .= "</TABLE>\n";
+  $output .= "</table>\n";
 
   return $output;
 }
@@ -45,34 +43,36 @@ function statistics_table_1($query) {
 function statistics_table_2($query) {
   $result = db_query($query);
 
-  $output .= "<TABLE BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\">\n";
-  $output .= " <TR><TH>URL</TH><TH>number</TH></TR>\n";
+  $output .= "<table border=\"1\" cellpadding=\"3\" cellspacing=\"0\">\n";
+  $output .= " <tr><th>URL</th><th>number</th></tr>\n";
   while ($referer = db_fetch_object($result)) {
-    $output .= "<TR><TD><A HREF=\"". check_output($referer->url) ."\">". substr(check_output($referer->url), 0, 100) ."</A></TD><TD>". check_output($referer->count) ."</TD></TR>";
+    $output .= "<tr><td><a href=\"". check_output($referer->url) ."\">". substr(check_output($referer->url), 0, 100) ."</a></td><td>". check_output($referer->count) ."</td></tr>";
   }
-  $output .= "</TABLE>\n";
+  $output .= "</table>\n";
 
   return $output;
 }
 
 function statistics_referer_internal() {
-  $output .= "<H3>Most recent referers</H3>\n";
-  $output .= statistics_table_1("SELECT url, timestamp FROM referer WHERE url LIKE '". path_uri() ."%' ORDER BY timestamp DESC LIMIT 15");
+  global $HTTP_HOST;
+
+  $output .= "<h3>Most recent internal referers</h3>\n";
+  $output .= statistics_table_1("SELECT url, timestamp FROM referer WHERE url LIKE '%". check_input($HTTP_HOST) ."%' ORDER BY timestamp DESC LIMIT 15");
 
-  $output .= "<H3>Referers of the last ". format_interval(variable_get("referer_clear", 604800)) ."</H3>\n";
-  $output .= statistics_table_2("SELECT url, COUNT(url) AS count FROM referer WHERE url LIKE '". path_uri() ."%' GROUP BY url ORDER BY count DESC");
+  $output .= "<h3>Internal referers of the last ". format_interval(variable_get("referer_clear", 604800)) ."</h3>\n";
+  $output .= statistics_table_2("SELECT url, COUNT(url) AS count FROM referer WHERE url LIKE '%". check_input($HTTP_HOST) ."%' GROUP BY url ORDER BY count DESC");
 
   return $output;
 }
 
 function statistics_referer_external() {
-  $result = db_query("SELECT url, COUNT(url) AS count FROM referer WHERE url NOT LIKE '". path_uri() ."%' GROUP BY url ORDER BY count DESC");
+  global $HTTP_HOST;
 
-  $output .= "<H3>Most recent referers</H3>\n";
-  $output .= statistics_table_1("SELECT url, timestamp FROM referer WHERE url NOT LIKE '". path_uri() ."%' ORDER BY timestamp DESC LIMIT 15");
+  $output .= "<h3>Most recent external referers</h3>\n";
+  $output .= statistics_table_1("SELECT url, timestamp FROM referer WHERE url NOT LIKE '%". check_input($HTTP_HOST) ."%' ORDER BY timestamp DESC LIMIT 15");
 
-  $output .= "<H3>Referers of the last ". format_interval(variable_get("referer_clear", 604800)) ."</H3>\n";
-  $output .= statistics_table_2("SELECT url, COUNT(url) AS count FROM referer WHERE url NOT LIKE '". path_uri() ."%' GROUP BY url ORDER BY count DESC");
+  $output .= "<h3>External referers of the last ". format_interval(variable_get("referer_clear", 604800)) ."</h3>\n";
+  $output .= statistics_table_2("SELECT url, COUNT(url) AS count FROM referer WHERE url NOT LIKE '%". check_input($HTTP_HOST) ."%' GROUP BY url ORDER BY count DESC");
 
   return $output;
 }
@@ -82,7 +82,7 @@ function statistics_admin() {
 
   if (user_access("administer statistics")) {
 
-    print "<SMALL><A HREF=\"admin.php?mod=statistics&type=internal+referer\">internal referers</A> | <A HREF=\"admin.php?mod=statistics&type=external+referer\">external referers</A></SMALL><HR>\n";
+    print "<small><a href=\"admin.php?mod=statistics&type=internal+referer\">internal referers</a> | <a href=\"admin.php?mod=statistics&type=external+referer\">external referers</a></small><hr />\n";
 
     switch ($type) {
       case "internal referer":