diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-25 12:35:23 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-25 12:35:23 +0000 |
| commit | f49a8147b71287695547794953940603dc57da35 (patch) | |
| tree | 92390dc76b1af4789887103513ab54a6affd739d | |
| parent | 5de37a5c0a9665ef7170c247a842d9cd38e9e1d3 (diff) | |
| download | forums-f49a8147b71287695547794953940603dc57da35.tar forums-f49a8147b71287695547794953940603dc57da35.tar.gz forums-f49a8147b71287695547794953940603dc57da35.tar.bz2 forums-f49a8147b71287695547794953940603dc57da35.tar.xz forums-f49a8147b71287695547794953940603dc57da35.zip | |
fix #1213
git-svn-id: file:///svn/phpbb/trunk@5710 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/acp/acp_bots.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 6 | ||||
| -rw-r--r-- | 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', |