diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html index 3492995e..1b89f3f6 100644 --- a/templates/themes/categories/news.html +++ b/templates/themes/categories/news.html @@ -37,8 +37,9 @@ {% trans "Board" %} {% trans "PPH" %} {% trans "IPs last hour" %} - {% trans "IPs last 24 hours (lynxchan-style)" %} - {% trans "IPs last 72 hours (8ch-style)" %} + {% trans "IPs last 24 hours
(lynxchan-style)" %} + {% trans "IPs last 48 hours" %} + {% trans "IPs last 72 hours
(8ch-style)" %} @@ -50,11 +51,14 @@ {{ stats.pph }} - {{ stats.recent_ips }} + {{ stats.hourly_ips }} {{ stats.daily_ips }} + + {{ stats.bidaily_ips }} + {{ stats.tridaily_ips }} @@ -68,11 +72,14 @@ {{ boardStat.pph }} - {{ boardStat.recent_ips }} + {{ boardStat.hourly_ips }} {{ board.daily_ips }} + + {{ board.bidaily_ips }} + {{ board.tridaily_ips }} diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php index 12d8360d..f7d59b91 100644 --- a/templates/themes/categories/theme.php +++ b/templates/themes/categories/theme.php @@ -102,10 +102,11 @@ $HOUR = 3600; $DAY = $HOUR * 24; + $BIDAY = $DAY * 2; $TRIDAY = $DAY * 3; $stats = []; - $unique = []; + $hourly = []; $daily = []; $tridaily = []; @@ -118,9 +119,10 @@ $boardStat['title'] = $_board['title']; - $boardStat['hourly_ips'] = Categories::countUniqueIps($unique, $HOUR, $_board); - $boardStat['daily_ips'] = Categories::countUniqueIps($unique, $DAY, $_board); - $boardStat['tridaily_ips'] = Categories::countUniqueIps($unique, $TRIDAY, $_board); + $boardStat['hourly_ips'] = Categories::countUniqueIps($hourly, $HOUR, $_board); + $boardStat['daily_ips'] = Categories::countUniqueIps($daily, $DAY, $_board); + $boardStat['bidaily_ips'] = Categories::countUniqueIps($bidaily, $BIDAY, $_board); + $boardStat['tridaily_ips'] = Categories::countUniqueIps($tridaily, $TRIDAY, $_board); $pph_query = query( sprintf("SELECT COUNT(*) AS count FROM ``posts_%s`` WHERE time > %d", @@ -133,9 +135,10 @@ $stats['boards'][] = $boardStat; } - $stats['hourly_ips'] = count($unique); - $stats['daily_ips'] = count($unique); - $stats['tridaily_ips'] = count($unique); + $stats['hourly_ips'] = count($hourly); + $stats['daily_ips'] = count($daily); + $stats['bidaily_ips'] = count($bidaily); + $stats['tridaily_ips'] = count($tridaily); $stats['pph'] = array_sum(array_column($stats['boards'], 'pph')); return $stats;