From 552df1f6eb79599bbf48743b0ce35cba35a956c6 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 27 Nov 2011 00:38:29 -0500
Subject: [ticket/10500] Use correct class name in @uses.

PHPBB3-10500
---
 phpBB/includes/template/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 228ea93513..267d637150 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -306,7 +306,7 @@ class phpbb_template
 	*
 	* @param string $handle Handle of the template to load
 	* @return phpbb_template_renderer Template renderer object, or null on failure
-	* @uses template_compile is used to compile template source
+	* @uses phpbb_template_compile is used to compile template source
 	*/
 	private function _tpl_load($handle)
 	{
-- 
cgit v1.2.1


From 18aa4e4ecd55b846ead8e15853164bb5742099ef Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 15 Dec 2011 15:13:11 +0000
Subject: [ticket/10535] Remove email confirm check on registration form

PHPBB3-10535
---
 phpBB/includes/ucp/ucp_register.php | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index fe09d0a9fe..56efc4706f 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -100,7 +100,6 @@ class ucp_register
 				$s_hidden_fields = array_merge($s_hidden_fields, array(
 					'username'			=> utf8_normalize_nfc(request_var('username', '', true)),
 					'email'				=> strtolower(request_var('email', '')),
-					'email_confirm'		=> strtolower(request_var('email_confirm', '')),
 					'lang'				=> $user->lang_name,
 					'tz'				=> request_var('tz', (float) $config['board_timezone']),
 				));
@@ -189,7 +188,6 @@ class ucp_register
 			'new_password'		=> request_var('new_password', '', true),
 			'password_confirm'	=> request_var('password_confirm', '', true),
 			'email'				=> strtolower(request_var('email', '')),
-			'email_confirm'		=> strtolower(request_var('email_confirm', '')),
 			'lang'				=> basename(request_var('lang', $user->lang_name)),
 			'tz'				=> request_var('tz', (float) $timezone),
 		);
@@ -208,7 +206,6 @@ class ucp_register
 				'email'				=> array(
 					array('string', false, 6, 60),
 					array('email')),
-				'email_confirm'		=> array('string', false, 6, 60),
 				'tz'				=> array('num', false, -14, 14),
 				'lang'				=> array('language_iso_name'),
 			));
@@ -253,11 +250,6 @@ class ucp_register
 				{
 					$error[] = $user->lang['NEW_PASSWORD_ERROR'];
 				}
-
-				if ($data['email'] != $data['email_confirm'])
-				{
-					$error[] = $user->lang['NEW_EMAIL_ERROR'];
-				}
 			}
 
 			if (!sizeof($error))
@@ -472,7 +464,6 @@ class ucp_register
 			'PASSWORD'			=> $data['new_password'],
 			'PASSWORD_CONFIRM'	=> $data['password_confirm'],
 			'EMAIL'				=> $data['email'],
-			'EMAIL_CONFIRM'		=> $data['email_confirm'],
 
 			'L_REG_COND'				=> $l_reg_cond,
 			'L_USERNAME_EXPLAIN'		=> $user->lang($config['allow_name_chars'] . '_EXPLAIN', $user->lang('CHARACTERS', (int) $config['min_name_chars']), $user->lang('CHARACTERS', (int) $config['max_name_chars'])),
-- 
cgit v1.2.1


From d73c3a297e1f31320c054685d5e38cb72a6357f3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 15 Dec 2011 23:15:24 +0000
Subject: [ticket/10535] Removed email confirm from UCP, removed unused
 language entries

PHPBB3-10535
---
 phpBB/includes/ucp/ucp_profile.php | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 6eb11e6e59..2bc438e042 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -47,7 +47,6 @@ class ucp_profile
 				$data = array(
 					'username'			=> utf8_normalize_nfc(request_var('username', $user->data['username'], true)),
 					'email'				=> strtolower(request_var('email', $user->data['user_email'])),
-					'email_confirm'		=> strtolower(request_var('email_confirm', '')),
 					'new_password'		=> request_var('new_password', '', true),
 					'cur_password'		=> request_var('cur_password', '', true),
 					'password_confirm'	=> request_var('password_confirm', '', true),
@@ -66,7 +65,6 @@ class ucp_profile
 						'email'				=> array(
 							array('string', false, 6, 60),
 							array('email')),
-						'email_confirm'		=> array('string', true, 6, 60),
 					);
 
 					if ($auth->acl_get('u_chgname') && $config['allow_namechange'])
@@ -79,11 +77,6 @@ class ucp_profile
 
 					$error = validate_data($data, $check_ary);
 
-					if ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email'] && $data['email_confirm'] != $data['email'])
-					{
-						$error[] = ($data['email_confirm']) ? 'NEW_EMAIL_ERROR' : 'NEW_EMAIL_CONFIRM_EMPTY';
-					}
-
 					if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && $data['password_confirm'] != $data['new_password'])
 					{
 						$error[] = ($data['password_confirm']) ? 'NEW_PASSWORD_ERROR' : 'NEW_PASSWORD_CONFIRM_EMPTY';
-- 
cgit v1.2.1


From 4baa2bb52c47b0b0e316c3a25f34e7bc27075ffd Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 23 Dec 2011 21:55:49 +0000
Subject: [ticket/10535] Removed email confirm field from acp_users module

PHPBB3-10535
---
 phpBB/includes/acp/acp_users.php | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index c1ad28ca14..cf5650a901 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -757,7 +757,6 @@ class acp_users
 						'username'			=> utf8_normalize_nfc(request_var('user', $user_row['username'], true)),
 						'user_founder'		=> request_var('user_founder', ($user_row['user_type'] == USER_FOUNDER) ? 1 : 0),
 						'email'				=> strtolower(request_var('user_email', $user_row['user_email'])),
-						'email_confirm'		=> strtolower(request_var('email_confirm', '')),
 						'new_password'		=> request_var('new_password', '', true),
 						'password_confirm'	=> request_var('password_confirm', '', true),
 					);
@@ -789,7 +788,6 @@ class acp_users
 								array('string', false, 6, 60),
 								array('email', $user_row['user_email'])
 							),
-							'email_confirm'		=> array('string', true, 6, 60)
 						);
 					}
 
@@ -800,11 +798,6 @@ class acp_users
 						$error[] = 'NEW_PASSWORD_ERROR';
 					}
 
-					if ($data['email'] != $user_row['user_email'] && $data['email_confirm'] != $data['email'])
-					{
-						$error[] = 'NEW_EMAIL_ERROR';
-					}
-
 					if (!check_form_key($form_name))
 					{
 						$error[] = 'FORM_INVALID';
-- 
cgit v1.2.1


From d9fef488af150107b753b3c30e15ab5bf6d9da38 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 26 Jul 2011 17:48:17 +0200
Subject: [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only
 SQL errors

PHPBB3-9079
---
 phpBB/includes/db/dbal.php   | 5 -----
 phpBB/includes/functions.php | 7 +++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index b4c1a72e1c..230c9c8ed7 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -662,12 +662,7 @@ class dbal
 			// The DEBUG_EXTRA constant is for development only!
 			if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG_EXTRA'))
 			{
-				// Print out a nice backtrace...
-				$backtrace = get_backtrace();
-
 				$message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : '';
-				$message .= ($backtrace) ? '<br /><br />BACKTRACE<br />' . $backtrace : '';
-				$message .= '<br />';
 			}
 			else
 			{
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 852fc683f2..f625f70c0f 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3853,6 +3853,13 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 				}
 			}
 
+			if (defined('IN_INSTALL') || defined('DEBUG_EXTRA') || isset($auth) && $auth->acl_get('a_'))
+			{
+				$backtrace = get_backtrace();
+				$msg_text .= ($backtrace) ? '<br /><br />BACKTRACE<br />' . $backtrace : '';
+				$msg_text .= '<br />';
+			}
+
 			if ((defined('DEBUG') || defined('IN_CRON') || defined('IMAGE_OUTPUT')) && isset($db))
 			{
 				// let's avoid loops
-- 
cgit v1.2.1


From b6999237f456443b0b325f2ebee1f990ee7f5116 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 24 Dec 2011 01:24:09 -0500
Subject: [ticket/9079] Always log backtrace to error log when logging errors.

PHPBB3-9079
---
 phpBB/includes/functions.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index f625f70c0f..1eefaee651 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3853,18 +3853,23 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 				}
 			}
 
