18 files changed, 1242 insertions, 20 deletions
diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php
index d360614122..dd55f09119 100644
--- a/phpBB/phpbb/avatar/driver/driver.php
+++ b/phpBB/phpbb/avatar/driver/driver.php
@@ -112,17 +112,6 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface
 	/**
 	* @inheritdoc
 	*/
-	public function get_template_name()
-	{
-		$driver = preg_replace('#^phpbb\\\\avatar\\\\driver\\\\#', '', get_class($this));
-		$template = "ucp_avatar_options_$driver.html";
-
-		return $template;
-	}
-
-	/**
-	* @inheritdoc
-	*/
 	public function get_name()
 	{
 		return $this->name;
diff --git a/phpBB/phpbb/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php
index d64f4da734..9f14b7f468 100644
--- a/phpBB/phpbb/avatar/driver/gravatar.php
+++ b/phpBB/phpbb/avatar/driver/gravatar.php
@@ -147,6 +147,14 @@ class gravatar extends \phpbb\avatar\driver\driver
 	}
 
 	/**
+	* @inheritdoc
+	*/
+	public function get_template_name()
+	{
+		return 'ucp_avatar_options_gravatar.html';
+	}
+
+	/**
 	* Build gravatar URL for output on page
 	*
 	* @return string Gravatar URL
diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php
index f6acc6e636..611a44cb3d 100644
--- a/phpBB/phpbb/avatar/driver/local.php
+++ b/phpBB/phpbb/avatar/driver/local.php
@@ -135,6 +135,14 @@ class local extends \phpbb\avatar\driver\driver
 	}
 
 	/**
+	* @inheritdoc
+	*/
+	public function get_template_name()
+	{
+		return 'ucp_avatar_options_local.html';
+	}
+
+	/**
 	* Get a list of avatars that are locally available
 	* Results get cached for 24 hours (86400 seconds)
 	*
diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php
index 22d50c703e..36623942df 100644
--- a/phpBB/phpbb/avatar/driver/remote.php
+++ b/phpBB/phpbb/avatar/driver/remote.php
@@ -186,4 +186,12 @@ class remote extends \phpbb\avatar\driver\driver
 			'avatar_height' => $height,
 		);
 	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_template_name()
+	{
+		return 'ucp_avatar_options_remote.html';
+	}
 }
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index 822c40af98..1e50e135e4 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -168,6 +168,14 @@ class upload extends \phpbb\avatar\driver\driver
 	}
 
 	/**
+	* @inheritdoc
+	*/
+	public function get_template_name()
+	{
+		return 'ucp_avatar_options_upload.html';
+	}
+
+	/**
 	* Check if user is able to upload an avatar
 	*
 	* @return bool True if user can upload, false if not
diff --git a/phpBB/phpbb/db/migration/data/v310/avatar_types.php b/phpBB/phpbb/db/migration/data/v310/avatar_types.php
new file mode 100644
index 0000000000..bdbdccf0c5
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/avatar_types.php
@@ -0,0 +1,60 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class avatar_types extends \phpbb\db\migration\migration
+{
+	/**
+	* @var avatar type map
+	*/
+	protected $avatar_type_map = array(
+		AVATAR_UPLOAD	=> 'avatar.driver.upload',
+		AVATAR_REMOTE	=> 'avatar.driver.remote',
+		AVATAR_GALLERY	=> 'avatar.driver.local',
+	);
+
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v310\dev',
+			'\phpbb\db\migration\data\v310\avatars',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'update_user_avatar_type'))),
+			array('custom', array(array($this, 'update_group_avatar_type'))),
+		);
+	}
+
+	public function update_user_avatar_type()
+	{
+		foreach ($this->avatar_type_map as $old => $new)
+		{
+			$sql = 'UPDATE ' . $this->table_prefix . "users
+				SET user_avatar_type = '$new'
+				WHERE user_avatar_type = '$old'";
+			$this->db->sql_query($sql);
+		}
+	}
+
+	public function update_group_avatar_type()
+	{
+		foreach ($this->avatar_type_map as $old => $new)
+		{
+			$sql = 'UPDATE ' . $this->table_prefix . "groups
+				SET group_avatar_type = '$new'
+				WHERE group_avatar_type = '$old'";
+			$this->db->sql_query($sql);
+		}
+	}
+}
diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php
index 7f009867c9..23b281deaa 100644
--- a/phpBB/phpbb/extension/manager.php
+++ b/phpBB/phpbb/extension/manager.php
@@ -411,9 +411,24 @@ class manager
 			if ($file_info->isFile() && $file_info->getFilename() == 'ext.' . $this->php_ext)
 			{
 				$ext_name = $iterator->getInnerIterator()->getSubPath();
+				$composer_file = $iterator->getPath() . '/composer.json';
 
+				// Ignore the extension if there is no composer.json.
+				if (!is_readable($composer_file) || !($ext_info = file_get_contents($composer_file)))
+				{
+					continue;
+				}
+
+				$ext_info = json_decode($ext_info, true);
 				$ext_name = str_replace(DIRECTORY_SEPARATOR, '/', $ext_name);
 
+				// Ignore the extension if directory depth is not correct or if the directory structure
+				// does not match the name value specified in composer.json.
+				if (substr_count($ext_name, '/') !== 1 || !isset($ext_info['name']) || $ext_name != $ext_info['name'])
+				{
+					continue;
+				}
+
 				$available[$ext_name] = $this->phpbb_root_path . 'ext/' . $ext_name . '/';
 			}
 		}
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php
index d0323120d8..66cdb86513 100644
--- a/phpBB/phpbb/extension/metadata_manager.php
+++ b/phpBB/phpbb/extension/metadata_manager.php
@@ -266,8 +266,8 @@ class metadata_manager
 	 */
 	public function validate_enable()
 	{
-		// Check for phpBB, PHP versions
-		if (!$this->validate_require_phpbb() || !$this->validate_require_php())
+		// Check for valid directory & phpBB, PHP versions
+		if (!$this->validate_dir() || !$this->validate_require_phpbb() || !$this->validate_require_php())
 		{
 			return false;
 		}
@@ -275,6 +275,16 @@ class metadata_manager
 		return true;
 	}
 
