From b672fc7ae113c0e01f1d7ce4ffae3eb26e57b586 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 26 Apr 2011 22:11:45 -0400
Subject: [feature/new-tz-handling] Started on database updater changes.

The changes are tricky since we need to drop user_dst column from
users table, but we need it during the data migration process to
properly calculate effective timezones for all users.

The change here converts user_timezone to vchar and computes
timezone identifiers from the offsets. It uses database-specific
functions for building SQL conditionals and concatenations which
need to be implemented, probably in a separate ticket. As a result
the current code is not functional.

PHPBB3-9558
---
 phpBB/install/database_update.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index fa0fba9dc7..9d550cf938 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1090,6 +1090,9 @@ function database_update_info()
 				GROUPS_TABLE		=> array(
 					'group_legend'		=> array('UINT', 0),
 				),
+				USERS_TABLE			=> array(
+					'user_timezone'		=> array('VCHAR:100', ''),
+				),
 			),
 			'drop_columns'      => array(
 			    STYLES_TABLE		    => array(
@@ -2352,6 +2355,25 @@ function change_database_data(&$no_updates, $version)
 				set_config('teampage_memberships', '1');
 			}
 
+			// Update timezones
+			// user_dst is 0 if not in dst and 1 if in dst;
+			// this happens to be exactly the correction that should be added to the timezone offset
+			// to obtain dst offset.
+			// Parenthesize here because we operate on this value later.
+			$active_offset = '(user_timezone + user_dst)';
+			// Now we have a tricky problem of forcing the plus sign into the expression.
+			// Build it via a conditional since there cannot be a portable printf equivalent in databases.
+			// Note that active offset is not an absolute value here - it is an expression that will
+			// be evaluated by the database during query execution.
+			// We don't print - here because it will come from active offset.
+			$sign = $db->conditional_sql("$active_offset < 0", '', '+');
+			// Use database-specific escaping because strings are quoted differently by different databases.
+			$new_value = $db->concatenate_sql($db->sql_escape('GMT'), $sign, $active_offset);
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_timezone = ' . $new_value;
+			_sql($sql, $errored, $error_ary);
+			// After we have calculated the timezones we can delete user_dst column from user table.
+
 			$no_updates = false;
 		break;
 	}
-- 
cgit v1.2.1


From 6069d9a3d7479f1fe0e7e7072aee0f3ea394519b Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sun, 6 May 2012 15:28:55 +0100
Subject: [ticket/10845] Two of the three colouns were missing in the DB update
 file

Added the two colouns that were missing in the DB update file

PHPBB3-10845
---
 phpBB/install/database_update.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a0892005d2..3c4a7f7027 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1102,7 +1102,9 @@ function database_update_info()
 					'style_parent_tree'		=> array('TEXT', ''),
 				),
 				REPORTS_TABLE		=> array(
-					'reported_post_text'	=> array('MTEXT_UNI', ''),
+					'reported_post_text'		=> array('MTEXT_UNI', ''),
+					'reported_post_uid'			=> array('VCHAR:8', ''),
+					'reported_post_bitfield'	=> array('VCHAR:255', ''),
 				),
 			),
 			'change_columns'	=> array(
-- 
cgit v1.2.1


From 3c6272ff0475dc19cc67553f370ce227214d0613 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 4 Jun 2012 23:28:48 +0200
Subject: [feature/new-tz-handling] Remove appearances of board_dst and
 user_dst

PHPBB3-9558
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 9758ad3b2b..b6f7f82785 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1971,7 +1971,7 @@ function change_database_data(&$no_updates, $version)
 					'user_email'			=> '',
 					'user_lang'				=> $config['default_lang'],
 					'user_style'			=> $config['default_style'],
-					'user_timezone'			=> 0,
+					'user_timezone'			=> 'UTC',
 					'user_dateformat'		=> $config['default_dateformat'],
 					'user_allow_massemail'	=> 0,
 				);
-- 
cgit v1.2.1


From 902a79bfdabb2c459f2385cff80b5fa38099d2f7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 20 Jun 2012 00:50:33 +0200
Subject: [feature/new-tz-handling] Readd Database updater changes from Oleg

The change here converts user_timezone to vchar and computes
timezone identifiers from the offsets. It uses database-specific
functions for building SQL conditionals and concatenations which
need to be implemented, probably in a separate ticket. As a result
the current code is not functional.

The changes are tricky since we need to drop user_dst column from
users table, but we need it during the data migration process to
properly calculate effective timezones for all users.

PHPBB3-9558
---
 phpBB/install/database_update.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b6f7f82785..dd2d04d3a6 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2588,6 +2588,33 @@ function change_database_data(&$no_updates, $version)
 				$config->set('assets_version', '1');
 			}
 
+			// If the column exists, we did not yet update the users timezone
+			if ($db_tools->sql_column_exists(USERS_TABLE, 'user_dst'))
+			{
+				// Update timezones
+				// user_dst is 0 if not in dst and 1 if in dst;
+				// this happens to be exactly the correction that should be added to the timezone offset
+				// to obtain dst offset.
+				// Parenthesize here because we operate on this value later.
+				$active_offset = '(user_timezone + user_dst)';
+
+				// Now we have a tricky problem of forcing the plus sign into the expression.
+				// Build it via a conditional since there cannot be a portable printf equivalent in databases.
+				// Note that active offset is not an absolute value here - it is an expression that will
+				// be evaluated by the database during query execution.
+				// We don't print - (minus) here because it will come from active offset.
+				$sign = $db->sql_conditional("$active_offset < 0", '', '+');
+
+				// Use database-specific escaping because strings are quoted differently by different databases.
+				$new_value = $db->sql_concatenate($db->sql_escape('GMT'), $sign, $active_offset);
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_timezone = ' . $new_value;
+				_sql($sql, $errored, $error_ary);
+
+				// After we have calculated the timezones we can delete user_dst column from user table.
+				$db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
+			}
+
 		break;
 	}
 }
-- 
cgit v1.2.1


From 8a659964e4788144fde24c4f43362ab2450582f8 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Thu, 7 Jun 2012 01:11:12 +0530
Subject: [feature/postgresql-fulltext-search] database changes in
 database_update

config entries are now added by database_update.php as well.
PostgreSQL will work during update too.

PHPBB3-9730
---
 phpBB/install/database_update.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 665db1f2f0..3716c03030 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2207,6 +2207,13 @@ function change_database_data(&$no_updates, $version)
 				set_config('search_type', 'phpbb_search_' . $config['search_type']);
 			}
 