+			$log_text = $msg_text;
+			$backtrace = get_backtrace();
+			if ($backtrace)
+			{
+				$log_text .= '<br /><br />BACKTRACE<br />' . $backtrace;
+			}
+
 			if (defined('IN_INSTALL') || defined('DEBUG_EXTRA') || isset($auth) && $auth->acl_get('a_'))
 			{
-				$backtrace = get_backtrace();
-				$msg_text .= ($backtrace) ? '<br /><br />BACKTRACE<br />' . $backtrace : '';
-				$msg_text .= '<br />';
+				$msg_text = $log_text;
 			}
 
 			if ((defined('DEBUG') || defined('IN_CRON') || defined('IMAGE_OUTPUT')) && isset($db))
 			{
 				// let's avoid loops
 				$db->sql_return_on_error(true);
-				add_log('critical', 'LOG_GENERAL_ERROR', $msg_title, $msg_text);
+				add_log('critical', 'LOG_GENERAL_ERROR', $msg_title, $log_text);
 				$db->sql_return_on_error(false);
 			}
 
-- 
cgit v1.2.1


From ffde8c8e06c4d37bef5cde280d520c0791ed2c67 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 6 Jan 2012 17:20:41 +0100
Subject: [ticket/10477] Normalize loaded module names to be class names or
 xcp_ prefixed

PHPBB3-10477
---
 phpBB/includes/functions_module.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index d810285313..a6015b1eac 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -804,6 +804,13 @@ class p_master
 	*/
 	function load($class, $name, $mode = false)
 	{
+		// new modules use the full class names, old ones are always called <class>_<name>, e.g. acp_board
+		// in the latter case this function may be called as load(acp, board)
+		if (!class_exists($name) && substr($name, 0, strlen($class) + 1) !== $class . '_')
+		{
+			$name = $class . '_' . $name;
+		}
+
 		$this->p_class = $class;
 		$this->p_name = $name;
 
-- 
cgit v1.2.1


From 3e36ac6678affa5f8578d29aee6bd2c27fb766b7 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 12 Jan 2012 22:25:14 -0500
Subject: [ticket/10579] Delete extra v2 from license block.

PHPBB3-10579
---
 phpBB/includes/search/fulltext_mysql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index f1e45c57cc..5372cfac7b 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -3,7 +3,7 @@
 *
 * @package search
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 v2
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-- 
cgit v1.2.1


From 3f754d118d8fbd36dcefbeea470ecb267e87ace6 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 12 Jan 2012 22:13:28 -0500
Subject: [ticket/10477] Document parameters to p_master#load.

PHPBB3-10477
---
 phpBB/includes/functions_module.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index a6015b1eac..653623a336 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -438,6 +438,8 @@ class p_master
 	* Loads currently active module
 	*
 	* This method loads a given module, passing it the relevant id and mode.
+	*
+	* @param string $mode mode, as passed through to the module
 	*/
 	function load_active($mode = false, $module_url = false, $execute_module = true)
 	{
@@ -801,11 +803,16 @@ class p_master
 
 	/**
 	* Load module as the current active one without the need for registering it
+	*
+	* @param string $class module class (acp/mcp/ucp)
+	* @param string $name module name (e.g. zebra for the ucp_zebra module)
+	* @param string $mode mode, as passed through to the module
+	*
 	*/
 	function load($class, $name, $mode = false)
 	{
 		// new modules use the full class names, old ones are always called <class>_<name>, e.g. acp_board
-		// in the latter case this function may be called as load(acp, board)
+		// in the latter case this function may be called as load('acp', 'board')
 		if (!class_exists($name) && substr($name, 0, strlen($class) + 1) !== $class . '_')
 		{
 			$name = $class . '_' . $name;
-- 
cgit v1.2.1


From 82c05a7ed6cde2ce1a217b988382167aa94fcf03 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 13 Jan 2012 12:59:29 +0100
Subject: [ticket/10477] Correctly document module (base)name parameter

PHPBB3-10477
---
 phpBB/includes/functions_module.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 653623a336..b7bb770031 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -805,7 +805,8 @@ class p_master
 	* Load module as the current active one without the need for registering it
 	*
 	* @param string $class module class (acp/mcp/ucp)
-	* @param string $name module name (e.g. zebra for the ucp_zebra module)
+	* @param string $name module name (class name of the module, or its basename
+    *                     phpbb_ext_foo_acp_bar_module, ucp_zebra or zebra)
 	* @param string $mode mode, as passed through to the module
 	*
 	*/
-- 
cgit v1.2.1


From 99164cd20b9d8ca77b1e9a54e0958cdb580945d0 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 17 Jan 2011 00:01:04 +0700
Subject: [ticket/9831] Correctly store checkbox default value for boolean CPF.

PHPBB3-9831
---
 phpBB/includes/acp/acp_profile.php          | 27 +++++++++++++++++++++++----
 phpBB/includes/functions_profile_fields.php |  4 ++--
 2 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 2e43b0545a..09a7a2f9ed 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -504,11 +504,26 @@ class acp_profile
 							}
 						}
 					}
-					/* else if ($field_type == FIELD_BOOL && $key == 'field_default_value')
+					else if ($field_type == FIELD_BOOL && $key == 'field_default_value')
 					{
-						// Get the number of options if this key is 'field_maxlen'
-						$var = request_var('field_default_value', 0);
-					}*/
+						// 'field_length' == 1 defines radio buttons. Possible values are 1 or 2 only.
+						// 'field_length' == 2 defines checkbox. Possible values are 0 or 1 only.
+						// If we switch the type on step 2, we have to adjust field value.
+						// 1 is a common value for the checkbox and radio buttons.
+
+						// If we switch to the checkbox type but former radio buttons value was 2,
+						// which is not the case for the checkbox, set it to 0 (unchecked).
+						if ($cp->vars['field_length'] == 2 && $var == 2)
+						{
+							$var = 0;
+						}
+						// If we switch to the radio buttons but the former checkbox value was 0,
+						// which is not the case for the radio buttons, set it to 0.
+						else if ($cp->vars['field_length'] == 1 && $var == 0)
+						{
+							$var = 2;
+						}
+					}
 					else if ($field_type == FIELD_INT && $key == 'field_default_value')
 					{
 						// Permit an empty string
@@ -676,6 +691,10 @@ class acp_profile
 						{
 							$_new_key_ary[$key] = utf8_normalize_nfc(request_var($key, array(array('')), true));
 						}
+						else if ($field_type == FIELD_BOOL && $key == 'field_default_value')
+						{
+							$_new_key_ary[$key] =  request_var($key, $cp->vars[$key]);
+						}
 						else
 						{
 							if (!isset($_REQUEST[$key]))
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 1eae2a9ad6..7874608009 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -625,10 +625,10 @@ class custom_profile
 
 		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
 		$user_ident = $profile_row['field_ident'];
-		// checkbox - only testing for isset
+		// checkbox - set the value to "true" if it has been set to 1
 		if ($profile_row['field_type'] == FIELD_BOOL && $profile_row['field_length'] == 2)
 		{
-			$value = (isset($_REQUEST[$profile_row['field_ident']])) ? true : ((!isset($user->profile_fields[$user_ident]) || $preview) ? $default_value : $user->profile_fields[$user_ident]);
+			$value = (isset($_REQUEST[$profile_row['field_ident']]) && request_var($profile_row['field_ident'], $default_value) == 1) ? true : ((!isset($user->profile_fields[$user_ident]) || $preview) ? $default_value : $user->profile_fields[$user_ident]);
 		}
 		else if ($profile_row['field_type'] == FIELD_INT)
 		{
-- 
cgit v1.2.1


From 2cf586a37206df3528237a2c91e255539c95a513 Mon Sep 17 00:00:00 2001
From: Richard Foote <dicky@phpbb.com>
Date: Tue, 17 Jan 2012 12:31:27 -0500
Subject: [ticket/10580] Remove checking of server timezone and DST when
 registering

Remove checking of server timezone and DST. It causes a problem by
selecting the wrong timezone when registering when the board_timezone is 1
hour less than the server timezone.

PHPBB3-10580
---
 phpBB/includes/ucp/ucp_register.php | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 4e8729db56..6ad3a55589 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -165,24 +165,8 @@ class ucp_register
 			$captcha->init(CONFIRM_REG);
 		}
 
-		// Try to manually determine the timezone and adjust the dst if the server date/time complies with the default setting +/- 1
-		$timezone = date('Z') / 3600;
-		$is_dst = date('I');
-
-		if ($config['board_timezone'] == $timezone || $config['board_timezone'] == ($timezone - 1))
-		{
-			$timezone = ($is_dst) ? $timezone - 1 : $timezone;
-
-			if (!isset($user->lang['tz_zones'][(string) $timezone]))
-			{
-				$timezone = $config['board_timezone'];
-			}
-		}
-		else
-		{
-			$is_dst = $config['board_dst'];
-			$timezone = $config['board_timezone'];
-		}
+		$is_dst = $config['board_dst'];
+		$timezone = $config['board_timezone'];
 
 		$data = array(
 			'username'			=> utf8_normalize_nfc(request_var('username', '', true)),
-- 
cgit v1.2.1


From ac492d8f1e7ef3420ebaee35131e342a39dfda10 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 22 Aug 2011 23:33:34 +0200
Subject: [ticket/10076] Move EHLO/HELO code into its own method.

PHPBB3-10076
---
 phpBB/includes/functions_messenger.php | 62 +++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 23 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 13d9b6a5cb..ccc17865f6 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -1286,30 +1286,10 @@ class smtp_class
 			}
 		}
 
-		// Try EHLO first
-		$this->server_send("EHLO {$local_host}");
-		if ($err_msg = $this->server_parse('250', __LINE__))
+		$hello_result = $this->hello($local_host);
+		if (!is_null($hello_result))
 		{
-			// a 503 response code means that we're already authenticated
-			if ($this->numeric_response_code == 503)
-			{
-				return false;
-			}
-
-			// If EHLO fails, we try HELO
-			$this->server_send("HELO {$local_host}");
-			if ($err_msg = $this->server_parse('250', __LINE__))
-			{
-				return ($this->numeric_response_code == 503) ? false : $err_msg;
-			}
-		}
-
-		foreach ($this->responses as $response)
-		{
-			$response = explode(' ', $response);
-			$response_code = $response[0];
-			unset($response[0]);
-			$this->commands[$response_code] = implode(' ', $response);
+			return $hello_result;
 		}
 
 		// If we are not authenticated yet, something might be wrong if no username and passwd passed
@@ -1355,6 +1335,42 @@ class smtp_class
 		return $this->$method($username, $password);
 	}
 
