From d8d2509ed2b672cd5fa921583c60b8e100e132f9 Mon Sep 17 00:00:00 2001 From: Retro_Guy Date: Wed, 6 Sep 2023 04:07:57 -0700 Subject: [PATCH] Improve counting users by separating bots/throttled. --- Rocksolid_Light/rocksolid/article-flat.php | 6 -- Rocksolid_Light/rocksolid/head.inc | 38 +++------- Rocksolid_Light/rocksolid/index.php | 4 +- Rocksolid_Light/rocksolid/newsportal.php | 71 +++++++++++++------ Rocksolid_Light/rocksolid/overboard.php | 2 - Rocksolid_Light/rocksolid/search.php | 1 - Rocksolid_Light/rocksolid/thread.php | 5 +- .../rslight/scripts/count_users.php | 15 ++-- 8 files changed, 71 insertions(+), 71 deletions(-) diff --git a/Rocksolid_Light/rocksolid/article-flat.php b/Rocksolid_Light/rocksolid/article-flat.php index ee3b9be..d540a8a 100644 --- a/Rocksolid_Light/rocksolid/article-flat.php +++ b/Rocksolid_Light/rocksolid/article-flat.php @@ -5,7 +5,6 @@ header("Cache-Control: max-age=100"); header("Pragma: cache"); include "config.inc.php"; -include "auth.inc"; include "$file_newsportal"; $logfile = $logdir . '/newsportal.log'; @@ -99,11 +98,6 @@ if (! $message) { $title .= ' - ' . $group . ' - ' . $subject; } include "head.inc"; -throttle_hits($client_device); -if ($client_device != "bot") { - $_SESSION['rsactive'] = true; -} -write_access_log(); echo '

'; echo '' . basename(getcwd()) . ' / '; diff --git a/Rocksolid_Light/rocksolid/head.inc b/Rocksolid_Light/rocksolid/head.inc index 18b3d57..e86a542 100644 --- a/Rocksolid_Light/rocksolid/head.inc +++ b/Rocksolid_Light/rocksolid/head.inc @@ -1,40 +1,18 @@ '; echo '' . htmlspecialchars($title) . ''; echo ''; echo ''; include "config.inc.php"; -// Try to get browser info to use for extra formatting of page -$ua = strtolower($_SERVER["HTTP_USER_AGENT"]); -$devices = array( - "bot", - "spider", - "mobile", - "lynx", - "w3m", - "links", - "ipad", - "tablet" -); -$client_device = "desktop"; -foreach ($devices as $device) { - if (strpos($ua, $device) !== false) { - $client_device = $device; - break; - } -} -if($client_device == "spider") { - $client_device = "bot"; -} -// Log client device if enabled by semaphore -if (file_exists($config_dir . '/devicelog.enable')) { - $client_ip = getenv("REMOTE_ADDR"); - $logfile = $logdir . '/device.log'; - file_put_contents($logfile, "\n" . date('M d H:i:s') . " " . $config_name . " Client: " . $client_ip . " browser: " . $client_device, FILE_APPEND); - file_put_contents($logfile, "\nFull UA: ".$ua, FILE_APPEND); -} - if (file_exists($config_dir . '/googleanalytics.conf')) { include $config_dir . '/googleanalytics.conf'; } diff --git a/Rocksolid_Light/rocksolid/index.php b/Rocksolid_Light/rocksolid/index.php index 014377e..9733de3 100644 --- a/Rocksolid_Light/rocksolid/index.php +++ b/Rocksolid_Light/rocksolid/index.php @@ -4,7 +4,7 @@ session_start(); $_SESSION['isframed'] = 1; include "config.inc.php"; -include "auth.inc"; +include ("$file_newsportal"); if (isset($frames_on) && $frames_on === true) { ?>