+	/**
+	 * Validates the most basic directory structure to ensure it follows <vendor>/<ext> convention.
+	 *
+	 * @return boolean True when passes validation
+	 */
+	public function validate_dir()
+	{
+		return (substr_count($this->ext_name, '/') === 1 && $this->ext_name == $this->get_metadata('name'));
+	}
+
 
 	/**
 	 * Validates the contents of the phpbb requirement field
diff --git a/phpBB/phpbb/mimetype/content_guesser.php b/phpBB/phpbb/mimetype/content_guesser.php
new file mode 100644
index 0000000000..2d74582a21
--- /dev/null
+++ b/phpBB/phpbb/mimetype/content_guesser.php
@@ -0,0 +1,33 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\mimetype;
+
+/**
+* @package mimetype
+*/
+
+class content_guesser extends guesser_base
+{
+	/**
+	* @inheritdoc
+	*/
+	public function is_supported()
+	{
+		return function_exists('mime_content_type');
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function guess($file, $file_name = '')
+	{
+		return mime_content_type($file);
+	}
+}
diff --git a/phpBB/phpbb/mimetype/extension_guesser.php b/phpBB/phpbb/mimetype/extension_guesser.php
new file mode 100644
index 0000000000..f6f4ae0138
--- /dev/null
+++ b/phpBB/phpbb/mimetype/extension_guesser.php
@@ -0,0 +1,509 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\mimetype;
+
+/**
+* @package mimetype
+*/
+
+class extension_guesser extends guesser_base
+{
+	/**
+	* @var file extension map
+	*/
+	protected $extension_map = array(
+		'3dm'		=> 'x-world/x-3dmf',
+		'3dmf'		=> 'x-world/x-3dmf',
+		'a'		=> 'application/octet-stream',
+		'aab'		=> 'application/x-authorware-bin',
+		'aam'		=> 'application/x-authorware-map',
+		'aas'		=> 'application/x-authorware-seg',
+		'abc'		=> 'text/vnd.abc',
+		'acgi'		=> 'text/html',
+		'afl'		=> 'video/animaflex',
+		'ai'		=> 'application/postscript',
+		'aif'		=> 'audio/aiff',
+		'aifc'		=> 'audio/aiff',
+		'aiff'		=> 'audio/aiff',
+		'aim'		=> 'application/x-aim',
+		'aip'		=> 'text/x-audiosoft-intra',
+		'ani'		=> 'application/x-navi-animation',
+		'aos'		=> 'application/x-nokia-9000-communicator-add-on-software',
+		'aps'		=> 'application/mime',
+		'arc'		=> 'application/octet-stream',
+		'arj'		=> 'application/arj',
+		'art'		=> 'image/x-jg',
+		'asf'		=> 'video/x-ms-asf',
+		'asm'		=> 'text/x-asm',
+		'asp'		=> 'text/asp',
+		'asx'		=> 'video/x-ms-asf',
+		'au'		=> 'audio/x-au',
+		'avi'		=> 'video/avi',
+		'avs'		=> 'video/avs-video',
+		'bcpio'		=> 'application/x-bcpio',
+		'bin'		=> 'application/x-binary',
+		'bm'		=> 'image/bmp',
+		'bmp'		=> 'image/bmp',
+		'boo'		=> 'application/book',
+		'book'		=> 'application/book',
+		'boz'		=> 'application/x-bzip2',
+		'bsh'		=> 'application/x-bsh',
+		'bz'		=> 'application/x-bzip',
+		'bz2'		=> 'application/x-bzip2',
+		'c'		=> 'text/x-c',
+		'c++'		=> 'text/x-c',
+		'cat'		=> 'application/vnd.ms-pki.seccat',
+		'cc'		=> 'text/plain',
+		'ccad'		=> 'application/clariscad',
+		'cco'		=> 'application/x-cocoa',
+		'cdf'		=> 'application/cdf',
+		'cer'		=> 'application/x-x509-ca-cert',
+		'cha'		=> 'application/x-chat',
+		'chat'		=> 'application/x-chat',
+		'class'		=> 'application/java',
+		'com'		=> 'application/octet-stream',
+		'conf'		=> 'text/plain',
+		'cpio'		=> 'application/x-cpio',
+		'cpp'		=> 'text/x-c',
+		'cpt'		=> 'application/x-cpt',
+		'crl'		=> 'application/pkix-crl',
+		'crt'		=> 'application/x-x509-ca-cert',
+		'csh'		=> 'application/x-csh',
+		'css'		=> 'text/css',
+		'cxx'		=> 'text/plain',
+		'dcr'		=> 'application/x-director',
+		'deepv'		=> 'application/x-deepv',
+		'def'		=> 'text/plain',
+		'der'		=> 'application/x-x509-ca-cert',
+		'dif'		=> 'video/x-dv',
+		'dir'		=> 'application/x-director',
+		'dl'		=> 'video/dl',
+		'doc'		=> 'application/msword',
+		'dot'		=> 'application/msword',
+		'dp'		=> 'application/commonground',
+		'drw'		=> 'application/drafting',
+		'dump'		=> 'application/octet-stream',
+		'dv'		=> 'video/x-dv',
+		'dvi'		=> 'application/x-dvi',
+		'dwf'		=> 'model/vnd.dwf',
+		'dwg'		=> 'image/x-dwg',
+		'dxf'		=> 'image/x-dwg',
+		'dxr'		=> 'application/x-director',
+		'el'		=> 'text/x-script.elisp',
+		'elc'		=> 'application/x-elc',
+		'env'		=> 'application/x-envoy',
+		'eps'		=> 'application/postscript',
+		'es'		=> 'application/x-esrehber',
+		'etx'		=> 'text/x-setext',
+		'evy'		=> 'application/x-envoy',
+		'exe'		=> 'application/octet-stream',
+		'f'		=> 'text/x-fortran',
+		'f77'		=> 'text/x-fortran',
+		'f90'		=> 'text/x-fortran',
+		'fdf'		=> 'application/vnd.fdf',
+		'fif'		=> 'image/fif',
+		'fli'		=> 'video/x-fli',
+		'flo'		=> 'image/florian',
+		'flx'		=> 'text/vnd.fmi.flexstor',
+		'fmf'		=> 'video/x-atomic3d-feature',
+		'for'		=> 'text/x-fortran',
+		'fpx'		=> 'image/vnd.fpx',
+		'frl'		=> 'application/freeloader',
+		'funk'		=> 'audio/make',
+		'g'		=> 'text/plain',
+		'g3'		=> 'image/g3fax',
+		'gif'		=> 'image/gif',
+		'gl'		=> 'video/x-gl',
+		'gsd'		=> 'audio/x-gsm',
+		'gsm'		=> 'audio/x-gsm',
+		'gsp'		=> 'application/x-gsp',
+		'gss'		=> 'application/x-gss',
+		'gtar'		=> 'application/x-gtar',
+		'gz'		=> 'application/x-gzip',
+		'gzip'		=> 'application/x-gzip',
+		'h'		=> 'text/x-h',
+		'hdf'		=> 'application/x-hdf',
+		'help'		=> 'application/x-helpfile',
+		'hgl'		=> 'application/vnd.hp-hpgl',
+		'hh'		=> 'text/x-h',
+		'hlb'		=> 'text/x-script',
+		'hlp'		=> 'application/hlp',
+		'hpg'		=> 'application/vnd.hp-hpgl',
+		'hpgl'		=> 'application/vnd.hp-hpgl',
+		'hqx'		=> 'application/x-binhex40',
+		'hta'		=> 'application/hta',
+		'htc'		=> 'text/x-component',
+		'htm'		=> 'text/html',
+		'html'		=> 'text/html',
+		'htmls'		=> 'text/html',
+		'htt'		=> 'text/webviewhtml',
+		'htx'		=> 'text/html',
+		'ice'		=> 'x-conference/x-cooltalk',
+		'ico'		=> 'image/x-icon',
+		'idc'		=> 'text/plain',
+		'ief'		=> 'image/ief',
+		'iefs'		=> 'image/ief',
+		'iges'		=> 'application/iges',
+		'igs'		=> 'application/iges',
+		'ima'		=> 'application/x-ima',
+		'imap'		=> 'application/x-httpd-imap',
+		'inf'		=> 'application/inf',
+		'ins'		=> 'application/x-internett-signup',
+		'ip'		=> 'application/x-ip2',
+		'isu'		=> 'video/x-isvideo',
+		'it'		=> 'audio/it',
+		'iv'		=> 'application/x-inventor',
+		'ivr'		=> 'i-world/i-vrml',
+		'ivy'		=> 'application/x-livescreen',
+		'jam'		=> 'audio/x-jam',
+		'jav'		=> 'text/plain',
+		'jav'		=> 'text/x-java-source',
+		'java'		=> 'text/x-java-source',
+		'jcm'		=> 'application/x-java-commerce',
+		'jfif'		=> 'image/jpeg',
+		'jfif-tbnl'	=> 'image/jpeg',
+		'jpe'		=> 'image/jpeg',
+		'jpeg'		=> 'image/jpeg',
+		'jpg'		=> 'image/jpeg',
+		'jps'		=> 'image/x-jps',
+		'js'		=> 'application/x-javascript',
+		'jut'		=> 'image/jutvision',
+		'kar'		=> 'audio/midi',
+		'ksh'		=> 'text/x-script.ksh',
+		'la'		=> 'audio/x-nspaudio',
+		'lam'		=> 'audio/x-liveaudio',
+		'latex'		=> 'application/x-latex',
+		'lha'		=> 'application/x-lha',
+		'lhx'		=> 'application/octet-stream',
+		'list'		=> 'text/plain',
+		'lma'		=> 'audio/x-nspaudio',
+		'log'		=> 'text/plain',
+		'lsp'		=> 'text/x-script.lisp',
+		'lst'		=> 'text/plain',
+		'lsx'		=> 'text/x-la-asf',
+		'ltx'		=> 'application/x-latex',
+		'lzh'		=> 'application/x-lzh',
+		'lzx'		=> 'application/x-lzx',
+		'm'		=> 'text/x-m',
+		'm1v'		=> 'video/mpeg',
+		'm2a'		=> 'audio/mpeg',
+		'm2v'		=> 'video/mpeg',
+		'm3u'		=> 'audio/x-mpequrl',
+		'man'		=> 'application/x-troff-man',
+		'map'		=> 'application/x-navimap',
+		'mar'		=> 'text/plain',
+		'mbd'		=> 'application/mbedlet',
+		'mc$'		=> 'application/x-magic-cap-package-1.0',
+		'mcd'		=> 'application/x-mathcad',
+		'mcf'		=> 'text/mcf',
+		'mcp'		=> 'application/netmc',
+		'me'		=> 'application/x-troff-me',
+		'mht'		=> 'message/rfc822',
+		'mhtml'		=> 'message/rfc822',
+		'mid'		=> 'audio/x-midi',
+		'midi'		=> 'audio/x-midi',
+		'mif'		=> 'application/x-mif',
+		'mime'		=> 'www/mime',
+		'mjf'		=> 'audio/x-vnd.audioexplosion.mjuicemediafile',
+		'mjpg'		=> 'video/x-motion-jpeg',
+		'mm'		=> 'application/x-meme',
+		'mme'		=> 'application/base64',
+		'mod'		=> 'audio/x-mod',
+		'moov'		=> 'video/quicktime',
+		'mov'		=> 'video/quicktime',
+		'movie'		=> 'video/x-sgi-movie',
+		'mp2'		=> 'audio/x-mpeg',
+		'mp3'		=> 'audio/x-mpeg-3',
+		'mpa'		=> 'audio/mpeg',
+		'mpc'		=> 'application/x-project',
+		'mpe'		=> 'video/mpeg',
+		'mpeg'		=> 'video/mpeg',
+		'mpg'		=> 'video/mpeg',
+		'mpga'		=> 'audio/mpeg',
+		'mpp'		=> 'application/vnd.ms-project',
+		'mpt'		=> 'application/x-project',
+		'mpv'		=> 'application/x-project',
+		'mpx'		=> 'application/x-project',
+		'mrc'		=> 'application/marc',
+		'ms'		=> 'application/x-troff-ms',
+		'mv'		=> 'video/x-sgi-movie',
+		'my'		=> 'audio/make',
+		'mzz'		=> 'application/x-vnd.audioexplosion.mzz',
+		'nap'		=> 'image/naplps',
+		'naplps'	=> 'image/naplps',
+		'nc'		=> 'application/x-netcdf',
+		'ncm'		=> 'application/vnd.nokia.configuration-message',
+		'nif'		=> 'image/x-niff',
+		'niff'		=> 'image/x-niff',
+		'nix'		=> 'application/x-mix-transfer',
+		'nsc'		=> 'application/x-conference',
+		'nvd'		=> 'application/x-navidoc',
+		'o'		=> 'application/octet-stream',
+		'oda'		=> 'application/oda',
+		'omc'		=> 'application/x-omc',
+		'omcd'		=> 'application/x-omcdatamaker',
+		'omcr'		=> 'application/x-omcregerator',
+		'p'		=> 'text/x-pascal',
+		'p10'		=> 'application/x-pkcs10',
+		'p12'		=> 'application/x-pkcs12',
+		'p7a'		=> 'application/x-pkcs7-signature',
+		'p7c'		=> 'application/x-pkcs7-mime',
+		'p7m'		=> 'application/x-pkcs7-mime',
+		'p7r'		=> 'application/x-pkcs7-certreqresp',
+		'p7s'		=> 'application/pkcs7-signature',
+		'part'		=> 'application/pro_eng',
+		'pas'		=> 'text/pascal',
+		'pbm'		=> 'image/x-portable-bitmap',
+		'pcl'		=> 'application/x-pcl',
+		'pct'		=> 'image/x-pict',
+		'pcx'		=> 'image/x-pcx',
+		'pdb'		=> 'chemical/x-pdb',
+		'pdf'		=> 'application/pdf',
+		'pfunk'		=> 'audio/make.my.funk',
+		'pgm'		=> 'image/x-portable-greymap',
+		'pic'		=> 'image/pict',
+		'pict'		=> 'image/pict',
+		'pkg'		=> 'application/x-newton-compatible-pkg',
+		'pko'		=> 'application/vnd.ms-pki.pko',
+		'pl'		=> 'text/x-script.perl',
+		'plx'		=> 'application/x-pixclscript',
+		'pm'		=> 'text/x-script.perl-module',
+		'pm4'		=> 'application/x-pagemaker',
+		'pm5'		=> 'application/x-pagemaker',
+		'png'		=> 'image/png',
+		'pnm'		=> 'image/x-portable-anymap',
+		'pot'		=> 'application/mspowerpoint',
+		'pov'		=> 'model/x-pov',
+		'ppa'		=> 'application/vnd.ms-powerpoint',
+		'ppm'		=> 'image/x-portable-pixmap',
+		'pps'		=> 'application/mspowerpoint',
+		'ppt'		=> 'application/mspowerpoint',
+		'ppz'		=> 'application/mspowerpoint',
+		'pre'		=> 'application/x-freelance',
+		'prt'		=> 'application/pro_eng',
+		'ps'		=> 'application/postscript',
+		'psd'		=> 'application/octet-stream',
+		'pvu'		=> 'paleovu/x-pv',
+		'pwz'		=> 'application/vnd.ms-powerpoint',
+		'py'		=> 'text/x-script.phyton',
+		'pyc'		=> 'applicaiton/x-bytecode.python',
+		'qcp'		=> 'audio/vnd.qcelp',
+		'qd3'		=> 'x-world/x-3dmf',
+		'qd3d'		=> 'x-world/x-3dmf',
+		'qif'		=> 'image/x-quicktime',
+		'qt'		=> 'video/quicktime',
+		'qtc'		=> 'video/x-qtc',
+		'qti'		=> 'image/x-quicktime',
+		'qtif'		=> 'image/x-quicktime',
+		'ra'		=> 'audio/x-realaudio',
+		'ram'		=> 'audio/x-pn-realaudio',
+		'ras'		=> 'image/x-cmu-raster',
+		'rast'		=> 'image/cmu-raster',
+		'rexx'		=> 'text/x-script.rexx',
+		'rf'		=> 'image/vnd.rn-realflash',
+		'rgb'		=> 'image/x-rgb',
+		'rm'		=> 'audio/x-pn-realaudio',
+		'rmi'		=> 'audio/mid',
+		'rmm'		=> 'audio/x-pn-realaudio',
+		'rmp'		=> 'audio/x-pn-realaudio',
+		'rng'		=> 'application/vnd.nokia.ringing-tone',
+		'rnx'		=> 'application/vnd.rn-realplayer',
+		'roff'		=> 'application/x-troff',
+		'rp'		=> 'image/vnd.rn-realpix',
+		'rpm'		=> 'audio/x-pn-realaudio-plugin',
+		'rt'		=> 'text/richtext',
+		'rtf'		=> 'text/richtext',
+		'rtx'		=> 'text/richtext',
+		'rv'		=> 'video/vnd.rn-realvideo',
+		's'		=> 'text/x-asm',
+		's3m'		=> 'audio/s3m',
+		'saveme'	=> 'application/octet-stream',
+		'sbk'		=> 'application/x-tbook',
+		'scm'		=> 'video/x-scm',
+		'sdml'		=> 'text/plain',
+		'sdp'		=> 'application/x-sdp',
+		'sdr'		=> 'application/sounder',
+		'sea'		=> 'application/x-sea',
+		'set'		=> 'application/set',
+		'sgm'		=> 'text/x-sgml',
+		'sgml'		=> 'text/x-sgml',
+		'sh'		=> 'text/x-script.sh',
+		'shar'		=> 'application/x-shar',
+		'shtml'		=> 'text/x-server-parsed-html',
+		'sid'		=> 'audio/x-psid',
+		'sit'		=> 'application/x-stuffit',
+		'skd'		=> 'application/x-koan',
+		'skm'		=> 'application/x-koan',
+		'skp'		=> 'application/x-koan',
+		'skt'		=> 'application/x-koan',
+		'sl'		=> 'application/x-seelogo',
+		'smi'		=> 'application/smil',
+		'smil'		=> 'application/smil',
+		'snd'		=> 'audio/x-adpcm',
+		'sol'		=> 'application/solids',
+		'spc'		=> 'text/x-speech',
+		'spl'		=> 'application/futuresplash',
+		'spr'		=> 'application/x-sprite',
+		'sprite'	=> 'application/x-sprite',
+		'src'		=> 'application/x-wais-source',
+		'ssi'		=> 'text/x-server-parsed-html',
+		'ssm'		=> 'application/streamingmedia',
+		'sst'		=> 'application/vnd.ms-pki.certstore',
+		'step'		=> 'application/step',
+		'stl'		=> 'application/vnd.ms-pki.stl',
+		'stp'		=> 'application/step',
+		'sv4cpio'	=> 'application/x-sv4cpio',
+		'sv4crc'	=> 'application/x-sv4crc',
+		'svf'		=> 'image/x-dwg',
+		'svr'		=> 'application/x-world',
+		'swf'		=> 'application/x-shockwave-flash',
+		't'		=> 'application/x-troff',
+		'talk'		=> 'text/x-speech',
+		'tar'		=> 'application/x-tar',
+		'tbk'		=> 'application/x-tbook',
+		'tcl'		=> 'text/x-script.tcl',
+		'tcsh'		=> 'text/x-script.tcsh',
+		'tex'		=> 'application/x-tex',
+		'texi'		=> 'application/x-texinfo',
+		'texinfo'	=> 'application/x-texinfo',
+		'text'		=> 'text/plain',
+		'tgz'		=> 'application/x-compressed',
+		'tif'		=> 'image/tiff',
+		'tiff'		=> 'image/tiff',
+		'tr'		=> 'application/x-troff',
+		'tsi'		=> 'audio/tsp-audio',
+		'tsp'		=> 'audio/tsplayer',
+		'tsv'		=> 'text/tab-separated-values',
+		'turbot'	=> 'image/florian',
+		'txt'		=> 'text/plain',
+		'uil'		=> 'text/x-uil',
+		'uni'		=> 'text/uri-list',
+		'unis'		=> 'text/uri-list',
+		'unv'		=> 'application/i-deas',
+		'uri'		=> 'text/uri-list',
+		'uris'		=> 'text/uri-list',
+		'ustar'		=> 'multipart/x-ustar',
+		'uu'		=> 'text/x-uuencode',
+		'uue'		=> 'text/x-uuencode',
+		'vcd'		=> 'application/x-cdlink',
+		'vcs'		=> 'text/x-vcalendar',
+		'vda'		=> 'application/vda',
+		'vdo'		=> 'video/vdo',
+		'vew'		=> 'application/groupwise',
+		'viv'		=> 'video/vivo',
+		'vivo'		=> 'video/vivo',
+		'vmd'		=> 'application/vocaltec-media-desc',
+		'vmf'		=> 'application/vocaltec-media-file',
+		'voc'		=> 'audio/voc',
+		'vos'		=> 'video/vosaic',
+		'vox'		=> 'audio/voxware',
+		'vqe'		=> 'audio/x-twinvq-plugin',
+		'vqf'		=> 'audio/x-twinvq',
+		'vql'		=> 'audio/x-twinvq-plugin',
+		'vrml'		=> 'application/x-vrml',
+		'vrt'		=> 'x-world/x-vrt',
+		'vsd'		=> 'application/x-visio',
+		'vst'		=> 'application/x-visio',
+		'vsw'		=> 'application/x-visio',
+		'w60'		=> 'application/wordperfect6.0',
+		'w61'		=> 'application/wordperfect6.1',
+		'w6w'		=> 'application/msword',
+		'wav'		=> 'audio/wav',
+		'wb1'		=> 'application/x-qpro',
+		'wbmp'		=> 'image/vnd.wap.wbmp',
+		'web'		=> 'application/vnd.xara',
+		'wiz'		=> 'application/msword',
+		'wk1'		=> 'application/x-123',
+		'wmf'		=> 'windows/metafile',
+		'wml'		=> 'text/vnd.wap.wml',
+		'wmlc'		=> 'application/vnd.wap.wmlc',
+		'wmls'		=> 'text/vnd.wap.wmlscript',
+		'wmlsc'		=> 'application/vnd.wap.wmlscriptc',
+		'word'		=> 'application/msword',
+		'wp'		=> 'application/wordperfect',
+		'wp5'		=> 'application/wordperfect',
+		'wp6'		=> 'application/wordperfect',
+		'wpd'		=> 'application/wordperfect',
+		'wq1'		=> 'application/x-lotus',
+		'wri'		=> 'application/mswrite',
+		'wrl'		=> 'model/vrml',
+		'wrz'		=> 'model/vrml',
+		'wsc'		=> 'text/scriplet',
+		'wsrc'		=> 'application/x-wais-source',
+		'wtk'		=> 'application/x-wintalk',
+		'xbm'		=> 'image/xbm',
+		'xdr'		=> 'video/x-amt-demorun',
+		'xgz'		=> 'xgl/drawing',
+		'xif'		=> 'image/vnd.xiff',
+		'xl'		=> 'application/excel',
+		'xla'		=> 'application/excel',
+		'xlb'		=> 'application/excel',
+		'xlc'		=> 'application/excel',
+		'xld'		=> 'application/excel',
+		'xlk'		=> 'application/excel',
+		'xll'		=> 'application/excel',
+		'xlm'		=> 'application/excel',
+		'xls'		=> 'application/excel',
+		'xlt'		=> 'application/excel',
+		'xlv'		=> 'application/excel',
+		'xlw'		=> 'application/excel',
+		'xm'		=> 'audio/xm',
+		'xml'		=> 'text/xml',
+		'xmz'		=> 'xgl/movie',
+		'xpix'		=> 'application/x-vnd.ls-xpix',
+		'xpm'		=> 'image/xpm',
+		'x-png'		=> 'image/png',
+		'xsr'		=> 'video/x-amt-showrun',
+		'xwd'		=> 'image/x-xwindowdump',
+		'xyz'		=> 'chemical/x-pdb',
+		'z'		=> 'application/x-compressed',
+		'zip'		=> 'application/x-zip-compressed',
+		'zoo'		=> 'application/octet-stream',
+		'zsh'		=> 'text/x-script.zsh',
+	);
+
+	/**
+	* @inheritdoc
+	*/
+	public function is_supported()
+	{
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function guess($file, $file_name = '')
+	{
+		$file_name = (empty($file_name)) ? $file : $file_name;
+		return $this->map_extension_to_type($file_name);
+	}
+
+	/**
+	* Map extension of supplied file_name to mime type
+	*
+	* @param string $file_name Path to file or filename
+	*
+	* @return string|null Mimetype if known or null if not
+	*/
+	protected function map_extension_to_type($file_name)
+	{
+		$extension = pathinfo($file_name, PATHINFO_EXTENSION);
+
+		if (isset($this->extension_map[$extension]))
+		{
+			return $this->extension_map[$extension];
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
diff --git a/phpBB/phpbb/mimetype/guesser.php b/phpBB/phpbb/mimetype/guesser.php
new file mode 100644
index 0000000000..3499b3b0f7
--- /dev/null
+++ b/phpBB/phpbb/mimetype/guesser.php
@@ -0,0 +1,130 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\mimetype;
+
+/**
+* @package mimetype
+*/
+
+class guesser
+{
+	/**
+	* @const Default priority for mimetype guessers
+	*/
+	const PRIORITY_DEFAULT = 0;
+
+	/**
+	* @var mimetype guessers
+	*/
+	protected $guessers;
+
+	/**
+	* Construct a mimetype guesser object
+	*
+	* @param array $mimetype_guessers Mimetype guesser service collection
+	*/
+	public function __construct($mimetype_guessers)
+	{
+		$this->register_guessers($mimetype_guessers);
+	}
+
+	/**
+	* Register MimeTypeGuessers and sort them by priority
+	*
+	* @param array $mimetype_guessers Mimetype guesser service collection
+	*
+	* @throws \LogicException If incorrect or not mimetype guessers have
+	*			been supplied to class
+	*/
+	protected function register_guessers($mimetype_guessers)
+	{
+		foreach ($mimetype_guessers as $guesser)
+		{
+			$is_supported = (method_exists($guesser, 'is_supported')) ? 'is_supported' : '';
+			$is_supported = (method_exists($guesser, 'isSupported')) ? 'isSupported' : $is_supported;
+
+			if (empty($is_supported))
+			{
+				throw new \LogicException('Incorrect mimetype guesser supplied.');
+			}
+
+			if ($guesser->$is_supported())
+			{
+				$this->guessers[] = $guesser;
+			}
+		}
+
+		if (empty($this->guessers))
+		{
+			throw new \LogicException('No mimetype guesser supplied.');
+		}
+
+		// Sort guessers by priority
+		usort($this->guessers, array($this, 'sort_priority'));
+	}
+
+	/**
+	* Sort the priority of supplied guessers
+	* This is a compare function for usort. A guesser with higher priority
+	* should be used first and vice versa. usort() orders the array values
+	* from low to high depending on what the comparison function returns
+	* to it. Return value should be smaller than 0 if value a is smaller
+	* than value b. This has been reversed in the comparision function in
+	* order to sort the guessers from high to low.
+	* Method has been set to public in order to allow proper testing.
+	*
+	* @param object $guesser_a Mimetype guesser a
+	* @param object $guesser_b Mimetype guesser b
+	*
+	* @return int 	If both guessers have the same priority 0, bigger
+	*		than 0 if first guesser has lower priority, and lower
+	*		than 0 if first guesser has higher priority
+	*/
+	public function sort_priority($guesser_a, $guesser_b)
+	{
+		$priority_a = (int) (method_exists($guesser_a, 'get_priority')) ? $guesser_a->get_priority() : self::PRIORITY_DEFAULT;
+		$priority_b = (int) (method_exists($guesser_b, 'get_priority')) ? $guesser_b->get_priority() : self::PRIORITY_DEFAULT;
+
+		return $priority_b - $priority_a;
+	}
+
+	/**
+	* Guess mimetype of supplied file
+	*
+	* @param string $file Path to file
+	*
+	* @return string Guess for mimetype of file
+	*/
+	public function guess($file, $file_name = '')
+	{
+		if (!is_file($file))
+		{
+			return false;
+		}
+
+		if (!is_readable($file))
+		{
+			return false;
+		}
+
+		foreach ($this->guessers as $guesser)
+		{
+			$mimetype = $guesser->guess($file, $file_name);
+
+			// Try to guess something that is not the fallback application/octet-stream
+			if ($mimetype !== null && $mimetype !== 'application/octet-stream')
+			{
+				return $mimetype;
+			}
+		}
+		// Return any mimetype if we got a result or the fallback value
+		return (!empty($mimetype)) ? $mimetype : 'application/octet-stream';
+	}
+}
diff --git a/phpBB/phpbb/mimetype/guesser_base.php b/phpBB/phpbb/mimetype/guesser_base.php
new file mode 100644
index 0000000000..082b098028
--- /dev/null
+++ b/phpBB/phpbb/mimetype/guesser_base.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\mimetype;
+
+/**
+* @package mimetype
+*/
+
+abstract class guesser_base implements guesser_interface
+{
+	/**
+	* @var int Guesser Priority
+	*/
+	protected $priority;
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_priority()
+	{
+		return $this->priority;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function set_priority($priority)
+	{
+		$this->priority = $priority;
+	}
+}
diff --git a/phpBB/phpbb/mimetype/guesser_interface.php b/phpBB/phpbb/mimetype/guesser_interface.php
new file mode 100644
index 0000000000..103689765e
--- /dev/null
+++ b/phpBB/phpbb/mimetype/guesser_interface.php
@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\mimetype;
+
+/**
+* @package mimetype
+*/
+
+interface guesser_interface
+{
+	/**
+	* Returns whether this guesser is supported on the current OS
+	*
+	* @return bool True if guesser is supported, false if not
+	*/
+	public function is_supported();
+
+	/**
+	* Guess mimetype of supplied file
+	*
+	* @param string $file Path to file
+	*
+	* @return string Guess for mimetype of file
+	*/
+	public function guess($file, $file_name = '');
+
+	/**
+	* Get the guesser priority
+	*
+	* @return int Guesser priority
+	*/
+	public function get_priority();
+
+	/**
+	* Set the guesser priority
+	*
+	* @param int Guesser priority
+	*
+	* @return void
+	*/
+	public function set_priority($priority);
+}
diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php
index 951585853f..10c876b286 100644
--- a/phpBB/phpbb/notification/type/base.php
+++ b/phpBB/phpbb/notification/type/base.php
@@ -282,15 +282,17 @@ abstract class base implements \phpbb\notification\type\type_interface
 	*/
 	public function prepare_for_display()
 	{
+		$mark_hash = generate_link_hash('mark_notification_read');
+
 		if ($this->get_url())
 		{
-			$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id);
+			$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id . '&amp;hash=' . $mark_hash);
 		}
 		else
 		{
 			$redirect = (($this->user->page['page_dir']) ? $this->user->page['page_dir'] . '/' : '') . $this->user->page['page_name'] . (($this->user->page['query_string']) ? '?' . $this->user->page['query_string'] : '');
 
-			$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id . '&amp;redirect=' . urlencode($redirect));
+			$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id . '&amp;hash=' . $mark_hash . '&amp;redirect=' . urlencode($redirect));
 		}
 
 		return array(
diff --git a/phpBB/phpbb/pagination.php b/phpBB/phpbb/pagination.php
new file mode 100644
index 0000000000..467dc2157f
--- /dev/null
+++ b/phpBB/phpbb/pagination.php
@@ -0,0 +1,306 @@
+<?php
+/**
+*
+* @package phpbb
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb;
+
+class pagination
+{
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/**
+	* Constructor
+	*
+	* @param	\phpbb\template\template	$template
+	* @param	\phpbb\user					$user
+	*/
+	public function __construct(\phpbb\template\template $template, \phpbb\user $user)
+	{
+		$this->template = $template;
+		$this->user = $user;
+	}
+
+	/**
+	* Generate a pagination link based on the url and the page information
+	*
+	* @param string $base_url is url prepended to all links generated within the function
+	*							If you use page numbers inside your controller route, base_url should contains a placeholder (%d)
+	*							for the page. Also be sure to specify the pagination path information into the start_name argument
+	* @param string $on_page is the page for which we want to generate the link
+	* @param string $start_name is the name of the parameter containing the first item of the given page (example: start=20)
+	*							If you use page numbers inside your controller route, start name should be the string
+	*							that should be removed for the first page (example: /page/%d)
+	* @param int $per_page the number of items, posts, etc. to display per page, used to determine the number of pages to produce
+	* @return URL for the requested page
+	*/
+	protected function generate_page_link($base_url, $on_page, $start_name, $per_page)
+	{
+		if (strpos($start_name, '%d') !== false)
+		{
+			return ($on_page > 1) ? sprintf($base_url, (int) $on_page) : str_replace($start_name, '', $base_url);
+		}
+		else
+		{
+			$url_delim = (strpos($base_url, '?') === false) ? '?' : ((strpos($base_url, '?') === strlen($base_url) - 1) ? '' : '&amp;');
+			return ($on_page > 1) ? $base_url . $url_delim . $start_name . '=' . (($on_page - 1) * $per_page) : $base_url;
+		}
+	}
+
+	/**
+	* Generate template rendered pagination
+	* Allows full control of rendering of pagination with the template
+	*
+	* @param string $base_url is url prepended to all links generated within the function
+	*							If you use page numbers inside your controller route, base_url should contains a placeholder (%d)
+	*							for the page. Also be sure to specify the pagination path information into the start_name argument
+	* @param string $block_var_name is the name assigned to the pagination data block within the template (example: <!-- BEGIN pagination -->)
+	* @param string $start_name is the name of the parameter containing the first item of the given page (example: start=20)
+	*							If you use page numbers inside your controller route, start name should be the string
+	*							that should be removed for the first page (example: /page/%d)
+	* @param int $num_items the total number of items, posts, etc., used to determine the number of pages to produce
+	* @param int $per_page the number of items, posts, etc. to display per page, used to determine the number of pages to produce
+	* @param int $start the item which should be considered currently active, used to determine the page we're on
+	* @param bool $reverse_count determines whether we weight display of the list towards the start (false) or end (true) of the list
+	* @param bool $ignore_on_page decides whether we enable an active (unlinked) item, used primarily for embedded lists
+	* @return null
+	*/
+	public function generate_template_pagination($base_url, $block_var_name, $start_name, $num_items, $per_page, $start = 1, $reverse_count = false, $ignore_on_page = false)
+	{
+		$total_pages = ceil($num_items / $per_page);
+
+		if ($total_pages == 1 || !$num_items)
+		{
+			return;
+		}
+
+		$on_page = $this->get_on_page($per_page, $start);
+
+		if ($reverse_count)
+		{
+			$start_page = ($total_pages > 5) ? $total_pages - 4 : 1;
+			$end_page = $total_pages;
+		}
+		else
+		{
+			// What we're doing here is calculating what the "start" and "end" pages should be. We
+			// do this by assuming pagination is "centered" around the currently active page with
+			// the three previous and three next page links displayed. Anything more than that and
+			// we display the ellipsis, likewise anything less.
+			//
+			// $start_page is the page at which we start creating the list. When we have five or less
+			// pages we start at page 1 since there will be no ellipsis displayed. Anymore than that
+			// and we calculate the start based on the active page. This is the min/max calculation.
+			// First (max) would we end up starting on a page less than 1? Next (min) would we end
+			// up starting so close to the end that we'd not display our minimum number of pages.
+			//
+			// $end_page is the last page in the list to display. Like $start_page we use a min/max to
+			// determine this number. Again at most five pages? Then just display them all. More than
+			// five and we first (min) determine whether we'd end up listing more pages than exist.
+			// We then (max) ensure we're displaying the minimum number of pages.
+			$start_page = ($total_pages > 5) ? min(max(1, $on_page - 3), $total_pages - 4) : 1;
+			$end_page = ($total_pages > 5) ? max(min($total_pages, $on_page + 3), 5) : $total_pages;
+		}
+
+		$u_previous_page = $u_next_page = '';
+		if ($on_page != 1)
+		{
+			$u_previous_page = $this->generate_page_link($base_url, $on_page - 1, $start_name, $per_page);
+
+			$this->template->assign_block_vars($block_var_name, array(
+				'PAGE_NUMBER'	=> '',
+				'PAGE_URL'		=> $u_previous_page,
+				'S_IS_CURRENT'	=> false,
+				'S_IS_PREV'		=> true,
+				'S_IS_NEXT'		=> false,
+				'S_IS_ELLIPSIS'	=> false,
+			));
+		}
+
+		// This do...while exists purely to negate the need for start and end assign_block_vars, i.e.
+		// to display the first and last page in the list plus any ellipsis. We use this loop to jump
+		// around a little within the list depending on where we're starting (and ending).
+		$at_page = 1;
+		do
+		{
+			// We decide whether to display the ellipsis during the loop. The ellipsis is always
+			// displayed as either the second or penultimate item in the list. So are we at either
+			// of those points and of course do we even need to display it, i.e. is the list starting
+			// on at least page 3 and ending three pages before the final item.
+			$this->template->assign_block_vars($block_var_name, array(
+				'PAGE_NUMBER'	=> $at_page,
+				'PAGE_URL'		=> $this->generate_page_link($base_url, $at_page, $start_name, $per_page),
+				'S_IS_CURRENT'	=> (!$ignore_on_page && $at_page == $on_page),
+				'S_IS_NEXT'		=> false,
+				'S_IS_PREV'		=> false,
+				'S_IS_ELLIPSIS'	=> ($at_page == 2 && $start_page > 2) || ($at_page == $total_pages - 1 && $end_page < $total_pages - 1),
+			));
+
+			// We may need to jump around in the list depending on whether we have or need to display
+			// the ellipsis. Are we on page 2 and are we more than one page away from the start
+			// of the list? Yes? Then we jump to the start of the list. Likewise are we at the end of
+			// the list and are there more than two pages left in total? Yes? Then jump to the penultimate
+			// page (so we can display the ellipsis next pass). Else, increment the counter and keep
+			// going
+			if ($at_page == 2 && $at_page < $start_page - 1)
+			{
+				$at_page = $start_page;
+			}
+			else if ($at_page == $end_page && $end_page < $total_pages - 1)
+			{
+				$at_page = $total_pages - 1;
+			}
+			else
+			{
+				$at_page++;
+			}
+		}
+		while ($at_page <= $total_pages);
+
+		if ($on_page != $total_pages)
+		{
+			$u_next_page = $this->generate_page_link($base_url, $on_page + 1, $start_name, $per_page);
+
+			$this->template->assign_block_vars($block_var_name, array(
+				'PAGE_NUMBER'	=> '',
+				'PAGE_URL'		=> $u_next_page,
+				'S_IS_CURRENT'	=> false,
+				'S_IS_PREV'		=> false,
+				'S_IS_NEXT'		=> true,
+				'S_IS_ELLIPSIS'	=> false,
+			));
+		}
+
+		// If the block_var_name is a nested block, we will use the last (most
+		// inner) block as a prefix for the template variables. If the last block
+		// name is pagination, the prefix is empty. If the rest of the
+		// block_var_name is not empty, we will modify the last row of that block
+		// and add our pagination items.
+		$tpl_block_name = $tpl_prefix = '';
+		if (strrpos($block_var_name, '.') !== false)
+		{
+			$tpl_block_name = substr($block_var_name, 0, strrpos($block_var_name, '.'));
+			$tpl_prefix = strtoupper(substr($block_var_name, strrpos($block_var_name, '.') + 1));
+		}
+		else
+		{
+			$tpl_prefix = strtoupper($block_var_name);
+		}
+		$tpl_prefix = ($tpl_prefix == 'PAGINATION') ? '' : $tpl_prefix . '_';
+
+		$template_array = array(
+			$tpl_prefix . 'BASE_URL'		=> $base_url,
+			$tpl_prefix . 'PER_PAGE'		=> $per_page,
+			'U_' . $tpl_prefix . 'PREVIOUS_PAGE'	=> ($on_page != 1) ? $u_previous_page : '',
+			'U_' . $tpl_prefix . 'NEXT_PAGE'		=> ($on_page != $total_pages) ? $u_next_page : '',
+			$tpl_prefix . 'TOTAL_PAGES'		=> $total_pages,
+			$tpl_prefix . 'CURRENT_PAGE'	=> $on_page,
+		);
+
+		if ($tpl_block_name)
+		{
+			$this->template->alter_block_array($tpl_block_name, $template_array, true, 'change');
+		}
+		else
+		{
+			$this->template->assign_vars($template_array);
+		}
+	}
+
+	/**
+	* Get current page number
+	*
+	* @param int $per_page the number of items, posts, etc. per page
+	* @param int $start the item which should be considered currently active, used to determine the page we're on
+	* @return int	Current page number
+	*/
+	public function get_on_page($per_page, $start)
+	{
+		return floor($start / $per_page) + 1;
+	}
+
+	/**
+	* Return current page
+	* This function also sets certain specific template variables
+	*
+	* @param string $base_url the base url used to call this page, used by Javascript for popup jump to page
+	* @param int $num_items the total number of items, posts, topics, etc.
+	* @param int $per_page the number of items, posts, etc. per page
+	* @param int $start the item which should be considered currently active, used to determine the page we're on
+	* @return string Descriptive pagination string (e.g. "page 1 of 10")
+	*/
+	public function on_page($base_url, $num_items, $per_page, $start)
+	{
+		$on_page = $this->get_on_page($per_page, $start);
+
+		$this->template->assign_vars(array(
+			'PER_PAGE'		=> $per_page,
+			'ON_PAGE'		=> $on_page,
+			'BASE_URL'		=> $base_url,
+		));
+
+		return $this->user->lang('PAGE_OF', $on_page, max(ceil($num_items / $per_page), 1));
+	}
+
+	/**
+	* Get current page number
+	*
+	* @param int $start the item which should be considered currently active, used to determine the page we're on
+	* @param int $per_page the number of items, posts, etc. per page
+	* @param int $num_items the total number of items, posts, topics, etc.
+	* @return int	Current page number
+	*/
+	public function validate_start($start, $per_page, $num_items)
+	{
+		if ($start < 0 || $start >= $num_items)
+		{
+			return ($start < 0) ? 0 : floor(($num_items - 1) / $per_page) * $per_page;
+		}
+
+		return $start;
+	}
+
+	/**
+	* Get new start when searching from the end
+	*
+	* If the user is trying to reach late pages, start searching from the end.
+	*
+	* @param int $start the item which should be considered currently active, used to determine the page we're on
+	* @param int $limit the number of items, posts, etc. to display
+	* @param int $num_items the total number of items, posts, topics, etc.
+	* @return int	Current page number
+	*/
+	public function reverse_start($start, $limit, $num_items)
+	{
+		return max(0, $num_items - $limit - $start);
+	}
+
+	/**
+	* Get new item limit when searching from the end
+	*
+	* If the user is trying to reach late pages, start searching from the end.
+	* In this case the items to display might be lower then the actual per_page setting.
+	*
+	* @param int $start the item which should be considered currently active, used to determine the page we're on
+	* @param int $per_page the number of items, posts, etc. per page
+	* @param int $num_items the total number of items, posts, topics, etc.
+	* @return int	Current page number
+	*/
+	public function reverse_limit($start, $per_page, $num_items)
+	{
+		if ($start + $per_page > $num_items)
+		{
+			return min($per_page, max(1, $num_items - $start));
+		}
+
+		return $per_page;
+	}
+}
diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php
index 8cd8808261..a8e12c4063 100644
--- a/phpBB/phpbb/path_helper.php
+++ b/phpBB/phpbb/path_helper.php
@@ -102,6 +102,27 @@ class path_helper
 	}
 
 	/**
+	* Strips away the web root path and prepends the normal root path
+	*
+	* This replaces get_web_root_path() . some_url with
+	*	$phpbb_root_path . some_url
+	*
+	* @param string $path The path to be updated
+	* @return string
+	*/
+	public function remove_web_root_path($path)
+	{
+		if (strpos($path, $this->get_web_root_path()) === 0)
+		{
+			$path = substr($path, strlen($this->get_web_root_path()));
+
+			return $this->phpbb_root_path . $path;
+		}
+
+		return $path;
+	}
+
+	/**
 	* Get a relative root path from the current URL
 	*
 	* @return string
@@ -162,4 +183,27 @@ class path_helper
 		*/
 		return $this->web_root_path = $this->phpbb_root_path . str_repeat('../', $corrections - 1);
 	}
+
+	/**
+	* Eliminates useless . and .. components from specified URL
+	*
+	* @param string $url URL to clean
+	*
+	* @return string Cleaned URL
+	*/
+	public function clean_url($url)
+	{
+		$delimiter_position = strpos($url, '://');
+		// URL should contain :// but it shouldn't start with it.
+		// Do not clean URLs that do not fit these constraints.
+		if (empty($delimiter_position))
+		{
+			return $url;
+		}
+		$scheme = substr($url, 0, $delimiter_position) . '://';
+		// Add length of URL delimiter to position
+		$path = substr($url, $delimiter_position + 3);
+
+		return $scheme . $this->filesystem->clean_path($path);
+	}
 }
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php
index f21ec40450..6bff2b8a7e 100644
--- a/phpBB/phpbb/plupload/plupload.php
+++ b/phpBB/phpbb/plupload/plupload.php
@@ -42,6 +42,11 @@ class plupload
 	protected $php_ini;
 
 	/**
+	* @var \phpbb\mimetype\guesser
+	*/
+	protected $mimetype_guesser;
+
+	/**
 	* Final destination for uploaded files, i.e. the "files" directory.
 	* @var string
 	*/