+	/**
+	* SMTP EHLO/HELO
+	*
+	* @return mixed		Null if the authentication process is supposed to continue
+	*					False if already authenticated
+	*					Error message (string) otherwise
+	*/
+	protected function hello($hostname)
+	{
+		// Try EHLO first
+		$this->server_send("EHLO $hostname");
+		if ($err_msg = $this->server_parse('250', __LINE__))
+		{
+			// a 503 response code means that we're already authenticated
+			if ($this->numeric_response_code == 503)
+			{
+				return false;
+			}
+
+			// If EHLO fails, we try HELO
+			$this->server_send("HELO $hostname");
+			if ($err_msg = $this->server_parse('250', __LINE__))
+			{
+				return ($this->numeric_response_code == 503) ? false : $err_msg;
+			}
+		}
+
+		foreach ($this->responses as $response)
+		{
+			$response = explode(' ', $response);
+			$response_code = $response[0];
+			unset($response[0]);
+			$this->commands[$response_code] = implode(' ', $response);
+		}
+	}
+
 	/**
 	* Pop before smtp authentication
 	*/
-- 
cgit v1.2.1


From 237ddf9d22e0aeccad5e1db022de3a890871849f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 22 Aug 2011 23:50:02 +0200
Subject: [ticket/10076] STARTTLS support for SMTP via smtp_class.

PHPBB3-10076
---
 phpBB/includes/functions_messenger.php | 57 ++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index ccc17865f6..f4e49b1b18 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -1136,6 +1136,7 @@ class smtp_class
 {
 	var $server_response = '';
 	var $socket = 0;
+	protected $socket_tls = false;
 	var $responses = array();
 	var $commands = array();
 	var $numeric_response_code = 0;
@@ -1292,6 +1293,25 @@ class smtp_class
 			return $hello_result;
 		}
 
+		// SMTP STARTTLS (RFC 3207)
+		if (!$this->socket_tls)
+		{
+			$this->socket_tls = $this->starttls();
+
+			if ($this->socket_tls)
+			{
+				// Switched to TLS
+				// RFC 3207: "The client MUST discard any knowledge obtained from the server, [...]"
+				// So say hello again
+				$hello_result = $this->hello($local_host);
+
+				if (!is_null($hello_result))
+				{
+					return $hello_result;
+				}
+			}
+		}
+
 		// If we are not authenticated yet, something might be wrong if no username and passwd passed
 		if (!$username || !$password)
 		{
@@ -1371,6 +1391,43 @@ class smtp_class
 		}
 	}
 
+	/**
+	* SMTP STARTTLS (RFC 3207)
+	*
+	* @return bool		Returns true if TLS was started
+	*					Otherwise false
+	*/
+	protected function starttls()
+	{
+		if (!function_exists('stream_socket_enable_crypto'))
+		{
+			return false;
+		}
+
+		if (!isset($this->commands['STARTTLS']))
+		{
+			return false;
+		}
+
+		$this->server_send('STARTTLS');
+
+		if ($err_msg = $this->server_parse('220', __LINE__))
+		{
+			return false;
+		}
+
+		$result = false;
+		$stream_meta = stream_get_meta_data($this->socket);
+
+		if (socket_set_blocking($this->socket, 1));
+		{
+			$result = stream_socket_enable_crypto($this->socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+			socket_set_blocking($this->socket, (int) $stream_meta['blocked']);
+		}
+
+		return $result;
+	}
+
 	/**
 	* Pop before smtp authentication
 	*/
-- 
cgit v1.2.1


From 4aef6ea979befe9c40b3253ed10678a4eeb74160 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Fri, 3 Feb 2012 16:09:48 +0200
Subject: [ticket/10616] Ignore template inheritance that points to self

Ignore template inheritance if it points to self

PHPBB3-10616
---
 phpBB/includes/functions.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 1eefaee651..4d2a00f2db 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3322,6 +3322,11 @@ function parse_cfg_file($filename, $lines = false)
 
 		$parsed_items[$key] = $value;
 	}
+	
+	if (isset($parsed_items['inherit_from']) && isset($parsed_items['name']) && $parsed_items['inherit_from'] == $parsed_items['name'])
+	{
+		unset($parsed_items['inherit_from']);
+	}
 
 	return $parsed_items;
 }
-- 
cgit v1.2.1


From 326ff46ef7812f9f725e680e5202364c6b25bb4b Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Fri, 3 Feb 2012 16:19:42 +0200
Subject: [ticket/10616] Add template inheritance to exported template

Add template inheritance when exporting template.cfg

PHPBB3-10616
---
 phpBB/includes/acp/acp_styles.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 5a7902755e..d7b0484af8 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -99,11 +99,11 @@ parse_css_file = {PARSE_CSS_FILE}
 		$this->template_cfg .= '
 # Some configuration options
 
-#
-# You can use this function to inherit templates from another template.
-# The template of the given name has to be installed.
-# Templates cannot inherit from inheriting templates.
-#';
+# Template inheritance
+# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/
+# Set value to empty or this template name to ignore template inheritance.
+inherit_from = {INHERIT_FROM}
+';
 
 		$this->imageset_keys = array(
 			'logos' => array(
@@ -2047,9 +2047,7 @@ parse_css_file = {PARSE_CSS_FILE}
 			// Export template core code
 			if ($mode == 'template' || $inc_template)
 			{
-				$template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], $config['version']), $this->template_cfg);
-
-				$use_template_name = '';
+				$use_template_name = $style_row['template_name'];
 
 				// Add the inherit from variable, depending on it's use...
 				if ($style_row['template_inherits_id'])
@@ -2063,7 +2061,8 @@ parse_css_file = {PARSE_CSS_FILE}
 					$db->sql_freeresult($result);
 				}
 