+			if (!isset($config['fulltext_postgres_ts_name']))
+			{
+				set_config('fulltext_postgres_max_word_len', 254);
+				set_config('fulltext_postgres_min_word_len', 4);
+				set_config('fulltext_postgres_ts_name', 'simple');
+			}
+
 			if (!isset($config['load_jquery_cdn']))
 			{
 				set_config('load_jquery_cdn', 0);
-- 
cgit v1.2.1


From d37c9cab6bc8444685c642b4a6bce6108f054acc Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Tue, 26 Jun 2012 01:36:34 +0530
Subject: [feature/postgresql-fulltext-search] each config is checked if it is
 set

In database_update.php each config value of postgres fulltext search is
first checked whether it already exists or not and then added.

PHPBB3-9730
---
 phpBB/install/database_update.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 3716c03030..a6e5921b63 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2209,11 +2209,19 @@ function change_database_data(&$no_updates, $version)
 
 			if (!isset($config['fulltext_postgres_ts_name']))
 			{
-				set_config('fulltext_postgres_max_word_len', 254);
-				set_config('fulltext_postgres_min_word_len', 4);
 				set_config('fulltext_postgres_ts_name', 'simple');
 			}
 
+			if (!isset($config['fulltext_postgres_min_word_len']))
+			{
+				set_config('fulltext_postgres_min_word_len', 4);
+			}
+
+			if (!isset($config['fulltext_postgres_max_word_len']))
+			{
+				set_config('fulltext_postgres_max_word_len', 254);
+			}
+
 			if (!isset($config['load_jquery_cdn']))
 			{
 				set_config('load_jquery_cdn', 0);
-- 
cgit v1.2.1


From 7ce66deca8dbe8187b86e130e8011be998580b4e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 18 Jul 2012 14:48:28 +0200
Subject: [feature/new-tz-handling] Correctly update user and board timezones
 on update

PHPBB3-9558
---
 phpBB/install/database_update.php | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 360e12e0b6..a3a51324a9 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2613,25 +2613,24 @@ function change_database_data(&$no_updates, $version)
 			// If the column exists, we did not yet update the users timezone
 			if ($db_tools->sql_column_exists(USERS_TABLE, 'user_dst'))
 			{
-				// Update timezones
-				// user_dst is 0 if not in dst and 1 if in dst;
-				// this happens to be exactly the correction that should be added to the timezone offset
-				// to obtain dst offset.
-				// Parenthesize here because we operate on this value later.
-				$active_offset = '(user_timezone + user_dst)';
-
-				// Now we have a tricky problem of forcing the plus sign into the expression.
-				// Build it via a conditional since there cannot be a portable printf equivalent in databases.
-				// Note that active offset is not an absolute value here - it is an expression that will
-				// be evaluated by the database during query execution.
-				// We don't print - (minus) here because it will come from active offset.
-				$sign = $db->sql_conditional("$active_offset < 0", '', '+');
-
-				// Use database-specific escaping because strings are quoted differently by different databases.
-				$new_value = $db->sql_concatenate($db->sql_escape('GMT'), $sign, $active_offset);
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_timezone = ' . $new_value;
-				_sql($sql, $errored, $error_ary);
+				// Update user timezones
+				$sql = 'SELECT user_dst, user_timezone
+					FROM ' . USERS_TABLE . '
+					GROUP BY user_timezone, user_dst';
+				$result = $db->sql_query($sql);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$sql = 'UPDATE ' . USERS_TABLE . "
+						SET user_timezone = '" . $db->sql_escape(_convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
+						WHERE user_timezone = '" . $db->sql_escape($row['user_timezone']) . "'
+							AND user_dst = " . (int) $row['user_dst'];
+					_sql($sql, $errored, $error_ary);
+				}
+				$db->sql_freeresult($result);
+
+				// Update board default timezone
+				set_config('board_timezone', _convert_phpbb30_timezone($config['board_timezone'], $config['board_dst']));
 
 				// After we have calculated the timezones we can delete user_dst column from user table.
 				$db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
-- 
cgit v1.2.1


From 8078a04f3a3816b4515da01eb3635ae8141db26b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 18 Jul 2012 14:52:51 +0200
Subject: [feature/new-tz-handling] Add function to update the timezone

PHPBB3-9558
---
 phpBB/install/database_update.php | 99 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a3a51324a9..43363babe1 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -809,6 +809,105 @@ function _add_modules($modules_to_install)
 	$_module->remove_cache_file();
 }
 
+/**
+* Determinate the new timezone for a given phpBB 3.0 timezone and
+* "Daylight Saving Time" option
+*
+*	@param	$timezone	float	Users timezone in 3.0
+*	@param	$dst		int		Users daylight saving time
+*	@return		string		Users new php Timezone which is used since 3.1
+*/
+function _convert_phpbb30_timezone($timezone, $dst)
+{
+	$offset = $timezone + $dst;
+
+	switch ($timezone)
+	{
+		case '-12':
+			return 'Etc/GMT' . $offset;		//'[UTC - 12] Baker Island Time'
+		case '-11':
+			return 'Etc/GMT' . $offset;		//'[UTC - 11] Niue Time, Samoa Standard Time'
+		case '-10':
+			return 'Etc/GMT' . $offset;		//'[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time'
+		case '-9.5':
+			return 'Pacific/Marquesas';		//'[UTC - 9:30] Marquesas Islands Time'
+		case '-9':
+			return 'Etc/GMT' . $offset;		//'[UTC - 9] Alaska Standard Time, Gambier Island Time'
+		case '-8':
+			return 'Etc/GMT' . $offset;		//'[UTC - 8] Pacific Standard Time'
+		case '-7':
+			return 'Etc/GMT' . $offset;		//'[UTC - 7] Mountain Standard Time'
+		case '-6':
+			return 'Etc/GMT' . $offset;		//'[UTC - 6] Central Standard Time'
+		case '-5':
+			return 'Etc/GMT' . $offset;		//'[UTC - 5] Eastern Standard Time'
+		case '-4.5':
+			return 'America/Caracas';		//'[UTC - 4:30] Venezuelan Standard Time'
+		case '-4':
+			return 'Etc/GMT' . $offset;		//'[UTC - 4] Atlantic Standard Time'
+		case '-3.5':
+			return 'America/St_Johns';		//'[UTC - 3:30] Newfoundland Standard Time'
+		case '-3':
+			return 'Etc/GMT' . $offset;		//'[UTC - 3] Amazon Standard Time, Central Greenland Time'
+		case '-2':
+			return 'Etc/GMT' . $offset;		//'[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time'
+		case '-1':
+			return 'Etc/GMT' . $offset;		//'[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time'
+		case '0':
+			return (!$dst) ? 'UTC' : 'Etc/GMT+1';		//'[UTC] Western European Time, Greenwich Mean Time'
+		case '1':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 1] Central European Time, West African Time'
+		case '2':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 2] Eastern European Time, Central African Time'
+		case '3':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 3] Moscow Standard Time, Eastern African Time'
+		case '3.5':
+			return 'Asia/Tehran';			//'[UTC + 3:30] Iran Standard Time'
+		case '4':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 4] Gulf Standard Time, Samara Standard Time'
+		case '4.5':
+			return 'Asia/Kabul';			//'[UTC + 4:30] Afghanistan Time'
+		case '5':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time'
+		case '5.5':
+			return 'Asia/Kolkata';			//'[UTC + 5:30] Indian Standard Time, Sri Lanka Time'
+		case '5.75':
+			return 'Asia/Kathmandu';		//'[UTC + 5:45] Nepal Time'
+		case '6':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time'
+		case '6.5':
+			return 'Indian/Cocos';			//'[UTC + 6:30] Cocos Islands Time, Myanmar Time'
+		case '7':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 7] Indochina Time, Krasnoyarsk Standard Time'
+		case '8':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time'
+		case '8.75':
+			return 'Australia/Eucla';		//'[UTC + 8:45] Southeastern Western Australia Standard Time'
+		case '9':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time'
+		case '9.5':
+			return 'Australia/ACT';			//'[UTC + 9:30] Australian Central Standard Time'
+		case '10':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time'
+		case '10.5':
+			return 'Australia/Lord_Howe';	//'[UTC + 10:30] Lord Howe Standard Time'
+		case '11':
+			return 'Etc/GMT+' . $offset;	//'[UTC + 11] Solomon Island Time, Magadan Standard Time'
+		case '11.5':
+			return 'Pacific/Norfolk';		//'[UTC + 11:30] Norfolk Island Time'
+		case '12':
+			return 'Etc/GMT+12';			//'[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time'
+		case '12.75':
+			return 'Pacific/Chatham';		//'[UTC + 12:45] Chatham Islands Time'
+		case '13':
+			return 'Pacific/Tongatapu';		//'[UTC + 13] Tonga Time, Phoenix Islands Time'
+		case '14':
+			return 'Pacific/Kiritimati';	//'[UTC + 14] Line Island Time'
+		default:
+			return 'UTC';
+	}
+}
+
 /****************************************************************************
 * ADD YOUR DATABASE SCHEMA CHANGES HERE										*
 *****************************************************************************/
-- 
cgit v1.2.1


From 14a07b11936bc061b5c82daa6387eb4645974fac Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 18 Jul 2012 17:18:10 +0200
Subject: [feature/new-tz-handling] Move update helper function to new class

PHPBB3-9558
---
 phpBB/install/database_update.php | 105 ++------------------------------------
 1 file changed, 4 insertions(+), 101 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 43363babe1..6e99fd56a0 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -809,105 +809,6 @@ function _add_modules($modules_to_install)
 	$_module->remove_cache_file();
 }
 
-/**
-* Determinate the new timezone for a given phpBB 3.0 timezone and
-* "Daylight Saving Time" option
-*
-*	@param	$timezone	float	Users timezone in 3.0
-*	@param	$dst		int		Users daylight saving time
-*	@return		string		Users new php Timezone which is used since 3.1
-*/
-function _convert_phpbb30_timezone($timezone, $dst)
-{
-	$offset = $timezone + $dst;
-
-	switch ($timezone)
-	{
-		case '-12':
-			return 'Etc/GMT' . $offset;		//'[UTC - 12] Baker Island Time'
-		case '-11':
-			return 'Etc/GMT' . $offset;		//'[UTC - 11] Niue Time, Samoa Standard Time'
-		case '-10':
-			return 'Etc/GMT' . $offset;		//'[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time'
-		case '-9.5':
-			return 'Pacific/Marquesas';		//'[UTC - 9:30] Marquesas Islands Time'
-		case '-9':
-			return 'Etc/GMT' . $offset;		//'[UTC - 9] Alaska Standard Time, Gambier Island Time'
-		case '-8':
-			return 'Etc/GMT' . $offset;		//'[UTC - 8] Pacific Standard Time'
-		case '-7':
-			return 'Etc/GMT' . $offset;		//'[UTC - 7] Mountain Standard Time'
-		case '-6':
-			return 'Etc/GMT' . $offset;		//'[UTC - 6] Central Standard Time'
-		case '-5':
-			return 'Etc/GMT' . $offset;		//'[UTC - 5] Eastern Standard Time'
-		case '-4.5':
-			return 'America/Caracas';		//'[UTC - 4:30] Venezuelan Standard Time'
-		case '-4':
-			return 'Etc/GMT' . $offset;		//'[UTC - 4] Atlantic Standard Time'
-		case '-3.5':
-			return 'America/St_Johns';		//'[UTC - 3:30] Newfoundland Standard Time'
-		case '-3':
-			return 'Etc/GMT' . $offset;		//'[UTC - 3] Amazon Standard Time, Central Greenland Time'
-		case '-2':
-			return 'Etc/GMT' . $offset;		//'[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time'
-		case '-1':
-			return 'Etc/GMT' . $offset;		//'[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time'
-		case '0':
-			return (!$dst) ? 'UTC' : 'Etc/GMT+1';		//'[UTC] Western European Time, Greenwich Mean Time'
-		case '1':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 1] Central European Time, West African Time'
-		case '2':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 2] Eastern European Time, Central African Time'
-		case '3':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 3] Moscow Standard Time, Eastern African Time'
-		case '3.5':
-			return 'Asia/Tehran';			//'[UTC + 3:30] Iran Standard Time'
-		case '4':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 4] Gulf Standard Time, Samara Standard Time'
-		case '4.5':
-			return 'Asia/Kabul';			//'[UTC + 4:30] Afghanistan Time'
-		case '5':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time'
-		case '5.5':
-			return 'Asia/Kolkata';			//'[UTC + 5:30] Indian Standard Time, Sri Lanka Time'
-		case '5.75':
-			return 'Asia/Kathmandu';		//'[UTC + 5:45] Nepal Time'
-		case '6':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time'
-		case '6.5':
-			return 'Indian/Cocos';			//'[UTC + 6:30] Cocos Islands Time, Myanmar Time'
-		case '7':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 7] Indochina Time, Krasnoyarsk Standard Time'
-		case '8':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time'
-		case '8.75':
-			return 'Australia/Eucla';		//'[UTC + 8:45] Southeastern Western Australia Standard Time'
-		case '9':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time'
-		case '9.5':
-			return 'Australia/ACT';			//'[UTC + 9:30] Australian Central Standard Time'
-		case '10':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time'
-		case '10.5':
-			return 'Australia/Lord_Howe';	//'[UTC + 10:30] Lord Howe Standard Time'
-		case '11':
-			return 'Etc/GMT+' . $offset;	//'[UTC + 11] Solomon Island Time, Magadan Standard Time'
-		case '11.5':
-			return 'Pacific/Norfolk';		//'[UTC + 11:30] Norfolk Island Time'
-		case '12':
-			return 'Etc/GMT+12';			//'[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time'
-		case '12.75':
-			return 'Pacific/Chatham';		//'[UTC + 12:45] Chatham Islands Time'
-		case '13':
-			return 'Pacific/Tongatapu';		//'[UTC + 13] Tonga Time, Phoenix Islands Time'
-		case '14':
-			return 'Pacific/Kiritimati';	//'[UTC + 14] Line Island Time'
-		default:
-			return 'UTC';
-	}
-}
-
 /****************************************************************************
 * ADD YOUR DATABASE SCHEMA CHANGES HERE										*
 *****************************************************************************/
