makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix #1213

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5710 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-03-25 12:35:23 +00:00
parent 5de37a5c0a
commit f49a8147b7
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/includes/acp/acp_bots.php
View file

@ -321,7 +321,6 @@ class acp_bots
); );
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
} }

6
phpBB/includes/session.php
View file

@ -247,8 +247,12 @@ class session
$bot = $row['user_id']; $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) foreach (explode(',', $row['bot_ip']) as $bot_ip)
{ {
if (strpos($this->ip, $bot_ip) === 0) if (strpos($this->ip, $bot_ip) === 0)

2
phpBB/language/en/acp/bots.php
View file

@ -46,7 +46,7 @@ $lang = array_merge($lang, array(
'BOT_LANG_EXPLAIN' => 'The language presented to the bot as it browses.', 'BOT_LANG_EXPLAIN' => 'The language presented to the bot as it browses.',
'BOT_LAST_VISIT' => 'Last visit', 'BOT_LAST_VISIT' => 'Last visit',
'BOT_IP' => 'Bot IP address', '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' => 'Bot name',
'BOT_NAME_EXPLAIN' => 'Used only for your own information.', 'BOT_NAME_EXPLAIN' => 'Used only for your own information.',
'BOT_NEVER' => 'Never', 'BOT_NEVER' => 'Never',