-				$template_cfg .= ($use_template_name) ? "\ninherit_from = $use_template_name" : "\n#inherit_from = ";
+				$template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}', '{INHERIT_FROM}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], $config['version'], $use_template_name), $this->template_cfg);
+
 				$template_cfg .= "\n\nbbcode_bitfield = {$style_row['bbcode_bitfield']}";
 
 				$data[] = array(
-- 
cgit v1.2.1


From 42d9edc4f268d4f0894bc140c2aefffbd87e3361 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 4 Feb 2012 00:57:39 +0100
Subject: [ticket/10495] Update request/type_cast_helper for PHP 5.4
 magic_quotes_gpc drop

PHPBB3-10495
---
 phpBB/includes/request/type_cast_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/request/type_cast_helper.php b/phpBB/includes/request/type_cast_helper.php
index 5aa0372328..561e8fc251 100644
--- a/phpBB/includes/request/type_cast_helper.php
+++ b/phpBB/includes/request/type_cast_helper.php
@@ -34,7 +34,7 @@ class phpbb_request_type_cast_helper implements phpbb_request_type_cast_helper_i
 	*/
 	public function __construct()
 	{
-		if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
+		if (version_compare(PHP_VERSION, '5.4.0-dev', '>='))
 		{
 			$this->strip = false;
 		}
-- 
cgit v1.2.1


From f832f5a4ee88459dae6fda7e1b303b15f84768dc Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 5 Feb 2012 22:03:02 +0800
Subject: [ticket/9831] Fix saving unchecked checkbox field value

PHPBB3-9831
---
 phpBB/includes/acp/acp_profile.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 09a7a2f9ed..a591474fce 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -511,6 +511,14 @@ class acp_profile
 						// If we switch the type on step 2, we have to adjust field value.
 						// 1 is a common value for the checkbox and radio buttons.
 
+						// Adjust unchecked checkbox value.
+						// If we return or save settings from 2nd/3rd page
+						// and the checkbox is unchecked, set the value to 0.
+						if (isset($_REQUEST['step']) && !isset($_REQUEST[$key]))
+						{
+							$var = 0;
+						}
+
 						// If we switch to the checkbox type but former radio buttons value was 2,
 						// which is not the case for the checkbox, set it to 0 (unchecked).
 						if ($cp->vars['field_length'] == 2 && $var == 2)
-- 
cgit v1.2.1


From 6cf7f205903767bf44d1ee1de796d5f3a00774cd Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 9 Feb 2012 01:34:37 +0200
Subject: [ticket/10634] Changing p_master::is_full_class

Changing p_master::is_full_class to check allow all module types, not only current type

PHPBB3-10634
---
 phpBB/includes/functions_module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index b7bb770031..db7defdc48 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -923,6 +923,6 @@ class p_master
 	*/
 	protected function is_full_class($basename)
 	{
-		return (substr($basename, 0, 6) === 'phpbb_' || substr($basename, 0, strlen($this->p_class) + 1) === $this->p_class . '_');
+		return (preg_match('/^(phpbb|ucp|mcp|acp)_/', $basename));
 	}
 }
-- 
cgit v1.2.1


From 5ccd6b0c7a2952f01b636e7319ed8ae4be8faa77 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 9 Feb 2012 01:03:17 +0100
Subject: [ticket/10614] Tweak list output, show state, purge cache, handle
 missing exts

PHPBB3-10614
---
 phpBB/includes/extension/manager.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 438578e7e7..b7f76d0400 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -132,6 +132,12 @@ class phpbb_extension_manager
 	*/
 	public function enable_step($name)
 	{
+		$ext_path = $this->get_extension_path($name);
+		if (!file_exists($ext_path))
+		{
+			throw new InvalidArgumentException('The provided extension does not exist.');
+		}
+
 		// ignore extensions that are already enabled
 		if (isset($this->extensions[$name]) && $this->extensions[$name]['ext_active'])
 		{
@@ -152,7 +158,7 @@ class phpbb_extension_manager
 		);
 
 		$this->extensions[$name] = $extension_data;
-		$this->extensions[$name]['ext_path'] = $this->get_extension_path($extension_data['ext_name']);
+		$this->extensions[$name]['ext_path'] = $ext_path;
 		ksort($this->extensions);
 
 		$sql = 'UPDATE ' . $this->extension_table . '
@@ -195,6 +201,12 @@ class phpbb_extension_manager
 	*/
 	public function disable_step($name)
 	{
+		$ext_path = $this->get_extension_path($name);
+		if (!file_exists($ext_path))
+		{
+			throw new InvalidArgumentException('The provided extension does not exist.');
+		}
+
 		// ignore extensions that are already disabled
 		if (!isset($this->extensions[$name]) || !$this->extensions[$name]['ext_active'])
 		{
@@ -262,6 +274,12 @@ class phpbb_extension_manager
 	*/
 	public function purge_step($name)
 	{
+		$ext_path = $this->get_extension_path($name);
+		if (!file_exists($ext_path))
+		{
+			throw new InvalidArgumentException('The provided extension does not exist.');
+		}
+
 		// ignore extensions that do not exist
 		if (!isset($this->extensions[$name]))
 		{
-- 
cgit v1.2.1


From 36728d3414e513f0b4aede75d53316e208e5eceb Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 9 Feb 2012 01:36:06 +0100
Subject: [ticket/10614] Refactor list command to use manager API

PHPBB3-10614
---
 phpBB/includes/extension/manager.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index b7f76d0400..b8643b39ee 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -61,7 +61,7 @@ class phpbb_extension_manager
 	*
 	* @return null
 	*/
-	protected function load_extensions()
+	public function load_extensions()
 	{
 		$sql = 'SELECT *
 			FROM ' . $this->extension_table;
@@ -173,6 +173,8 @@ class phpbb_extension_manager
 			$this->db->sql_query($sql);
 		}
 
+		$this->cache->destroy($this->cache_name);
+
 		return !$active;
 	}
 
@@ -231,6 +233,8 @@ class phpbb_extension_manager
 				WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
 			$this->db->sql_query($sql);
 
+			$this->cache->destroy($this->cache_name);
+
 			return true;
 		}
 
@@ -246,6 +250,8 @@ class phpbb_extension_manager
 			WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
 		$this->db->sql_query($sql);
 
+		$this->cache->destroy($this->cache_name);
+
 		return false;
 	}
 
@@ -310,6 +316,8 @@ class phpbb_extension_manager
 				WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
 			$this->db->sql_query($sql);
 
+			$this->cache->destroy($this->cache_name);
+
 			return true;
 		}
 
@@ -319,6 +327,8 @@ class phpbb_extension_manager
 			WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
 		$this->db->sql_query($sql);
 
+		$this->cache->destroy($this->cache_name);
+
 		return false;
 	}
 
-- 
cgit v1.2.1


From 68e4c667fa5f29f7974b83549a2a9bb8bbd8abc5 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 9 Feb 2012 01:37:53 +0100
Subject: [ticket/10614] Remove ext manager exceptions for now

PHPBB3-10614
---
 phpBB/includes/extension/manager.php | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index b8643b39ee..12b626d69f 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -132,12 +132,6 @@ class phpbb_extension_manager
 	*/
 	public function enable_step($name)
 	{
-		$ext_path = $this->get_extension_path($name);
-		if (!file_exists($ext_path))
-		{
-			throw new InvalidArgumentException('The provided extension does not exist.');
-		}
-
 		// ignore extensions that are already enabled
 		if (isset($this->extensions[$name]) && $this->extensions[$name]['ext_active'])
 		{
@@ -158,7 +152,7 @@ class phpbb_extension_manager
 		);
 
 		$this->extensions[$name] = $extension_data;
-		$this->extensions[$name]['ext_path'] = $ext_path;
+		$this->extensions[$name]['ext_path'] = $this->get_extension_path($extension_data['ext_name']);
 		ksort($this->extensions);
 
 		$sql = 'UPDATE ' . $this->extension_table . '
@@ -203,12 +197,6 @@ class phpbb_extension_manager
 	*/
 	public function disable_step($name)
 	{
-		$ext_path = $this->get_extension_path($name);
-		if (!file_exists($ext_path))
-		{
-			throw new InvalidArgumentException('The provided extension does not exist.');
-		}
-
 		// ignore extensions that are already disabled
 		if (!isset($this->extensions[$name]) || !$this->extensions[$name]['ext_active'])
 		{
@@ -280,12 +268,6 @@ class phpbb_extension_manager
 	*/
 	public function purge_step($name)
 	{
-		$ext_path = $this->get_extension_path($name);
-		if (!file_exists($ext_path))
-		{
-			throw new InvalidArgumentException('The provided extension does not exist.');
-		}
-
 		// ignore extensions that do not exist
 		if (!isset($this->extensions[$name]))
 		{
-- 
cgit v1.2.1


From 78de29b7ce5b8c1c34749bb68813840f7e6c4b7b Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 9 Feb 2012 01:39:45 +0100
Subject: [ticket/10614] Check if cache exists before destroying it

PHPBB3-10614
---
 phpBB/includes/extension/manager.php | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 12b626d69f..56092410f2 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -167,7 +167,10 @@ class phpbb_extension_manager
 			$this->db->sql_query($sql);
 		}
 
-		$this->cache->destroy($this->cache_name);
+		if ($this->cache)
+		{
+			$this->cache->destroy($this->cache_name);
+		}
 
 		return !$active;
 	}
@@ -221,7 +224,10 @@ class phpbb_extension_manager
 				WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
 			$this->db->sql_query($sql);
 
-			$this->cache->destroy($this->cache_name);
+			if ($this->cache)
+			{
+				$this->cache->destroy($this->cache_name);
+			}
 
 			return true;
 		}
@@ -238,7 +244,10 @@ class phpbb_extension_manager
 			WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
 		$this->db->sql_query($sql);
 
-		$this->cache->destroy($this->cache_name);
+		if ($this->cache)
+		{
+			$this->cache->destroy($this->cache_name);
+		}
 
 		return false;
 	}
@@ -298,7 +307,10 @@ class phpbb_extension_manager
 				WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
 			$this->db->sql_query($sql);
 
-			$this->cache->destroy($this->cache_name);
+			if ($this->cache)
+			{
+				$this->cache->destroy($this->cache_name);
+			}
 
 			return true;
 		}
@@ -309,7 +321,10 @@ class phpbb_extension_manager
 			WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
 		$this->db->sql_query($sql);
 
-		$this->cache->destroy($this->cache_name);
+		if ($this->cache)
+		{
+			$this->cache->destroy($this->cache_name);
+		}
 
 		return false;
 	}