@@ -1225,6 +1126,8 @@ function change_database_data(&$no_updates, $version)
 {
 	global $db, $errored, $error_ary, $config, $phpbb_root_path, $phpEx, $db_tools;
 
+	$update_helpers = new phpbb_update_helpers();
+
 	switch ($version)
 	{
 		case '3.0.0':
@@ -2721,7 +2624,7 @@ function change_database_data(&$no_updates, $version)
 				while ($row = $db->sql_fetchrow($result))
 				{
 					$sql = 'UPDATE ' . USERS_TABLE . "
-						SET user_timezone = '" . $db->sql_escape(_convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
+						SET user_timezone = '" . $db->sql_escape($update_helpers->convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
 						WHERE user_timezone = '" . $db->sql_escape($row['user_timezone']) . "'
 							AND user_dst = " . (int) $row['user_dst'];
 					_sql($sql, $errored, $error_ary);
@@ -2729,7 +2632,7 @@ function change_database_data(&$no_updates, $version)
 				$db->sql_freeresult($result);
 
 				// Update board default timezone
-				set_config('board_timezone', _convert_phpbb30_timezone($config['board_timezone'], $config['board_dst']));
+				set_config('board_timezone', $update_helpers->convert_phpbb30_timezone($config['board_timezone'], $config['board_dst']));
 
 				// After we have calculated the timezones we can delete user_dst column from user table.
 				$db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
-- 
cgit v1.2.1


From 9711da2763f707408efde160357d51330fd17681 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Tue, 10 Jul 2012 05:04:14 +0530
Subject: [feature/sphinx-fulltext-search] adds default config values

Default config values are added to config table in new install as well
as database_update.

PHPBB3-10946
---
 phpBB/install/database_update.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 594397c815..0ffab8e413 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2260,6 +2260,16 @@ function change_database_data(&$no_updates, $version)
 				set_config('fulltext_postgres_max_word_len', 254);
 			}
 
+			if (!isset($config['fulltext_sphinx_stopwords']))
+			{
+				set_config('fulltext_sphinx_stopwords', 0);
+			}
+
+			if (!isset($config['fulltext_sphinx_indexer_mem_limit']))
+			{
+				set_config('fulltext_sphinx_indexer_mem_limit', 512);
+			}
+
 			if (!isset($config['load_jquery_cdn']))
 			{
 				set_config('load_jquery_cdn', 0);
-- 
cgit v1.2.1


From a5dd64195a3a88db3fec38ac74dfb5d118ab5622 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 22 Jul 2012 22:26:38 -0500
Subject: [ticket/11021] Add the option to specify a Site home URL and text

PHPBB3-11021
---
 phpBB/install/database_update.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 6e99fd56a0..18efee72b5 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2637,6 +2637,12 @@ function change_database_data(&$no_updates, $version)
 				// After we have calculated the timezones we can delete user_dst column from user table.
 				$db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
 			}
+			
+			if (!isset($config['site_home_url']))
+			{
+				$config->set('site_home_url', '');
+				$config->set('site_home_text', '');
+			}
 
 		break;
 	}
-- 
cgit v1.2.1


From 10172887fd47e86eefbabd6f5e755cd93279960d Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 17 Jul 2012 18:48:10 +0200
Subject: [ticket/10965] Introduce a new profile field option to display no
 value

By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.

PHPBB3-10965
---
 phpBB/install/database_update.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c1fe144c62..2901bc76ee 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -995,6 +995,14 @@ function database_update_info()
 		'3.0.10-RC3'	=> array(),
 		// No changes from 3.0.10 to 3.0.11-RC1
 		'3.0.10'		=> array(),
+		// Changes from 3.0.11-RC1 to 3.0.11-RC2
+		'3.0.5'		=> array(
+			'add_columns'		=> array(
+				PROFILE_FIELDS_TABLE			=> array(
+					'field_show_novalue'		=> array('BOOL', 0),
+				),
+			),
+		),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
 	);
-- 
cgit v1.2.1


From 19237f561396c9a2f096c9d01acc857fe92b89ba Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 17 Jul 2012 20:28:01 +0200
Subject: [ticket/10965] Database update was referring to 3.0.5 instead of
 3.0.11-RC1

PHPBB3-10965
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 2901bc76ee..c51286f25f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -996,7 +996,7 @@ function database_update_info()
 		// No changes from 3.0.10 to 3.0.11-RC1
 		'3.0.10'		=> array(),
 		// Changes from 3.0.11-RC1 to 3.0.11-RC2
-		'3.0.5'		=> array(
+		'3.0.11-RC1'	=> array(
 			'add_columns'		=> array(
 				PROFILE_FIELDS_TABLE			=> array(
 					'field_show_novalue'		=> array('BOOL', 0),
-- 
cgit v1.2.1


From 9f073e4c75cbb214eca6a4342c8a1dfe9fd9b94c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 23 Jul 2012 23:30:20 +0200
Subject: [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.

---
 phpBB/install/database_update.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c51286f25f..95b3401a7e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.11-RC1');
+define('UPDATES_TO_VERSION', '3.0.11-RC2');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -2098,6 +2098,10 @@ function change_database_data(&$no_updates, $version)
 
 			$no_updates = false;
 		break;
+
+		// No changes from 3.0.11-RC1 to 3.0.11-RC2
+		case '3.0.11-RC1':
+		break;
 	}
 }
 
-- 
cgit v1.2.1


From 6da03913bfcd2ac964116a42cdc7d5e7d4b4c6fd Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 20 Aug 2012 16:32:34 +0200
Subject: [prep-release-3.0.11] Bumping version number for 3.0.11 final.

---
 phpBB/install/database_update.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 95b3401a7e..b7aaefb1d0 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.11-RC2');
+define('UPDATES_TO_VERSION', '3.0.11');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -1003,6 +1003,8 @@ function database_update_info()
 				),
 			),
 		),
+		// No changes from 3.0.11-RC2 to 3.0.11
+		'3.0.11-RC2'	=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
 	);
@@ -2102,6 +2104,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.11-RC1 to 3.0.11-RC2
 		case '3.0.11-RC1':
 		break;
+
+		// No changes from 3.0.11-RC2 to 3.0.11
+		case '3.0.11-RC2':
+		break;
 	}
 }
 
-- 
cgit v1.2.1


From 8bbab088dd5830d8dd1151a3684dde5c197ba268 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 23 Jul 2012 15:17:42 -0500
Subject: [ticket/10631] Validation for extensions

PHPBB3-10631
---
 phpBB/install/database_update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 502b3bb1a4..0b470ced26 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -683,12 +683,12 @@ function _write_result($no_updates, $errored, $error_ary)
 
 function _add_modules($modules_to_install)
 {
-	global $phpbb_root_path, $phpEx, $db, $phpbb_extension_manager;
+	global $phpbb_root_path, $phpEx, $db, $phpbb_extension_manager, $config;
 
 	// modules require an extension manager
 	if (empty($phpbb_extension_manager))
 	{
-		$phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx");
+		$phpbb_extension_manager = new phpbb_extension_manager($db, $config, EXT_TABLE, $phpbb_root_path, ".$phpEx");
 	}
 
 	include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
-- 
cgit v1.2.1


From 503989979a2e6a7fb9d64ed249b09a0bef2b2f95 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 13 Sep 2012 16:44:26 -0400
Subject: [ticket/11086] Fix database_update.php to use Dependency Injection
 Container

PHPBB3-11086
---
 phpBB/install/database_update.php | 47 ++++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 13 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0b470ced26..323ba0c876 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -7,6 +7,10 @@
 *
 */
 
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
 define('UPDATES_TO_VERSION', '3.1.0-dev');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
@@ -107,21 +111,38 @@ if (!defined('EXT_TABLE'))
 	define('EXT_TABLE', $table_prefix . 'ext');
 }
 
