12 files changed, 161 insertions, 120 deletions
diff --git a/phpBB/phpbb/db/migration/data/v320/remote_upload_validation.php b/phpBB/phpbb/db/migration/data/v320/remote_upload_validation.php
new file mode 100644
index 0000000000..d61f6b96fd
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v320/remote_upload_validation.php
@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v320;
+
+class remote_upload_validation extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v320\v320a2',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('remote_upload_verify', '0')),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v320/text_reparser.php b/phpBB/phpbb/db/migration/data/v320/text_reparser.php
index 1d73b74a76..ea614feb40 100644
--- a/phpBB/phpbb/db/migration/data/v320/text_reparser.php
+++ b/phpBB/phpbb/db/migration/data/v320/text_reparser.php
@@ -17,7 +17,10 @@ class text_reparser extends \phpbb\db\migration\container_aware_migration
 {
 	static public function depends_on()
 	{
-		return array('\phpbb\db\migration\data\v310\contact_admin_form');
+		return array(
+			'\phpbb\db\migration\data\v310\contact_admin_form',
+			'\phpbb\db\migration\data\v320\allowed_schemes_links',
+		);
 	}
 
 	public function effectively_installed()
@@ -78,7 +81,7 @@ class text_reparser extends \phpbb\db\migration\container_aware_migration
 			$end = max(1, $resume_data['current']);
 			$reparser->reparse_range($start, $end);
 
-			$processed_records = $end - $start + 1;
+			$processed_records += $end - $start + 1;
 			$resume_data['current'] = $start - 1;
 
 			if ($start === 1)
diff --git a/phpBB/phpbb/db/migration/data/v320/v320b1.php b/phpBB/phpbb/db/migration/data/v320/v320b1.php
new file mode 100644
index 0000000000..5c3a3797cd
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v320/v320b1.php
@@ -0,0 +1,39 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v320;
+
+class v320b1 extends \phpbb\db\migration\container_aware_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.2.0-b1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v31x\v317pl1',
+			'\phpbb\db\migration\data\v320\v320a2',
+			'\phpbb\db\migration\data\v31x\increase_size_of_dateformat',
+			'\phpbb\db\migration\data\v320\default_data_type_ids',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.2.0-b1')),
+		);
+	}
+}
diff --git a/phpBB/phpbb/files/types/remote.php b/phpBB/phpbb/files/types/remote.php
index 33cbfb00ae..1fdba0ca32 100644
--- a/phpBB/phpbb/files/types/remote.php
+++ b/phpBB/phpbb/files/types/remote.php
@@ -14,6 +14,7 @@
 namespace phpbb\files\types;
 
 use bantu\IniGetWrapper\IniGetWrapper;
+use phpbb\config\config;
 use phpbb\files\factory;
 use phpbb\files\filespec;
 use phpbb\language\language;
@@ -21,6 +22,9 @@ use phpbb\request\request_interface;
 
 class remote extends base
 {
+	/** @var config phpBB config */
+	protected $config;
+
 	/** @var factory Files factory */
 	protected $factory;
 
@@ -42,14 +46,16 @@ class remote extends base
 	/**
 	 * Construct a form upload type
 	 *
+	 * @param config $config phpBB config
 	 * @param factory $factory Files factory
 	 * @param language $language Language class
 	 * @param IniGetWrapper $php_ini ini_get() wrapper
 	 * @param request_interface $request Request object
 	 * @param string $phpbb_root_path phpBB root path
 	 */
-	public function __construct(factory $factory, language $language, IniGetWrapper $php_ini, request_interface $request, $phpbb_root_path)
+	public function __construct(config $config, factory $factory, language $language, IniGetWrapper $php_ini, request_interface $request, $phpbb_root_path)
 	{
+		$this->config = $config;
 		$this->factory = $factory;
 		$this->language = $language;
 		$this->php_ini = $php_ini;
@@ -86,10 +92,6 @@ class remote extends base
 
 		$url = parse_url($upload_url);
 
-		$host = $url['host'];
-		$path = $url['path'];
-		$port = (!empty($url['port'])) ? (int) $url['port'] : 80;
-
 		$upload_ary['type'] = 'application/octet-stream';
 
 		$url['path'] = explode('.', $url['path']);
@@ -97,108 +99,55 @@ class remote extends base
 
 		$url['path'] = implode('', $url['path']);
 		$upload_ary['name'] = utf8_basename($url['path']) . (($ext) ? '.' . $ext : '');
-		$filesize = 0;
 
 		$remote_max_filesize = $this->get_max_file_size();
 
-		$errno = 0;
-		$errstr = '';
+		$guzzle_options = [
+			'timeout'			=> $this->upload->upload_timeout,
+			'connect_timeout'	=> $this->upload->upload_timeout,
+			'verify'			=> !empty($this->config['remote_upload_verify']) ? (bool) $this->config['remote_upload_verify'] : false,
+		];
+		$client = new \GuzzleHttp\Client($guzzle_options);
 
-		if (!($fsock = @fsockopen($host, $port, $errno, $errstr)))
+		try
 		{
-			return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'NOT_UPLOADED'));
+			$response = $client->get($upload_url, $guzzle_options);
 		}