-- 
cgit v1.2.1


From 6858485964fda2d43fd7622123ffce796b2fd365 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 9 Feb 2012 14:08:58 +0100
Subject: [ticket/10636] Resolve variable name ($sql_ary) conflict in
 cache_moderators().

Regression from 4c77903129749008cd08c346006d2a57cf6ff544.

PHPBB3-10636
---
 phpBB/includes/functions_admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 7fdf874456..2fd58a11e9 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2330,7 +2330,7 @@ function cache_moderators()
 		$ug_id_ary = array_keys($hold_ary);
 
 		// Remove users who have group memberships with DENY moderator permissions
-		$sql_ary = array(
+		$sql_ary_deny = array(
 			'SELECT'	=> 'a.forum_id, ug.user_id, g.group_id',
 
 			'FROM'		=> array(
@@ -2357,7 +2357,7 @@ function cache_moderators()
 				AND ug.user_pending = 0
 				AND o.auth_option " . $db->sql_like_expression('m_' . $db->any_char),
 		);
-		$sql = $db->sql_build_query('SELECT', $sql_ary);
+		$sql = $db->sql_build_query('SELECT', $sql_ary_deny);
 		$result = $db->sql_query($sql);
 
 		while ($row = $db->sql_fetchrow($result))
-- 
cgit v1.2.1


From 35d5d527dbe2de1a608e6af4b004ed807ff22743 Mon Sep 17 00:00:00 2001
From: James King <ginger_ninja56@yahoo.co.uk>
Date: Wed, 8 Feb 2012 01:33:08 +0000
Subject: [ticket/10606] Fix incorrect hidden fields array name in
 page_header().

Regression from dfb7cc625a37c6345fa647ee3a21f890ba5c9649.

PHPBB3-10606
---
 phpBB/includes/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 4d2a00f2db..0320230a7d 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4553,7 +4553,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		foreach ($_EXTRA_URL as $url_param)
 		{
 			$url_param = explode('=', $url_param, 2);
-			$s_hidden_fields[$url_param[0]] = $url_param[1];
+			$s_search_hidden_fields[$url_param[0]] = $url_param[1];
 		}
 	}
 
-- 
cgit v1.2.1


From 345e8e084fd5ab7f99442ce6515a786a90806e2e Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Fri, 10 Feb 2012 00:31:13 +0800
Subject: [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not
 required

PHPBB3-9084
---
 phpBB/includes/functions_profile_fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 1eae2a9ad6..79701429e6 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -571,7 +571,7 @@ class custom_profile
 					$this->get_option_lang($field_id, $lang_id, FIELD_DROPDOWN, false);
 				}
 
-				if ($value == $ident_ary['data']['field_novalue'])
+				if ($value == $ident_ary['data']['field_novalue'] && $ident_ary['data']['field_required'])
 				{
 					return NULL;
 				}
-- 
cgit v1.2.1


From 11606c86073db42b0455a654d35d6ff38fb70105 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 9 Feb 2012 21:58:39 +0200
Subject: [ticket/10637] Leftovers from implementation of extensions

Replacing code in includes/functions_admin.php that was missed in ticket 10323

PHPBB3-10637
---
 phpBB/includes/functions_admin.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 7fdf874456..7b4393f383 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -847,15 +847,13 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 	}
 
 	// Remove the message from the search index
-	$search_type = basename($config['search_type']);
+	$search_type = $config['search_type'];
 
-	if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx))
+	if (!class_exists($search_type))
 	{
 		trigger_error('NO_SUCH_SEARCH_MODULE');
 	}
 
-	include_once("{$phpbb_root_path}includes/search/$search_type.$phpEx");
-
 	$error = false;
 	$search = new $search_type($error);
 
-- 
cgit v1.2.1


From 1d72a47ea6f47ec95b201ea4a3b9a9e0ea34da9a Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 9 Feb 2012 22:13:13 +0200
Subject: [ticket/10637] Leftovers from implementation of extensions in
 mcp_main

Replacing code in includes/mcp/mcp_main.php that was missed in ticket 10323

PHPBB3-10637
---
 phpBB/includes/mcp/mcp_main.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 10e5956fc2..a21c67924d 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -907,16 +907,11 @@ function mcp_fork_topic($topic_ids)
 			if (!isset($search_type) && $topic_row['enable_indexing'])
 			{
 				// Select the search method and do some additional checks to ensure it can actually be utilised
-				$search_type = basename($config['search_type']);
-
-				if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx))
-				{
-					trigger_error('NO_SUCH_SEARCH_MODULE');
-				}
+				$search_type = $config['search_type'];
 
 				if (!class_exists($search_type))
 				{
-					include("{$phpbb_root_path}includes/search/$search_type.$phpEx");
+					trigger_error('NO_SUCH_SEARCH_MODULE');
 				}
 
 				$error = false;
-- 
cgit v1.2.1


From 92303d2dacdd7be3fad4d2ffba84c0d30fcadeaf Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 9 Feb 2012 22:17:33 +0200
Subject: [ticket/10637] Leftovers from implementation of extensions in
 mcp_post

Replacing code in includes/mcp/mcp_post.php that was missed in ticket 10323

PHPBB3-10637
---
 phpBB/includes/mcp/mcp_post.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index ee79928eb1..2a52a858b3 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -464,12 +464,10 @@ function change_poster(&$post_info, $userdata)
 	}
 
 	// refresh search cache of this post
-	$search_type = basename($config['search_type']);
+	$search_type = $config['search_type'];
 
