Complete refacture for previously discovered inconsistency

[mailer.git] / inc / modules / admin / what-surfbar_stats.php

diff --git a/inc/modules/admin/what-surfbar_stats.php b/inc/modules/admin/what-surfbar_stats.php
index 58fabb982b1956e7759d9dc20f15b18bc809e437..54ff5df476f48c92f282f3778132f8dd43861973 100644 (file)
--- a/inc/modules/admin/what-surfbar_stats.php
+++ b/inc/modules/admin/what-surfbar_stats.php
@@ -48,11 +48,17 @@ addMenuDescription('admin', __FILE__);
 // Is the 'url_id' set?
 if (isGetRequestParameterSet(('url_id'))) {
        // Generate general statistics
-       $result = SQL_QUERY_ESC("SELECT `userid`,`count` AS `total_visits`, UNIX_TIMESTAMP(`last_surfed`) AS `last_surfed`
-FROM `{?_MYSQL_PREFIX?}_surfbar_stats`
-WHERE `url_id`=%s
-ORDER BY `userid` ASC",
-       array(bigintval(getRequestParameter('url_id'))), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT
+       `stats_userid`,
+       `stats_count` AS `total_visits`,
+       UNIX_TIMESTAMP(`stats_last_surfed`) AS `last_surfed`
+FROM
+       `{?_MYSQL_PREFIX?}_surfbar_stats`
+WHERE
+       `stats_url_id`=%s
+ORDER BY
+       `stats_userid` ASC",
+               array(bigintval(getRequestParameter('url_id'))), __FILE__, __LINE__);
 
        // Entries found?
        if (SQL_NUMROWS($result) > 0) {
@@ -63,7 +69,7 @@ ORDER BY `userid` ASC",
                        $visits += $content['total_visits'];
 
                        // "Translate" some data
-                       $content['userid']       = generateUserProfileLink($content['userid']);
+                       $content['stats_userid'] = generateUserProfileLink($content['stats_userid']);
                        $content['total_visits'] = translateComma($content['total_visits']);
                        $content['last_surfed']  = generateDateTime($content['last_surfed'], 2);
                        $content['sw']           = $SW;
@@ -90,13 +96,15 @@ ORDER BY `userid` ASC",
 } else {
        // Generate general statistics
        $result = SQL_QUERY("SELECT
-       `userid`, COUNT(`url_id`) AS `visited_urls`, SUM(`count`) AS `total_visits`
+       `stats_userid`,
+       COUNT(`stats_url_id`) AS `visited_urls`,
+       SUM(`stats_count`) AS `total_visits`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_stats`
 GROUP BY
-       `userid`
+       `stats_userid`
 ORDER BY
-       `userid` ASC", __FILE__, __LINE__);
+       `stats_userid` ASC", __FILE__, __LINE__);
 
        // Entries found?
        if (SQL_NUMROWS($result) > 0) {
@@ -108,7 +116,8 @@ ORDER BY
                        $visits += $content['total_visits'];
 
                        // "Translate" some data
-                       $content['userid']       = generateUserProfileLink($content['userid']);
+                       // @TODO Can't all these translation blocks moved into templates? This code looks ugly.
+                       $content['stats_userid'] = generateUserProfileLink($content['stats_userid']);
                        $content['visited_urls'] = translateComma($content['visited_urls']);
                        $content['total_visits'] = translateComma($content['total_visits']);
                        $content['sw']           = $SW;