From 18164e63e2897a755a214b8fcb4b6d84897888e6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 30 Jul 2013 01:06:10 +0200
Subject: [PATCH 1/4] [ticket/11752] HTTP -> HTTPs in email/installed.txt

PHPBB3-11752
---
 phpBB/language/en/email/installed.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt
index 2aa03a7f33..60e52e37c4 100644
--- a/phpBB/language/en/email/installed.txt
+++ b/phpBB/language/en/email/installed.txt
@@ -12,7 +12,7 @@ Username: {USERNAME}
 Board URL: {U_BOARD}
 ----------------------------
 
-Useful information regarding the phpBB software can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/
+Useful information regarding the phpBB software can be found in the docs folder of your installation and on phpBB.com's support page - https://www.phpbb.com/support/
 
 In order to keep your board safe and secure, we highly recommended keeping current with software releases. For your convenience, a mailing list is available at the page referenced above.
 

From 8a6f3a58000b7d969bd9108f2bdb34203354d39b Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 30 Jul 2013 01:54:11 +0200
Subject: [PATCH 2/4] [ticket/11524] Add another isset() to mitigate "Illegal
 string offset 'limit'"

... on PHP 5.4 or higher.

PHPBB3-11524
---
 phpBB/develop/mysql_upgrader.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index 05d279a099..17ce12e2bf 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -149,7 +149,8 @@ foreach ($schema_data as $table_name => $table_data)
 			list($orig_column_type, $column_length) = explode(':', $column_data[0]);
 			$column_type = sprintf($dbms_type_map['mysql_41'][$orig_column_type . ':'], $column_length);
 
-			if (isset($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit'][0]))
+			if (isset($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit']) &&
+				isset($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit'][0]))
 			{
 				switch ($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit'][0])
 				{

From 404f2881135373060086116003122a9f6d851adf Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 30 Jul 2013 02:01:24 +0200
Subject: [PATCH 3/4] [ticket/11753] Update MySQL upgrader schema data.

PHPBB3-11753
---
 phpBB/develop/mysql_upgrader.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index 05d279a099..b3f40b2ca4 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -694,6 +694,24 @@ function get_schema_struct()
 		),
 	);
 
+	$schema_data['phpbb_login_attempts'] = array(
+		'COLUMNS'		=> array(
+			'attempt_ip'			=> array('VCHAR:40', ''),
+			'attempt_browser'		=> array('VCHAR:150', ''),
+			'attempt_forwarded_for'	=> array('VCHAR:255', ''),
+			'attempt_time'			=> array('TIMESTAMP', 0),
+			'user_id'				=> array('UINT', 0),
+			'username'				=> array('VCHAR_UNI:255', 0),
+			'username_clean'		=> array('VCHAR_CI', 0),
+		),
+		'KEYS'			=> array(
+			'att_ip'				=> array('INDEX', array('attempt_ip', 'attempt_time')),
+			'att_for'		=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+			'att_time'				=> array('INDEX', array('attempt_time')),
+			'user_id'					=> array('INDEX', 'user_id'),
+		),
+	);
+
 	$schema_data['phpbb_moderator_cache'] = array(
 		'COLUMNS'		=> array(
 			'forum_id'				=> array('UINT', 0),
@@ -897,6 +915,7 @@ function get_schema_struct()
 			'field_default_value'	=> array('VCHAR_UNI', ''),
 			'field_validation'		=> array('VCHAR_UNI:20', ''),
 			'field_required'		=> array('BOOL', 0),
+			'field_show_novalue'	=> array('BOOL', 0),
 			'field_show_on_reg'		=> array('BOOL', 0),
 			'field_show_on_vt'		=> array('BOOL', 0),
 			'field_show_profile'	=> array('BOOL', 0),

From a3de463b3027733f0560a420fb1c61e5413a8957 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 30 Jul 2013 02:01:41 +0200
Subject: [PATCH 4/4] [ticket/11753] Remove ?> from MySQL Upgrader.

PHPBB3-11753
---
 phpBB/develop/mysql_upgrader.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index b3f40b2ca4..6dd577ebf7 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -1415,5 +1415,3 @@ function get_schema_struct()
 
 	return $schema_data;
 }
-
-?>
\ No newline at end of file