-$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".$phpEx");
-$phpbb_class_loader_ext->register();
-$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".$phpEx");
-$phpbb_class_loader->register();
+$phpbb_container = new ContainerBuilder();
+$loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/../config'));
+$loader->load('services.yml');
+
+// We must include the DI processor class files because the class loader
+// is not yet set up
+require($phpbb_root_path . 'includes/di/processor/interface.' . $phpEx);
+require($phpbb_root_path . 'includes/di/processor/config.' . $phpEx);
+
+$processor = new phpbb_di_processor_config($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx);
+$processor->process($phpbb_container);
+
+// Setup class loader first
+$phpbb_class_loader = $phpbb_container->get('class_loader');
+$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
+
+$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
+foreach ($ids as $id)
+{
+	$processor = $phpbb_container->get($id);
+	$processor->process($phpbb_container);
+}
 
 // set up caching
-$cache_factory = new phpbb_cache_factory($acm_type);
-$cache = $cache_factory->get_service();
-$phpbb_class_loader_ext->set_cache($cache->get_driver());
-$phpbb_class_loader->set_cache($cache->get_driver());
-
-$phpbb_dispatcher = new phpbb_event_dispatcher();
-$request = new phpbb_request();
-$user = new phpbb_user();
-$db = new $sql_db();
+$cache = $phpbb_container->get('cache');
+
+// Instantiate some basic classes
+$phpbb_dispatcher = $phpbb_container->get('dispatcher');
+$request	= $phpbb_container->get('request');
+$user		= $phpbb_container->get('user');
+$auth		= $phpbb_container->get('auth');
+$db			= $phpbb_container->get('dbal.conn');
 
 // make sure request_var uses this request instance
 request_var('', 0, false, false, $request); // "dependency injection" for a function
-- 
cgit v1.2.1


From 298fa894e7ea0807a295cd0ed55cabef8a27a3f3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 13 Sep 2012 16:56:09 -0400
Subject: [ticket/11086] Move DI processing below $request definition

As per PR #991 (ticket/11101).

PHPBB3-11086
---
 phpBB/install/database_update.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 323ba0c876..5fa6166913 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -119,7 +119,6 @@ $loader->load('services.yml');
 // is not yet set up
 require($phpbb_root_path . 'includes/di/processor/interface.' . $phpEx);
 require($phpbb_root_path . 'includes/di/processor/config.' . $phpEx);
-
 $processor = new phpbb_di_processor_config($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx);
 $processor->process($phpbb_container);
 
@@ -127,13 +126,6 @@ $processor->process($phpbb_container);
 $phpbb_class_loader = $phpbb_container->get('class_loader');
 $phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
 
-$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
-foreach ($ids as $id)
-{
-	$processor = $phpbb_container->get($id);
-	$processor->process($phpbb_container);
-}
-
 // set up caching
 $cache = $phpbb_container->get('cache');
 
@@ -144,6 +136,13 @@ $user		= $phpbb_container->get('user');
 $auth		= $phpbb_container->get('auth');
 $db			= $phpbb_container->get('dbal.conn');
 
+$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
+foreach ($ids as $id)
+{
+	$processor = $phpbb_container->get($id);
+	$processor->process($phpbb_container);
+}
+
 // make sure request_var uses this request instance
 request_var('', 0, false, false, $request); // "dependency injection" for a function
 
-- 
cgit v1.2.1


From 95d02d74ac6d71578a98e8850140d9a6cad7e852 Mon Sep 17 00:00:00 2001
From: Vinny <vinny@suportephpbb.com.br>
Date: Fri, 5 Oct 2012 21:18:59 -0300
Subject: [ticket/11135] Full replacement of credit link to https

PHPBB3-11135
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 5a186d0eeb..40837145ba 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -527,7 +527,7 @@ function _print_footer()
 	</div>
 
 	<div id="page-footer">
-		Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+		Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 	</div>
 </div>
 
-- 
cgit v1.2.1


From 5f5d395c625fe0257e7bca5d787424808f7649cc Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 29 Oct 2012 13:58:24 -0400
Subject: [ticket/11158] Require acl_u_sig for ucp signature module.

PHPBB3-11158
---
 phpBB/install/database_update.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 40837145ba..099ab6aeb5 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1005,6 +1005,8 @@ function database_update_info()
 		),
 		// No changes from 3.0.11-RC2 to 3.0.11
 		'3.0.11-RC2'	=> array(),
+		// No changes from 3.0.11 to 3.0.12-RC1
+		'3.0.11'		=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
 	);
@@ -2108,6 +2110,16 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.11-RC2 to 3.0.11
 		case '3.0.11-RC2':
 		break;
+
+		// Changes from 3.0.11 to 3.0.12-RC1
+		case '3.0.11':
+			$sql = 'UPDATE ' . MODULES_TABLE . '
+				SET module_auth = \'acl_u_sig\'
+				WHERE module_class = \'ucp\'
+					AND module_basename = \'profile\'
+					AND module_mode = \'signature\'';
+			_sql($sql, $errored, $error_ary);
+		break;
 	}
 }
 
-- 
cgit v1.2.1


From 53e9bab237470e827243fcf3743eb7ca3d9ee346 Mon Sep 17 00:00:00 2001
From: Carlo <carlos94@tiscali.it>
Date: Tue, 28 Aug 2012 10:02:27 +0200
Subject: [ticket/10897] Update bots during phpBB update

PHPBB3-10897
---
 phpBB/install/database_update.php | 70 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 099ab6aeb5..0343e0dc86 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2119,6 +2119,76 @@ function change_database_data(&$no_updates, $version)
 					AND module_basename = \'profile\'
 					AND module_mode = \'signature\'';
 			_sql($sql, $errored, $error_ary);
+
+			$bots_to_update = array(
+				'Baidu [Spider]'	=> array('Baiduspider', ''),
+				'Exabot [Bot]'		=> array('Exabot', ''),
+				'Voyager [Bot]'		=> array('voyager/', ''),
+				'W3C [Validator]'	=> array('W3C_Validator', ''),
+			);
+
+			$bots_to_delete = array(
+				'NG-Search [Bot]',
+				'Nutch/CVS [Bot]',
+				'OmniExplorer [Bot]',
+				'Seekport [Bot]',
+				'Synoo [Bot]',
+				'WiseNut [Bot]',
+			);
+
+			foreach($bots_to_update as $bot_name => $bot_array)
+			{
+				list($bot_agent, $bot_ip) = $bot_array;
+
+				$bot_name_clean = utf8_clean_string($bot_name);
+
+				$sql = 'SELECT user_id
+					FROM ' . USERS_TABLE . "
+					WHERE username_clean = '" . $db->sql_escape($bot_name_clean) . "'";
+				$result = $db->sql_query($sql);
+				$is_user = (bool) $db->sql_fetchfield('user_id');
+				$db->sql_freeresult($result);
+
+				if ($is_user)
+				{
+					$sql = 'UPDATE ' . BOTS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
+						'bot_agent'		=> (string) $bot_agent,
+						'bot_ip'		=> (string) $bot_ip,
+					)) . " WHERE bot_name = '" . $db->sql_escape($bot_name) . "'";
+
+					_sql($sql, $errored, $error_ary);
+				}
+			}
+
+			if (!function_exists('user_delete'))
+			{
+				include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+			}
+
+			foreach($bots_to_delete as $bot_name)
+			{
+				$bot_name_clean = utf8_clean_string($bot_name);
+
+				$sql = 'SELECT user_id
+					FROM ' . USERS_TABLE . "
+					WHERE username_clean = '" . $db->sql_escape($bot_name_clean) . "'";
+				$result = $db->sql_query($sql);
+				$bot_user_id = $db->sql_fetchfield('user_id');
+				$is_user = (bool) $bot_user_id;
+				$db->sql_freeresult($result);
+
+				if ($is_user)
+				{
+					$sql = 'DELETE FROM ' . BOTS_TABLE . "
+						WHERE bot_name = '" . $db->sql_escape($bot_name) . "'";
+
+					_sql($sql, $errored, $error_ary);
+
+					user_delete('remove', $bot_user_id);
+				}
+			}
+
+			$no_updates = false;
 		break;
 	}
 }
-- 
cgit v1.2.1


From 07e7c475d510a221c9080529647ec432cca038c6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 9 Nov 2012 12:12:12 +0100
Subject: [ticket/10897] Add space after foreach.

PHPBB3-10897
---
 phpBB/install/database_update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0343e0dc86..4c94cdf5bd 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2136,7 +2136,7 @@ function change_database_data(&$no_updates, $version)
 				'WiseNut [Bot]',
 			);
 
-			foreach($bots_to_update as $bot_name => $bot_array)
+			foreach ($bots_to_update as $bot_name => $bot_array)
 			{
 				list($bot_agent, $bot_ip) = $bot_array;
 
@@ -2165,7 +2165,7 @@ function change_database_data(&$no_updates, $version)
 				include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 			}
 
-			foreach($bots_to_delete as $bot_name)
+			foreach ($bots_to_delete as $bot_name)
 			{
 				$bot_name_clean = utf8_clean_string($bot_name);
 
-- 
cgit v1.2.1


From b2183c9b705dc5283f3a1c3abbc80331f74e4b72 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 9 Nov 2012 12:12:27 +0100
Subject: [ticket/10897] Remove unnecessary string casting.

PHPBB3-10897
---
 phpBB/install/database_update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4c94cdf5bd..bbb05e67ec 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2152,8 +2152,8 @@ function change_database_data(&$no_updates, $version)
 				if ($is_user)
 				{
 					$sql = 'UPDATE ' . BOTS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
-						'bot_agent'		=> (string) $bot_agent,
-						'bot_ip'		=> (string) $bot_ip,
+						'bot_agent'		=> $bot_agent,
+						'bot_ip'		=> $bot_ip,
 					)) . " WHERE bot_name = '" . $db->sql_escape($bot_name) . "'";
 
 					_sql($sql, $errored, $error_ary);
