Skip to content

[2.1] Don't log guests if disallowed #9215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sbulen wants to merge 6 commits into
base: release-2.1
Choose a base branch
from
+12 −17
Open

[2.1] Don't log guests if disallowed #9215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e81ea6f
Only log after testing if guests should be kicked
sbulen May 6, 2026
36449fc
No longer needed, since not logged
sbulen May 6, 2026
be32835
No longer needed, since not logged
sbulen May 7, 2026
076b623
No longer needed, since not logged
sbulen May 7, 2026
9a59e09
No longer needed, since not logged
sbulen May 7, 2026
3eba226
Keep no-stats array & integration hook where they were
sbulen Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Sources/Security.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ function is_not_guest($message = '')
return;

// Log what they were trying to do didn't work)
if (!empty($modSettings['who_enabled']))
$_GET['error'] = 'guest_login';
writeLog(true);

// Just die.
Expand Down
2 changes: 0 additions & 2 deletions Sources/Who.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,8 +448,6 @@ function determineActions($urls, $preferred_prefix = false)

if (isset($txt[$actions['error']]))
$error_message = str_replace('"', '"', empty($actions['error_params']) ? $txt[$actions['error']] : vsprintf($txt[$actions['error']], (array) $actions['error_params']));
elseif ($actions['error'] == 'guest_login')
$error_message = str_replace('"', '"', $txt['who_guest_login']);
else
$error_message = str_replace('"', '"', $actions['error']);

Expand Down
1 change: 0 additions & 1 deletion Themes/default/languages/Who.english.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
$txt['who_no_online_spiders'] = 'There are currently no spiders online.';
$txt['who_no_online_guests'] = 'There are currently no guests online.';
$txt['who_no_online_members'] = 'There are currently no members online.';
$txt['who_guest_login'] = 'User has been taken to the login page.';

$txt['whospider_login'] = 'Viewing the login page.';
$txt['whospider_register'] = 'Viewing the registration page.';
Expand Down
24 changes: 12 additions & 12 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,18 +264,6 @@ function smf_main()
);
call_integration_hook('integrate_pre_log_stats', array(&$no_stat_actions));

$should_log = !is_filtered_request($no_stat_actions, 'action');
if ($should_log)
{
// Log this user as online.
writeLog();

// Track forum statistics and hits...?
if (!empty($modSettings['hitStats']))
trackStats(array('hits' => '+'));
}
unset($no_stat_actions);

// Make sure that our scheduled tasks have been running as intended
check_cron();

Expand Down Expand Up @@ -337,6 +325,18 @@ function smf_main()
}
}

$should_log = !is_filtered_request($no_stat_actions, 'action');
if ($should_log)
{
// Log this user as online.
writeLog();

// Track forum statistics and hits...?
if (!empty($modSettings['hitStats']))
trackStats(array('hits' => '+'));
}
unset($no_stat_actions);

// Here's the monstrous $_REQUEST['action'] array - $_REQUEST['action'] => array($file, $function).
$actionArray = array(
'agreement' => array('Agreement.php', 'Agreement'),
Expand Down
Loading