diff --git a/Sources/Security.php b/Sources/Security.php index 633aab20e0..54f60eec1a 100644 --- a/Sources/Security.php +++ b/Sources/Security.php @@ -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. diff --git a/Sources/Who.php b/Sources/Who.php index b9b5012a80..73c0f5388e 100644 --- a/Sources/Who.php +++ b/Sources/Who.php @@ -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']); diff --git a/Themes/default/languages/Who.english.php b/Themes/default/languages/Who.english.php index 030e4ce96b..27189cd04e 100644 --- a/Themes/default/languages/Who.english.php +++ b/Themes/default/languages/Who.english.php @@ -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.'; diff --git a/index.php b/index.php index 2ff89336ba..13a992b14b 100644 --- a/index.php +++ b/index.php @@ -240,42 +240,6 @@ function smf_main() if (!empty($topic) && empty($board_info['cur_topic_approved']) && !allowedTo('approve_posts') && ($user_info['id'] != $board_info['cur_topic_starter'] || $user_info['is_guest'])) fatal_lang_error('not_a_topic', false); - // Do some logging, unless this is an attachment, avatar, toggle of editor buttons, theme option, XML feed, popup, etc. - $no_stat_actions = array( - 'about:unknown' => true, - 'clock' => true, - 'dlattach' => true, - 'findmember' => true, - 'helpadmin' => true, - 'jsoption' => true, - 'likes' => true, - 'modifycat' => true, - 'pm' => array('sa' => array('popup')), - 'profile' => array('area' => array('popup', 'alerts_popup', 'download', 'dlattach')), - 'requestmembers' => true, - 'smstats' => true, - 'suggest' => true, - 'uploadAttach' => true, - 'verificationcode' => true, - 'viewquery' => true, - 'viewsmfile' => true, - 'xmlhttp' => true, - '.xml' => true, - ); - 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(); @@ -337,6 +301,42 @@ function smf_main() } } + // Do some logging, unless this is an attachment, avatar, toggle of editor buttons, theme option, XML feed, popup, etc. + $no_stat_actions = array( + 'about:unknown' => true, + 'clock' => true, + 'dlattach' => true, + 'findmember' => true, + 'helpadmin' => true, + 'jsoption' => true, + 'likes' => true, + 'modifycat' => true, + 'pm' => array('sa' => array('popup')), + 'profile' => array('area' => array('popup', 'alerts_popup', 'download', 'dlattach')), + 'requestmembers' => true, + 'smstats' => true, + 'suggest' => true, + 'uploadAttach' => true, + 'verificationcode' => true, + 'viewquery' => true, + 'viewsmfile' => true, + 'xmlhttp' => true, + '.xml' => true, + ); + 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); + // Here's the monstrous $_REQUEST['action'] array - $_REQUEST['action'] => array($file, $function). $actionArray = array( 'agreement' => array('Agreement.php', 'Agreement'),