-- 
cgit v1.2.1


From de6d741d96e57a704e7653e8c73a20b3c196a0d9 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 9 Nov 2012 12:19:18 +0100
Subject: [ticket/10897] Add comment about what's going on.

PHPBB3-10897
---
 phpBB/install/database_update.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index bbb05e67ec..c8675fa95a 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2120,6 +2120,7 @@ function change_database_data(&$no_updates, $version)
 					AND module_mode = \'signature\'';
 			_sql($sql, $errored, $error_ary);
 
+			// Update bot list
 			$bots_to_update = array(
 				'Baidu [Spider]'	=> array('Baiduspider', ''),
 				'Exabot [Bot]'		=> array('Exabot', ''),
-- 
cgit v1.2.1


From 935bc33268bb062158d6421242335483fcd955bd Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 9 Nov 2012 12:19:58 +0100
Subject: [ticket/10897] Move bot delete data to the relevant foreach loop.

PHPBB3-10897
---
 phpBB/install/database_update.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c8675fa95a..0372b6e608 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2128,15 +2128,6 @@ function change_database_data(&$no_updates, $version)
 				'W3C [Validator]'	=> array('W3C_Validator', ''),
 			);
 
-			$bots_to_delete = array(
-				'NG-Search [Bot]',
-				'Nutch/CVS [Bot]',
-				'OmniExplorer [Bot]',
-				'Seekport [Bot]',
-				'Synoo [Bot]',
-				'WiseNut [Bot]',
-			);
-
 			foreach ($bots_to_update as $bot_name => $bot_array)
 			{
 				list($bot_agent, $bot_ip) = $bot_array;
@@ -2166,6 +2157,15 @@ function change_database_data(&$no_updates, $version)
 				include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 			}
 
+			$bots_to_delete = array(
+				'NG-Search [Bot]',
+				'Nutch/CVS [Bot]',
+				'OmniExplorer [Bot]',
+				'Seekport [Bot]',
+				'Synoo [Bot]',
+				'WiseNut [Bot]',
+			);
+
 			foreach ($bots_to_delete as $bot_name)
 			{
 				$bot_name_clean = utf8_clean_string($bot_name);
-- 
cgit v1.2.1


From 63c64694bc253358a50dce7dce99a7551b5e2b17 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 9 Nov 2012 12:41:59 +0100
Subject: [ticket/10897] Update by user_id instead of bot_name.

PHPBB3-10897
---
 phpBB/install/database_update.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0372b6e608..6496069658 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2132,22 +2132,23 @@ function change_database_data(&$no_updates, $version)
 			{
 				list($bot_agent, $bot_ip) = $bot_array;
 
-				$bot_name_clean = utf8_clean_string($bot_name);
-
 				$sql = 'SELECT user_id
 					FROM ' . USERS_TABLE . "
-					WHERE username_clean = '" . $db->sql_escape($bot_name_clean) . "'";
+					WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($bot_name)) . "'";
 				$result = $db->sql_query($sql);
-				$is_user = (bool) $db->sql_fetchfield('user_id');
+				$bot_user_id = (int) $db->sql_fetchfield('user_id');
 				$db->sql_freeresult($result);
 
-				if ($is_user)
+				if ($bot_user_id)
 				{
-					$sql = 'UPDATE ' . BOTS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array(
+					$update_array = array(
 						'bot_agent'		=> $bot_agent,
 						'bot_ip'		=> $bot_ip,
-					)) . " WHERE bot_name = '" . $db->sql_escape($bot_name) . "'";
+					);
 
+					$sql = 'UPDATE ' . BOTS_TABLE . '
+						SET ' . $db->sql_build_array('UPDATE', $update_array) . "
+						WHERE user_id = $bot_user_id";
 					_sql($sql, $errored, $error_ary);
 				}
 			}
-- 
cgit v1.2.1


From c054757f3caad66152eaafe09f2c98abcb9ef0e2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 9 Nov 2012 12:45:20 +0100
Subject: [ticket/10897] Do not handle IP address. There is no need.

PHPBB3-10897
---
 phpBB/install/database_update.php | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 6496069658..154fc313a0 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2121,17 +2121,16 @@ function change_database_data(&$no_updates, $version)
 			_sql($sql, $errored, $error_ary);
 
 			// Update bot list
+			// Bot name to bot user agent map
 			$bots_to_update = array(
-				'Baidu [Spider]'	=> array('Baiduspider', ''),
-				'Exabot [Bot]'		=> array('Exabot', ''),
-				'Voyager [Bot]'		=> array('voyager/', ''),
-				'W3C [Validator]'	=> array('W3C_Validator', ''),
+				'Baidu [Spider]'	=> 'Baiduspider',
+				'Exabot [Bot]'		=> 'Exabot',
+				'Voyager [Bot]'		=> 'voyager/',
+				'W3C [Validator]'	=> 'W3C_Validator',
 			);
 
-			foreach ($bots_to_update as $bot_name => $bot_array)
+			foreach ($bots_to_update as $bot_name => $bot_agent)
 			{
-				list($bot_agent, $bot_ip) = $bot_array;
-
 				$sql = 'SELECT user_id
 					FROM ' . USERS_TABLE . "
 					WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($bot_name)) . "'";
@@ -2141,13 +2140,8 @@ function change_database_data(&$no_updates, $version)
 
 				if ($bot_user_id)
 				{
-					$update_array = array(
-						'bot_agent'		=> $bot_agent,
-						'bot_ip'		=> $bot_ip,
-					);
-
 					$sql = 'UPDATE ' . BOTS_TABLE . '
-						SET ' . $db->sql_build_array('UPDATE', $update_array) . "
+						SET bot_agent = ' .  $db->sql_escape($bot_agent) . "
 						WHERE user_id = $bot_user_id";
 					_sql($sql, $errored, $error_ary);
 				}
-- 
cgit v1.2.1


From 520ffdf368bee84549a0b284bd2df4da1d633a8f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 9 Nov 2012 12:47:50 +0100
Subject: [ticket/10897] Make sure the user we're fetching is a bot.

PHPBB3-10897
---
 phpBB/install/database_update.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 154fc313a0..bd12a90288 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2132,8 +2132,9 @@ function change_database_data(&$no_updates, $version)
 			foreach ($bots_to_update as $bot_name => $bot_agent)
 			{
 				$sql = 'SELECT user_id
-					FROM ' . USERS_TABLE . "
-					WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($bot_name)) . "'";
+					FROM ' . USERS_TABLE . '
+					WHERE user_type = ' . USER_IGNORE . "
+						AND username_clean = '" . $db->sql_escape(utf8_clean_string($bot_name)) . "'";
 				$result = $db->sql_query($sql);
 				$bot_user_id = (int) $db->sql_fetchfield('user_id');
 				$db->sql_freeresult($result);
-- 
cgit v1.2.1


From 54700f5ba24fe944616e017c3c2ff9c09c312445 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 9 Nov 2012 12:53:33 +0100
Subject: [ticket/10897] Use same code/query for deleting.

