From f49a8147b71287695547794953940603dc57da35 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 25 Mar 2006 12:35:23 +0000 Subject: [PATCH] fix #1213 git-svn-id: file:///svn/phpbb/trunk@5710 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_bots.php | 1 - phpBB/includes/session.php | 6 +++++- phpBB/language/en/acp/bots.php | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/acp/acp_bots.php b/phpBB/includes/acp/acp_bots.php index 0672c45dc2..d8435cbd60 100644 --- a/phpBB/includes/acp/acp_bots.php +++ b/phpBB/includes/acp/acp_bots.php @@ -321,7 +321,6 @@ class acp_bots ); } $db->sql_freeresult($result); - } } diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 25829d5186..8568d8f6db 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -247,8 +247,12 @@ class session $bot = $row['user_id']; } - if ($row['bot_ip'] && (!$row['bot_agent'] || !$bot)) + // If ip is supplied, we will make sure the ip is matching too... + if ($row['bot_ip'] && ($bot || !$row['bot_agent'])) { + // Set bot to false, then we only have to set it to true if it is matching + $bot = false; + foreach (explode(',', $row['bot_ip']) as $bot_ip) { if (strpos($this->ip, $bot_ip) === 0) diff --git a/phpBB/language/en/acp/bots.php b/phpBB/language/en/acp/bots.php index a4e81645fd..45bbdfbad9 100644 --- a/phpBB/language/en/acp/bots.php +++ b/phpBB/language/en/acp/bots.php @@ -46,7 +46,7 @@ $lang = array_merge($lang, array( 'BOT_LANG_EXPLAIN' => 'The language presented to the bot as it browses.', 'BOT_LAST_VISIT' => 'Last visit', 'BOT_IP' => 'Bot IP address', - 'BOT_IP_EXPLAIN' => 'Partial matches are allowed, seperate addresses with an apostrophe. A single hostname may be entered instead of an IP.', + 'BOT_IP_EXPLAIN' => 'Partial matches are allowed, seperate addresses with a comma.', 'BOT_NAME' => 'Bot name', 'BOT_NAME_EXPLAIN' => 'Used only for your own information.', 'BOT_NEVER' => 'Never',