2 files changed, 83 insertions, 28 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index b2c8e08fea..ac3333f33e 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -81,6 +81,7 @@ class install_install extends module
 			case 'final' :
 				$this->load_schema($mode, $sub);
 				$this->add_modules($mode, $sub);
+				$this->add_bots($mode, $sub);
 				$this->email_admin($mode, $sub);
 			
 			break;
@@ -1268,9 +1269,8 @@ class install_install extends module
 			{
 				$sql = 'SELECT module_id, left_id, right_id FROM ' . MODULES_TABLE . " 
 					WHERE module_langname = 'ACP_CAT_USERS'
-					AND module_class = 'acp'
-					LIMIT 1";
-				$result = $db->sql_query($sql);
+					AND module_class = 'acp'";
+				$result = $db->sql_query_limit($sql, 1);
 				$row2 = $db->sql_fetchrow($result);
 				$db->sql_freeresult($result);
 
@@ -1283,9 +1283,8 @@ class install_install extends module
 
 				$sql = 'SELECT * FROM ' . MODULES_TABLE . " 
 					WHERE module_langname = 'ACP_MANAGE_USERS'
-					AND module_class = 'acp'
-					LIMIT 1";
-				$result = $db->sql_query($sql);
+					AND module_class = 'acp'";
+				$result = $db->sql_query_limit($sql,a);
 				$module_data = $db->sql_fetchrow($result);
 				$db->sql_freeresult($result);
 
@@ -1305,9 +1304,8 @@ class install_install extends module
 				{
 					$sql = 'SELECT module_id, left_id, right_id FROM ' . MODULES_TABLE . " 
 						WHERE module_langname = '$cat_name'
-						AND module_class = '$module_class'
-						LIMIT 1";
-					$result = $db->sql_query($sql);
+						AND module_class = '$module_class'";
+					$result = $db->sql_query_limit($sql, 1);
 					$row2 = $db->sql_fetchrow($result);
 					$db->sql_freeresult($result);
 
@@ -1350,6 +1348,69 @@ class install_install extends module
 	}
 
 	/**
+	* Add search robots to the database
+	*/
+	function add_bots($mode, $sub)
+	{
+		global $db;
+
+		$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'";
+		$result = $db->sql_query($sql);
+		$group_id = (int) $db->sql_fetchfield('group_id', 0, $result);
+		$db->sql_freeresult($result);
+
+		if (!$group_id)
+		{
+			// If we reach this point then something has gone very wrong
+			$this->p_master->error($lang['NO_GROUP'], __LINE__, __FILE__);
+		}
+
+		foreach ($this->bot_list as $bot_name => $bot_ary)
+		{
+			$sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+				'user_type'		=> GROUP_HIDDEN,
+				'group_id'		=> $group_id,
+				'username'		=> $bot_name,
+				'user_regdate'	=> time(),
+				'user_password'	=> '',
+				'user_lang'		=> 'en',
+				'user_style'	=> 1,
+				'user_rank'		=> 0,
+				'user_colour'	=> '9E8DA7',
+			));
+
+			$result = $db->sql_query($sql);
+
+			if (!$result)
+			{
+				// If we can't insert this user then continue to the next one to avoid inconsistant data
+				$this->p_master->db_error('Unable to insert bot into users table', $sql, __LINE__, __FILE__, true);
+				continue;
+			}
+
+			$user_id = $db->sql_nextid();
+
+			$sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+				'group_id'		=> $group_id,
+				'user_id'		=> $user_id,
+				'group_leader'	=> 0,
+				'user_pending'	=> 0,
+			));
+			$result = $db->sql_query($sql);
+
+			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+				'bot_active'	=> 1,
+				'bot_name'		=> $bot_name,
+				'user_id'		=> $user_id,
+				'bot_agent'		=> $bot_ary[0],
+				'bot_ip'		=> $bot_ary[1],
+			));
+
+			$result = $db->sql_query($sql);
+		}
+	}
+
+	/**
 	* Sends an email to the board administrator with their password and some useful links
 	*/
 	function email_admin($mode, $sub)