PHPBB3-10897
---
 phpBB/install/database_update.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index bd12a90288..b8bf85e283 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2164,21 +2164,18 @@ function change_database_data(&$no_updates, $version)
 
 			foreach ($bots_to_delete as $bot_name)
 			{
-				$bot_name_clean = utf8_clean_string($bot_name);
-
 				$sql = 'SELECT user_id
-					FROM ' . USERS_TABLE . "
-					WHERE username_clean = '" . $db->sql_escape($bot_name_clean) . "'";
+					FROM ' . USERS_TABLE . '
+					WHERE user_type = ' . USER_IGNORE . "
+						AND username_clean = '" . $db->sql_escape(utf8_clean_string($bot_name)) . "'";
 				$result = $db->sql_query($sql);
-				$bot_user_id = $db->sql_fetchfield('user_id');
-				$is_user = (bool) $bot_user_id;
+				$bot_user_id = (int) $db->sql_fetchfield('user_id');
 				$db->sql_freeresult($result);
 
-				if ($is_user)
+				if ($bot_user_id)
 				{
 					$sql = 'DELETE FROM ' . BOTS_TABLE . "
-						WHERE bot_name = '" . $db->sql_escape($bot_name) . "'";
-
+						WHERE user_id = $bot_user_id";
 					_sql($sql, $errored, $error_ary);
 
 					user_delete('remove', $bot_user_id);
-- 
cgit v1.2.1


From 60ea1c10ef0038fdb00fd38253d4b7407215e699 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 9 Nov 2012 12:59:05 +0100
Subject: [ticket/10897] Combine bot updates and bot delete.

PHPBB3-10897
---
 phpBB/install/database_update.php | 71 +++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 40 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b8bf85e283..f7980ab1be 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2120,49 +2120,30 @@ function change_database_data(&$no_updates, $version)
 					AND module_mode = \'signature\'';
 			_sql($sql, $errored, $error_ary);
 
-			// Update bot list
-			// Bot name to bot user agent map
-			$bots_to_update = array(
-				'Baidu [Spider]'	=> 'Baiduspider',
-				'Exabot [Bot]'		=> 'Exabot',
-				'Voyager [Bot]'		=> 'voyager/',
-				'W3C [Validator]'	=> 'W3C_Validator',
-			);
-
-			foreach ($bots_to_update as $bot_name => $bot_agent)
-			{
-				$sql = 'SELECT user_id
-					FROM ' . USERS_TABLE . '
-					WHERE user_type = ' . USER_IGNORE . "
-						AND username_clean = '" . $db->sql_escape(utf8_clean_string($bot_name)) . "'";
-				$result = $db->sql_query($sql);
-				$bot_user_id = (int) $db->sql_fetchfield('user_id');
-				$db->sql_freeresult($result);
-
-				if ($bot_user_id)
-				{
-					$sql = 'UPDATE ' . BOTS_TABLE . '
-						SET bot_agent = ' .  $db->sql_escape($bot_agent) . "
-						WHERE user_id = $bot_user_id";
-					_sql($sql, $errored, $error_ary);
-				}
-			}
-
+			// Update bots
 			if (!function_exists('user_delete'))
 			{
 				include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 			}
 
-			$bots_to_delete = array(
-				'NG-Search [Bot]',
-				'Nutch/CVS [Bot]',
-				'OmniExplorer [Bot]',
-				'Seekport [Bot]',
-				'Synoo [Bot]',
-				'WiseNut [Bot]',
+			$bots_updates = array(
+				// Bot Deletions
+				'NG-Search [Bot]'		=> false,
+				'Nutch/CVS [Bot]'		=> false,
+				'OmniExplorer [Bot]'	=> false,
+				'Seekport [Bot]'		=> false,
+				'Synoo [Bot]'			=> false,
+				'WiseNut [Bot]'			=> false,
+
+				// Bot Updates
+				// Bot name to bot user agent map
+				'Baidu [Spider]'	=> 'Baiduspider',
+				'Exabot [Bot]'		=> 'Exabot',
+				'Voyager [Bot]'		=> 'voyager/',
+				'W3C [Validator]'	=> 'W3C_Validator',
 			);
 
-			foreach ($bots_to_delete as $bot_name)
+			foreach ($bots_updates as $bot_name => $bot_agent)
 			{
 				$sql = 'SELECT user_id
 					FROM ' . USERS_TABLE . '
@@ -2174,11 +2155,21 @@ function change_database_data(&$no_updates, $version)
 
 				if ($bot_user_id)
 				{
-					$sql = 'DELETE FROM ' . BOTS_TABLE . "
-						WHERE user_id = $bot_user_id";
-					_sql($sql, $errored, $error_ary);
+					if ($bot_agent === false)
+					{
+						$sql = 'DELETE FROM ' . BOTS_TABLE . "
+							WHERE user_id = $bot_user_id";
+						_sql($sql, $errored, $error_ary);
 
-					user_delete('remove', $bot_user_id);
+						user_delete('remove', $bot_user_id);
+					}
+					else
+					{
+						$sql = 'UPDATE ' . BOTS_TABLE . "
+							SET bot_agent = '" .  $db->sql_escape($bot_agent) . "'
+							WHERE user_id = $bot_user_id";
+						_sql($sql, $errored, $error_ary);
+					}
 				}
 			}
 
-- 
cgit v1.2.1


From ed74c9c4870885cc3f1e04a2f68efb600012f529 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 9 Nov 2012 14:26:45 +0100
Subject: [ticket/11178] Do not set error_reporting to E_ALL in
 database_updater.php

Take whatever startup.php sets instead.

This especially takes care of E_STRICT messages that are generated because of
PHP4 compatibility.

PHPBB3-11178
---
 phpBB/install/database_update.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 099ab6aeb5..b6299dbf7c 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -60,8 +60,6 @@ $updates_to_version = UPDATES_TO_VERSION;
 $debug_from_version = DEBUG_FROM_VERSION;
 $oldest_from_version = OLDEST_FROM_VERSION;
 
-error_reporting(E_ALL);
-
 @set_time_limit(0);
 
 // Include essential scripts
-- 
cgit v1.2.1


From 195014867ae84fe04ec01c913e38bf1d435590f7 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 10 Nov 2012 11:25:22 +0100
Subject: [ticket/11183] Remove $load_extensions and weird dl() calls

PHPBB3-11183
---
 phpBB/install/database_update.php | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 527108af08..dcdd17cbc0 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -73,17 +73,6 @@ if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type))
 	die("Please read: <a href='../docs/INSTALL.html'>INSTALL.html</a> before attempting to update.");
 }
 
-// Load Extensions
-if (!empty($load_extensions) && function_exists('dl'))
-{
-	$load_extensions = explode(',', $load_extensions);
-
-	foreach ($load_extensions as $extension)
-	{
-		@dl(trim($extension));
-	}
-}
-
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 
@@ -2716,10 +2705,10 @@ function change_database_data(&$no_updates, $version)
 
 			// Create config value for displaying last subject on forum list
 			if (!isset($config['display_last_subject']))
-			{			
+			{
 				$config->set('display_last_subject', '1');
 			}
-			
+
 			$no_updates = false;
 
 			if (!isset($config['assets_version']))
@@ -2752,7 +2741,7 @@ function change_database_data(&$no_updates, $version)
 				// After we have calculated the timezones we can delete user_dst column from user table.
 				$db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
 			}
-			
+
 			if (!isset($config['site_home_url']))
 			{
 				$config->set('site_home_url', '');
-- 
cgit v1.2.1


From f48709f5bb8fb1b916d308e3b4bb06bc96d08611 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 19 Oct 2012 19:53:29 -0400
Subject: [feature/compiled-dic] Compile the DI Container into a cached class

PHPBB3-11152
---
 phpBB/install/database_update.php | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 527108af08..65c72ad635 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -109,20 +109,28 @@ if (!defined('EXT_TABLE'))
 	define('EXT_TABLE', $table_prefix . 'ext');
 }
 
-$phpbb_container = new ContainerBuilder();
-$loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/../config'));
-$loader->load('services.yml');
-
-// We must include the DI processor class files because the class loader
-// is not yet set up
-require($phpbb_root_path . 'includes/di/processor/interface.' . $phpEx);
-require($phpbb_root_path . 'includes/di/processor/config.' . $phpEx);
-$processor = new phpbb_di_processor_config($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx);
-$processor->process($phpbb_container);
-
 // Setup class loader first
-$phpbb_class_loader = $phpbb_container->get('class_loader');
-$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", ".$phpEx");
+$phpbb_class_loader->register();
+$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", ".$phpEx");
+$phpbb_class_loader_ext->register();
+
+// Set up container
+$phpbb_container = phpbb_create_compiled_container(
+	array(
+		new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
+		new phpbb_di_extension_core($phpbb_root_path),
+	),
+	array(
+		new phpbb_event_kernel_compiler_pass(),
+	),
+	$phpbb_root_path . 'config.' . $phpEx,
+	$phpbb_root_path,
+	$phpEx
+);
+
+$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
+$phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
 
 // set up caching
 $cache = $phpbb_container->get('cache');
-- 
cgit v1.2.1


From f9f03435f0681ab1aba1ff23d84fb4101be37e46 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 20 Oct 2012 17:03:06 -0400
Subject: [feature/compiled-dic] Move this to the other PR

PHPBB3-11152
---
 phpBB/install/database_update.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 65c72ad635..3d296545b4 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -121,9 +121,7 @@ $phpbb_container = phpbb_create_compiled_container(
 		new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
 		new phpbb_di_extension_core($phpbb_root_path),
 	),
-	array(
-		new phpbb_event_kernel_compiler_pass(),
-	),
+	array(),
 	$phpbb_root_path . 'config.' . $phpEx,
 	$phpbb_root_path,
 	$phpEx
-- 
cgit v1.2.1


From cb2725dd5a04118de8628e10f940e926f4fa8fa1 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sun, 21 Oct 2012 16:09:43 -0400
Subject: [feature/compiled-dic] Fix cron task loading

We cannot use container tags at run time if we are using a cached, compiled
container object (i.e. phpbb_cache_container) so we have to load them
beforehand.

PHPBB3-11152
---
 phpBB/install/database_update.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 3d296545b4..1734272486 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -121,8 +121,9 @@ $phpbb_container = phpbb_create_compiled_container(
 		new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
 		new phpbb_di_extension_core($phpbb_root_path),
 	),
-	array(),
-	$phpbb_root_path . 'config.' . $phpEx,
+	array(
+		new phpbb_di_pass_cron(),
+	),
 	$phpbb_root_path,
 	$phpEx
 );
-- 
cgit v1.2.1


From 897e8f2e8361839a92acae7e77225ef212e44647 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 9 Nov 2012 23:00:44 +0100
Subject: [ticket/11152] Move container functions to a separate function file

PHPBB3-11152
---
 phpBB/install/database_update.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 1734272486..a5c4e2acd3 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -88,6 +88,7 @@ if (!empty($load_extensions) && function_exists('dl'))
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
+require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
 
 phpbb_require_updated('includes/functions_content.' . $phpEx, true);
 
@@ -2723,10 +2724,10 @@ function change_database_data(&$no_updates, $version)
 
 			// Create config value for displaying last subject on forum list
 			if (!isset($config['display_last_subject']))
-			{			
+			{
 				$config->set('display_last_subject', '1');
 			}
-			
+
 			$no_updates = false;
 
 			if (!isset($config['assets_version']))
@@ -2759,7 +2760,7 @@ function change_database_data(&$no_updates, $version)
 				// After we have calculated the timezones we can delete user_dst column from user table.
 				$db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
 			}