-
-		// Make sure $path not beginning with /
-		if (strpos($path, '/') === 0)
+		catch (\GuzzleHttp\Exception\ClientException $clientException)
 		{
-			$path = substr($path, 1);
+			return $this->factory->get('filespec')->set_error($this->upload->error_prefix . 'URL_NOT_FOUND');
 		}
-
-		fputs($fsock, 'GET /' . $path . " HTTP/1.1\r\n");
-		fputs($fsock, "HOST: " . $host . "\r\n");
-		fputs($fsock, "Connection: close\r\n\r\n");
-
-		// Set a proper timeout for the socket
-		socket_set_timeout($fsock, $this->upload->upload_timeout);
-
-		$get_info = false;
-		$data = '';
-		$length = false;
-		$timer_stop = time() + $this->upload->upload_timeout;
-
-		while ((!$length || $filesize < $length) && !@feof($fsock))
+		catch (\GuzzleHttp\Exception\RequestException $requestException)
 		{
-			if ($get_info)
+			if (strpos($requestException->getMessage(), 'cURL error 28') !== false || preg_match('/408|504/', $requestException->getCode()))
 			{
-				if ($length)
-				{
-					// Don't attempt to read past end of file if server indicated length
-					$block = @fread($fsock, min($length - $filesize, 1024));
-				}
-				else
-				{
-					$block = @fread($fsock, 1024);
-				}
-
-				$filesize += strlen($block);
-
-				if ($remote_max_filesize && $filesize > $remote_max_filesize)
-				{
-					$max_filesize = get_formatted_filesize($remote_max_filesize, false);
-
-					return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'WRONG_FILESIZE', $max_filesize['value'], $max_filesize['unit']));
-				}
-
-				$data .= $block;
+				return $this->factory->get('filespec')->set_error($this->upload->error_prefix . 'REMOTE_UPLOAD_TIMEOUT');
 			}
 			else
 			{
-				$line = @fgets($fsock, 1024);
-
-				if ($line == "\r\n")
-				{
-					$get_info = true;
-				}
-				else
-				{
-					if (stripos($line, 'content-type: ') !== false)
-					{
-						$upload_ary['type'] = rtrim(str_replace('content-type: ', '', strtolower($line)));
-					}
-					else if ($this->upload->max_filesize && stripos($line, 'content-length: ') !== false)
-					{
-						$length = (int) str_replace('content-length: ', '', strtolower($line));
-
-						if ($remote_max_filesize && $length && $length > $remote_max_filesize)
-						{
-							$max_filesize = get_formatted_filesize($remote_max_filesize, false);
-
-							return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'WRONG_FILESIZE', $max_filesize['value'], $max_filesize['unit']));
-						}
-					}
-					else if (stripos($line, '404 not found') !== false)
-					{
-						return $this->factory->get('filespec')->set_error($this->upload->error_prefix . 'URL_NOT_FOUND');
-					}
-				}
+				return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'NOT_UPLOADED'));
 			}
+		}
+		catch (\Exception $e)
+		{
+			return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'NOT_UPLOADED'));
+		}
 
-			$stream_meta_data = stream_get_meta_data($fsock);
+		$content_length = $response->getBody()->getSize();
+		if ($remote_max_filesize && $content_length > $remote_max_filesize)
+		{
+			$max_filesize = get_formatted_filesize($remote_max_filesize, false);
 
-			// Cancel upload if we exceed timeout
-			if (!empty($stream_meta_data['timed_out']) || time() >= $timer_stop)
-			{
-				return $this->factory->get('filespec')->set_error($this->upload->error_prefix . 'REMOTE_UPLOAD_TIMEOUT');
-			}
+			return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'WRONG_FILESIZE', $max_filesize['value'], $max_filesize['unit']));
 		}
-		@fclose($fsock);
 
-		if (empty($data))
+		if ($content_length == 0)
 		{
 			return $this->factory->get('filespec')->set_error($this->upload->error_prefix . 'EMPTY_REMOTE_DATA');
 		}
 
+		$data = $response->getBody();
+
 		$filename = tempnam(sys_get_temp_dir(), unique_id() . '-');
 
 		if (!($fp = @fopen($filename, 'wb')))
diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php
index 6859414236..ff7e691224 100644
--- a/phpBB/phpbb/install/controller/helper.php
+++ b/phpBB/phpbb/install/controller/helper.php
@@ -183,11 +183,6 @@ class helper
 		if (!empty($submit))
 		{
 			$lang = $this->phpbb_request->variable('language', '');
-
-			if (!empty($lang))
-			{
-				$this->language_cookie = $lang;
-			}
 		}
 
 		// Retrieve language from cookie
@@ -195,10 +190,10 @@ class helper
 		if (empty($lang) && !empty($lang_cookie))
 		{
 			$lang = $lang_cookie;
-			$this->language_cookie = $lang;
 		}
 
 		$lang = (!empty($lang) && strpos($lang, '/') === false) ? $lang : null;
+		$this->language_cookie = $lang;
 
 		$this->render_language_select($lang);
 
diff --git a/phpBB/phpbb/install/controller/install.php b/phpBB/phpbb/install/controller/install.php
index b987d91c6a..92506872a3 100644
--- a/phpBB/phpbb/install/controller/install.php
+++ b/phpBB/phpbb/install/controller/install.php
@@ -123,6 +123,7 @@ class install
 
 		// Set the appropriate input-output handler
 		$this->installer->set_iohandler($this->iohandler_factory->get());