-	if (file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx))
+	if (class_exists($search_type))
 	{
-		require("{$phpbb_root_path}includes/search/$search_type.$phpEx");
-
 		// We do some additional checks in the module to ensure it can actually be utilised
 		$error = false;
 		$search = new $search_type($error);
-- 
cgit v1.2.1


From 2814021d3ff3be4d57166ac8da224807cabb5367 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 11 Feb 2012 15:08:05 -0500
Subject: [ticket/10614] Unbreak all_available on extension manager.

By default RecursiveIteratorIterator skips all directories.
This results in extension manager not finding any extensions.
Add RecursiveIteratorIterator::SELF_FIRST to correct this.

PHPBB3-10614
---
 phpBB/includes/extension/manager.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 56092410f2..c38f0df32e 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -354,7 +354,8 @@ class phpbb_extension_manager
 		$available = array();
 
 		$iterator = new RecursiveIteratorIterator(
-			new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/'));
+			new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/'),
+			RecursiveIteratorIterator::SELF_FIRST);
 		foreach ($iterator as $file_info)
 		{
 			if ($file_info->isFile() && $file_info->getFilename() == 'ext' . $this->phpEx)
-- 
cgit v1.2.1


From 5aad71b22017dea39a4a549d4e3b1b939789c1ce Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Wed, 15 Feb 2012 18:46:27 +0200
Subject: [ticket/10652] Fixing typo in template class

Fixing typo in template class that prevents template inheritance from working

PHPBB3-10652
---
 phpBB/includes/template/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 43dec7dbf5..9297b759ac 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -128,7 +128,7 @@ class phpbb_template
 	{
 		$templates = array($template_name => $template_path);
 
-		if ($fallback_template_path !== false)
+		if ($fallback_template_name !== false)
 		{
 			$templates[$fallback_template_name] = $fallback_template_path;
 		}
-- 
cgit v1.2.1


From c3265c913817e5e774d30993c181d70e853b60d4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 20 Feb 2012 01:52:33 +0100
Subject: [ticket/10639] Do not allow negative post count as rank's minimum
 posts

PHPBB3-10639
---
 phpBB/includes/acp/acp_ranks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_ranks.php b/phpBB/includes/acp/acp_ranks.php
index dfd7511427..ea057cd84c 100644
--- a/phpBB/includes/acp/acp_ranks.php
+++ b/phpBB/includes/acp/acp_ranks.php
@@ -52,7 +52,7 @@ class acp_ranks
 				}
 				$rank_title = utf8_normalize_nfc(request_var('title', '', true));
 				$special_rank = request_var('special_rank', 0);
-				$min_posts = ($special_rank) ? 0 : request_var('min_posts', 0);
+				$min_posts = ($special_rank) ? 0 : max(0, request_var('min_posts', 0));
 				$rank_image = request_var('rank_image', '');
 
 				// The rank image has to be a jpg, gif or png
-- 
cgit v1.2.1


From afcf9cbc8617462853d3b42e4dfc9f1f46051e79 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 20 Feb 2012 02:14:23 +0100
Subject: [ticket/10630] Perform array_unique on authors array before creating
 the query

This is needed to avoid an additional appearance for an author for every
post he made.

PHPBB3-10630
---
 phpBB/includes/search/fulltext_mysql.php  | 2 +-
 phpBB/includes/search/fulltext_native.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 29cdd8ee9a..52372a14d8 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -707,7 +707,7 @@ class fulltext_mysql extends search_backend
 	*/
 	function index_remove($post_ids, $author_ids, $forum_ids)
 	{
-		$this->destroy_cache(array(), $author_ids);
+		$this->destroy_cache(array(), array_unique($author_ids));
 	}
 
 	/**
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index 727e3aaffb..b63205fd76 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -1334,7 +1334,7 @@ class fulltext_native extends search_backend
 			$db->sql_query($sql);
 		}
 
-		$this->destroy_cache(array_unique($word_texts), $author_ids);
+		$this->destroy_cache(array_unique($word_texts), array_unique($author_ids));
 	}
 
 	/**
-- 
cgit v1.2.1


From ef154b78a169402e7f968cd2189b69b041a73543 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 20 Feb 2012 02:16:41 +0100
Subject: [ticket/10630] Use sql_like_expression() method instead of hardcoded
 LIKE '%x%'

PHPBB3-10630
---
 phpBB/includes/search/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/search.php b/phpBB/includes/search/search.php
index 2f20d11495..df7c8a0892 100644
--- a/phpBB/includes/search/search.php
+++ b/phpBB/includes/search/search.php
@@ -295,7 +295,7 @@ class search_backend
 			$sql_where = '';
 			foreach ($authors as $author)
 			{
-				$sql_where .= (($sql_where) ? ' OR ' : '') . 'search_authors LIKE \'% ' . (int) $author . ' %\'';
+				$sql_where .= (($sql_where) ? ' OR ' : '') . 'search_authors ' . $db->sql_like_expression($db->any_char . ' ' . (int) $author . ' ' . $db->any_char);
 			}
 
 			$sql = 'SELECT search_key
-- 
cgit v1.2.1


From 41870c40954bdd0faad2ce4b01fb416a03eed4e0 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 21 Feb 2012 18:32:08 +0100
Subject: [ticket/10663] Extension finder should not find subdirs with
 directory filter

The directory filter pattern now has a $ in the end, do avoid subdirectories
from being matched as well.

PHPBB3-10663
---
 phpBB/includes/extension/finder.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php
index e5e5e4983e..23b9f1c658 100644
--- a/phpBB/includes/extension/finder.php
+++ b/phpBB/includes/extension/finder.php
@@ -375,6 +375,10 @@ class phpbb_extension_finder
 			{
 				$directory_pattern = preg_quote(DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $directory) . DIRECTORY_SEPARATOR, '#');
 			}
+			if ($is_dir)
+			{
+				$directory_pattern .= '$';
+			}
 			$directory_pattern = '#' . $directory_pattern . '#';
 
 			$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST);
-- 
cgit v1.2.1


From 470b79c9e38ea5c37fe5f4685618e5794b6954ad Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Fri, 24 Feb 2012 07:41:08 +0000
Subject: [ticket/8652] Sending 2 emails on 2 replies

This is a fix for the problem of the system sending 2 emails when there are 2
replies to a topic where the user is subscribed in a topic and the forum that
contains the topic.
This simple fix seems to solve the problem. In simple tests I made it shows
it does.

PHPBB3-8652
---
 phpBB/includes/functions_posting.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 77d92e26e2..38f542264c 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1286,6 +1286,12 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 		{
 			$msg_users[] = $row;
 			$update_notification[$row['notify_type']][] = $row['user_id'];
+			if ($row['notify_type'] === 'topic')
+			{
+				// Using SQL characteristics. If it didn't exist it isn't added.
+				// It's very rare to find someone that is registered in topic and noone is registered in the forum
+				$update_notification['forum'][] = $row['user_id'];
+			}
 		}
 	}
 	unset($notify_rows);
-- 
cgit v1.2.1


From b74530259faa6197d7215d957c180280210a93e0 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 2 Mar 2012 00:19:42 +0100
Subject: [ticket/8652] Comment for also updating forum watch table in
 user_notification.

PHPBB3-8652
---
 phpBB/includes/functions_posting.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 38f542264c..f920be9c4b 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1286,10 +1286,18 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 		{
 			$msg_users[] = $row;
 			$update_notification[$row['notify_type']][] = $row['user_id'];
+
+			/*
+			* We also update the forums watch table for this user when we are
+			* sending out a topic notification to prevent sending out another
+			* notification in case this user is also subscribed to the forum
+			* this topic was posted in.
+			* Since an UPDATE query is used, this has no effect on users only
+			* subscribed to the topic (i.e. no row is created) and should not
+			* be a performance issue.
+			*/
 			if ($row['notify_type'] === 'topic')
 			{
-				// Using SQL characteristics. If it didn't exist it isn't added.
-				// It's very rare to find someone that is registered in topic and noone is registered in the forum
 				$update_notification['forum'][] = $row['user_id'];
 			}
 		}
-- 
cgit v1.2.1


From efe25a0b49c7445bef665ab28fc979e485e49289 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 29 Oct 2011 15:31:29 +0200
Subject: [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on
 MySQL.

PHPBB3-9813
---
 phpBB/includes/search/fulltext_native.php | 38 +++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index b63205fd76..e5eee50fdb 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -1461,17 +1461,35 @@ class fulltext_native extends search_backend
 	{
 		global $db;
 
-		$sql = 'SELECT COUNT(*) as total_words
-			FROM ' . SEARCH_WORDLIST_TABLE;
-		$result = $db->sql_query($sql);
-		$this->stats['total_words'] = (int) $db->sql_fetchfield('total_words');
-		$db->sql_freeresult($result);
+		switch ($db->sql_layer)
+		{
+			case 'mysql4':
+			case 'mysqli':
+				$sql = "SHOW TABLE STATUS LIKE '" . SEARCH_WORDLIST_TABLE . "'";
+				$result = $db->sql_query($sql);
+				$this->stats['total_words'] = (int) $db->sql_fetchfield('Rows');
+				$db->sql_freeresult($result);
+
+				$sql = "SHOW TABLE STATUS LIKE '" . SEARCH_WORDMATCH_TABLE . "'";
+				$result = $db->sql_query($sql);
+				$this->stats['total_matches'] = (int) $db->sql_fetchfield('Rows');
+				$db->sql_freeresult($result);
+			break;
 
-		$sql = 'SELECT COUNT(*) as total_matches
-			FROM ' . SEARCH_WORDMATCH_TABLE;
-		$result = $db->sql_query($sql);
-		$this->stats['total_matches'] = (int) $db->sql_fetchfield('total_matches');
-		$db->sql_freeresult($result);
+			default:
+				$sql = 'SELECT COUNT(*) as total_words
+					FROM ' . SEARCH_WORDLIST_TABLE;
+				$result = $db->sql_query($sql);
+				$this->stats['total_words'] = (int) $db->sql_fetchfield('total_words');
+				$db->sql_freeresult($result);
+
+				$sql = 'SELECT COUNT(*) as total_matches
+					FROM ' . SEARCH_WORDMATCH_TABLE;
+				$result = $db->sql_query($sql);
+				$this->stats['total_matches'] = (int) $db->sql_fetchfield('total_matches');
+				$db->sql_freeresult($result);
+			break;
+		}
 	}
 
 	/**
-- 
cgit v1.2.1


From 97cf433dea658127ed60c70ea47d1c3830964f25 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 12 Dec 2011 02:41:48 +0100
Subject: [ticket/9813] Use table status row count only if greater than 100000
 or exact.

PHPBB3-9813
---
 phpBB/includes/search/fulltext_native.php | 67 +++++++++++++++++++------------
 1 file changed, 41 insertions(+), 26 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index e5eee50fdb..69937ff9c9 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -1458,38 +1458,53 @@ class fulltext_native extends search_backend
 	}
 
 	function get_stats()
+	{
+		$this->stats['total_words']		= $this->get_table_row_count(SEARCH_WORDLIST_TABLE);
+		$this->stats['total_matches']	= $this->get_table_row_count(SEARCH_WORDMATCH_TABLE);
+	}
+
+	/**
+	* Gets statistics for a specific database table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Row count. Prefixed with ~ if estimated.
+	*
+	* @access protected
+	*/
+	function get_table_row_count($table_name)
 	{
 		global $db;
 
-		switch ($db->sql_layer)
+		if (stripos($db->sql_layer, 'mysql') === 0)
 		{
-			case 'mysql4':
-			case 'mysqli':
-				$sql = "SHOW TABLE STATUS LIKE '" . SEARCH_WORDLIST_TABLE . "'";
-				$result = $db->sql_query($sql);
-				$this->stats['total_words'] = (int) $db->sql_fetchfield('Rows');
-				$db->sql_freeresult($result);
-
-				$sql = "SHOW TABLE STATUS LIKE '" . SEARCH_WORDMATCH_TABLE . "'";
-				$result = $db->sql_query($sql);
-				$this->stats['total_matches'] = (int) $db->sql_fetchfield('Rows');
-				$db->sql_freeresult($result);
-			break;
+			$sql = "SHOW TABLE STATUS
+				LIKE '" . $table_name . "'";
+			$result = $db->sql_query($sql);
+			$table_status = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
 
-			default:
-				$sql = 'SELECT COUNT(*) as total_words
-					FROM ' . SEARCH_WORDLIST_TABLE;
-				$result = $db->sql_query($sql);
-				$this->stats['total_words'] = (int) $db->sql_fetchfield('total_words');
-				$db->sql_freeresult($result);
-
-				$sql = 'SELECT COUNT(*) as total_matches
-					FROM ' . SEARCH_WORDMATCH_TABLE;
-				$result = $db->sql_query($sql);
-				$this->stats['total_matches'] = (int) $db->sql_fetchfield('total_matches');
-				$db->sql_freeresult($result);
-			break;
+			if (isset($table_status['Engine']))
+			{
+				if ($table_status['Engine'] === 'MyISAM')
+				{
+					return $table_status['Rows'];
+				}
+				else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
+				{
+					return '~' . $table_status['Rows'];
+				}
+			}
 		}
+
+		// Get exact row count by actually counting rows
+		$sql = 'SELECT COUNT(*) AS rows_total
+			FROM ' . $table_name;
+		$result = $db->sql_query($sql);
+		$rows_total = $db->sql_fetchfield('rows_total');
+		$db->sql_freeresult($result);
+
+		return $rows_total;
 	}
 
 	/**
-- 
cgit v1.2.1


From f9953fc3395e6b206c0789d40f89f9d2463348e7 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 18 Feb 2012 19:29:32 +0100
Subject: [ticket/10653] Add ability to count table rows to database
 abstraction layer.

PHPBB3-10653
---
 phpBB/includes/db/dbal.php                | 35 ++++++++++++++++
 phpBB/includes/db/mysql.php               | 70 +++++++++++++++++++++++++++++++
 phpBB/includes/db/mysqli.php              | 70 +++++++++++++++++++++++++++++++
 phpBB/includes/search/fulltext_native.php | 46 +-------------------
 4 files changed, 177 insertions(+), 44 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 230c9c8ed7..5d456c2ff0 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -900,6 +900,41 @@ class dbal
 
 		return true;
 	}
+
+	/**
+	* Gets the estimated number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Number of rows in $table_name.
+	*								Prefixed with ~ if estimated (otherwise exact).
+	*
+	* @access public
+	*/
+	function get_estimated_row_count($table_name)
+	{
+		return $this->get_row_count($table_name);
+	}
+
+	/**
+	* Gets the exact number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Exact number of rows in $table_name.
+	*
+	* @access public
+	*/
+	function get_row_count($table_name)
+	{
+		$sql = 'SELECT COUNT(*) AS rows_total
+			FROM ' . $this->sql_escape($table_name);
+		$result = $this->sql_query($sql);
+		$rows_total = $this->sql_fetchfield('rows_total');
+		$this->sql_freeresult($result);
+
+		return $rows_total;
+	}
 }
 
 /**
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 1e24c79577..87413e808d 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -318,6 +318,76 @@ class dbal_mysql extends dbal
 		return @mysql_real_escape_string($msg, $this->db_connect_id);
 	}
 
+	/**
+	* Gets the estimated number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Number of rows in $table_name.
+	*								Prefixed with ~ if estimated (otherwise exact).
+	*
+	* @access public
+	*/
+	function get_estimated_row_count($table_name)
+	{
+		$table_status = $this->get_table_status($table_name);
+
+		if (isset($table_status['Engine']))
+		{
+			if ($table_status['Engine'] === 'MyISAM')
+			{
+				return $table_status['Rows'];
+			}
+			else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
+			{
+				return '~' . $table_status['Rows'];
+			}
+		}
+
+		return $this->get_row_count($table_name);
+	}
+
+	/**
+	* Gets the exact number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Exact number of rows in $table_name.
+	*
+	* @access public
+	*/
+	function get_row_count($table_name)
+	{
+		$table_status = $this->get_table_status($table_name);
+
+		if (isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM')
+		{
+			return $table_status['Rows'];
+		}
+
+		return parent::get_row_count($table_name);
+	}
+
+	/**
+	* Gets some information about the specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return array
+	*
+	* @access protected
+	*/
+	function get_table_status($table_name)
+	{
+		$sql = "SHOW TABLE STATUS
+			LIKE '" . $this->sql_escape($table_name) . "'";
+		$result = $this->sql_query($sql);
+		$table_status = $this->sql_fetchrow($result);
+		$this->sql_freeresult($result);
+
+		return $table_status;
+	}
+
 	/**
 	* Build LIKE expression
 	* @access private
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index 456ce906d0..49b2789ce6 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -315,6 +315,76 @@ class dbal_mysqli extends dbal
 		return @mysqli_real_escape_string($this->db_connect_id, $msg);
 	}
 
+	/**
+	* Gets the estimated number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Number of rows in $table_name.
+	*								Prefixed with ~ if estimated (otherwise exact).
+	*
+	* @access public
+	*/
+	function get_estimated_row_count($table_name)
+	{
+		$table_status = $this->get_table_status($table_name);
+
+		if (isset($table_status['Engine']))
+		{
+			if ($table_status['Engine'] === 'MyISAM')
+			{
+				return $table_status['Rows'];
+			}
+			else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
+			{
+				return '~' . $table_status['Rows'];
+			}
+		}
+
+		return $this->get_row_count($table_name);
+	}
+
+	/**
+	* Gets the exact number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Exact number of rows in $table_name.
+	*
+	* @access public
+	*/
+	function get_row_count($table_name)
+	{
+		$table_status = $this->get_table_status($table_name);
+
+		if (isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM')
+		{
+			return $table_status['Rows'];
+		}
+
+		return parent::get_row_count($table_name);
+	}
+
+	/**
+	* Gets some information about the specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return array
+	*
+	* @access protected
+	*/
+	function get_table_status($table_name)
+	{
+		$sql = "SHOW TABLE STATUS
+			LIKE '" . $this->sql_escape($table_name) . "'";
+		$result = $this->sql_query($sql);
+		$table_status = $this->sql_fetchrow($result);
+		$this->sql_freeresult($result);
+
+		return $table_status;
+	}
+
 	/**
 	* Build LIKE expression
 	* @access private
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index 69937ff9c9..dc961f3c8a 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -1458,53 +1458,11 @@ class fulltext_native extends search_backend
 	}
 
 	function get_stats()
-	{
-		$this->stats['total_words']		= $this->get_table_row_count(SEARCH_WORDLIST_TABLE);
-		$this->stats['total_matches']	= $this->get_table_row_count(SEARCH_WORDMATCH_TABLE);
-	}
-
-	/**
-	* Gets statistics for a specific database table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Row count. Prefixed with ~ if estimated.
-	*
-	* @access protected
-	*/
-	function get_table_row_count($table_name)
 	{
 		global $db;
 
-		if (stripos($db->sql_layer, 'mysql') === 0)
-		{
-			$sql = "SHOW TABLE STATUS
-				LIKE '" . $table_name . "'";
-			$result = $db->sql_query($sql);
-			$table_status = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-
-			if (isset($table_status['Engine']))
-			{
-				if ($table_status['Engine'] === 'MyISAM')
-				{
-					return $table_status['Rows'];
-				}
-				else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
-				{
-					return '~' . $table_status['Rows'];
-				}
-			}
-		}
-
-		// Get exact row count by actually counting rows
-		$sql = 'SELECT COUNT(*) AS rows_total
-			FROM ' . $table_name;
-		$result = $db->sql_query($sql);
-		$rows_total = $db->sql_fetchfield('rows_total');
-		$db->sql_freeresult($result);
-
-		return $rows_total;
+		$this->stats['total_words']		= $db->get_estimated_row_count(SEARCH_WORDLIST_TABLE);
+		$this->stats['total_matches']	= $db->get_estimated_row_count(SEARCH_WORDMATCH_TABLE);
 	}
 
 	/**
-- 
cgit v1.2.1


From 785c75254e763a24cf56765ca9a7e02140982497 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 5 Mar 2012 00:29:28 +0100
Subject: [ticket/9813] Also use estimated row count of posts table for
 fulltext mysql.

Since this is 'only' for statistics anyway, using an estimated value does no
harm. Also, if MyISAM is the underlying storage engine for the posts table,
the value will actually be exact.

PHPBB3-9813
---
 phpBB/includes/search/fulltext_mysql.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 52372a14d8..54cc894f6a 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -896,11 +896,7 @@ class fulltext_mysql extends search_backend
 		}
 		$db->sql_freeresult($result);
 
-		$sql = 'SELECT COUNT(post_id) as total_posts
-			FROM ' . POSTS_TABLE;
-		$result = $db->sql_query($sql);
-		$this->stats['total_posts'] = (int) $db->sql_fetchfield('total_posts');
-		$db->sql_freeresult($result);
+		$this->stats['total_posts'] = $db->get_estimated_row_count(POSTS_TABLE);
 	}
 
 	/**
-- 
cgit v1.2.1


From a98117b22967db2c475988a0b271d827cf0f9af6 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Mon, 5 Mar 2012 02:41:42 +0200
Subject: [feature/append_var] Adding append_var template class function

Adding append_var template class function

PHPBB3-10666
---
 phpBB/includes/template/context.php  | 19 ++++++++++++++++++-
 phpBB/includes/template/template.php | 17 ++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php
index 65a3531bc5..ec09da1cf3 100644
--- a/phpBB/includes/template/context.php
+++ b/phpBB/includes/template/context.php
@@ -53,7 +53,9 @@ class phpbb_template_context
 	}
 
 	/**
-	* Assign a single variable to a single key
+	* Assign a single scalar value to a single key.
+	*
+	* Value can be a string, an integer or a boolean.
 	*
 	* @param string $varname Variable name
 	* @param string $varval Value to assign to variable
@@ -65,6 +67,21 @@ class phpbb_template_context
 		return true;
 	}
 
+	/**
+	* Append text to the string value stored in a key.
+	*
+	* Text is appended using the string concatenation operator (.).
+	*
+	* @param string $varname Variable name
+	* @param string $varval Value to append to variable
+	*/
+	public function append_var($varname, $varval)
+	{
+		$this->rootref[$varname] = (isset($this->rootref[$varname]) ? $this->rootref[$varname] : '') . $varval;
+
+		return true;
+	}
+
 	/**
 	* Returns a reference to template data array.
 	*
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 9297b759ac..bac5445511 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -378,7 +378,9 @@ class phpbb_template
 	}
 
 	/**
-	* Assign a single variable to a single key
+	* Assign a single scalar value to a single key.
+	*
+	* Value can be a string, an integer or a boolean.
 	*
 	* @param string $varname Variable name
 	* @param string $varval Value to assign to variable
@@ -388,6 +390,19 @@ class phpbb_template
 		$this->context->assign_var($varname, $varval);
 	}
 
+	/**
+	* Append text to the string value stored in a key.
+	*
+	* Text is appended using the string concatenation operator (.).
+	*
+	* @param string $varname Variable name
+	* @param string $varval Value to append to variable
+	*/
+	public function append_var($varname, $varval)
+	{
+		$this->context->append_var($varname, $varval);
+	}
+
 	// Docstring is copied from phpbb_template_context method with the same name.
 	/**
 	* Assign key variable pairs from an array to a specified block
-- 
cgit v1.2.1


From 01d90e59a8c311778a832ba4920e4c5a85b1256f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 5 Mar 2012 00:42:36 +0100
Subject: [ticket/9813] Only get posts table row count if we detected a
 fulltext index.

PHPBB3-9813
---
 phpBB/includes/search/fulltext_mysql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 54cc894f6a..779ec1d216 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -896,7 +896,7 @@ class fulltext_mysql extends search_backend
 		}
 		$db->sql_freeresult($result);
 
-		$this->stats['total_posts'] = $db->get_estimated_row_count(POSTS_TABLE);
+		$this->stats['total_posts'] = empty($this->stats) ? 0 : $db->get_estimated_row_count(POSTS_TABLE);
 	}
 
 	/**
-- 
cgit v1.2.1


From c11607bdd1ad4209a7697f0dc8d46ea81795b14c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 7 Mar 2012 12:11:18 +0100
Subject: [ticket/10653] Call get_row_count of base class in mysql
 get_estimated_row_count

There is no point in fetching the table status again.

PHPBB3-10653
---
 phpBB/includes/db/mysql.php  | 2 +-
 phpBB/includes/db/mysqli.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 87413e808d..1ccb785150 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -344,7 +344,7 @@ class dbal_mysql extends dbal
 			}
 		}
 
-		return $this->get_row_count($table_name);
+		return parent::get_row_count($table_name);
 	}
 
 	/**
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index 49b2789ce6..a311b8cda6 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -341,7 +341,7 @@ class dbal_mysqli extends dbal
 			}
 		}
 
-		return $this->get_row_count($table_name);
+		return parent::get_row_count($table_name);
 	}
 
 	/**
-- 
cgit v1.2.1


From cd61de4bfdd1818d173e7413e53d8fd3d7ce1913 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 9 Mar 2012 04:31:03 -0500
Subject: [ticket/9084] Explain the logic.

PHPBB3-9084
---
 phpBB/includes/functions_profile_fields.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 79701429e6..d44be16184 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -571,6 +571,11 @@ class custom_profile
 					$this->get_option_lang($field_id, $lang_id, FIELD_DROPDOWN, false);
 				}
 
+				// If a dropdown field is required, users
+				// cannot choose the "no value" option.
+				// They must choose one of the other options.
+				// Therefore, here we treat a value equal to
+				// the "no value" as a lack of value, i.e. NULL.
 				if ($value == $ident_ary['data']['field_novalue'] && $ident_ary['data']['field_required'])
 				{
 					return NULL;
-- 
cgit v1.2.1