-			
+
 			if (!isset($config['site_home_url']))
 			{
 				$config->set('site_home_url', '');
-- 
cgit v1.2.1


From bd37f7f6c04780819dfa8f81b2d761b91859fd67 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 10 Nov 2012 10:45:02 -0600
Subject: [ticket/11189] Replace DEBUG_EXTRA with DEBUG

PHPBB3-11189
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index dcdd17cbc0..899394cd08 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -620,7 +620,7 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true)
 {
 	global $db;
 
-	if (defined('DEBUG_EXTRA'))
+	if (defined('DEBUG'))
 	{
 		echo "<br />\n{$sql}\n<br />";
 	}
-- 
cgit v1.2.1


From 231d743ba9966e8304e0dd226ebf5eb7fb3b70d8 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 10 Nov 2012 23:34:27 +0100
Subject: [ticket/11152] Change phpbb_di_pass_cron to generic
 phpbb_di_pass_collection

PHPBB3-11152
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a5c4e2acd3..bc45b27cdc 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -123,7 +123,7 @@ $phpbb_container = phpbb_create_compiled_container(
 		new phpbb_di_extension_core($phpbb_root_path),
 	),
 	array(
-		new phpbb_di_pass_cron(),
+		new phpbb_di_pass_collection('cron.task_collection', 'cron.task'),
 	),
 	$phpbb_root_path,
 	$phpEx
-- 
cgit v1.2.1


From 8851b797fbf0f1b4120aa4d3ae713711e01ef98f Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 10 Nov 2012 23:35:52 +0100
Subject: [ticket/11152] Create separate function for debug-dependent container

PHPBB3-11152
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index bc45b27cdc..add59b3c85 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -117,7 +117,7 @@ $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_pat
 $phpbb_class_loader_ext->register();
 
 // Set up container
-$phpbb_container = phpbb_create_compiled_container(
+$phpbb_container = phpbb_create_dumped_container_unless_debug(
 	array(
 		new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
 		new phpbb_di_extension_core($phpbb_root_path),
-- 
cgit v1.2.1


From 3e4d3761fdec878758e43779eab124816596c8aa Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 11 Nov 2012 14:18:11 +0100
Subject: [ticket/11152] Rename collection to collection_pass

PHPBB3-11152
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index add59b3c85..1940daf334 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -123,7 +123,7 @@ $phpbb_container = phpbb_create_dumped_container_unless_debug(
 		new phpbb_di_extension_core($phpbb_root_path),
 	),
 	array(
-		new phpbb_di_pass_collection('cron.task_collection', 'cron.task'),
+		new phpbb_di_pass_collection_pass('cron.task_collection', 'cron.task'),
 	),
 	$phpbb_root_path,
 	$phpEx
-- 
cgit v1.2.1


From 844770d223eca4fe509a00e6e979be7cb58eadd5 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 11 Nov 2012 17:43:12 +0100
Subject: [ticket/11152] Remove old container processor calls

PHPBB3-11152
---
 phpBB/install/database_update.php | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 1940daf334..0121ccab1e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -142,13 +142,6 @@ $user		= $phpbb_container->get('user');
 $auth		= $phpbb_container->get('auth');
 $db			= $phpbb_container->get('dbal.conn');
 
-$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
-foreach ($ids as $id)
-{
-	$processor = $phpbb_container->get($id);
-	$processor->process($phpbb_container);
-}
-
 // make sure request_var uses this request instance
 request_var('', 0, false, false, $request); // "dependency injection" for a function
 
-- 
cgit v1.2.1


From d2a051cdd4269fd5749bdd4e7619fc5176a510a8 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 11 Nov 2012 18:39:24 +0100
Subject: [ticket/11193] Instantiate a single collection_pass for all
 collections

PHPBB3-11193
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 27cc4951a9..297802c210 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -112,7 +112,7 @@ $phpbb_container = phpbb_create_dumped_container_unless_debug(
 		new phpbb_di_extension_core($phpbb_root_path),
 	),
 	array(
-		new phpbb_di_pass_collection_pass('cron.task_collection', 'cron.task'),
+		new phpbb_di_pass_collection_pass(),
 	),
 	$phpbb_root_path,
 	$phpEx
-- 
cgit v1.2.1


From dd1f8a0e554cc7c7fd975089cfd01acc88c656a6 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sun, 11 Nov 2012 19:41:45 -0500
Subject: [feature/controller-new] Call pass to subscribe the Kernel event
 listener

PHPBB3-10864
---
 phpBB/install/database_update.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 297802c210..b8f5021dfd 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -113,6 +113,7 @@ $phpbb_container = phpbb_create_dumped_container_unless_debug(
 	),
 	array(
 		new phpbb_di_pass_collection_pass(),
+		new phpbb_di_pass_kernel(),
 	),
 	$phpbb_root_path,
 	$phpEx
-- 
cgit v1.2.1


From 4b6d538b062a56f55ba221ac8437b4bfc712a475 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 13 Nov 2012 09:28:56 -0500
Subject: [feature/controller] Rename kernel pass class properly

PHPBB3-10864
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b8f5021dfd..377e38c423 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -113,7 +113,7 @@ $phpbb_container = phpbb_create_dumped_container_unless_debug(
 	),
 	array(
 		new phpbb_di_pass_collection_pass(),
-		new phpbb_di_pass_kernel(),
+		new phpbb_di_pass_kernel_pass(),
 	),
 	$phpbb_root_path,
 	$phpEx
-- 
cgit v1.2.1


From 80da19ca7c12feb2996fd9d64dbdc8cb5c3cd2d9 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Wed, 7 Nov 2012 09:13:16 +0000
Subject: [ticket/10601] Database updating code

This is what is needed to update the database to comply with these code changes

PHPBB3-10601
---
 phpBB/install/database_update.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 377e38c423..7b20404cf2 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2749,6 +2749,33 @@ function change_database_data(&$no_updates, $version)
 				$config->set('site_home_url', '');
 				$config->set('site_home_text', '');
 			}
+			
+			
+			// ticket/10601: Make inbox default. Add basename to ucp's pm category
+			// Check if this was already applied
+				$sql = 'SELECT module_id, module_basename, parent_id, left_id, right_id 
+						FROM ' . MODULES_TABLE . '
+						WHERE 
+						module_basename = \'ucp_pm\'
+						ORDER BY module_id';
+				$result = $db->sql_query_limit($sql, 1);
+
+				if ($row = $db->sql_fetchrow($result))
+				{
+					// Checking if this is not a category
+					if ($row['left_id'] === $row['right_id'] - 1)
+					{
+						// This update is still not applied. Applying it
+						
+						$sql = 'UPDATE ' . MODULES_TABLE . '
+							SET module_basename = \'ucp_pm\'
+							WHERE  module_id = ' . (int)$row['parent_id'];
+						
+						_sql($sql, $errored, $error_ary);
+					
+					}
+				}
+				$db->sql_freeresult($result);
 
 		break;
 	}
-- 
cgit v1.2.1


From 85ebbbaec471ea64f22543e006f8c160b02d503f Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Wed, 7 Nov 2012 22:26:54 +0000
Subject: [ticket/10601] Database updating code v2

Added the space after the (int) as requested

PHPBB3-10601
---
 phpBB/install/database_update.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7b20404cf2..620af92173 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2753,29 +2753,29 @@ function change_database_data(&$no_updates, $version)
 			
 			// ticket/10601: Make inbox default. Add basename to ucp's pm category
 			// Check if this was already applied
-				$sql = 'SELECT module_id, module_basename, parent_id, left_id, right_id 
-						FROM ' . MODULES_TABLE . '
-						WHERE 
-						module_basename = \'ucp_pm\'
-						ORDER BY module_id';
-				$result = $db->sql_query_limit($sql, 1);
+			$sql = 'SELECT module_id, module_basename, parent_id, left_id, right_id 
+					FROM ' . MODULES_TABLE . '
+					WHERE 
+					module_basename = \'ucp_pm\'
+					ORDER BY module_id';
+			$result = $db->sql_query_limit($sql, 1);
 
-				if ($row = $db->sql_fetchrow($result))
+			if ($row = $db->sql_fetchrow($result))
+			{
+				// Checking if this is not a category
+				if ($row['left_id'] === $row['right_id'] - 1)
 				{
-					// Checking if this is not a category
-					if ($row['left_id'] === $row['right_id'] - 1)
-					{
-						// This update is still not applied. Applying it
-						
-						$sql = 'UPDATE ' . MODULES_TABLE . '
-							SET module_basename = \'ucp_pm\'
-							WHERE  module_id = ' . (int)$row['parent_id'];
-						
-						_sql($sql, $errored, $error_ary);
+					// This update is still not applied. Applying it
 					
-					}
+					$sql = 'UPDATE ' . MODULES_TABLE . '
+						SET module_basename = \'ucp_pm\'
+						WHERE  module_id = ' . (int) $row['parent_id'];
+					
+					_sql($sql, $errored, $error_ary);
+				
 				}
-				$db->sql_freeresult($result);
+			}
+			$db->sql_freeresult($result);
 
 		break;
 	}
-- 
cgit v1.2.1


From 1f9eaa1c56ec909bde82e1d7ad86079cd23f46bc Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Fri, 9 Nov 2012 08:51:18 +0000
Subject: [ticket/10601] Cosmetic code changes

- Removed the double line before the addition
- Moved the condition of the WHERE so that both are in the same line
- Removed TABs from the black lines
- Used double quotes instead of escaped single quotes.

PHPBB3-10601
---
 phpBB/install/database_update.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 620af92173..1dae3e566b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2749,14 +2749,12 @@ function change_database_data(&$no_updates, $version)
 				$config->set('site_home_url', '');
 				$config->set('site_home_text', '');
 			}
-			
-			
+
 			// ticket/10601: Make inbox default. Add basename to ucp's pm category
 			// Check if this was already applied
 			$sql = 'SELECT module_id, module_basename, parent_id, left_id, right_id 
 					FROM ' . MODULES_TABLE . '
-					WHERE 
-					module_basename = \'ucp_pm\'
+					WHERE module_basename = "ucp_pm"
 					ORDER BY module_id';
 			$result = $db->sql_query_limit($sql, 1);
 
