Merge pull request #3727 from marc1706/ticket/13904

[ticket/13904] Refactor attachments functions into service * marc1706/ticket/13904: (66 commits) [ticket/13904] Use filespec's get_filesize instead of calling filesize() [ticket/13904] Set properties to protected where possible in filespec [ticket/13904] Fix tests after changes to factory [ticket/13904] Minor coding style fixes [ticket/13904] Add language entries for error messages in upload class [ticket/13904] Modify files for updated fast-image-size library [ticket/13904] Update composer.lock [ticket/13904] Improve code coverage [ticket/13904] Add unit tests for local upload type [ticket/13904] Minor coding style fixes [ticket/13904] Improve test coverage of base upload type class [ticket/13904] Improve test coverage of remote upload type [ticket/13904] Improve test coverage of form upload type [ticket/13904] Improve test coverage of filespec class [ticket/13904] Add back tests for retrieving floats [ticket/13904] Use ini_get() wrapper in file upload types [ticket/13904] Modify files for changes in ini wrapper [ticket/13904] Add bantu/ini-get-wrapper to composer.json [ticket/13904] Switch around constructor arguments [ticket/13904] Use \phpbb\php\ini class for ini_get() ...
author: Tristan Darricau <tristan.darricau@sensiolabs.com> 2015-09-16 11:55:13 +0200
committer: Tristan Darricau <tristan.darricau@sensiolabs.com> 2015-09-16 11:55:13 +0200
commit: a562fea2306c8ba5b47a161568bea5fbe2ffd19f (patch)
tree: fcab88a3a5dd5f05c77934eef0983793f2e2bd6a /phpBB
parent: d4a47409f7da09790f38d3418401cbe34f8c3703 (diff)
parent: 6651c1d8f4aead15f4750989670f75721390ee21 (diff)
download: forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar
forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar.gz
forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar.bz2
forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar.xz
forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.zip
22 files changed, 1811 insertions, 1174 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json
index 70319fe3fb..bcf359a53b 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -25,6 +25,7 @@
 		"phpbb/phpbb-core": "self.version"
 	},
 	"require": {
+		"bantu/ini-get-wrapper": "1.0.*",
 		"lusitanian/oauth": "0.2.*",
 		"marc1706/fast-image-size": "1.1.*",
 		"patchwork/utf8": "1.1.*",
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 7d45abc6e3..accd4a55f6 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -4,9 +4,39 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "da690ad4ab4884661792b4b9d648934a",
+    "hash": "983770c26a0dcd7399ebd488846ade9a",
     "packages": [
         {
+            "name": "bantu/ini-get-wrapper",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bantuXorg/php-ini-get-wrapper.git",
+                "reference": "4770c7feab370c62e23db4f31c112b7c6d90aee2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bantuXorg/php-ini-get-wrapper/zipball/4770c7feab370c62e23db4f31c112b7c6d90aee2",
+                "reference": "4770c7feab370c62e23db4f31c112b7c6d90aee2",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "bantu\\IniGetWrapper\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Convenience wrapper around ini_get()",
+            "time": "2014-09-15 13:12:35"
+        },
+        {
             "name": "lusitanian/oauth",
             "version": "v0.2.1",
             "source": {
diff --git a/phpBB/config/default/container/services_avatar.yml b/phpBB/config/default/container/services_avatar.yml
index 1b0c109298..76057cf5a7 100644
--- a/phpBB/config/default/container/services_avatar.yml
+++ b/phpBB/config/default/container/services_avatar.yml
@@ -63,8 +63,8 @@ services:
             - %core.php_ext%
             - @filesystem
             - @path_helper
-            - @mimetype.guesser
             - @dispatcher
+            - @files.factory
             - @cache.driver
         calls:
             - [set_name, [avatar.driver.upload]]
diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml
index 828f9076dd..cfdade37df 100644
--- a/phpBB/config/default/container/services_files.yml
+++ b/phpBB/config/default/container/services_files.yml
@@ -1,3 +1,60 @@
 services:
     filesystem:
         class: phpbb\filesystem\filesystem
+
+    files.factory:
+        class: phpbb\files\factory
+        arguments:
+            - @service_container
+
+    files.filespec:
+        class: phpbb\files\filespec
+        scope: prototype
+        arguments:
+            - @filesystem
+            - @language
+            - @php_ini
+            - @upload_imagesize
+            - %core.root_path%
+            - @mimetype.guesser
+            - @plupload
+
+    files.upload:
+        class: phpbb\files\upload
+        scope: prototype
+        arguments:
+            - @filesystem
+            - @files.factory
+            - @language
+            - @php_ini
+            - @request
+            - %core.root_path%
+
+    files.types.form:
+        class: phpbb\files\types\form
+        scope: prototype
+        arguments:
+            - @files.factory
+            - @language
+            - @php_ini
+            - @plupload
+            - @request
+
+    files.types.local:
+        class: phpbb\files\types\form
+        scope: prototype
+        arguments:
+            - @files.factory
+            - @language
+            - @php_ini
+            - @request
+
+    files.types.remote:
+        class: phpbb\files\types\remote
+        scope: prototype
+        arguments:
+            - @files.factory
+            - @language
+            - @php_ini
+            - @request
+            - %core.root_path%
diff --git a/phpBB/config/default/container/services_php.yml b/phpBB/config/default/container/services_php.yml
index 8aabc7341f..29349960f3 100644
--- a/phpBB/config/default/container/services_php.yml
+++ b/phpBB/config/default/container/services_php.yml
@@ -1,3 +1,3 @@
 services:
     php_ini:
-        class: phpbb\php\ini
+        class: bantu\IniGetWrapper\IniGetWrapper
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 4206c87eb9..8b17dba534 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -405,14 +405,13 @@ function posting_gen_topic_types($forum_id, $cur_topic_type = POST_NORMAL)
 function upload_attachment($form_name, $forum_id, $local = false, $local_storage = '', $is_message = false, $local_filedata = false, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null)
 {
 	global $auth, $user, $config, $db, $cache;
-	global $phpbb_root_path, $phpEx, $phpbb_dispatcher, $phpbb_filesystem;
+	global $phpbb_root_path, $phpEx, $phpbb_dispatcher, $phpbb_container;
 
 	$filedata = array(
 		'error'	=> array()
 	);
 
-	include_once($phpbb_root_path . 'includes/functions_upload.' . $phpEx);
-	$upload = new fileupload($phpbb_filesystem);
+	$upload = $phpbb_container->get('files.upload');
 
 	if ($config['check_attachment_content'] && isset($config['mime_triggers']))
 	{
@@ -434,9 +433,10 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 	$extensions = $cache->obtain_attach_extensions((($is_message) ? false : (int) $forum_id));
 	$upload->set_allowed_extensions(array_keys($extensions['_allowed_']));
 
-	$file = ($local) ? $upload->local_upload($local_storage, $local_filedata, $mimetype_guesser) : $upload->form_upload($form_name, $mimetype_guesser, $plupload);
+	/** @var \phpbb\files\filespec $file */
+	$file = ($local) ? $upload->handle_upload('files.types.local', $local_storage, $local_filedata) : $upload->handle_upload('files.types.form', $form_name);
 
-	if ($file->init_error)
+	if ($file->init_error())
 	{
 		$filedata['post_attach'] = false;
 		return $filedata;
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
deleted file mode 100644
index 3ab87ee794..0000000000
--- a/phpBB/includes/functions_upload.php
+++ /dev/null
@@ -1,1129 +0,0 @@
-<?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.
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Responsible for holding all file relevant information, as well as doing file-specific operations.
-* The {@link fileupload fileupload class} can be used to upload several files, each of them being this object to operate further on.
-*/
-class filespec
-{
-	var $filename = '';
-	var $realname = '';
-	var $uploadname = '';
-	var $mimetype = '';
-	var $extension = '';
-	var $filesize = 0;
-	var $width = 0;
-	var $height = 0;
-	var $image_info = array();
-
-	var $destination_file = '';
-	var $destination_path = '';
-
-	var $file_moved = false;
-	var $init_error = false;
-	var $local = false;
-
-	var $error = array();
-
-	var $upload = '';
-
-	/**
-	 * @var \phpbb\filesystem\filesystem_interface
-	 */
-	protected $filesystem;
-
-	/**
-	 * The plupload object
-	 * @var \phpbb\plupload\plupload
-	 */
-	protected $plupload;
-
-	/**
-	 * phpBB Mimetype guesser
-	 * @var \phpbb\mimetype\guesser
-	 */
-	protected $mimetype_guesser;
-
-	/**
-	* File Class
-	* @access private
-	*/
-	function filespec($upload_ary, $upload_namespace, \phpbb\filesystem\filesystem_interface $phpbb_filesystem, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null)
-	{
-		if (!isset($upload_ary))
-		{
-			$this->init_error = true;
-			return;
-		}
-
-		$this->filename = $upload_ary['tmp_name'];
-		$this->filesize = $upload_ary['size'];
-		$name = (STRIP) ? stripslashes($upload_ary['name']) : $upload_ary['name'];
-		$name = trim(utf8_basename($name));
-		$this->realname = $this->uploadname = $name;
-		$this->mimetype = $upload_ary['type'];
-
-		// Opera adds the name to the mime type
-		$this->mimetype	= (strpos($this->mimetype, '; name') !== false) ? str_replace(strstr($this->mimetype, '; name'), '', $this->mimetype) : $this->mimetype;
-
-		if (!$this->mimetype)
-		{
-			$this->mimetype = 'application/octet-stream';
-		}
-
-		$this->extension = strtolower(self::get_extension($this->realname));
-
-		// Try to get real filesize from temporary folder (not always working) ;)
-		$this->filesize = (@filesize($this->filename)) ? @filesize($this->filename) : $this->filesize;
-
-		$this->width = $this->height = 0;
-		$this->file_moved = false;
-
-		$this->local = (isset($upload_ary['local_mode'])) ? true : false;
-		$this->upload = $upload_namespace;
-		$this->plupload = $plupload;
-		$this->mimetype_guesser = $mimetype_guesser;
-		$this->filesystem = $phpbb_filesystem;
-	}
-
-	/**
-	* Cleans destination filename
-	*
-	* @param real|unique|unique_ext $mode real creates a realname, filtering some characters, lowering every character. Unique creates an unique filename
-	* @param string $prefix Prefix applied to filename
-	* @param string $user_id The user_id is only needed for when cleaning a user's avatar
-	* @access public
-	*/
-	function clean_filename($mode = 'unique', $prefix = '', $user_id = '')
-	{
-		if ($this->init_error)
-		{
-			return;
-		}
-
-		switch ($mode)
-		{
-			case 'real':
-				// Remove every extension from filename (to not let the mime bug being exposed)
-				if (strpos($this->realname, '.') !== false)
-				{
-					$this->realname = substr($this->realname, 0, strpos($this->realname, '.'));
-				}
-
-				// Replace any chars which may cause us problems with _
-				$bad_chars = array("'", "\\", ' ', '/', ':', '*', '?', '"', '<', '>', '|');
-
-				$this->realname = rawurlencode(str_replace($bad_chars, '_', strtolower($this->realname)));
-				$this->realname = preg_replace("/%(\w{2})/", '_', $this->realname);
-
-				$this->realname = $prefix . $this->realname . '.' . $this->extension;
-			break;
-
-			case 'unique':
-				$this->realname = $prefix . md5(unique_id());
-			break;
-
-			case 'avatar':
-				$this->extension = strtolower($this->extension);
-				$this->realname = $prefix . $user_id . '.' . $this->extension;
-
-			break;
-
-			case 'unique_ext':
-			default:
-				$this->realname = $prefix . md5(unique_id()) . '.' . $this->extension;
-			break;
-		}
-	}
-
-	/**
-	* Get property from file object
-	*/
-	function get($property)
-	{
-		if ($this->init_error || !isset($this->$property))
-		{
-			return false;
-		}
-
-		return $this->$property;
-	}
-
-	/**
-	* Check if file is an image (mimetype)
-	*
-	* @return true if it is an image, false if not
-	*/
-	function is_image()
-	{
-		return (strpos($this->mimetype, 'image/') === 0);
-	}
-
-	/**
-	* Check if the file got correctly uploaded
-	*
-	* @return true if it is a valid upload, false if not
-	*/
-	function is_uploaded()
-	{
-		$is_plupload = $this->plupload && $this->plupload->is_active();
-
-		if (!$this->local && !$is_plupload && !is_uploaded_file($this->filename))
-		{
-			return false;
-		}
-
-		if (($this->local || $is_plupload) && !file_exists($this->filename))
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	* Remove file
-	*/
-	function remove()
-	{
-		if ($this->file_moved)
-		{
-			@unlink($this->destination_file);
-		}
-	}
-
-	/**
-	* Get file extension
-	*
-	* @param string Filename that needs to be checked
-	* @return string Extension of the supplied filename
-	*/
-	static public function get_extension($filename)
-	{
-		$filename = utf8_basename($filename);
-
-		if (strpos($filename, '.') === false)
-		{
-			return '';
-		}
-
-		$filename = explode('.', $filename);
-		return array_pop($filename);
-	}
-
-	/**
-	* Get mimetype
-	*
-	* @param string $filename Filename that needs to be checked
-	* @return string Mimetype of supplied filename
-	*/
-	function get_mimetype($filename)
-	{
-		if ($this->mimetype_guesser !== null)
-		{
-			$mimetype = $this->mimetype_guesser->guess($filename, $this->uploadname);
-
-			if ($mimetype !== 'application/octet-stream')
-			{
-				$this->mimetype = $mimetype;
-			}
-		}
-
-		return $this->mimetype;
-	}
-
-	/**
-	* Get filesize
-	*/
-	function get_filesize($filename)
-	{
-		return @filesize($filename);
-	}
-
-
-	/**
-	* Check the first 256 bytes for forbidden content
-	*/
-	function check_content($disallowed_content)
-	{
-		if (empty($disallowed_content))
-		{
-			return true;
-		}
-
-		$fp = @fopen($this->filename, 'rb');
-
-		if ($fp !== false)
-		{
-			$ie_mime_relevant = fread($fp, 256);
-			fclose($fp);
-			foreach ($disallowed_content as $forbidden)
-			{
-				if (stripos($ie_mime_relevant, '<' . $forbidden) !== false)
-				{
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	* Move file to destination folder
-	* The phpbb_root_path variable will be applied to the destination path
-	*
-	* @param string $destination Destination path, for example $config['avatar_path']
-	* @param bool $overwrite If set to true, an already existing file will be overwritten
-	* @param bool $skip_image_check If set to true, the check for the file to be a valid image is skipped
-	* @param string $chmod Permission mask for chmodding the file after a successful move. The mode entered here reflects the mode defined by {@link phpbb_chmod()}
-	*
-	* @access public
-	*/
-	function move_file($destination, $overwrite = false, $skip_image_check = false, $chmod = false)
-	{
-		global $user, $phpbb_root_path;
-
-		if (sizeof($this->error))
-		{
-			return false;
-		}
-
-		$chmod = ($chmod === false) ? CHMOD_READ | CHMOD_WRITE : $chmod;
-
-		// We need to trust the admin in specifying valid upload directories and an attacker not being able to overwrite it...
-		$this->destination_path = $phpbb_root_path . $destination;
-
-		// Check if the destination path exist...
-		if (!file_exists($this->destination_path))
-		{
-			@unlink($this->filename);
-			return false;
-		}
-
-		$upload_mode = (@ini_get('open_basedir') || @ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'on') ? 'move' : 'copy';
-		$upload_mode = ($this->local) ? 'local' : $upload_mode;
-		$this->destination_file = $this->destination_path . '/' . utf8_basename($this->realname);
-
-		// Check if the file already exist, else there is something wrong...
-		if (file_exists($this->destination_file) && !$overwrite)
-		{
-			@unlink($this->filename);
-			$this->error[] = $user->lang($this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR', $this->destination_file);
-			$this->file_moved = false;
-			return false;
-		}
-		else
-		{
-			if (file_exists($this->destination_file))
-			{
-				@unlink($this->destination_file);
-			}
-
-			switch ($upload_mode)
-			{
-				case 'copy':
-
-					if (!@copy($this->filename, $this->destination_file))
-					{
-						if (!@move_uploaded_file($this->filename, $this->destination_file))
-						{
-							$this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file);
-						}
-					}
-
-				break;
-
-				case 'move':
-
-					if (!@move_uploaded_file($this->filename, $this->destination_file))
-					{
-						if (!@copy($this->filename, $this->destination_file))
-						{
-							$this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file);
-						}
-					}
-
-				break;
-
-				case 'local':
-
-					if (!@copy($this->filename, $this->destination_file))
-					{
-						$this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file);
-					}
-
-				break;
-			}
-
-			// Remove temporary filename
-			@unlink($this->filename);
-
-			if (sizeof($this->error))
-			{
-				return false;
-			}
-
-			try
-			{
-				$this->filesystem->phpbb_chmod($this->destination_file, $chmod);
-			}
-			catch (\phpbb\filesystem\exception\filesystem_exception $e)
-			{
-				// Do nothing
-			}
-		}
-
-		// Try to get real filesize from destination folder
-		$this->filesize = (@filesize($this->destination_file)) ? @filesize($this->destination_file) : $this->filesize;
-
-		// Get mimetype of supplied file
-		$this->mimetype = $this->get_mimetype($this->destination_file);
-
-		if ($this->is_image() && !$skip_image_check)
-		{
-			$this->width = $this->height = 0;
-
-			// Get imagesize class
-			$imagesize = new \FastImageSize\FastImageSize();
-
-			$this->image_info = $imagesize->getImageSize($this->destination_file, $this->mimetype);
-
-			if ($this->image_info !== false)
-			{
-				$this->width = $this->image_info['width'];
-				$this->height = $this->image_info['height'];
-
-				// Check image type
-				$types = fileupload::image_types();
-
-				if (!isset($types[$this->image_info['type']]) || !in_array($this->extension, $types[$this->image_info['type']]))
-				{
-					if (!isset($types[$this->image_info['type']]))
-					{
-						$this->error[] = $user->lang('IMAGE_FILETYPE_INVALID', $this->image_info['type'], $this->mimetype);
-					}
-					else
-					{
-						$this->error[] = $user->lang('IMAGE_FILETYPE_MISMATCH', $types[$this->image_info['type']][0], $this->extension);
-					}
-				}
-
-				// Make sure the dimensions match a valid image
-				if (empty($this->width) || empty($this->height))
-				{
-					$this->error[] = $user->lang['ATTACHED_IMAGE_NOT_IMAGE'];
-				}
-			}
-			else
-			{
-				$this->error[] = $user->lang['UNABLE_GET_IMAGE_SIZE'];
-			}
-		}
-
-		$this->file_moved = true;
-		$this->additional_checks();
-		unset($this->upload);
-
-		return true;
-	}
-
-	/**
-	* Performing additional checks
-	*/
-	function additional_checks()
-	{
-		global $user;
-
-		if (!$this->file_moved)
-		{
-			return false;
-		}
-
-		// Filesize is too big or it's 0 if it was larger than the maxsize in the upload form
-		if ($this->upload->max_filesize && ($this->get('filesize') > $this->upload->max_filesize || $this->filesize == 0))
-		{
-			$max_filesize = get_formatted_filesize($this->upload->max_filesize, false);
-
-			$this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'WRONG_FILESIZE'], $max_filesize['value'], $max_filesize['unit']);
-
-			return false;
-		}
-
-		if (!$this->upload->valid_dimensions($this))
-		{
-			$this->error[] = $user->lang($this->upload->error_prefix . 'WRONG_SIZE',
-				$user->lang('PIXELS', (int) $this->upload->min_width),
-				$user->lang('PIXELS', (int) $this->upload->min_height),
-				$user->lang('PIXELS', (int) $this->upload->max_width),
-				$user->lang('PIXELS', (int) $this->upload->max_height),
-				$user->lang('PIXELS', (int) $this->width),
-				$user->lang('PIXELS', (int) $this->height));
-
-			return false;
-		}
-
-		return true;
-	}
-}
-
-/**
-* Class for assigning error messages before a real filespec class can be assigned
-*/
-class fileerror extends filespec
-{
-	function fileerror($error_msg)
-	{
-		$this->error[] = $error_msg;
-	}
-}
-
-/**
-* File upload class
-* Init class (all parameters optional and able to be set/overwritten separately) - scope is global and valid for all uploads
-*/
-class fileupload
-{
-	var $allowed_extensions = array();
-	var $disallowed_content = array('body', 'head', 'html', 'img', 'plaintext', 'a href', 'pre', 'script', 'table', 'title');
-	var $max_filesize = 0;
-	var $min_width = 0;
-	var $min_height = 0;
-	var $max_width = 0;
-	var $max_height = 0;
-	var $error_prefix = '';
-
-	/** @var int Timeout for remote upload */
-	var $upload_timeout = 6;
-
-	/**
-	 * @var \phpbb\filesystem\filesystem_interface
-	 */
-	protected $filesystem;
-
-	/**
-	* Init file upload class.
-	*
-	* @param \phpbb\filesystem\filesystem_interface $filesystem
-	* @param string $error_prefix Used error messages will get prefixed by this string
-	* @param array $allowed_extensions Array of allowed extensions, for example array('jpg', 'jpeg', 'gif', 'png')
-	* @param int $max_filesize Maximum filesize
-	* @param int $min_width Minimum image width (only checked for images)
-	* @param int $min_height Minimum image height (only checked for images)
-	* @param int $max_width Maximum image width (only checked for images)
-	* @param int $max_height Maximum image height (only checked for images)
-	* @param bool|array $disallowed_content If enabled, the first 256 bytes of the file must not
-	*										contain any of its values. Defaults to false.
-	*
-	*/
-	function fileupload(\phpbb\filesystem\filesystem_interface $filesystem, $error_prefix = '', $allowed_extensions = false, $max_filesize = false, $min_width = false, $min_height = false, $max_width = false, $max_height = false, $disallowed_content = false)
-	{
-		$this->set_allowed_extensions($allowed_extensions);
-		$this->set_max_filesize($max_filesize);
-		$this->set_allowed_dimensions($min_width, $min_height, $max_width, $max_height);
-		$this->set_error_prefix($error_prefix);
-		$this->set_disallowed_content($disallowed_content);
-		$this->filesystem = $filesystem;
-	}
-
-	/**
-	* Reset vars
-	*/
-	function reset_vars()
-	{
-		$this->max_filesize = 0;
-		$this->min_width = $this->min_height = $this->max_width = $this->max_height = 0;
-		$this->error_prefix = '';
-		$this->allowed_extensions = array();
-		$this->disallowed_content = array();
-	}
-
-	/**
-	* Set allowed extensions
-	*/
-	function set_allowed_extensions($allowed_extensions)
-	{
-		if ($allowed_extensions !== false && is_array($allowed_extensions))
-		{
-			$this->allowed_extensions = $allowed_extensions;
-		}
-	}
-
-	/**
-	* Set allowed dimensions
-	*/
-	function set_allowed_dimensions($min_width, $min_height, $max_width, $max_height)
-	{
-		$this->min_width = (int) $min_width;
-		$this->min_height = (int) $min_height;
-		$this->max_width = (int) $max_width;
-		$this->max_height = (int) $max_height;
-	}
-
-	/**
-	* Set maximum allowed filesize
-	*/
-	function set_max_filesize($max_filesize)
-	{
-		if ($max_filesize !== false && (int) $max_filesize)
-		{
-			$this->max_filesize = (int) $max_filesize;
-		}
-	}
-
-	/**
-	* Set disallowed strings
-	*/
-	function set_disallowed_content($disallowed_content)
-	{
-		if ($disallowed_content !== false && is_array($disallowed_content))
-		{
-			$this->disallowed_content = array_diff($disallowed_content, array(''));
-		}
-	}
-
-	/**
-	* Set error prefix
-	*/
-	function set_error_prefix($error_prefix)
-	{
-		$this->error_prefix = $error_prefix;
-	}
-
-	/**
-	* Form upload method
-	* Upload file from users harddisk
-	*
-	* @param string $form_name Form name assigned to the file input field (if it is an array, the key has to be specified)
-	* @param \phpbb\mimetype\guesser $mimetype_guesser Mimetype guesser
-	* @param \phpbb\plupload\plupload $plupload The plupload object
-	*
-	* @return object $file Object "filespec" is returned, all further operations can be done with this object
-	* @access public
-	*/
-	function form_upload($form_name, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null)
-	{
-		global $user, $request;
-
-		$upload = $request->file($form_name);
-		unset($upload['local_mode']);
-
-		if ($plupload)
-		{
-			$result = $plupload->handle_upload($form_name);
-			if (is_array($result))
-			{
-				$upload = array_merge($upload, $result);
-			}
-		}
-
-		$file = new filespec($upload, $this, $this->filesystem, $mimetype_guesser, $plupload);
-
-		if ($file->init_error)
-		{
-			$file->error[] = '';
-			return $file;
-		}
-
-		// Error array filled?
-		if (isset($upload['error']))
-		{
-			$error = $this->assign_internal_error($upload['error']);
-
-			if ($error !== false)
-			{
-				$file->error[] = $error;
-				return $file;
-			}
-		}
-
-		// Check if empty file got uploaded (not catched by is_uploaded_file)
-		if (isset($upload['size']) && $upload['size'] == 0)
-		{
-			$file->error[] = $user->lang[$this->error_prefix . 'EMPTY_FILEUPLOAD'];
-			return $file;
-		}
-
-		// PHP Upload filesize exceeded
-		if ($file->get('filename') == 'none')
-		{
-			$max_filesize = @ini_get('upload_max_filesize');
-			$unit = 'MB';
-
-			if (!empty($max_filesize))
-			{
-				$unit = strtolower(substr($max_filesize, -1, 1));
-				$max_filesize = (int) $max_filesize;
-
-				$unit = ($unit == 'k') ? 'KB' : (($unit == 'g') ? 'GB' : 'MB');
-			}
-
-			$file->error[] = (empty($max_filesize)) ? $user->lang[$this->error_prefix . 'PHP_SIZE_NA'] : sprintf($user->lang[$this->error_prefix . 'PHP_SIZE_OVERRUN'], $max_filesize, $user->lang[$unit]);
-			return $file;
-		}
-
-		// Not correctly uploaded
-		if (!$file->is_uploaded())
-		{
-			$file->error[] = $user->lang[$this->error_prefix . 'NOT_UPLOADED'];
-			return $file;
-		}
-
-		$this->common_checks($file);
-
-		return $file;
-	}
-
-	/**
-	* Move file from another location to phpBB
-	*/
-	function local_upload($source_file, $filedata = false, \phpbb\mimetype\guesser $mimetype_guesser = null)
-	{
-		global $user, $request;
-
-		$upload = array();
-
-		$upload['local_mode'] = true;
-		$upload['tmp_name'] = $source_file;
-
-		if ($filedata === false)
-		{
-			$upload['name'] = utf8_basename($source_file);
-			$upload['size'] = 0;
-		}
-		else
-		{
-			$upload['name'] = $filedata['realname'];
-			$upload['size'] = $filedata['size'];
-			$upload['type'] = $filedata['type'];
-		}
-
-		$file = new filespec($upload, $this, $this->filesystem, $mimetype_guesser);
-
-		if ($file->init_error)
-		{
-			$file->error[] = '';
-			return $file;
-		}
-
-		if (isset($upload['error']))
-		{
-			$error = $this->assign_internal_error($upload['error']);
-
-			if ($error !== false)
-			{
-				$file->error[] = $error;
-				return $file;
-			}
-		}
-
-		// PHP Upload filesize exceeded
-		if ($file->get('filename') == 'none')
-		{
-			$max_filesize = @ini_get('upload_max_filesize');
-			$unit = 'MB';
-
-			if (!empty($max_filesize))
-			{
-				$unit = strtolower(substr($max_filesize, -1, 1));
-				$max_filesize = (int) $max_filesize;
-
-				$unit = ($unit == 'k') ? 'KB' : (($unit == 'g') ? 'GB' : 'MB');
-			}
-
-			$file->error[] = (empty($max_filesize)) ? $user->lang[$this->error_prefix . 'PHP_SIZE_NA'] : sprintf($user->lang[$this->error_prefix . 'PHP_SIZE_OVERRUN'], $max_filesize, $user->lang[$unit]);
-			return $file;
-		}
-
-		// Not correctly uploaded
-		if (!$file->is_uploaded())
-		{
-			$file->error[] = $user->lang[$this->error_prefix . 'NOT_UPLOADED'];
-			return $file;
-		}
-
-		$this->common_checks($file);
-		$request->overwrite('local', $upload, \phpbb\request\request_interface::FILES);
-
-		return $file;
-	}
-
-	/**
-	* Remote upload method
-	* Uploads file from given url
-	*
-	* @param string $upload_url URL pointing to file to upload, for example http://www.foobar.com/example.gif
-	* @param \phpbb\mimetype\guesser $mimetype_guesser Mimetype guesser
-	* @return object $file Object "filespec" is returned, all further operations can be done with this object
-	* @access public
-	*/
-	function remote_upload($upload_url, \phpbb\mimetype\guesser $mimetype_guesser = null)
-	{
-		global $user, $phpbb_root_path;
-
-		$upload_ary = array();
-		$upload_ary['local_mode'] = true;
-
-		if (!preg_match('#^(https?://).*?\.(' . implode('|', $this->allowed_extensions) . ')$#i', $upload_url, $match))
-		{
-			$file = new fileerror($user->lang[$this->error_prefix . 'URL_INVALID']);
-			return $file;
-		}
-
-		if (empty($match[2]))
-		{
-			$file = new fileerror($user->lang[$this->error_prefix . 'URL_INVALID']);
-			return $file;
-		}
-
-		$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']);
-		$ext = array_pop($url['path']);
-
-		$url['path'] = implode('', $url['path']);
-		$upload_ary['name'] = utf8_basename($url['path']) . (($ext) ? '.' . $ext : '');
-		$filename = $url['path'];
-		$filesize = 0;
-
-		$remote_max_filesize = $this->max_filesize;
-		if (!$remote_max_filesize)
-		{
-			$max_filesize = @ini_get('upload_max_filesize');
-
-			if (!empty($max_filesize))
-			{
-				$unit = strtolower(substr($max_filesize, -1, 1));
-				$remote_max_filesize = (int) $max_filesize;
-
-				switch ($unit)
-				{
-					case 'g':
-						$remote_max_filesize *= 1024;
-					// no break
-					case 'm':
-						$remote_max_filesize *= 1024;
-					// no break
-					case 'k':
-						$remote_max_filesize *= 1024;
-					// no break
-				}
-			}
-		}
-
-		$errno = 0;
-		$errstr = '';
-
-		if (!($fsock = @fsockopen($host, $port, $errno, $errstr)))
-		{
-			$file = new fileerror($user->lang[$this->error_prefix . 'NOT_UPLOADED']);
-			return $file;
-		}
-
-		// Make sure $path not beginning with /
-		if (strpos($path, '/') === 0)
-		{
-			$path = substr($path, 1);
-		}
-
-		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_timeout);
-
-		$get_info = false;
-		$data = '';
-		$length = false;
-		$timer_stop = time() + $this->upload_timeout;
-
-		while ((!$length || $filesize < $length) && !@feof($fsock))
-		{
-			if ($get_info)
-			{
-				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);
-
-					$file = new fileerror(sprintf($user->lang[$this->error_prefix . 'WRONG_FILESIZE'], $max_filesize['value'], $max_filesize['unit']));
-					return $file;
-				}
-
-				$data .= $block;
-			}
-			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->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);
-
-							$file = new fileerror(sprintf($user->lang[$this->error_prefix . 'WRONG_FILESIZE'], $max_filesize['value'], $max_filesize['unit']));
-							return $file;
-						}
-					}
-					else if (stripos($line, '404 not found') !== false)
-					{
-						$file = new fileerror($user->lang[$this->error_prefix . 'URL_NOT_FOUND']);
-						return $file;
-					}
-				}
-			}
-
-			$stream_meta_data = stream_get_meta_data($fsock);
-
-			// Cancel upload if we exceed timeout
-			if (!empty($stream_meta_data['timed_out']) || time() >= $timer_stop)
-			{
-				$file = new fileerror($user->lang[$this->error_prefix . 'REMOTE_UPLOAD_TIMEOUT']);
-				return $file;
-			}
-		}
-		@fclose($fsock);
-
-		if (empty($data))
-		{
-			$file = new fileerror($user->lang[$this->error_prefix . 'EMPTY_REMOTE_DATA']);
-			return $file;
-		}
-
-		$tmp_path = (!@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'off') ? false : $phpbb_root_path . 'cache';
-		$filename = tempnam($tmp_path, unique_id() . '-');
-
-		if (!($fp = @fopen($filename, 'wb')))
-		{
-			$file = new fileerror($user->lang[$this->error_prefix . 'NOT_UPLOADED']);
-			return $file;
-		}
-
-		$upload_ary['size'] = fwrite($fp, $data);
-		fclose($fp);
-		unset($data);
-
-		$upload_ary['tmp_name'] = $filename;
-
-		$file = new filespec($upload_ary, $this, $this->filesystem, $mimetype_guesser);
-		$this->common_checks($file);
-
-		return $file;
-	}
-
-	/**
-	* Assign internal error
-	* @access private
-	*/
-	function assign_internal_error($errorcode)
-	{
-		global $user;
-
-		switch ($errorcode)
-		{
-			case 1:
-				$max_filesize = @ini_get('upload_max_filesize');
-				$unit = 'MB';
-
-				if (!empty($max_filesize))
-				{
-					$unit = strtolower(substr($max_filesize, -1, 1));
-					$max_filesize = (int) $max_filesize;
-
-					$unit = ($unit == 'k') ? 'KB' : (($unit == 'g') ? 'GB' : 'MB');
-				}
-
-				$error = (empty($max_filesize)) ? $user->lang[$this->error_prefix . 'PHP_SIZE_NA'] : sprintf($user->lang[$this->error_prefix . 'PHP_SIZE_OVERRUN'], $max_filesize, $user->lang[$unit]);
-			break;
-
-			case 2:
-				$max_filesize = get_formatted_filesize($this->max_filesize, false);
-
-				$error = sprintf($user->lang[$this->error_prefix . 'WRONG_FILESIZE'], $max_filesize['value'], $max_filesize['unit']);
-			break;
-
-			case 3:
-				$error = $user->lang[$this->error_prefix . 'PARTIAL_UPLOAD'];
-			break;
-
-			case 4:
-				$error = $user->lang[$this->error_prefix . 'NOT_UPLOADED'];
-			break;
-
-			case 6:
-				$error = 'Temporary folder could not be found. Please check your PHP installation.';
-			break;
-
-			default:
-				$error = false;
-			break;
-		}
-
-		return $error;
-	}
-
-	/**
-	* Perform common checks
-	*/
-	function common_checks(&$file)
-	{
-		global $user;
-
-		// Filesize is too big or it's 0 if it was larger than the maxsize in the upload form
-		if ($this->max_filesize && ($file->get('filesize') > $this->max_filesize || $file->get('filesize') == 0))
-		{
-			$max_filesize = get_formatted_filesize($this->max_filesize, false);
-
-			$file->error[] = sprintf($user->lang[$this->error_prefix . 'WRONG_FILESIZE'], $max_filesize['value'], $max_filesize['unit']);
-		}
-
-		// check Filename
-		if (preg_match("#[\\/:*?\"<>|]#i", $file->get('realname')))
-		{
-			$file->error[] = sprintf($user->lang[$this->error_prefix . 'INVALID_FILENAME'], $file->get('realname'));
-		}
-
-		// Invalid Extension
-		if (!$this->valid_extension($file))
-		{
-			$file->error[] = sprintf($user->lang[$this->error_prefix . 'DISALLOWED_EXTENSION'], $file->get('extension'));
-		}
-
-		// MIME Sniffing
-		if (!$this->valid_content($file))
-		{
-			$file->error[] = sprintf($user->lang[$this->error_prefix . 'DISALLOWED_CONTENT']);
-		}
-	}
-
-	/**
-	* Check for allowed extension
-	*/
-	function valid_extension(&$file)
-	{
-		return (in_array($file->get('extension'), $this->allowed_extensions)) ? true : false;
-	}
-
-	/**
-	* Check for allowed dimension
-	*/
-	function valid_dimensions(&$file)
-	{
-		if (!$this->max_width && !$this->max_height && !$this->min_width && !$this->min_height)
-		{
-			return true;
-		}
-
-		if (($file->get('width') > $this->max_width && $this->max_width) ||
-			($file->get('height') > $this->max_height && $this->max_height) ||
-			($file->get('width') < $this->min_width && $this->min_width) ||
-			($file->get('height') < $this->min_height && $this->min_height))
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	* Check if form upload is valid
-	*/
-	function is_valid($form_name)
-	{
-		global $request;
-		$upload = $request->file($form_name);
-
-		return (!empty($upload) && $upload['name'] !== 'none');
-	}
-
-
-	/**
-	* Check for bad content (IE mime-sniffing)
-	*/
-	function valid_content(&$file)
-	{
-		return ($file->check_content($this->disallowed_content));
-	}
-
-	/**
-	* Get image type/extension mapping
-	*
-	* @return array Array containing the image types and their extensions
-	*/
-	static public function image_types()
-	{
-		$result = array(
-			IMAGETYPE_GIF		=> array('gif'),
-			IMAGETYPE_JPEG		=> array('jpg', 'jpeg'),
-			IMAGETYPE_PNG		=> array('png'),
-			IMAGETYPE_SWF		=> array('swf'),
-			IMAGETYPE_PSD		=> array('psd'),
-			IMAGETYPE_BMP		=> array('bmp'),
-			IMAGETYPE_TIFF_II	=> array('tif', 'tiff'),
-			IMAGETYPE_TIFF_MM	=> array('tif', 'tiff'),
-			IMAGETYPE_JPC		=> array('jpg', 'jpeg'),
-			IMAGETYPE_JP2		=> array('jpg', 'jpeg'),
-			IMAGETYPE_JPX		=> array('jpg', 'jpeg'),
-			IMAGETYPE_JB2		=> array('jpg', 'jpeg'),
-			IMAGETYPE_IFF		=> array('iff'),
-			IMAGETYPE_WBMP		=> array('wbmp'),
-			IMAGETYPE_XBM		=> array('xbm'),
-		);
-
-		if (defined('IMAGETYPE_SWC'))
-		{
-			$result[IMAGETYPE_SWC] = array('swc');
-		}
-
-		return $result;
-	}
-}
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 853848d637..299467b5f3 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -205,8 +205,8 @@ $migrator->set_migrations($migrations);
 
 // What is a safe limit of execution time? Half the max execution time should be safe.
 //  No more than 15 seconds so the user isn't sitting and waiting for a very long time
-$phpbb_ini = new \phpbb\php\ini();
-$safe_time_limit = min(15, ($phpbb_ini->get_int('max_execution_time') / 2));
+$phpbb_ini = new \bantu\IniGetWrapper\IniGetWrapper();
+$safe_time_limit = min(15, ($phpbb_ini->getNumeric('max_execution_time') / 2));
 
 // While we're going to try limit this to half the max execution time,
 //  we want to try and take additional measures to prevent hitting the
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index bde9a91267..0390dbb2ac 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -105,11 +105,13 @@ $lang = array_merge($lang, array(
 	'AVATAR_EMPTY_FILEUPLOAD'		=> 'The uploaded avatar file is empty.',
 	'AVATAR_INVALID_FILENAME'		=> '%s is an invalid filename.',
 	'AVATAR_NOT_UPLOADED'			=> 'Avatar could not be uploaded.',
+	'AVATAR_NO_TEMP_DIR'			=> 'Temporary folder could not be found or is not writable.',
 	'AVATAR_NO_SIZE'				=> 'The width or height of the linked avatar could not be determined. Please enter them manually.',
 	'AVATAR_PARTIAL_UPLOAD'			=> 'The specified file was only partially uploaded.',
 	'AVATAR_PHP_SIZE_NA'			=> 'The avatar’s filesize is too large.<br />The maximum allowed filesize set in php.ini could not be determined.',
 	'AVATAR_PHP_SIZE_OVERRUN'		=> 'The avatar’s filesize is too large. The maximum allowed upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
 	'AVATAR_REMOTE_UPLOAD_TIMEOUT'		=> 'The specified avatar could not be uploaded because the request timed out.',
+	'AVATAR_PHP_UPLOAD_STOPPED'		=> 'A PHP extension has stopped the file upload.',
 	'AVATAR_URL_INVALID'			=> 'The URL you specified is invalid.',
 	'AVATAR_URL_NOT_FOUND'			=> 'The file specified could not be found.',
 	'AVATAR_WRONG_FILESIZE'			=> 'The avatar’s filesize must be between 0 and %1$d %2$s.',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 924395ed44..0e2d706f19 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -176,8 +176,10 @@ $lang = array_merge($lang, array(
 	'NO_POLL_TITLE'				=> 'You have to enter a poll title.',
 	'NO_POST'					=> 'The requested post does not exist.',
 	'NO_POST_MODE'				=> 'No post mode specified.',
+	'NO_TEMP_DIR'				=> 'Temporary folder could not be found or is not writable.',
 
 	'PARTIAL_UPLOAD'			=> 'The uploaded file was only partially uploaded.',
+	'PHP_UPLOAD_STOPPED'		=> 'A PHP extension has stopped the file upload.',
 	'PHP_SIZE_NA'				=> 'The attachment’s file size is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
 	'PHP_SIZE_OVERRUN'			=> 'The attachment’s file size is too large, the maximum upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
 	'PLACE_INLINE'				=> 'Place inline',
diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php
index 90443c9b4e..0526b9184e 100644
--- a/phpBB/phpbb/avatar/driver/remote.php
+++ b/phpBB/phpbb/avatar/driver/remote.php
@@ -114,13 +114,8 @@ class remote extends \phpbb\avatar\driver\driver
 			return false;
 		}
 
-		if (!class_exists('fileupload'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_upload.' . $this->php_ext);
-		}
-
-		$types = \fileupload::image_types();
-		$extension = strtolower(\filespec::get_extension($url));
+		$types = \phpbb\files\upload::image_types();
+		$extension = strtolower(\phpbb\files\filespec::get_extension($url));
 
 		// Check if this is actually an image
 		if ($file_stream = @fopen($url, 'r'))
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index b31609b982..a0c23cb624 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -24,36 +24,36 @@ class upload extends \phpbb\avatar\driver\driver
 	protected $filesystem;
 
 	/**
-	* @var \phpbb\mimetype\guesser
-	*/
-	protected $mimetype_guesser;
-
-	/**
 	* @var \phpbb\event\dispatcher_interface
 	*/
 	protected $dispatcher;
 
 	/**
+	 * @var \phpbb\files\factory
+	 */
+	protected $files_factory;
+
+	/**
 	* Construct a driver object
 	*
 	* @param \phpbb\config\config $config phpBB configuration
 	* @param string $phpbb_root_path Path to the phpBB root
 	* @param string $php_ext PHP file extension
-	* @param \phpbb\filesystem\filesystem_interface phpBB filesystem helper
+	* @param \phpbb\filesystem\filesystem_interface $filesystem phpBB filesystem helper
 	* @param \phpbb\path_helper $path_helper phpBB path helper
-	* @param \phpbb\mimetype\guesser $mimetype_guesser Mimetype guesser
 	* @param \phpbb\event\dispatcher_interface $dispatcher phpBB Event dispatcher object
+	* @param \phpbb\files\factory $files_factory File classes factory
 	* @param \phpbb\cache\driver\driver_interface $cache Cache driver
 	*/
-	public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\filesystem\filesystem_interface $filesystem, \phpbb\path_helper $path_helper, \phpbb\mimetype\guesser $mimetype_guesser, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\cache\driver\driver_interface $cache = null)
+	public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\filesystem\filesystem_interface $filesystem, \phpbb\path_helper $path_helper, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\files\factory $files_factory, \phpbb\cache\driver\driver_interface $cache = null)
 	{
 		$this->config = $config;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 		$this->filesystem = $filesystem;
 		$this->path_helper = $path_helper;
-		$this->mimetype_guesser = $mimetype_guesser;
 		$this->dispatcher = $dispatcher;
+		$this->files_factory = $files_factory;
 		$this->cache = $cache;
 	}
 
@@ -99,19 +99,24 @@ class upload extends \phpbb\avatar\driver\driver
 			return false;
 		}
 
-		if (!class_exists('fileupload'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_upload.' . $this->php_ext);
-		}
-
-		$upload = new \fileupload($this->filesystem, 'AVATAR_', $this->allowed_extensions, $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
+		/** @var \phpbb\files\upload $upload */
+		$upload = $this->files_factory->get('upload')
+			->set_error_prefix('AVATAR_')
+			->set_allowed_extensions($this->allowed_extensions)
+			->set_max_filesize($this->config['avatar_filesize'])
+			->set_allowed_dimensions(
+				$this->config['avatar_min_width'],
+				$this->config['avatar_min_height'],
+				$this->config['avatar_max_width'],
+				$this->config['avatar_max_height'])
+			->set_disallowed_content((isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
 
 		$url = $request->variable('avatar_upload_url', '');
 		$upload_file = $request->file('avatar_upload_file');
 
 		if (!empty($upload_file['name']))
 		{
-			$file = $upload->form_upload('avatar_upload_file', $this->mimetype_guesser);
+			$file = $upload->handle_upload('files.types.form', 'avatar_upload_file');
 		}
 		else if (!empty($this->config['allow_avatar_remote_upload']) && !empty($url))
 		{
@@ -141,7 +146,7 @@ class upload extends \phpbb\avatar\driver\driver
 				return false;
 			}
 
-			$file = $upload->remote_upload($url, $this->mimetype_guesser);
+			$file = $upload->handle_upload('files.types.remote', $url);
 		}
 		else
 		{
diff --git a/phpBB/phpbb/files/factory.php b/phpBB/phpbb/files/factory.php
new file mode 100644
index 0000000000..84b7cc9449
--- /dev/null
+++ b/phpBB/phpbb/files/factory.php
@@ -0,0 +1,58 @@
+<?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\files;
+
+class factory
+{
+	/**
+	 * @var \Symfony\Component\DependencyInjection\ContainerInterface
+	 */
+	private $container;
+
+	/**
+	 * Constructor
+	 *
+	 * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+	 */
+	public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container)
+	{
+		$this->container = $container;
+	}
+
+	/**
+	 * Get files service
+	 *
+	 * @param string $name Service name
+	 *
+	 * @return object|bool Requested service or false if service could not be
+	 *				found by the container
+	 */
+	public function get($name)
+	{
+		$service = false;
+
+		$name = (strpos($name, '.') === false) ? 'files.' . $name : $name;
+
+		try
+		{
+			$service = $this->container->get($name);
+		}
+		catch (\Exception $e)
+		{
+			// do nothing
+		}
+
+		return $service;
+	}
+}
diff --git a/phpBB/phpbb/files/filespec.php b/phpBB/phpbb/files/filespec.php
new file mode 100644
index 0000000000..2ff2a92c83
--- /dev/null
+++ b/phpBB/phpbb/files/filespec.php
@@ -0,0 +1,584 @@
+<?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\files;
+
+use phpbb\language\language;
+
+/**
+ * Responsible for holding all file relevant information, as well as doing file-specific operations.
+ * The {@link fileupload fileupload class} can be used to upload several files, each of them being this object to operate further on.
+ */
+class filespec
+{
+	/** @var string File name */
+	protected $filename = '';
+
+	/** @var string Real name of file */
+	protected $realname = '';
+
+	/** @var string Upload name of file */
+	protected $uploadname = '';
+
+	/** @var string Mimetype of file */
+	protected $mimetype = '';
+
+	/** @var string File extension */
+	protected $extension = '';
+
+	/** @var int File size */
+	protected $filesize = 0;
+
+	/** @var int Width of file */
+	protected $width = 0;
+
+	/** @var int Height of file */
+	protected $height = 0;
+
+	/** @var array Image info including type and size */
+	protected $image_info = array();
+
+	/** @var string Destination file name */
+	protected $destination_file = '';
+
+	/** @var string Destination file path */
+	protected $destination_path = '';
+
+	/** @var bool Whether file was moved */
+	protected $file_moved = false;
+
+	/** @var bool Whether file is local */
+	protected $local = false;
+
+	/** @var bool Class initialization flag */
+	protected $class_initialized = false;
+
+	/** @var array Error array */
+	public $error = array();
+
+	/** @var upload Instance of upload class  */
+	public $upload;
+
+	/** @var \phpbb\filesystem\filesystem_interface */
+	protected $filesystem;
+
+	/** @var \bantu\IniGetWrapper\IniGetWrapper ini_get() wrapper class */
+	protected $php_ini;
+
+	/** @var \FastImageSize\FastImageSize */
+	protected $imagesize;
+
+	/** @var language Language class */
+	protected $language;
+
+	/** @var string phpBB root path */
+	protected $phpbb_root_path;
+
+	/** @var \phpbb\plupload\plupload The plupload object */
+	protected $plupload;
+
+	/** @var \phpbb\mimetype\guesser phpBB Mimetype guesser */
+	protected $mimetype_guesser;
+
+	/**
+	 * File upload class
+	 *
+	 * @param \phpbb\filesystem\filesystem_interface	$phpbb_filesystem Filesystem
+	 * @param language					$language Language
+	 * @param \bantu\IniGetWrapper\IniGetWrapper			$php_ini ini_get() wrapper
+	 * @param \FastImageSize\FastImageSize $imagesize Imagesize class
+	 * @param string					$phpbb_root_path phpBB root path
+	 * @param \phpbb\mimetype\guesser	$mimetype_guesser Mime type guesser
+	 * @param \phpbb\plupload\plupload	$plupload Plupload
+	 */
+	public function __construct(\phpbb\filesystem\filesystem_interface $phpbb_filesystem, language $language, \bantu\IniGetWrapper\IniGetWrapper $php_ini, \FastImageSize\FastImageSize $imagesize, $phpbb_root_path, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null)
+	{
+		$this->filesystem = $phpbb_filesystem;
+		$this->language = $language;
+		$this->php_ini = $php_ini;
+		$this->imagesize = $imagesize;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->plupload = $plupload;
+		$this->mimetype_guesser = $mimetype_guesser;
+	}
+
+	/**
+	 * Set upload ary
+	 *
+	 * @param array $upload_ary Upload ary
+	 *
+	 * @return filespec This instance of the filespec class
+	 */
+	public function set_upload_ary($upload_ary)
+	{
+		if (!isset($upload_ary) || !sizeof($upload_ary))
+		{
+			return $this;
+		}
+
+		$this->class_initialized = true;
+		$this->filename = $upload_ary['tmp_name'];
+		$this->filesize = $upload_ary['size'];
+		$name = (STRIP) ? stripslashes($upload_ary['name']) : $upload_ary['name'];
+		$name = trim(utf8_basename($name));
+		$this->realname = $this->uploadname = $name;
+		$this->mimetype = $upload_ary['type'];
+
+		// Opera adds the name to the mime type
+		$this->mimetype	= (strpos($this->mimetype, '; name') !== false) ? str_replace(strstr($this->mimetype, '; name'), '', $this->mimetype) : $this->mimetype;
+
+		if (!$this->mimetype)
+		{
+			$this->mimetype = 'application/octet-stream';
+		}
+
+		$this->extension = strtolower(self::get_extension($this->realname));
+
+		// Try to get real filesize from temporary folder (not always working) ;)
+		$this->filesize = ($this->get_filesize($this->filename)) ?: $this->filesize;
+
+		$this->width = $this->height = 0;
+		$this->file_moved = false;
+
+		$this->local = (isset($upload_ary['local_mode'])) ? true : false;
+
+		return $this;
+	}
+
+	/**
+	 * Set the upload namespace
+	 *
+	 * @param upload $namespace Instance of upload class
+	 *
+	 * @return filespec This instance of the filespec class
+	 */
+	public function set_upload_namespace($namespace)
+	{
+		$this->upload = $namespace;
+
+		return $this;
+	}
+
+	/**
+	 * Check if class members were not properly initialised yet
+	 *
+	 * @return bool True if there was an init error, false if not
+	 */
+	public function init_error()
+	{
+		return !$this->class_initialized;
+	}
+
+	/**
+	 * Set error in error array
+	 *
+	 * @param mixed $error Content for error array
+	 *
+	 * @return \phpbb\files\filespec This instance of the filespec class
+	 */
+	public function set_error($error)
+	{
+		$this->error[] = $error;
+
+		return $this;
+	}
+
+	/**
+	 * Cleans destination filename
+	 *
+	 * @param string $mode Either real, unique, or unique_ext. Real creates a
+	 *				realname, filtering some characters, lowering every
+	 *				character. Unique creates a unique filename.
+	 * @param string $prefix Prefix applied to filename
+	 * @param string $user_id The user_id is only needed for when cleaning a user's avatar
+	 */
+	public function clean_filename($mode = 'unique', $prefix = '', $user_id = '')
+	{
+		if ($this->init_error())
+		{
+			return;
+		}
+
+		switch ($mode)
+		{
+			case 'real':
+				// Remove every extension from filename (to not let the mime bug being exposed)
+				if (strpos($this->realname, '.') !== false)
+				{
+					$this->realname = substr($this->realname, 0, strpos($this->realname, '.'));
+				}
+
+				// Replace any chars which may cause us problems with _
+				$bad_chars = array("'", "\\", ' ', '/', ':', '*', '?', '"', '<', '>', '|');
+
+				$this->realname = rawurlencode(str_replace($bad_chars, '_', strtolower($this->realname)));
+				$this->realname = preg_replace("/%(\w{2})/", '_', $this->realname);
+
+				$this->realname = $prefix . $this->realname . '.' . $this->extension;
+			break;
+
+			case 'unique':
+				$this->realname = $prefix . md5(unique_id());
+			break;
+
+			case 'avatar':
+				$this->extension = strtolower($this->extension);
+				$this->realname = $prefix . $user_id . '.' . $this->extension;
+
+			break;
+
+			case 'unique_ext':
+			default:
+				$this->realname = $prefix . md5(unique_id()) . '.' . $this->extension;
+		}
+	}
+
+	/**
+	 * Get property from file object
+	 *
+	 * @param string $property Name of property
+	 *
+	 * @return mixed Content of property
+	 */
+	public function get($property)
+	{
+		if ($this->init_error() || !isset($this->$property))
+		{
+			return false;
+		}
+
+		return $this->$property;
+	}
+
+	/**
+	 * Check if file is an image (mime type)
+	 *
+	 * @return bool true if it is an image, false if not
+	 */
+	public function is_image()
+	{
+		return (strpos($this->mimetype, 'image/') === 0);
+	}
+
+	/**
+	 * Check if the file got correctly uploaded
+	 *
+	 * @return bool true if it is a valid upload, false if not
+	 */
+	public function is_uploaded()
+	{
+		$is_plupload = $this->plupload && $this->plupload->is_active();
+
+		if (!$this->local && !$is_plupload && !is_uploaded_file($this->filename))
+		{
+			return false;
+		}
+
+		if (($this->local || $is_plupload) && !file_exists($this->filename))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Remove file
+	 */
+	public function remove()
+	{
+		if ($this->file_moved)
+		{
+			@unlink($this->destination_file);
+		}
+	}
+
+	/**
+	 * Get file extension
+	 *
+	 * @param string $filename Filename that needs to be checked
+	 *
+	 * @return string Extension of the supplied filename
+	 */
+	static public function get_extension($filename)
+	{
+		$filename = utf8_basename($filename);
+
+		if (strpos($filename, '.') === false)
+		{
+			return '';
+		}
+
+		$filename = explode('.', $filename);
+		return array_pop($filename);
+	}
+
+	/**
+	 * Get mime type
+	 *
+	 * @param string $filename Filename that needs to be checked
+	 * @return string Mime type of supplied filename
+	 */
+	public function get_mimetype($filename)
+	{
+		if ($this->mimetype_guesser !== null)
+		{
+			$mimetype = $this->mimetype_guesser->guess($filename, $this->uploadname);
+
+			if ($mimetype !== 'application/octet-stream')
+			{
+				$this->mimetype = $mimetype;
+			}
+		}
+
+		return $this->mimetype;
+	}
+
+	/**
+	 * Get file size
+	 *
+	 * @param string $filename File name of file to check
+	 *
+	 * @return int File size
+	 */
+	public function get_filesize($filename)
+	{
+		return @filesize($filename);
+	}
+
+
+	/**
+	 * Check the first 256 bytes for forbidden content
+	 *
+	 * @param array $disallowed_content Array containg disallowed content
+	 *
+	 * @return bool False if disallowed content found, true if not
+	 */
+	public function check_content($disallowed_content)
+	{
+		if (empty($disallowed_content))
+		{
+			return true;
+		}
+
+		$fp = @fopen($this->filename, 'rb');
+
+		if ($fp !== false)
+		{
+			$ie_mime_relevant = fread($fp, 256);
+			fclose($fp);
+			foreach ($disallowed_content as $forbidden)
+			{
+				if (stripos($ie_mime_relevant, '<' . $forbidden) !== false)
+				{
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Move file to destination folder
+	 * The phpbb_root_path variable will be applied to the destination path
+	 *
+	 * @param string $destination Destination path, for example $config['avatar_path']
+	 * @param bool $overwrite If set to true, an already existing file will be overwritten
+	 * @param bool $skip_image_check If set to true, the check for the file to be a valid image is skipped
+	 * @param string|bool $chmod Permission mask for chmodding the file after a successful move.
+	 *				The mode entered here reflects the mode defined by {@link phpbb_chmod()}
+	 *
+	 * @return bool True if file was moved, false if not
+	 * @access public
+	 */
+	public function move_file($destination, $overwrite = false, $skip_image_check = false, $chmod = false)
+	{
+		if (sizeof($this->error))
+		{
+			return false;
+		}
+
+		$chmod = ($chmod === false) ? CHMOD_READ | CHMOD_WRITE : $chmod;
+
+		// We need to trust the admin in specifying valid upload directories and an attacker not being able to overwrite it...
+		$this->destination_path = $this->phpbb_root_path . $destination;
+
+		// Check if the destination path exist...
+		if (!file_exists($this->destination_path))
+		{
+			@unlink($this->filename);
+			return false;
+		}
+
+		$upload_mode = ($this->php_ini->getBool('open_basedir') || $this->php_ini->getBool('safe_mode')) ? 'move' : 'copy';
+		$upload_mode = ($this->local) ? 'local' : $upload_mode;
+		$this->destination_file = $this->destination_path . '/' . utf8_basename($this->realname);
+
+		// Check if the file already exist, else there is something wrong...
+		if (file_exists($this->destination_file) && !$overwrite)
+		{
+			@unlink($this->filename);
+			$this->error[] = $this->language->lang($this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR', $this->destination_file);
+			$this->file_moved = false;
+			return false;
+		}
+		else
+		{
+			if (file_exists($this->destination_file))
+			{
+				@unlink($this->destination_file);
+			}
+
+			switch ($upload_mode)
+			{
+				case 'copy':
+
+					if (!@copy($this->filename, $this->destination_file))
+					{
+						if (!@move_uploaded_file($this->filename, $this->destination_file))
+						{
+							$this->error[] = $this->language->lang($this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR', $this->destination_file);
+						}
+					}
+
+				break;
+
+				case 'move':
+
+					if (!@move_uploaded_file($this->filename, $this->destination_file))
+					{
+						if (!@copy($this->filename, $this->destination_file))
+						{
+							$this->error[] = $this->language->lang($this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR', $this->destination_file);
+						}
+					}
+
+				break;
+
+				case 'local':
+
+					if (!@copy($this->filename, $this->destination_file))
+					{
+						$this->error[] = $this->language->lang($this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR', $this->destination_file);
+					}
+
+				break;
+			}
+
+			// Remove temporary filename
+			@unlink($this->filename);
+
+			if (sizeof($this->error))
+			{
+				return false;
+			}
+
+			try
+			{
+				$this->filesystem->phpbb_chmod($this->destination_file, $chmod);
+			}
+			catch (\phpbb\filesystem\exception\filesystem_exception $e)
+			{
+				// Do nothing
+			}
+		}
+
+		// Try to get real filesize from destination folder
+		$this->filesize = ($this->get_filesize($this->destination_file)) ?: $this->filesize;
+
+		// Get mimetype of supplied file
+		$this->mimetype = $this->get_mimetype($this->destination_file);
+
+		if ($this->is_image() && !$skip_image_check)
+		{
+			$this->width = $this->height = 0;
+
+			$this->image_info = $this->imagesize->getImageSize($this->destination_file, $this->mimetype);
+
+			if ($this->image_info !== false)
+			{
+				$this->width = $this->image_info['width'];
+				$this->height = $this->image_info['height'];
+
+				// Check image type
+				$types = upload::image_types();
+
+				if (!isset($types[$this->image_info['type']]) || !in_array($this->extension, $types[$this->image_info['type']]))
+				{
+					if (!isset($types[$this->image_info['type']]))
+					{
+						$this->error[] = $this->language->lang('IMAGE_FILETYPE_INVALID', $this->image_info['type'], $this->mimetype);
+					}
+					else
+					{
+						$this->error[] = $this->language->lang('IMAGE_FILETYPE_MISMATCH', $types[$this->image_info['type']][0], $this->extension);
+					}
+				}
+
+				// Make sure the dimensions match a valid image
+				if (empty($this->width) || empty($this->height))
+				{
+					$this->error[] = $this->language->lang('ATTACHED_IMAGE_NOT_IMAGE');
+				}
+			}
+			else
+			{
+				$this->error[] = $this->language->lang('UNABLE_GET_IMAGE_SIZE');
+			}
+		}
+
+		$this->file_moved = true;
+		$this->additional_checks();
+		unset($this->upload);
+
+		return true;
+	}
+
+	/**
+	 * Performing additional checks
+	 *
+	 * @return bool False if issue was found, true if not
+	 */
+	public function additional_checks()
+	{
+		if (!$this->file_moved)
+		{
+			return false;
+		}
+
+		// Filesize is too big or it's 0 if it was larger than the maxsize in the upload form
+		if ($this->upload->max_filesize && ($this->get('filesize') > $this->upload->max_filesize || $this->filesize == 0))
+		{
+			$max_filesize = get_formatted_filesize($this->upload->max_filesize, false);
+
+			$this->error[] = $this->language->lang($this->upload->error_prefix . 'WRONG_FILESIZE', $max_filesize['value'], $max_filesize['unit']);
+
+			return false;
+		}
+
+		if (!$this->upload->valid_dimensions($this))
+		{
+			$this->error[] = $this->language->lang($this->upload->error_prefix . 'WRONG_SIZE',
+				$this->language->lang('PIXELS', (int) $this->upload->min_width),
+				$this->language->lang('PIXELS', (int) $this->upload->min_height),
+				$this->language->lang('PIXELS', (int) $this->upload->max_width),
+				$this->language->lang('PIXELS', (int) $this->upload->max_height),
+				$this->language->lang('PIXELS', (int) $this->width),
+				$this->language->lang('PIXELS', (int) $this->height));
+
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/phpBB/phpbb/files/types/base.php b/phpBB/phpbb/files/types/base.php
new file mode 100644
index 0000000000..3313ad040b
--- /dev/null
+++ b/phpBB/phpbb/files/types/base.php
@@ -0,0 +1,65 @@
+<?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\files\types;
+
+abstract class base implements type_interface
+{
+	/** @var \phpbb\language\language */
+	protected $language;
+
+	/** @var \bantu\IniGetWrapper\IniGetWrapper */
+	protected $php_ini;
+
+	/** @var \phpbb\files\upload */
+	protected $upload;
+
+	/**
+	 * Check if upload exceeds maximum file size
+	 *
+	 * @param \phpbb\files\filespec $file Filespec object
+	 *
+	 * @return \phpbb\files\filespec Returns same filespec instance
+	 */
+	public function check_upload_size($file)
+	{
+		// PHP Upload filesize exceeded
+		if ($file->get('filename') == 'none')
+		{
+			$max_filesize = $this->php_ini->getString('upload_max_filesize');
+			$unit = 'MB';
+
+			if (!empty($max_filesize))
+			{
+				$unit = strtolower(substr($max_filesize, -1, 1));
+				$max_filesize = (int) $max_filesize;
+
+				$unit = ($unit == 'k') ? 'KB' : (($unit == 'g') ? 'GB' : 'MB');
+			}
+
+			$file->error[] = (empty($max_filesize)) ? $this->language->lang($this->upload->error_prefix . 'PHP_SIZE_NA') : $this->language->lang($this->upload->error_prefix . 'PHP_SIZE_OVERRUN', $max_filesize, $this->language->lang($unit));
+		}
+
+		return $file;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function set_upload(\phpbb\files\upload $upload)
+	{
+		$this->upload = $upload;
+
+		return $this;
+	}
+}
diff --git a/phpBB/phpbb/files/types/form.php b/phpBB/phpbb/files/types/form.php
new file mode 100644
index 0000000000..832f090c47
--- /dev/null
+++ b/phpBB/phpbb/files/types/form.php
@@ -0,0 +1,138 @@
+<?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\files\types;
+
+use bantu\IniGetWrapper\IniGetWrapper;
+use phpbb\files\factory;
+use phpbb\files\filespec;
+use phpbb\language\language;
+use phpbb\plupload\plupload;
+use phpbb\request\request_interface;
+
+class form extends base
+{
+	/** @var factory Files factory */
+	protected $factory;
+
+	/** @var language */
+	protected $language;
+
+	/** @var IniGetWrapper */
+	protected $php_ini;
+
+	/** @var plupload */
+	protected $plupload;
+
+	/** @var request_interface */
+	protected $request;
+
+	/** @var \phpbb\files\upload */
+	protected $upload;
+
+	/**
+	 * Construct a form upload type
+	 *
+	 * @param factory			$factory	Files factory
+	 * @param language			$language	Language class
+	 * @param IniGetWrapper		$php_ini	ini_get() wrapper
+	 * @param plupload			$plupload	Plupload
+	 * @param request_interface	$request	Request object
+	 */
+	public function __construct(factory $factory, language $language, IniGetWrapper $php_ini, plupload $plupload, request_interface $request)
+	{
+		$this->factory = $factory;
+		$this->language = $language;
+		$this->php_ini = $php_ini;
+		$this->plupload = $plupload;
+		$this->request = $request;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function upload()
+	{
+		$args = func_get_args();
+		return $this->form_upload($args[0]);
+	}
+
+	/**
+	 * Form upload method
+	 * Upload file from users harddisk
+	 *
+	 * @param string $form_name Form name assigned to the file input field (if it is an array, the key has to be specified)
+	 *
+	 * @return filespec $file Object "filespec" is returned, all further operations can be done with this object
+	 * @access public
+	 */
+	protected function form_upload($form_name)
+	{
+		$upload = $this->request->file($form_name);
+		unset($upload['local_mode']);
+
+		$result = $this->plupload->handle_upload($form_name);
+		if (is_array($result))
+		{
+			$upload = array_merge($upload, $result);
+		}
+
+		/** @var filespec $file */
+		$file = $this->factory->get('filespec')
+			->set_upload_ary($upload)
+			->set_upload_namespace($this->upload);
+
+		if ($file->init_error())
+		{
+			$file->error[] = '';
+			return $file;
+		}
+
+		// Error array filled?
+		if (isset($upload['error']))
+		{
+			$error = $this->upload->assign_internal_error($upload['error']);
+
+			if ($error !== false)
+			{
+				$file->error[] = $error;
+				return $file;
+			}
+		}
+
+		// Check if empty file got uploaded (not catched by is_uploaded_file)
+		if (isset($upload['size']) && $upload['size'] == 0)
+		{
+			$file->error[] = $this->language->lang($this->upload->error_prefix . 'EMPTY_FILEUPLOAD');
+			return $file;
+		}
+
+		// PHP Upload file size check
+		$file = $this->check_upload_size($file);
+		if (sizeof($file->error))
+		{
+			return $file;
+		}
+
+		// Not correctly uploaded
+		if (!$file->is_uploaded())
+		{
+			$file->error[] = $this->language->lang($this->upload->error_prefix . 'NOT_UPLOADED');
+			return $file;
+		}
+
+		$this->upload->common_checks($file);
+
+		return $file;
+	}
+}
diff --git a/phpBB/phpbb/files/types/local.php b/phpBB/phpbb/files/types/local.php
new file mode 100644
index 0000000000..7e9210b196
--- /dev/null
+++ b/phpBB/phpbb/files/types/local.php
@@ -0,0 +1,136 @@
+<?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\files\types;
+
+use bantu\IniGetWrapper\IniGetWrapper;
+use phpbb\files\factory;
+use phpbb\files\filespec;
+use phpbb\language\language;
+use phpbb\request\request_interface;
+
+class local extends base
+{
+	/** @var factory Files factory */
+	protected $factory;
+
+	/** @var language */
+	protected $language;
+
+	/** @var IniGetWrapper */
+	protected $php_ini;
+
+	/** @var request_interface */
+	protected $request;
+
+	/** @var \phpbb\files\upload */
+	protected $upload;
+
+	/**
+	 * Construct a form upload type
+	 *
+	 * @param factory $factory Files factory
+	 * @param language $language Language class
+	 * @param IniGetWrapper $php_ini ini_get() wrapper
+	 * @param request_interface $request Request object
+	 */
+	public function __construct(factory $factory, language $language, IniGetWrapper $php_ini, request_interface $request)
+	{
+		$this->factory = $factory;
+		$this->language = $language;
+		$this->php_ini = $php_ini;
+		$this->request = $request;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function upload()
+	{
+		$args = func_get_args();
+		return $this->local_upload($args[0], isset($args[1]) ? $args[1] : false);
+	}
+
+	/**
+	 * Move file from another location to phpBB
+	 *
+	 * @param string $source_file Filename of source file
+	 * @param array|bool $filedata Array with filedata or false
+	 *
+	 * @return filespec Object "filespec" is returned, all further operations can be done with this object
+	 */
+	protected function local_upload($source_file, $filedata = false)
+	{
+		$upload = $this->get_upload_ary($source_file, $filedata);
+
+		/** @var filespec $file */
+		$file = $this->factory->get('filespec')
+			->set_upload_ary($upload)
+			->set_upload_namespace($this->upload);
+
+		if ($file->init_error())
+		{
+			$file->error[] = '';
+			return $file;
+		}
+
+		// PHP Upload file size check
+		$file = $this->check_upload_size($file);
+		if (sizeof($file->error))
+		{
+			return $file;
+		}
+
+		// Not correctly uploaded
+		if (!$file->is_uploaded())
+		{
+			$file->error[] = $this->language->lang($this->upload->error_prefix . 'NOT_UPLOADED');
+			return $file;
+		}
+
+		$this->upload->common_checks($file);
+		$this->request->overwrite('local', $upload, request_interface::FILES);
+
+		return $file;
+	}
+
+	/**
+	 * Retrieve upload array
+	 *
+	 * @param string $source_file Source file name
+	 * @param array $filedata File data array
+	 *
+	 * @return array Upload array
+	 */
+	protected function get_upload_ary($source_file, $filedata)
+	{
+		$upload = array();
+
+		$upload['local_mode'] = true;
+		$upload['tmp_name'] = $source_file;
+
+		if ($filedata === false)
+		{
+			$upload['name'] = utf8_basename($source_file);
+			$upload['size'] = 0;
+		}
+		else
+		{
+			$upload['name'] = $filedata['realname'];
+			$upload['size'] = $filedata['size'];
+			$upload['type'] = $filedata['type'];
+		}
+
+		return $upload;
+	}
+}
diff --git a/phpBB/phpbb/files/types/remote.php b/phpBB/phpbb/files/types/remote.php
new file mode 100644
index 0000000000..44feab0ece
--- /dev/null
+++ b/phpBB/phpbb/files/types/remote.php
@@ -0,0 +1,260 @@
+<?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\files\types;
+
+use bantu\IniGetWrapper\IniGetWrapper;
+use phpbb\files\factory;
+use phpbb\files\filespec;
+use phpbb\language\language;
+use phpbb\request\request_interface;
+
+class remote extends base
+{
+	/** @var factory Files factory */
+	protected $factory;
+
+	/** @var language */
+	protected $language;
+
+	/** @var IniGetWrapper */
+	protected $php_ini;
+
+	/** @var request_interface */
+	protected $request;
+
+	/** @var \phpbb\files\upload */
+	protected $upload;
+
+	/** @var string phpBB root path */
+	protected $phpbb_root_path;
+
+	/**
+	 * Construct a form upload type
+	 *
+	 * @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)
+	{
+		$this->factory = $factory;
+		$this->language = $language;
+		$this->php_ini = $php_ini;
+		$this->request = $request;
+		$this->phpbb_root_path = $phpbb_root_path;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function upload()
+	{
+		$args = func_get_args();
+		return $this->remote_upload($args[0]);
+	}
+
+	/**
+	 * Remote upload method
+	 * Uploads file from given url
+	 *
+	 * @param string $upload_url URL pointing to file to upload, for example http://www.foobar.com/example.gif
+	 * @return filespec $file Object "filespec" is returned, all further operations can be done with this object
+	 * @access public
+	 */
+	protected function remote_upload($upload_url)
+	{
+		$upload_ary = array();
+		$upload_ary['local_mode'] = true;
+
+		if (!preg_match('#^(https?://).*?\.(' . implode('|', $this->upload->allowed_extensions) . ')$#i', $upload_url, $match))
+		{
+			return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'URL_INVALID'));
+		}
+
+		$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']);
+		$ext = array_pop($url['path']);
+
+		$url['path'] = implode('', $url['path']);
+		$upload_ary['name'] = utf8_basename($url['path']) . (($ext) ? '.' . $ext : '');
+		$filename = $url['path'];
+		$filesize = 0;
+
+		$remote_max_filesize = $this->get_max_file_size();
+
+		$errno = 0;
+		$errstr = '';
+
+		if (!($fsock = @fsockopen($host, $port, $errno, $errstr)))
+		{
+			return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'NOT_UPLOADED'));
+		}
+
+		// Make sure $path not beginning with /
+		if (strpos($path, '/') === 0)
+		{
+			$path = substr($path, 1);
+		}
+
+		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))
+		{
+			if ($get_info)
+			{
+				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;
+			}
+			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');
+					}
+				}
+			}
+
+			$stream_meta_data = stream_get_meta_data($fsock);
+
+			// 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');
+			}
+		}
+		@fclose($fsock);
+
+		if (empty($data))
+		{
+			return $this->factory->get('filespec')->set_error($this->upload->error_prefix . 'EMPTY_REMOTE_DATA');
+		}
+
+		$tmp_path = (!$this->php_ini->getBool('safe_mode')) ? false : $this->phpbb_root_path . 'cache';
+		$filename = tempnam($tmp_path, unique_id() . '-');
+
+		if (!($fp = @fopen($filename, 'wb')))
+		{
+			return $this->factory->get('filespec')->set_error($this->upload->error_prefix . 'NOT_UPLOADED');
+		}
+
+		$upload_ary['size'] = fwrite($fp, $data);
+		fclose($fp);
+		unset($data);
+
+		$upload_ary['tmp_name'] = $filename;
+
+		/** @var filespec $file */
+		$file = $this->factory->get('filespec')
+			->set_upload_ary($upload_ary)
+			->set_upload_namespace($this->upload);
+		$this->upload->common_checks($file);
+
+		return $file;
+	}
+
+	/**
+	 * Get maximum file size for remote uploads
+	 *
+	 * @return int Maximum file size
+	 */
+	protected function get_max_file_size()
+	{
+		$max_file_size = $this->upload->max_filesize;
+		if (!$max_file_size)
+		{
+			$max_file_size = $this->php_ini->getString('upload_max_filesize');
+
+			if (!empty($max_file_size))
+			{
+				$unit = strtolower(substr($max_file_size, -1, 1));
+				$max_file_size = (int) $max_file_size;
+
+				switch ($unit)
+				{
+					case 'g':
+						$max_file_size *= 1024;
+					// no break
+					case 'm':
+						$max_file_size *= 1024;
+					// no break
+					case 'k':
+						$max_file_size *= 1024;
+					// no break
+				}
+			}
+		}
+
+		return $max_file_size;
+	}
+}
diff --git a/phpBB/phpbb/files/types/type_interface.php b/phpBB/phpbb/files/types/type_interface.php
new file mode 100644
index 0000000000..e07078349a
--- /dev/null
+++ b/phpBB/phpbb/files/types/type_interface.php
@@ -0,0 +1,38 @@
+<?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\files\types;
+
+use phpbb\files\upload;
+
+interface type_interface
+{
+	/**
+	 * Handle upload for upload types. Arguments passed to this method will be
+	 * handled by the upload type classes themselves.
+	 *
+	 * @return \phpbb\files\filespec|bool Filespec instance if upload is
+	 *                                    successful or false if not
+	 */
+	public function upload();
+
+	/**
+	 * Set upload instance
+	 * Needs to be executed before every upload.
+	 *
+	 * @param upload $upload Upload instance
+	 *
+	 * @return type_interface Returns itself
+	 */
+	public function set_upload(upload $upload);
+}
diff --git a/phpBB/phpbb/files/upload.php b/phpBB/phpbb/files/upload.php
new file mode 100644
index 0000000000..e011e714e5
--- /dev/null
+++ b/phpBB/phpbb/files/upload.php
@@ -0,0 +1,395 @@
+<?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\files;
+
+use phpbb\filesystem\filesystem_interface;
+use phpbb\language\language;
+use phpbb\request\request_interface;
+
+/**
+ * File upload class
+ * Init class (all parameters optional and able to be set/overwritten separately) - scope is global and valid for all uploads
+ */
+class upload
+{
+	/** @var array Allowed file extensions */
+	public $allowed_extensions = array();
+
+	/** @var array Disallowed content */
+	protected $disallowed_content = array('body', 'head', 'html', 'img', 'plaintext', 'a href', 'pre', 'script', 'table', 'title');
+
+	/** @var int Maximum filesize */
+	public $max_filesize = 0;
+
+	/** @var int Minimum width of images */
+	public $min_width = 0;
+
+	/** @var int Minimum height of images */
+	public $min_height = 0;
+
+	/** @var int Maximum width of images */
+	public $max_width = 0;
+
+	/** @var int Maximum height of images */
+	public $max_height = 0;
+
+	/** @var string Prefix for language variables of errors */
+	public $error_prefix = '';
+
+	/** @var int Timeout for remote upload */
+	public $upload_timeout = 6;
+
+	/** @var filesystem_interface */
+	protected $filesystem;
+
+	/** @var \phpbb\files\factory Files factory */
+	protected $factory;
+
+	/** @var \bantu\IniGetWrapper\IniGetWrapper ini_get() wrapper */
+	protected $php_ini;
+
+	/** @var \phpbb\language\language Language class */
+	protected $language;
+
+	/** @var request_interface Request class */
+	protected $request;
+
+	/** @var string phpBB root path */
+	protected $phpbb_root_path;
+
+	/**
+	 * Init file upload class.
+	 *
+	 * @param filesystem_interface $filesystem
+	 * @param factory $factory Files factory
+	 * @param language $language Language class
+	 * @param \bantu\IniGetWrapper\IniGetWrapper $php_ini ini_get() wrapper
+	 * @param request_interface $request Request class
+	 * @param string $phpbb_root_path phpBB root path
+	 */
+	public function __construct(filesystem_interface $filesystem, factory $factory, language $language, \bantu\IniGetWrapper\IniGetWrapper $php_ini, request_interface $request, $phpbb_root_path)
+	{
+		$this->filesystem = $filesystem;
+		$this->factory = $factory;
+		$this->language = $language;
+		$this->php_ini = $php_ini;
+		$this->request = $request;
+		$this->phpbb_root_path = $phpbb_root_path;
+	}
+
+	/**
+	 * Reset vars
+	 */
+	public function reset_vars()
+	{
+		$this->max_filesize = 0;
+		$this->min_width = $this->min_height = $this->max_width = $this->max_height = 0;
+		$this->error_prefix = '';
+		$this->allowed_extensions = array();
+		$this->disallowed_content = array();
+	}
+
+	/**
+	 * Set allowed extensions
+	 *
+	 * @param array $allowed_extensions Allowed file extensions
+	 *
+	 * @return \phpbb\files\upload This instance of upload
+	 */
+	public function set_allowed_extensions($allowed_extensions)
+	{
+		if ($allowed_extensions !== false && is_array($allowed_extensions))
+		{
+			$this->allowed_extensions = $allowed_extensions;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set allowed dimensions
+	 *
+	 * @param int $min_width Minimum image width
+	 * @param int $min_height Minimum image height
+	 * @param int $max_width Maximum image width
+	 * @param int $max_height Maximum image height
+	 *
+	 * @return \phpbb\files\upload This instance of upload
+	 */
+	public function set_allowed_dimensions($min_width, $min_height, $max_width, $max_height)
+	{
+		$this->min_width = (int) $min_width;
+		$this->min_height = (int) $min_height;
+		$this->max_width = (int) $max_width;
+		$this->max_height = (int) $max_height;
+
+		return $this;
+	}
+
+	/**
+	 * Set maximum allowed file size
+	 *
+	 * @param int $max_filesize Maximum file size
+	 *
+	 * @return \phpbb\files\upload This instance of upload
+	 */
+	public function set_max_filesize($max_filesize)
+	{
+		if ($max_filesize !== false && (int) $max_filesize)
+		{
+			$this->max_filesize = (int) $max_filesize;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set disallowed strings
+	 *
+	 * @param array $disallowed_content Disallowed content
+	 *
+	 * @return \phpbb\files\upload This instance of upload
+	 */
+	public function set_disallowed_content($disallowed_content)
+	{
+		if ($disallowed_content !== false && is_array($disallowed_content))
+		{
+			$this->disallowed_content = array_diff($disallowed_content, array(''));
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set error prefix
+	 *
+	 * @param string $error_prefix Prefix for language variables of errors
+	 *
+	 * @return \phpbb\files\upload This instance of upload
+	 */
+	public function set_error_prefix($error_prefix)
+	{
+		$this->error_prefix = $error_prefix;
+
+		return $this;
+	}
+
+	/**
+	 * Handle upload based on type
+	 *
+	 * @param string $type Upload type
+	 *
+	 * @return \phpbb\files\filespec|bool A filespec instance if upload was
+	 *		successful, false if there were issues or the type is not supported
+	 */
+	public function handle_upload($type)
+	{
+		$args = func_get_args();
+		array_shift($args);
+		$type_class = $this->factory->get($type)
+			->set_upload($this);
+
+		return (is_object($type_class)) ? call_user_func_array(array($type_class, 'upload'), $args) : false;
+	}
+
+	/**
+	 * Assign internal error
+	 *
+	 * @param string $errorcode Error code to assign
+	 *
+	 * @return string Error string
+	 * @access public
+	 */
+	public function assign_internal_error($errorcode)
+	{
+		switch ($errorcode)
+		{
+			case UPLOAD_ERR_INI_SIZE:
+				$max_filesize = $this->php_ini->getString('upload_max_filesize');
+				$unit = 'MB';
+
+				if (!empty($max_filesize))
+				{
+					$unit = strtolower(substr($max_filesize, -1, 1));
+					$max_filesize = (int) $max_filesize;
+
+					$unit = ($unit == 'k') ? 'KB' : (($unit == 'g') ? 'GB' : 'MB');
+				}
+
+				$error = (empty($max_filesize)) ? $this->language->lang($this->error_prefix . 'PHP_SIZE_NA') : $this->language->lang($this->error_prefix . 'PHP_SIZE_OVERRUN', $max_filesize, $this->language->lang($unit));
+			break;
+
+			case UPLOAD_ERR_FORM_SIZE:
+				$max_filesize = get_formatted_filesize($this->max_filesize, false);
+
+				$error = $this->language->lang($this->error_prefix . 'WRONG_FILESIZE', $max_filesize['value'], $max_filesize['unit']);
+			break;
+
+			case UPLOAD_ERR_PARTIAL:
+				$error = $this->language->lang($this->error_prefix . 'PARTIAL_UPLOAD');
+			break;
+
+			case UPLOAD_ERR_NO_FILE:
+				$error = $this->language->lang($this->error_prefix . 'NOT_UPLOADED');
+			break;
+
+			case UPLOAD_ERR_NO_TMP_DIR:
+			case UPLOAD_ERR_CANT_WRITE:
+				$error = $this->language->lang($this->error_prefix . 'NO_TEMP_DIR');
+			break;
+
+			case UPLOAD_ERR_EXTENSION:
+				$error = $this->language->lang($this->error_prefix . 'PHP_UPLOAD_STOPPED');
+			break;
+
+			default:
+				$error = false;
+			break;
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Perform common file checks
+	 *
+	 * @param filespec $file Instance of filespec class
+	 */
+	public function common_checks(&$file)
+	{
+		// Filesize is too big or it's 0 if it was larger than the maxsize in the upload form
+		if ($this->max_filesize && ($file->get('filesize') > $this->max_filesize || $file->get('filesize') == 0))
+		{
+			$max_filesize = get_formatted_filesize($this->max_filesize, false);
+
+			$file->error[] = $this->language->lang($this->error_prefix . 'WRONG_FILESIZE', $max_filesize['value'], $max_filesize['unit']);
+		}
+
+		// check Filename
+		if (preg_match("#[\\/:*?\"<>|]#i", $file->get('realname')))
+		{
+			$file->error[] = $this->language->lang($this->error_prefix . 'INVALID_FILENAME', $file->get('realname'));
+		}
+
+		// Invalid Extension
+		if (!$this->valid_extension($file))
+		{
+			$file->error[] = $this->language->lang($this->error_prefix . 'DISALLOWED_EXTENSION', $file->get('extension'));
+		}
+
+		// MIME Sniffing
+		if (!$this->valid_content($file))
+		{
+			$file->error[] = $this->language->lang($this->error_prefix . 'DISALLOWED_CONTENT');
+		}
+	}
+
+	/**
+	 * Check for allowed extension
+	 *
+	 * @param filespec $file Instance of filespec class
+	 *
+	 * @return bool True if extension is allowed, false if not
+	 */
+	public function valid_extension(&$file)
+	{
+		return (in_array($file->get('extension'), $this->allowed_extensions)) ? true : false;
+	}
+
+	/**
+	 * Check for allowed dimension
+	 *
+	 * @param filespec $file Instance of filespec class
+	 *
+	 * @return bool True if dimensions are valid or no constraints set, false
+	 *			if not
+	 */
+	public function valid_dimensions(&$file)
+	{
+		if (!$this->max_width && !$this->max_height && !$this->min_width && !$this->min_height)
+		{
+			return true;
+		}
+
+		if (($file->get('width') > $this->max_width && $this->max_width) ||
+			($file->get('height') > $this->max_height && $this->max_height) ||
+			($file->get('width') < $this->min_width && $this->min_width) ||
+			($file->get('height') < $this->min_height && $this->min_height))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if form upload is valid
+	 *
+	 * @param string $form_name Name of form
+	 *
+	 * @return bool True if form upload is valid, false if not
+	 */
+	public function is_valid($form_name)
+	{
+		$upload = $this->request->file($form_name);
+
+		return (!empty($upload) && $upload['name'] !== 'none');
+	}
+
+
+	/**
+	 * Check for bad content (IE mime-sniffing)
+	 *
+	 * @param filespec $file Instance of filespec class
+	 *
+	 * @return bool True if content is valid, false if not
+	 */
+	public function valid_content(&$file)
+	{
+		return ($file->check_content($this->disallowed_content));
+	}
+
+	/**
+	 * Get image type/extension mapping
+	 *
+	 * @return array Array containing the image types and their extensions
+	 */
+	static public function image_types()
+	{
+		$result = array(
+			IMAGETYPE_GIF		=> array('gif'),
+			IMAGETYPE_JPEG		=> array('jpg', 'jpeg'),
+			IMAGETYPE_PNG		=> array('png'),
+			IMAGETYPE_SWF		=> array('swf'),
+			IMAGETYPE_PSD		=> array('psd'),
+			IMAGETYPE_BMP		=> array('bmp'),
+			IMAGETYPE_TIFF_II	=> array('tif', 'tiff'),
+			IMAGETYPE_TIFF_MM	=> array('tif', 'tiff'),
+			IMAGETYPE_JPC		=> array('jpg', 'jpeg'),
+			IMAGETYPE_JP2		=> array('jpg', 'jpeg'),
+			IMAGETYPE_JPX		=> array('jpg', 'jpeg'),
+			IMAGETYPE_JB2		=> array('jpg', 'jpeg'),
+			IMAGETYPE_IFF		=> array('iff'),
+			IMAGETYPE_WBMP		=> array('wbmp'),
+			IMAGETYPE_XBM		=> array('xbm'),
+		);
+
+		if (defined('IMAGETYPE_SWC'))
+		{
+			$result[IMAGETYPE_SWC] = array('swc');
+		}
+
+		return $result;
+	}
+}
diff --git a/phpBB/phpbb/install/helper/config.php b/phpBB/phpbb/install/helper/config.php
index b0480e7e5b..d5653f1924 100644
--- a/phpBB/phpbb/install/helper/config.php
+++ b/phpBB/phpbb/install/helper/config.php
@@ -41,7 +41,7 @@ class config
 	protected $install_config_file;
 
 	/**
-	 * @var \phpbb\php\ini
+	 * @var \bantu\IniGetWrapper\IniGetWrapper
 	 */
 	protected $php_ini;
 
@@ -83,7 +83,7 @@ class config
 	/**
 	 * Constructor
 	 */
-	public function __construct(\phpbb\filesystem\filesystem_interface $filesystem, \phpbb\php\ini $php_ini, $phpbb_root_path)
+	public function __construct(\phpbb\filesystem\filesystem_interface $filesystem, \bantu\IniGetWrapper\IniGetWrapper $php_ini, $phpbb_root_path)
 	{
 		$this->filesystem		= $filesystem;
 		$this->php_ini			= $php_ini;
@@ -373,7 +373,7 @@ class config
 	protected function setup_system_data()
 	{
 		// Query maximum runtime from php.ini
-		$execution_time = $this->php_ini->get_int('max_execution_time');
+		$execution_time = $this->php_ini->getNumeric('max_execution_time');
 		$execution_time = min(15, $execution_time / 2);
 		$this->system_data['max_execution_time'] = $execution_time;
 
@@ -381,6 +381,6 @@ class config
 		$this->system_data['start_time'] = time();
 
 		// Get memory limit
-		$this->system_data['memory_limit'] = $this->php_ini->get_bytes('memory_limit');
+		$this->system_data['memory_limit'] = $this->php_ini->getBytes('memory_limit');
 	}
 }
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php
index ca78167ec0..0e67ee209b 100644
--- a/phpBB/phpbb/plupload/plupload.php
+++ b/phpBB/phpbb/plupload/plupload.php
@@ -39,7 +39,7 @@ class plupload
 	protected $user;
 
 	/**
-	* @var \phpbb\php\ini
+	* @var \bantu\IniGetWrapper\IniGetWrapper
 	*/
 	protected $php_ini;
 
@@ -67,10 +67,10 @@ class plupload
 	* @param \phpbb\config\config $config
 	* @param \phpbb\request\request_interface $request
 	* @param \phpbb\user $user
-	* @param \phpbb\php\ini $php_ini
+	* @param \bantu\IniGetWrapper\IniGetWrapper $php_ini
 	* @param \phpbb\mimetype\guesser $mimetype_guesser
 	*/
-	public function __construct($phpbb_root_path, \phpbb\config\config $config, \phpbb\request\request_interface $request, \phpbb\user $user, \phpbb\php\ini $php_ini, \phpbb\mimetype\guesser $mimetype_guesser)
+	public function __construct($phpbb_root_path, \phpbb\config\config $config, \phpbb\request\request_interface $request, \phpbb\user $user, \bantu\IniGetWrapper\IniGetWrapper $php_ini, \phpbb\mimetype\guesser $mimetype_guesser)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->config = $config;
@@ -284,9 +284,9 @@ class plupload
 	public function get_chunk_size()
 	{
 		$max = min(
-			$this->php_ini->get_bytes('upload_max_filesize'),
-			$this->php_ini->get_bytes('post_max_size'),
-			max(1, $this->php_ini->get_bytes('memory_limit')),
+			$this->php_ini->getBytes('upload_max_filesize'),
+			$this->php_ini->getBytes('post_max_size'),
+			max(1, $this->php_ini->getBytes('memory_limit')),
 			$this->config['max_filesize']
 		);
 
@@ -303,7 +303,7 @@ class plupload
 			$this->temporary_directory,
 			$this->config['plupload_salt'],
 			md5($file_name),
-			\filespec::get_extension($file_name)
+			\phpbb\files\filespec::get_extension($file_name)
 		);
 	}
author	Tristan Darricau <tristan.darricau@sensiolabs.com>	2015-09-16 11:55:13 +0200
committer	Tristan Darricau <tristan.darricau@sensiolabs.com>	2015-09-16 11:55:13 +0200
commit	a562fea2306c8ba5b47a161568bea5fbe2ffd19f (patch)
tree	fcab88a3a5dd5f05c77934eef0983793f2e2bd6a /phpBB
parent	d4a47409f7da09790f38d3418401cbe34f8c3703 (diff)
parent	6651c1d8f4aead15f4750989670f75721390ee21 (diff)
download	forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar.gz forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar.bz2 forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar.xz forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.zip