+		$this->controller_helper->handle_language_select();
 
 		if ($this->request->is_ajax())
 		{
@@ -142,8 +143,6 @@ class install
 			// Determine whether the installation was started or not
 			if (true)
 			{
-				$this->controller_helper->handle_language_select();
-
 				// Set active stage
 				$this->menu_provider->set_nav_property(
 					array('install', 0, 'introduction'),
diff --git a/phpBB/phpbb/install/controller/update.php b/phpBB/phpbb/install/controller/update.php
index 9fff11cae8..6b88827940 100644
--- a/phpBB/phpbb/install/controller/update.php
+++ b/phpBB/phpbb/install/controller/update.php
@@ -122,6 +122,7 @@ class update
 
 		// Set the appropriate input-output handler
 		$this->installer->set_iohandler($this->iohandler_factory->get());
+		$this->controller_helper->handle_language_select();
 
 		// Render the intro page
 		if ($this->request->is_ajax())
@@ -140,8 +141,6 @@ class update
 		}
 		else
 		{
-			$this->controller_helper->handle_language_select();
-
 			// Set active stage
 			$this->menu_provider->set_nav_property(
 				array('update', 0, 'introduction'),
diff --git a/phpBB/phpbb/install/helper/config.php b/phpBB/phpbb/install/helper/config.php
index ab5af86320..f58925899b 100644
--- a/phpBB/phpbb/install/helper/config.php
+++ b/phpBB/phpbb/install/helper/config.php
@@ -227,18 +227,22 @@ class config
 		$file_content = @file_get_contents($this->install_config_file);
 		$serialized_data = trim(substr($file_content, 8));
 
-		$this->installer_config = array();
-		$this->progress_data = array();
-		$this->navigation_data = array();
+		$installer_config = array();
+		$progress_data = array();
+		$navigation_data = array();
 
 		if (!empty($serialized_data))
 		{
 			$unserialized_data = json_decode($serialized_data, true);
 
-			$this->installer_config = (is_array($unserialized_data['installer_config'])) ? $unserialized_data['installer_config'] : array();
-			$this->progress_data = (is_array($unserialized_data['progress_data'])) ? $unserialized_data['progress_data'] : array();
-			$this->navigation_data = (is_array($unserialized_data['navigation_data'])) ? $unserialized_data['navigation_data'] : array();
+			$installer_config = (is_array($unserialized_data['installer_config'])) ? $unserialized_data['installer_config'] : array();
+			$progress_data = (is_array($unserialized_data['progress_data'])) ? $unserialized_data['progress_data'] : array();
+			$navigation_data = (is_array($unserialized_data['navigation_data'])) ? $unserialized_data['navigation_data'] : array();
 		}
+
+		$this->installer_config = array_merge($this->installer_config, $installer_config);
+		$this->progress_data = array_merge($this->progress_data, $progress_data);
+		$this->navigation_data = array_merge($this->navigation_data, $navigation_data);
 	}
 
 	/**
diff --git a/phpBB/phpbb/install/helper/iohandler/factory.php b/phpBB/phpbb/install/helper/iohandler/factory.php
index 52d24e49b2..1e8395760a 100644
--- a/phpBB/phpbb/install/helper/iohandler/factory.php
+++ b/phpBB/phpbb/install/helper/iohandler/factory.php
@@ -75,7 +75,5 @@ class factory
 				throw new iohandler_not_implemented_exception();
 			break;
 		}
-
-		throw new iohandler_not_implemented_exception();
 	}
 }
diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_update_settings.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_update_settings.php
index 6a98721e77..be6404dcd8 100644
--- a/phpBB/phpbb/install/module/obtain_data/task/obtain_update_settings.php
+++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_update_settings.php
@@ -57,22 +57,35 @@ class obtain_update_settings extends task_base
 		}
 		else
 		{
+			if ($this->installer_config->get('disable_filesystem_update', false))
+			{
+				$options[] = array(
+					'value'		=> 'db_only',
+					'label'		=> 'UPDATE_TYPE_DB_ONLY',
+					'selected'	=> true,
+				);
+			}
+			else
+			{
+				$options = array(
+					array(
+						'value'		=> 'all',
+						'label'		=> 'UPDATE_TYPE_ALL',
+						'selected'	=> true,
+					),
+					array(
+						'value'		=> 'db_only',
+						'label'		=> 'UPDATE_TYPE_DB_ONLY',
+						'selected'	=> false,
+					),
+				);
+			}
+
 			$this->iohandler->add_user_form_group('UPDATE_TYPE', array(
 				'update_type' => array(
 					'label'		=> 'UPDATE_TYPE',
 					'type'		=> 'radio',
-					'options'	=> array(
-						array(
-							'value'		=> 'all',
-							'label'		=> 'UPDATE_TYPE_ALL',
-							'selected'	=> true,
-						),
-						array(
-							'value'		=> 'db_only',
-							'label'		=> 'UPDATE_TYPE_DB_ONLY',
-							'selected'	=> false,
-						),
-					),
+					'options'	=> $options,
 				),
 				'submit_update' => array(
 					'label'	=> 'SUBMIT',
diff --git a/phpBB/phpbb/install/module/requirements/task/check_update.php b/phpBB/phpbb/install/module/requirements/task/check_update.php
index c986c76810..4e9124ff47 100644
--- a/phpBB/phpbb/install/module/requirements/task/check_update.php
+++ b/phpBB/phpbb/install/module/requirements/task/check_update.php
@@ -14,6 +14,7 @@
 namespace phpbb\install\module\requirements\task;
 
 use phpbb\filesystem\filesystem;
+use phpbb\install\helper\config;
 use phpbb\install\helper\container_factory;
 use phpbb\install\helper\iohandler\iohandler_interface;
 use phpbb\install\helper\update_helper;
@@ -35,6 +36,11 @@ class check_update extends task_base
 	protected $filesystem;
 
 	/**
+	 * @var config
+	 */
+	protected $installer_config;
+
+	/**
 	 * @var iohandler_interface
 	 */
 	protected $iohandler;
@@ -69,14 +75,16 @@ class check_update extends task_base
 	 *
 	 * @param container_factory		$container
 	 * @param filesystem			$filesystem
+	 * @param config				$config
 	 * @param iohandler_interface	$iohandler
 	 * @param update_helper			$update_helper
 	 * @param string				$phpbb_root_path
 	 * @param string				$php_ext
 	 */
-	public function __construct(container_factory $container, filesystem $filesystem, iohandler_interface $iohandler, update_helper $update_helper, $phpbb_root_path, $php_ext)
+	public function __construct(container_factory $container, filesystem $filesystem, config $config, iohandler_interface $iohandler, update_helper $update_helper, $phpbb_root_path, $php_ext)
 	{
 		$this->filesystem		= $filesystem;
+		$this->installer_config	= $config;
 		$this->iohandler		= $iohandler;
 		$this->update_helper	= $update_helper;
 		$this->phpbb_root_path	= $phpbb_root_path;
@@ -117,8 +125,10 @@ class check_update extends task_base
 			$this->iohandler->add_error_message('UPDATE_FILES_NOT_FOUND');
 			$this->set_test_passed(false);
 
-			// If there are no update files, we can't check the version
-			return false;
+			// If there are no update files, we can't check the version etc
+			// However, we can let the users run migrations if they really want to...
+			$this->installer_config->set('disable_filesystem_update', true);
+			return true;
 		}
 
 		// Recover version numbers
diff --git a/phpBB/phpbb/install/module/update_database/task/update.php b/phpBB/phpbb/install/module/update_database/task/update.php
index 4b2baf2c23..aa44d403dd 100644
--- a/phpBB/phpbb/install/module/update_database/task/update.php
+++ b/phpBB/phpbb/install/module/update_database/task/update.php
@@ -158,6 +158,7 @@ class update extends task_base
 				array_unshift($msg, $e->getMessage());
 
 				$this->iohandler->add_error_message($msg);
+				$this->iohandler->send_response();
 				throw new user_interaction_required_exception();
 			}