From 314462d8352a6b5ea1fd27ce1bb21cb0a8fb1310 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 9 Nov 2012 22:36:01 +0100
Subject: [PATCH 1/2] [ticket/10184] Disable receiving pms for bots by default

PHPBB3-10184
---
 phpBB/install/database_update.php | 6 ++++++
 phpBB/install/install_install.php | 1 +
 2 files changed, 7 insertions(+)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 399ad3429a..8e23434b5b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2171,6 +2171,12 @@ function change_database_data(&$no_updates, $version)
 				}
 			}
 
+			// Disable receiving pms for bots
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_allow_pm = 0
+				WHERE user_type = ' . USER_IGNORE;
+			$db->sql_query($sql);
+
 			$no_updates = false;
 		break;
 	}
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 67ebb8b1c5..0575b58d92 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1859,6 +1859,7 @@ class install_install extends module
 				'user_timezone'			=> 0,
 				'user_dateformat'		=> $lang['default_dateformat'],
 				'user_allow_massemail'	=> 0,
+				'user_allow_pm'			=> 0,
 			);
 
 			$user_id = user_add($user_row);

From ad2d560f3f6ab0232728392b2c1c946f2b07902d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 16 Nov 2012 14:32:31 +0100
Subject: [PATCH 2/2] [ticket/10184] Query bots table to get the user_ids of
 the bots

PHPBB3-10184
---
 phpBB/install/database_update.php | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 8e23434b5b..983b1b46c4 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2172,10 +2172,24 @@ function change_database_data(&$no_updates, $version)
 			}
 
 			// Disable receiving pms for bots
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_allow_pm = 0
-				WHERE user_type = ' . USER_IGNORE;
-			$db->sql_query($sql);
+			$sql = 'SELECT user_id
+				FROM ' . BOTS_TABLE;
+			$result = $db->sql_query($sql);
+
+			$bot_user_ids = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$bot_user_ids[] = (int) $row['user_id'];
+			}
+			$db->sql_freeresult($result);
+
+			if (!empty($bot_user_ids))
+			{
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_allow_pm = 0
+					WHERE ' . $db->sql_in_set('user_id', $bot_user_ids);
+				_sql($sql, $errored, $error_ary);
+			}
 
 			$no_updates = false;
 		break;