@@ -2766,13 +2764,13 @@ function change_database_data(&$no_updates, $version)
 				if ($row['left_id'] === $row['right_id'] - 1)
 				{
 					// This update is still not applied. Applying it
-					
+
 					$sql = 'UPDATE ' . MODULES_TABLE . '
 						SET module_basename = \'ucp_pm\'
 						WHERE  module_id = ' . (int) $row['parent_id'];
-					
+
 					_sql($sql, $errored, $error_ary);
-				
+
 				}
 			}
 			$db->sql_freeresult($result);
-- 
cgit v1.2.1


From a4cc07617726bffd4c64cdebaa2e20a463990c5d Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Wed, 28 Nov 2012 19:36:13 +0000
Subject: [ticket/10601] Requested code changes

- Renamed the comment to PHPBB3-10601
- Removed backslashes
- Traded double quotes into single quotes inside.

PHPBB3-10601
---
 phpBB/install/database_update.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 1dae3e566b..eed484dfae 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2753,9 +2753,9 @@ function change_database_data(&$no_updates, $version)
 			// ticket/10601: Make inbox default. Add basename to ucp's pm category
 			// Check if this was already applied
 			$sql = 'SELECT module_id, module_basename, parent_id, left_id, right_id 
-					FROM ' . MODULES_TABLE . '
-					WHERE module_basename = "ucp_pm"
-					ORDER BY module_id';
+					FROM ' . MODULES_TABLE . "
+					WHERE module_basename = 'ucp_pm'
+					ORDER BY module_id";
 			$result = $db->sql_query_limit($sql, 1);
 
 			if ($row = $db->sql_fetchrow($result))
@@ -2765,9 +2765,9 @@ function change_database_data(&$no_updates, $version)
 				{
 					// This update is still not applied. Applying it
 
-					$sql = 'UPDATE ' . MODULES_TABLE . '
-						SET module_basename = \'ucp_pm\'
-						WHERE  module_id = ' . (int) $row['parent_id'];
+					$sql = 'UPDATE ' . MODULES_TABLE . "
+						SET module_basename = 'ucp_pm'
+						WHERE  module_id = " . (int) $row['parent_id'];
 
 					_sql($sql, $errored, $error_ary);
 
-- 
cgit v1.2.1


From a0d5c52eb6e8ef3a6bb44cff60b364d3a3a5bf3e Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sat, 1 Dec 2012 09:44:51 +0000
Subject: [ticket/10601] New approach in the update algorithm

 - New approach in the database update algorithm

PHPBB3-10601
---
 phpBB/install/database_update.php | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index eed484dfae..f3136690a2 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2750,28 +2750,25 @@ function change_database_data(&$no_updates, $version)
 				$config->set('site_home_text', '');
 			}
 
-			// ticket/10601: Make inbox default. Add basename to ucp's pm category
-			// Check if this was already applied
-			$sql = 'SELECT module_id, module_basename, parent_id, left_id, right_id 
+			// PHPBB3-10601: Make inbox default. Add basename to ucp's pm category
+			
+			// Get the category wanted while checking, at the same time, if this has already been applied
+			$sql = 'SELECT module_id, module_basename
 					FROM ' . MODULES_TABLE . "
-					WHERE module_basename = 'ucp_pm'
+					WHERE module_basename <> 'ucp_pm' AND
+						module_langname='UCP_PM'
 					ORDER BY module_id";
 			$result = $db->sql_query_limit($sql, 1);
 
 			if ($row = $db->sql_fetchrow($result))
 			{
-				// Checking if this is not a category
-				if ($row['left_id'] === $row['right_id'] - 1)
-				{
-					// This update is still not applied. Applying it
-
-					$sql = 'UPDATE ' . MODULES_TABLE . "
-						SET module_basename = 'ucp_pm'
-						WHERE  module_id = " . (int) $row['parent_id'];
+				// This update is still not applied. Applying it
 
-					_sql($sql, $errored, $error_ary);
+				$sql = 'UPDATE ' . MODULES_TABLE . "
+					SET module_basename = 'ucp_pm'
+					WHERE  module_id = " . (int) $row['module_id'];
 
-				}
+				_sql($sql, $errored, $error_ary);		
 			}
 			$db->sql_freeresult($result);
 
-- 
cgit v1.2.1


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: [ticket/10184] Disable receiving pms for bots by default

PHPBB3-10184
---
 phpBB/install/database_update.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/install/database_update.php')

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;
 	}
-- 
cgit v1.2.1


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: [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(-)

(limited to 'phpBB/install/database_update.php')

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;
-- 
cgit v1.2.1


From 1ce06711811561d2e3fa3c6ba2aeac4ebffa6581 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sat, 1 Dec 2012 10:05:20 +0000
Subject: [ticket/10601] The ORDER BY is only taking space there

PHPBB3-10601
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index f3136690a2..ae6e3bd9cf 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2757,7 +2757,7 @@ function change_database_data(&$no_updates, $version)
 					FROM ' . MODULES_TABLE . "
 					WHERE module_basename <> 'ucp_pm' AND
 						module_langname='UCP_PM'
-					ORDER BY module_id";
+						";
 			$result = $db->sql_query_limit($sql, 1);
 
 			if ($row = $db->sql_fetchrow($result))
-- 
cgit v1.2.1


From 4103c99a8676653a868014a6f58a76e8986bd5ed Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 1 Mar 2012 16:15:11 +0100
Subject: [ticket/10679] Add new permission for changing profile field
 information

The setting is copied from "Can use signature"

PHPBB3-10679
---
 phpBB/install/database_update.php | 48 +++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index e966756337..f0a16844e9 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2731,8 +2731,6 @@ function change_database_data(&$no_updates, $version)
 				$config->set('display_last_subject', '1');
 			}
 
-			$no_updates = false;
-
 			if (!isset($config['assets_version']))
 			{
 				$config->set('assets_version', '1');
@@ -2771,7 +2769,7 @@ function change_database_data(&$no_updates, $version)
 			}
 
 			// PHPBB3-10601: Make inbox default. Add basename to ucp's pm category
-			
+
 			// Get the category wanted while checking, at the same time, if this has already been applied
 			$sql = 'SELECT module_id, module_basename
 					FROM ' . MODULES_TABLE . "
@@ -2788,10 +2786,52 @@ function change_database_data(&$no_updates, $version)
 					SET module_basename = 'ucp_pm'
 					WHERE  module_id = " . (int) $row['module_id'];
 
-				_sql($sql, $errored, $error_ary);		
+				_sql($sql, $errored, $error_ary);
 			}
 			$db->sql_freeresult($result);
 
+			// Add new permission u_chgprofileinfo and duplicate settings from u_sig
+			include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
+			$auth_admin = new auth_admin();
+
+			// Only add the new permission if it does not already exist
+			if (empty($auth_admin->acl_options['id']['u_chgprofileinfo']))
+			{
+				$auth_admin->acl_add_option(array('global' => array('u_chgprofileinfo')));
+
+				// Now the tricky part, filling the permission
+				$old_id = $auth_admin->acl_options['id']['u_sig'];
+				$new_id = $auth_admin->acl_options['id']['u_chgprofileinfo'];
+
+				$tables = array(ACL_GROUPS_TABLE, ACL_ROLES_DATA_TABLE, ACL_USERS_TABLE);
+
+				foreach ($tables as $table)
+				{
+					$sql = 'SELECT *
+						FROM ' . $table . '
+						WHERE auth_option_id = ' . $old_id;
+					$result = _sql($sql, $errored, $error_ary);
+
+					$sql_ary = array();
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$row['auth_option_id'] = $new_id;
+						$sql_ary[] = $row;
+					}
+					$db->sql_freeresult($result);
+
+					if (sizeof($sql_ary))
+					{
+						$db->sql_multi_insert($table, $sql_ary);
+					}
+				}
+
+				// Remove any old permission entries
+				$auth_admin->acl_clear_prefetch();
+			}
+
+			$no_updates = false;
+
 		break;
 	}
 }
-- 
cgit v1.2.1


From 2f490293e4b8d08d6c1008ef5ea324ae259d9993 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Dec 2012 16:33:12 +0100
Subject: [ticket/10679] Use module_auth to limit access to the module

PHPBB3-10679
---
 phpBB/install/database_update.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index f0a16844e9..95fd1ca2c2 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2830,6 +2830,14 @@ function change_database_data(&$no_updates, $version)
 				$auth_admin->acl_clear_prefetch();
 			}
 
+			// Update the auth setting for the module
+			$sql = 'UPDATE ' . MODULES_TABLE . "
+				SET module_auth = 'acl_u_chgprofileinfo'
+				WHERE module_class = 'ucp'
+					AND module_basename = 'profile'
+					AND module_mode = 'profile_info'";
+			_sql($sql, $errored, $error_ary);
+
 			$no_updates = false;
 
 		break;
-- 
cgit v1.2.1


From c23d2457e9be616bfa83aebc5e743130b6c69624 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 7 Dec 2012 12:50:21 +0100
Subject: [ticket/10679] Update module basename, we added the xcp_ prefix in
 3.1

PHPBB3-10679
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 95fd1ca2c2..30592b995d 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2834,7 +2834,7 @@ function change_database_data(&$no_updates, $version)
 			$sql = 'UPDATE ' . MODULES_TABLE . "
 				SET module_auth = 'acl_u_chgprofileinfo'
 				WHERE module_class = 'ucp'
-					AND module_basename = 'profile'
+					AND module_basename = 'ucp_profile'
 					AND module_mode = 'profile_info'";
 			_sql($sql, $errored, $error_ary);
 
-- 
cgit v1.2.1