From e81c014937a5a4c1628ae52efe00a04ae24b2257 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Thu, 12 Jul 2001 20:36:40 +0000 Subject: - 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 --- modules/statistics.module | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'modules/statistics.module') 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 @@ 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 .= "\n"; - $output .= " \n"; + $output .= "
URLdate
\n"; + $output .= " \n"; while ($referer = db_fetch_object($result)) { - $output .= ""; + $output .= ""; } - $output .= "
URLdate
url) ."\">". substr(check_output($referer->url), 0, 100) ."". format_date($referer->timestamp, "small") ."
url) ."\">". substr(check_output($referer->url), 0, 100) ."". format_date($referer->timestamp, "small") ."
\n"; + $output .= "\n"; return $output; } @@ -45,34 +43,36 @@ function statistics_table_1($query) { function statistics_table_2($query) { $result = db_query($query); - $output .= "\n"; - $output .= " \n"; + $output .= "
URLnumber
\n"; + $output .= " \n"; while ($referer = db_fetch_object($result)) { - $output .= ""; + $output .= ""; } - $output .= "
URLnumber
url) ."\">". substr(check_output($referer->url), 0, 100) ."". check_output($referer->count) ."
url) ."\">". substr(check_output($referer->url), 0, 100) ."". check_output($referer->count) ."
\n"; + $output .= "\n"; return $output; } function statistics_referer_internal() { - $output .= "

Most recent referers

\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 .= "

Most recent internal referers

\n"; + $output .= statistics_table_1("SELECT url, timestamp FROM referer WHERE url LIKE '%". check_input($HTTP_HOST) ."%' ORDER BY timestamp DESC LIMIT 15"); - $output .= "

Referers of the last ". format_interval(variable_get("referer_clear", 604800)) ."

\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 .= "

Internal referers of the last ". format_interval(variable_get("referer_clear", 604800)) ."

\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 .= "

Most recent referers

\n"; - $output .= statistics_table_1("SELECT url, timestamp FROM referer WHERE url NOT LIKE '". path_uri() ."%' ORDER BY timestamp DESC LIMIT 15"); + $output .= "

Most recent external referers

\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 .= "

Referers of the last ". format_interval(variable_get("referer_clear", 604800)) ."

\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 .= "

External referers of the last ". format_interval(variable_get("referer_clear", 604800)) ."

\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 "internal referers | external referers
\n"; + print "internal referers | external referers
\n"; switch ($type) { case "internal referer": -- cgit v1.2.3