@@ -1719,6 +1780,16 @@ class install_install extends module
 	);
 
 	/**
+	* A list of the web-crawlers/bots we recognise by default
+	*/
+	var $bot_list = array(
+		'Alexa'			=> array('ia_archiver', '66.28.250.,209.237.238.'),
+		'Fastcrawler'	=> array('FAST MetaWeb Crawler', '66.151.181.'),
+		'Googlebot'		=> array('Googlebot/', ''),
+		'Inktomi'		=> array('Slurp/', '216.35.116.,66.196.'),
+	);
+
+	/**
 	* Define the module structure so that we can populate the database without
 	* needing to hard-code module_id values
 	*/
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 147610768c..c1d74706ad 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -400,43 +400,27 @@ INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id,
 # -- Users / Anonymous user
 INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_email, user_lang, user_style, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_colour, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (2, 1, 'Anonymous', 0, '', '', 'en', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
 
-# -- username: Admin    password: admin (change this or remove it ON #ce everything is working!)
+# -- username: Admin    password: admin (change this or remove it once everything is working!)
 INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (3, 7, 'Admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
 
-# -- bots
-INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_lang, user_style, user_rank, user_colour, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd, user_email) VALUES (2, 8, 'Googlebot', 0, '', 'en', 1, 1, '9E8DA7', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
-INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_lang, user_style, user_rank, user_colour, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd, user_email) VALUES (2, 8, 'Fastcrawler', 0, '', 'en', 1, 1, '9E8DA7', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
-INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_lang, user_style, user_rank, user_colour, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd, user_email) VALUES (2, 8, 'Alexa', 0, '', 'en', 1, 1, '9E8DA7', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
-INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_lang, user_style, user_rank, user_colour, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd, user_email) VALUES (2, 8, 'Inktomi', 0, '', 'en', 1, 1, '9E8DA7', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
-
 # -- Groups
 INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('GUESTS', 3, '', 0, '', '', '');
 INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('INACTIVE', 3, '', 0, '', '', '');
 INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('INACTIVE_COPPA', 3, '', 0, '', '', '');
 INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('REGISTERED', 3, '', 0, '', '', '');
 INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('REGISTERED_COPPA', 3, '', 0, '', '', '');
-INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('GLOBAL_MODERATORS', 3, '00AA00', 0, '', '', '');
+INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('GLOBAL_MODERATORS', 3, '00AA00', 1, '', '', '');
 INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('ADMINISTRATORS', 3, 'AA0000', 1, '', '', '');
-INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('BOTS', 3, '9E8DA7', 1, '', '', '');
+INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('BOTS', 3, '9E8DA7', 0, '', '', '');
 
 # -- User -> Group
 INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (1, 1, 0, 0);
 INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (4, 2, 0, 0);
 INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (7, 2, 0, 1);
-INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (8, 3, 0, 0);
-INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (8, 4, 0, 0);
-INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (8, 5, 0, 0);
-INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (8, 6, 0, 0);
 
 # -- Ranks
 INSERT INTO phpbb_ranks (rank_title, rank_min, rank_special, rank_image) VALUES ('Site Admin', -1, 1, NULL);
 
-# -- Bots
-INSERT INTO phpbb_bots (bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES (1, 'Googlebot', 3, 'Googlebot', '');
-INSERT INTO phpbb_bots (bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES (1, 'Fastcrawler', 4, 'FAST MetaWeb Crawler', '66.151.181.');
-INSERT INTO phpbb_bots (bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES (1, 'Alexa', 5, 'ia_archiver', '66.28.250.,209.237.238.');
-INSERT INTO phpbb_bots (bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES (1, 'Inktomi', 6, 'Slurp/', '216.35.116.,66.196.');
-
 # -- Roles data
 
 # Standard Admin (a_)