@@ -61,16 +66,18 @@ class plupload
 	* @param \phpbb\request\request_interface $request
 	* @param \phpbb\user $user
 	* @param \phpbb\php\ini $php_ini
+	* @param \phpbb\mimetype\guesser $mimetype_guesser
 	*
 	* @return null
 	*/
-	public function __construct($phpbb_root_path, \phpbb\config\config $config, \phpbb\request\request_interface $request, \phpbb\user $user, \phpbb\php\ini $php_ini)
+	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)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->config = $config;
 		$this->request = $request;
 		$this->user = $user;
 		$this->php_ini = $php_ini;
+		$this->mimetype_guesser = $mimetype_guesser;
 
 		$this->upload_directory = $this->phpbb_root_path . $this->config['upload_path'];
 		$this->temporary_directory = $this->upload_directory . '/plupload';
@@ -113,14 +120,12 @@ class plupload
 		{
 			rename("{$file_path}.part", $file_path);
 
-			$file_info = new \Symfony\Component\HttpFoundation\File\File($file_path);
-
 			// Need to modify some of the $_FILES values to reflect the new file
 			return array(
 				'tmp_name' => $file_path,
 				'name' => $this->request->variable('real_filename', ''),
 				'size' => filesize($file_path),
-				'type' => $file_info->getMimeType($file_path),
+				'type' => $this->mimetype_guesser->guess($file_path, $file_name),
 			);
 		}
 		else
diff --git a/phpBB/phpbb/request/request.php b/phpBB/phpbb/request/request.php
index e158d33c01..3171a6edb7 100644
--- a/phpBB/phpbb/request/request.php
+++ b/phpBB/phpbb/request/request.php
@@ -217,7 +217,7 @@ class request implements \phpbb\request\request_interface
 	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
 	*					the same as that of $default. If the variable is not set $default is returned.
 	*/
-	public function untrimmed_variable($var_name, $default, $multibyte, $super_global = \phpbb\request\request_interface::REQUEST)
+	public function untrimmed_variable($var_name, $default, $multibyte = false, $super_global = \phpbb\request\request_interface::REQUEST)
 	{
 		return $this->_variable($var_name, $default, $multibyte, $super_global, false);
 	}