[prep-release-3.1.0-RC5] Add changelog for 3.1.0-RC5

[ticket/13137] Remove schema.json from repository

* nickvergessen/ticket/13137:
  [ticket/13137] Create schema.json in build script
  [ticket/13137] Improve output of create_schema_files.php
  [ticket/13137] Add schema.json file to .gitignore
  [ticket/13137] Generate the schema when the schema.json file is not available
  [ticket/13137] Remove schema.json file

.editorconfig

@@ -0,0 +1,18 @@
+# This file is for standardising the coding style between different editors
+# http://editorconfig.org/
+
+root = true
+
+[*]
+end_of_line = lf
+indent_size = 4
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 4
+indent_style = space

.gitignore

@@ -10,7 +10,14 @@
 /phpBB/files/*
 /phpBB/images/avatars/gallery/*
 /phpBB/images/avatars/upload/*
+/phpBB/images/ranks/*
+/phpBB/install/schemas/schema.json
+/phpBB/language/*
+!/phpBB/language/en
 /phpBB/store/*
+/phpBB/styles/*
+!/phpBB/styles/prosilver
+!/phpBB/styles/subsilver2
 /phpBB/vendor
 /tests/phpbb_unit_tests.sqlite*
 /tests/test_config*.php

.travis.yml

@@ -1,14 +1,30 @@
 language: php
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
 
-env:
-  - DB=mysql
+matrix:
+  include:
+    - php: 5.3.3
+      env: DB=mysqli
+    - php: 5.3
+      env: DB=mysqli # MyISAM
+    - php: 5.4
+      env: DB=mysqli
+    - php: 5.4
+      env: DB=mysql
+    - php: 5.4
+      env: DB=mariadb
+    - php: 5.4
+      env: DB=postgres
+    - php: 5.4
+      env: DB=sqlite3
+    - php: 5.5
+      env: DB=mysqli
+    - php: 5.6
+      env: DB=mysqli
+    - php: hhvm
+      env: DB=mysqli
+  allow_failures:
+    - php: hhvm
+  fast_finish: true
 
 services:
   - redis-server
@@ -21,17 +37,9 @@ before_script:
 
 script:
   - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION
+  - travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION
+  - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION
+  - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./
   - phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
 
-matrix:
-  include:
-    - php: 5.4
-      env: DB=mariadb
-    - php: 5.4
-      env: DB=postgres
-    - php: 5.4
-      env: DB=sqlite3
-  allow_failures:
-    - php: hhvm
-  fast_finish: true

build/build.xml

@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.1.0-b3" />
-	<property name="prevversion" value="3.1.0-b2" />
-	<property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1" />
+	<property name="newversion" value="3.1.0-RC5" />
+	<property name="prevversion" value="3.1.0-RC4" />
+	<property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3, 3.1.0-b4, 3.1.0-RC1, 3.1.0-RC2, 3.1.0-RC3" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -67,7 +67,6 @@
 		<exec dir="."
 			command="phpBB/vendor/bin/phpunit
 			--log-junit build/logs/phpunit.xml
-			--configuration phpunit.xml.all
 			--group slow
 			--coverage-clover build/logs/clover-slow.xml
 			--coverage-html build/coverage-slow"
@@ -78,29 +77,39 @@
 		<exec command="phpBB/vendor/bin/phpcs
 				-s
 				--extensions=php
-				--standard=build/code_sniffer/ruleset-php-strict.xml
-				--ignore=phpBB/phpbb/db/migration/data/v30x/*
+				--standard=build/code_sniffer/ruleset-php-strict-core.xml
+				--ignore=${project.basedir}/phpBB/phpbb/db/migration/data/v30x/*
 				phpBB/phpbb"
 			dir="." returnProperty="retval-php-strict" passthru="true" />
 		<exec command="phpBB/vendor/bin/phpcs
 				-s
 				--extensions=php
-				--standard=build/code_sniffer/ruleset-php-legacy.xml
-				--ignore=phpBB/cache/*
-				--ignore=phpBB/develop/*
-				--ignore=phpBB/includes/diff/*.php
-				--ignore=phpBB/includes/sphinxapi.php
-				--ignore=phpBB/includes/utf/data/*
-				--ignore=phpBB/install/data/*
-				--ignore=phpBB/install/database_update.php
-				--ignore=phpBB/phpbb/*
-				--ignore=phpBB/vendor/*
+				--standard=build/code_sniffer/ruleset-php-legacy-core.xml
+				--ignore=${project.basedir}/phpBB/cache/*
+				--ignore=${project.basedir}/phpBB/develop/*
+				--ignore=${project.basedir}/phpBB/ext/*
+				--ignore=${project.basedir}/phpBB/includes/diff/*.php
+				--ignore=${project.basedir}/phpBB/includes/sphinxapi.php
+				--ignore=${project.basedir}/phpBB/includes/utf/data/*
+				--ignore=${project.basedir}/phpBB/install/data/*
+				--ignore=${project.basedir}/phpBB/install/database_update.php
+				--ignore=${project.basedir}/phpBB/phpbb/*
+				--ignore=${project.basedir}/phpBB/vendor/*
 				phpBB"
 			dir="." returnProperty="retval-php-legacy" passthru="true" />
+		<exec command="phpBB/vendor/bin/phpcs
+				-s
+				--extensions=php
+				--standard=build/code_sniffer/ruleset-php-extensions.xml
+				--ignore=${project.basedir}/phpBB/ext/*/tests/*
+				--ignore=${project.basedir}/phpBB/ext/*/vendor/*
+				phpBB/ext"
+			dir="." returnProperty="retval-php-ext" passthru="true" />
 		<if>
 			<or>
 				<not><equals arg1="${retval-php-strict}" arg2="0" /></not>
 				<not><equals arg1="${retval-php-legacy}" arg2="0" /></not>
+				<not><equals arg1="${retval-php-ext}" arg2="0" /></not>
 			</or>
 			<then>
 				<fail message="PHP Code Sniffer failed." />
@@ -109,14 +118,8 @@
 	</target>
 
 	<target name="docs">
-		<!-- only works if you setup phpdoctor:
-                     git clone https://github.com/peej/phpdoctor.git
-                     and then create an executable phpdoctor in your path containing
-                     #!/bin/sh
-                     php -f /path/to/phpdoctor/phpdoc.php $@
-                -->
-		<exec dir="build"
-			command="phpdoctor phpdoc-phpbb.ini"
+		<exec dir="."
+			command="phpBB/vendor/bin/sami.php update build/sami.conf.php"
 			passthru="true" />
 	</target>
 
@@ -141,6 +144,7 @@
 
 		<exec dir="build/old_versions" command="LC_ALL=C diff -crNEBwd release-${version} release-${newversion} >
 			../new_version/patches/phpBB-${version}_to_${newversion}.patch" escape="false" />
+		<exec dir="build/old_versions" command="LC_ALL=C diff -qr release-${version} release-${newversion} | grep 'Only in release-${version}' > ../new_version/patches/phpBB-${version}_to_${newversion}.deleted" escape="false" />
 	</target>
 
 	<target name="prepare-new-version">
@@ -255,7 +259,7 @@
 							command="git archive ${revision} composer.phar | tar -xf - -C ${dir}"
 							checkreturn="true" />
 						<exec dir="${dir}"
-							command="php composer.phar install --no-dev"
+							command="php composer.phar install --no-dev --optimize-autoloader"
 							checkreturn="true"
 							passthru="true" />
 						<delete file="${dir}/composer.phar" />
@@ -269,6 +273,9 @@
 			</else>
 		</if>
 
+		<!-- Create schema.json -->
+		<exec dir="${dir}" command="php develop/create_schema_files.php" />
+
 		<delete file="${dir}/config.php" />
 		<delete dir="${dir}/develop" />
 		<delete dir="${dir}/install/data" />

build/build_announcement.php

@@ -2,9 +2,13 @@
 <?php
 /**
 *
-* @package build
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 

build/build_changelog.php

@@ -2,9 +2,13 @@
 <?php
 /**
 *
-* @package build
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 

build/build_helper.php

@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package build
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -312,4 +316,63 @@ class build_package
 
 		return $result;
 	}
+
+	/**
+	* Collect the list of the deleted files from a list of deleted files and folders.
+	*
+	* @param string $deleted_filename   The full path to a file containing the list of deleted files and directories
+	* @param string $package_name       The name of the package
+	* @return array
+	*/
+	public function collect_deleted_files($deleted_filename, $package_name)
+	{
+		$result = array();
+		$file_contents = file($deleted_filename);
+
+		foreach ($file_contents as $filename)
+		{
+			$filename = trim($filename);
+
+			if (!$filename)
+			{
+				continue;
+			}
+
+			$filename = str_replace('Only in ' . $package_name, '', $filename);
+			$filename = ltrim($filename, '/');
+
+			if (substr($filename, 0, 1) == ':')
+			{
+				$replace = '';
+			}
+			else
+			{
+				$replace = '/';
+			}
+
+			$filename = str_replace(': ', $replace, $filename);
+
+			if (is_dir("{$this->locations['old_versions']}{$package_name}/{$filename}"))
+			{
+				$iterator = new \RecursiveIteratorIterator(
+					new \RecursiveDirectoryIterator(
+						"{$this->locations['old_versions']}{$package_name}/{$filename}",
+						\FilesystemIterator::UNIX_PATHS | \FilesystemIterator::SKIP_DOTS
+					),
+					\RecursiveIteratorIterator::LEAVES_ONLY
+				);
+
+				foreach ($iterator as $file_info)
+				{
+					$result[] = "{$filename}/{$iterator->getSubPathname()}";
+				}
+			}
+			else
+			{
+				$result[] = $filename;
+			}
+		}
+
+		return $result;
+	}
 }

build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php

@@ -1,17 +1,19 @@
 <?php
-/** 
+/**
 *
-* @package code_sniffer
-* @version $Id: $
-* @copyright (c) 2007 phpBB Group 
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 
+* 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.
 *
 */
 
 /**
-* Checks that each source file contains the standard header.
-* 
-* Based on Coding Guidelines 1.ii File Header.
+* Checks that each PHP source file contains a valid header as defined by the
+* phpBB Coding Guidelines.
 *
 * @package code_sniffer
 * @author Manuel Pichler <mapi@phpundercontrol.org>
@@ -44,10 +46,10 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
 		{
 			if ($phpcsFile->findPrevious(T_OPEN_TAG, $stackPtr - 1) !== false)
 			{
-                return;
+				return;
 			}
 		}
-		
+
 		// Fetch next non whitespace token
 		$tokens = $phpcsFile->getTokens();
 		$start  = $phpcsFile->findNext(T_WHITESPACE, $stackPtr + 1, null, true);
@@ -63,65 +65,68 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
 			$phpcsFile->addError('Missing required file doc comment.', $stackPtr);
 			return;
 		}
-		
+
 		// Find comment end token
 		$end = $phpcsFile->findNext(T_DOC_COMMENT, $start + 1, null, true) - 1;
-		
+
 		// If there is no end, skip processing here
 		if ($end === false)
 		{
 			return;
 		}
-		
+
 		// List of found comment tags
 		$tags = array();
-		
+
 		// check comment lines without the first(/**) an last(*/) line
-		for ($i = $start + 1, $c = ($end - $start); $i <= $c; ++$i)
+		for ($i = $start + 1, $c = $end - 1; $i <= $c; ++$i)
 		{
 			$line = $tokens[$i]['content'];
 
 			// Check that each line starts with a '*'
 			if (substr($line, 0, 1) !== '*')
 			{
-                $message = 'The file doc comment should not be idented.';
+				$message = 'The file doc comment should not be idented.';
 				$phpcsFile->addWarning($message, $i);
 			}
 			else if (preg_match('/^\*\s+@([\w]+)\s+(.*)$/', $line, $match) !== 0)
 			{
-				$tags[$match[1]] = array($match[2], $i);
+				if (!isset($tags[$match[1]]))
+				{
+					$tags[$match[1]] = array();
+				}
+
+				$tags[$match[1]][] = array($match[2], $i);
 			}
 		}
-		
+
 		// Check that the first and last line is empty
 		if (trim($tokens[$start + 1]['content']) !== '*')
 		{
 			$message = 'The first file comment line should be empty.';
-            $phpcsFile->addWarning($message, ($start + 1));			
+			$phpcsFile->addWarning($message, ($start + 1));
 		}
-        if (trim($tokens[$end - $start]['content']) !== '*')
-        {
-        	$message = 'The last file comment line should be empty.';
-            $phpcsFile->addWarning($message, ($end - $start));         
-        }
-        
-        $this->processPackage($phpcsFile, $start, $tags);
-        $this->processVersion($phpcsFile, $start, $tags);
-        $this->processCopyright($phpcsFile, $start, $tags);
-        $this->processLicense($phpcsFile, $start, $tags);
-		
-        //print_r($tags);
+		if (trim($tokens[$end - 1]['content']) !== '*')
+		{
+			$message = 'The last file comment line should be empty.';
+			$phpcsFile->addWarning($message, $end - 1);
+		}
+
+		//$this->processPackage($phpcsFile, $start, $tags);
+		//$this->processVersion($phpcsFile, $start, $tags);
+		$this->processCopyright($phpcsFile, $start, $tags);
+		$this->processLicense($phpcsFile, $start, $tags);
 	}
-	
+
 	/**
-	 * Checks that the tags array contains a valid package tag
-	 *
-	 * @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
-	 * @param integer The stack pointer for the first comment token.
-	 * @param array(string=>array) $tags The found file doc comment tags.
-	 * 
-	 * @return null
-	 */
+	* Checks that the tags array contains a valid package tag
+	*
+	* @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
+	* @param integer The stack pointer for the first comment token.
+	* @param array(string=>array) $tags The found file doc comment tags.
+	*
+	* @return null
+	*/
 	protected function processPackage(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
 	{
 		if (!isset($tags['package']))
@@ -131,80 +136,87 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
 		}
 		else if (preg_match('/^([\w]+)$/', $tags['package'][0]) === 0)
 		{
-            $message = 'Invalid content found for @package tag.';
-            $phpcsFile->addWarning($message, $tags['package'][1]);			
+			$message = 'Invalid content found for @package tag.';
+			$phpcsFile->addWarning($message, $tags['package'][1]);
 		}
 	}
-	
+
 	/**
-     * Checks that the tags array contains a valid version tag
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
-     * @param integer The stack pointer for the first comment token.
-     * @param array(string=>array) $tags The found file doc comment tags.
-     * 
-     * @return null
-	 */
+	* Checks that the tags array contains a valid version tag
+	*
+	* @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
+	* @param integer The stack pointer for the first comment token.
+	* @param array(string=>array) $tags The found file doc comment tags.
+	*
+	* @return null
+	*/
 	protected function processVersion(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
-    {
-        if (!isset($tags['version']))
-        {
-            $message = 'Missing require @version tag in file doc comment.';
-            $phpcsFile->addError($message, $ptr);
-        }
-        else if (preg_match('/^\$Id:[^\$]+\$$/', $tags['version'][0]) === 0)
-        {
-            $message = 'Invalid content found for @version tag, use "$Id: $".';
-            $phpcsFile->addError($message, $tags['version'][1]);            
-        }
-    }
-    
-    /**
-     * Checks that the tags array contains a valid copyright tag
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
-     * @param integer The stack pointer for the first comment token.
-     * @param array(string=>array) $tags The found file doc comment tags.
-     * 
-     * @return null
-     */
-    protected function processCopyright(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
-    {
-        if (!isset($tags['copyright']))
-        {
-            $message = 'Missing require @copyright tag in file doc comment.';
-            $phpcsFile->addError($message, $ptr);
-        }
-        else if (preg_match('/^\(c\) 2[0-9]{3} phpBB Group\s*$/', $tags['copyright'][0]) === 0)
-        {
-            $message = 'Invalid content found for @copyright tag, use "(c) <year> phpBB Group".';
-            $phpcsFile->addError($message, $tags['copyright'][1]);            
-        }
-    }
-    
-    /**
-     * Checks that the tags array contains a valid license tag
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
-     * @param integer The stack pointer for the first comment token.
-     * @param array(string=>array) $tags The found file doc comment tags.
-     * 
-     * @return null
-     */
-    protected function processLicense(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
-    {
-		$license = 'http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2';
-    	
-        if (!isset($tags['license']))
-        {
-            $message = 'Missing require @license tag in file doc comment.';
-            $phpcsFile->addError($message, $ptr);
-        }
-        else if (trim($tags['license'][0]) !== $license)
-        {
-            $message = 'Invalid content found for @license tag, use ' 
-                     . '"' . $license . '".';
-            $phpcsFile->addError($message, $tags['license'][1]);            
-        }
-    }
+	{
+		if (!isset($tags['version']))
+		{
+			$message = 'Missing require @version tag in file doc comment.';
+			$phpcsFile->addError($message, $ptr);
+		}
+		else if (preg_match('/^\$Id:[^\$]+\$$/', $tags['version'][0]) === 0)
+		{
+			$message = 'Invalid content found for @version tag, use "$Id: $".';
+			$phpcsFile->addError($message, $tags['version'][1]);
+		}
+	}
+
+	/**
+	* Checks that the tags array contains a valid copyright tag
+	*
+	* @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
+	* @param integer The stack pointer for the first comment token.
+	* @param array(string=>array) $tags The found file doc comment tags.
+	*
+	* @return null
+	*/
+	protected function processCopyright(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
+	{
+		$copyright = '(c) phpBB Limited <https://www.phpbb.com>';
+
+		if (!isset($tags['copyright']))
+		{
+			$message = 'Missing require @copyright tag in file doc comment.';
+			$phpcsFile->addError($message, $ptr);
+		}
+		else if ($tags['copyright'][0][0] !== $copyright)
+		{
+			$message = 'Invalid content found for the first @copyright tag, use "' . $copyright . '".';
+			$phpcsFile->addError($message, $tags['copyright'][0][1]);
+		}
+	}
+
+	/**
+	* Checks that the tags array contains a valid license tag
+	*
+	* @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
+	* @param integer The stack pointer for the first comment token.
+	* @param array(string=>array) $tags The found file doc comment tags.
+	*
+	* @return null
+	*/
+	protected function processLicense(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
+	{
+		$license = 'GNU General Public License, version 2 (GPL-2.0)';
+
+		if (!isset($tags['license']))
+		{
+			$message = 'Missing require @license tag in file doc comment.';
+			$phpcsFile->addError($message, $ptr);
+		}
+		else if (sizeof($tags['license']) !== 1)
+		{
+			$message = 'It must be only one @license tag in file doc comment.';
+			$phpcsFile->addError($message, $ptr);
+		}
+		else if (trim($tags['license'][0][0]) !== $license)
+		{
+			$message = 'Invalid content found for @license tag, use '
+				. '"' . $license . '".';
+			$phpcsFile->addError($message, $tags['license'][0][1]);
+		}
+	}
 }

build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php

@@ -0,0 +1,214 @@
+<?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.
+*
+*/
+
+/**
+* Checks that each use statement is used.
+*/
+class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
+{
+	/**
+	* {@inheritdoc}
+	*/
+	public function register()
+	{
+		return array(T_USE);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	{
+		if ($this->should_ignore_use($phpcsFile, $stackPtr) === true)
+		{
+			return;
+		}
+
+		$tokens = $phpcsFile->getTokens();
+
+		$class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($stackPtr + 1));
+
+		$find = array(
+			T_NS_SEPARATOR,
+			T_STRING,
+			T_WHITESPACE,
+		);
+
+		$class_name_end = $phpcsFile->findNext($find, ($stackPtr + 1), null, true);
+
+		$aliasing_as_position = $phpcsFile->findNext(T_AS, $class_name_end, null, false, null, true);
+		if ($aliasing_as_position !== false)
+		{
+			$alias_position = $phpcsFile->findNext(T_STRING, $aliasing_as_position, null, false, null, true);
+			$class_name_short = $tokens[$alias_position]['content'];
+			$class_name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1));
+		}
+		else
+		{
+			$class_name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start));
+			$class_name_short = $tokens[$class_name_end - 1]['content'];
+		}
+
+		$ok = false;
+
+		// Checks in simple statements (new, instanceof and extends)
+		foreach (array(T_INSTANCEOF, T_NEW, T_EXTENDS) as $keyword)
+		{
+			$old_simple_statement = $stackPtr;
+			while (($simple_statement = $phpcsFile->findNext($keyword, ($old_simple_statement + 1))) !== false)
+			{
+				$old_simple_statement = $simple_statement;
+
+				$simple_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($simple_statement + 1));
+				$simple_class_name_end = $phpcsFile->findNext($find, ($simple_statement + 1), null, true);
+
+				$simple_class_name = trim($phpcsFile->getTokensAsString($simple_class_name_start, ($simple_class_name_end - $simple_class_name_start)));
+
+				if ($simple_class_name === $class_name_full)
+				{
+					$error = 'Either use statement or full name must be used.';
+					$phpcsFile->addError($error, $simple_statement, 'FullName');
+				}
+
+				if ($simple_class_name === $class_name_short)
+				{
+					$ok = true;
+				}
+			}
+		}
+
+		// Checks paamayim nekudotayim
+		$old_paamayim_nekudotayim = $stackPtr;
+		while (($paamayim_nekudotayim = $phpcsFile->findNext(T_PAAMAYIM_NEKUDOTAYIM, ($old_paamayim_nekudotayim + 1))) !== false)
+		{
+			$old_paamayim_nekudotayim = $paamayim_nekudotayim;
+
+			$paamayim_nekudotayim_class_name_start = $phpcsFile->findPrevious($find, $paamayim_nekudotayim - 1, null, true);
+			$paamayim_nekudotayim_class_name_end = $paamayim_nekudotayim - 1;
+
+			$paamayim_nekudotayim_class_name = trim($phpcsFile->getTokensAsString($paamayim_nekudotayim_class_name_start + 1, ($paamayim_nekudotayim_class_name_end - $paamayim_nekudotayim_class_name_start)));
+
+			if ($paamayim_nekudotayim_class_name === $class_name_full)
+			{
+				$error = 'Either use statement or full name must be used.';
+				$phpcsFile->addError($error, $paamayim_nekudotayim, 'FullName');
+			}
+
+			if ($paamayim_nekudotayim_class_name === $class_name_short)
+			{
+				$ok = true;
+			}
+		}
+
+		// Checks in implements
+		$old_implements = $stackPtr;
+		while (($implements = $phpcsFile->findNext(T_IMPLEMENTS, ($old_implements + 1))) !== false)
+		{
+			$old_implements = $implements;
+
+			$old_implemented_class = $implements;
+			while (($implemented_class = $phpcsFile->findNext(T_STRING, ($old_implemented_class + 1), null, false, null, true)) !== false)
+			{
+				$old_implemented_class = $implemented_class;
+
+				$implements_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($implemented_class - 1));
+				$implements_class_name_end = $phpcsFile->findNext($find, ($implemented_class - 1), null, true);
+
+				$implements_class_name = trim($phpcsFile->getTokensAsString($implements_class_name_start, ($implements_class_name_end - $implements_class_name_start)));
+
+				if ($implements_class_name === $class_name_full)
+				{
+					$error = 'Either use statement or full name must be used.';
+					$phpcsFile->addError($error, $implements, 'FullName');
+				}
+
+				if ($implements_class_name === $class_name_short)
+				{
+					$ok = true;
+				}
+			}
+		}
+
+		// Checks in type hinting
+		$old_function_declaration = $stackPtr;
+		while (($function_declaration = $phpcsFile->findNext(T_FUNCTION, ($old_function_declaration + 1))) !== false)
+		{
+			$old_function_declaration = $function_declaration;
+
+			$end_function = $phpcsFile->findNext(array(T_CLOSE_PARENTHESIS), ($function_declaration + 1));
+			$old_argument = $function_declaration;
+			while (($argument = $phpcsFile->findNext(T_VARIABLE, ($old_argument + 1), $end_function)) !== false)
+			{
+				$old_argument = $argument;
+
+				$start_argument = $phpcsFile->findPrevious(array(T_OPEN_PARENTHESIS, T_COMMA), $argument);
+				$argument_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($start_argument + 1), $argument);
+
+				// Skip the parameter if no type is defined.
+				if ($argument_class_name_start !== false)
+				{
+					$argument_class_name_end = $phpcsFile->findNext($find, ($argument_class_name_start + 1), null, true);
+
+					$argument_class_name = $phpcsFile->getTokensAsString($argument_class_name_start, ($argument_class_name_end - $argument_class_name_start - 1));
+
+					if ($argument_class_name === $class_name_full)
+					{
+						$error = 'Either use statement or full name must be used.';
+						$phpcsFile->addError($error, $function_declaration, 'FullName');
+					}
+
+					if ($argument_class_name === $class_name_short)
+					{
+						$ok = true;
+					}
+				}
+			}
+		}
+
+		if (!$ok)
+		{
+			$error = 'There must not be unused USE statements.';
+			$phpcsFile->addError($error, $stackPtr, 'Unused');
+		}
+	}
+
+	/**
+	* Check if this use statement is part of the namespace block.
+	*
+	* @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	* @param int                  $stackPtr  The position of the current token in
+	*                                        the stack passed in $tokens.
+	*
+	* @return bool
+	*/
+	private function should_ignore_use(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// Ignore USE keywords inside closures.
+		$next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+		if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS)
+		{
+			return true;
+		}
+
+		// Ignore USE keywords for traits.
+		if ($phpcsFile->hasCondition($stackPtr, array(T_CLASS, T_TRAIT)) === true)
+		{
+			return true;
+		}
+
+		return false;
+
+	}
+}

build/code_sniffer/phpbb/Tests/Commenting/FileCommentUnitTest.inc

@@ -1,19 +0,0 @@
-<?php
-/** 
-*
-* @package code_sniffer³
-* @version $Id: $
-* @copyright (c) 2008 phpBB Group 
-* @license http://opensource.org/licenses/gpl-license.php BSD License
- *
-*/
-?>
-<?php
-/** 
-* Broken but not first file doc comment.
-* 
-* @version @package_version@
-* @license   http://www.opensource.org/licenses/bsd-license.php  BSD License
-* @copyright (c) 2007 phpBB Group  
-*
-*/

build/code_sniffer/phpbb/Tests/Commenting/FileCommentUnitTest.php

@@ -1,51 +0,0 @@
-<?php
-/** 
-*
-* @package code_sniffer
-* @version $Id: $
-* @copyright (c) 2007 phpBB Group 
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 
-*
-*/
-
-/**
-* Unit test class for the EmptyStatement sniff.
-*
-* @package code_sniffer
-* @author Manuel Pichler <mapi@phpundercontrol.org>
-*/
-class phpbb_Tests_Commenting_FileCommentUnitTest extends AbstractSniffUnitTest
-{
-	
-	/**
-	* Returns the lines where errors should occur.
-	*
-	* The key of the array should represent the line number and the value
-	* should represent the number of errors that should occur on that line.
-	*
-	* @return array(int => int)
-	*/
-	public function getErrorList()
-	{
-		return array(
-            7  =>  1 // BSD License error :)
-		);
-	}//end getErrorList()
-
-
-	/**
-	* Returns the lines where warnings should occur.
-	*
-	* The key of the array should represent the line number and the value
-	* should represent the number of warnings that should occur on that line.
-	*
-	* @return array(int => int)
-	*/
-	public function getWarningList()
-	{
-		return array(
-		    4  =>  1,
-            8  =>  1
-        );
-	}//end getWarningList()
-}

build/code_sniffer/phpbb/build.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="code_sniffer" basedir="." default="install">
-
-  <property name="working.dir" value="${basedir}" />
-  <property name="target.dir" value="/usr/share/php/PHP/CodeSniffer/Standards" />
-
-  <!--
-  Install phpbb sniff
-  -->
-  <target name="install">
-    <delete dir="${target.dir}/phpbb" />
-    <mkdir dir="${target.dir}/phpbb"/>
-
-    <copy todir="${target.dir}/phpbb">
-	<fileset file="${working.dir}/phpbbCodingStandard.php" />
-    </copy>
-    <copy todir="${target.dir}/phpbb/Sniffs">
-	<fileset dir="${working.dir}/Sniffs" />
-    </copy>
-
-  </target>
-
-</project>

build/code_sniffer/phpbb/phpbbCodingStandard.php

@@ -1,43 +0,0 @@
-<?php
-/** 
-*
-* @package code_sniffer
-* @version $Id: $
-* @copyright (c) 2007 phpBB Group 
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 
-*
-*/
-
-/**
- * @ignore
- */
-if (class_exists('PHP_CodeSniffer_Standards_CodingStandard', true) === false) {
-    throw new PHP_CodeSniffer_Exception(
-        'Class PHP_CodeSniffer_Standards_CodingStandard not found'
-    );
-}
-
-/**
- * Primary class for the phpbb coding standard.
- *
- * @package code_sniffer
- */
-class PHP_CodeSniffer_Standards_phpbb_phpbbCodingStandard extends PHP_CodeSniffer_Standards_CodingStandard
-{
-	/**
-    * Return a list of external sniffs to include with this standard.
-    *
-    * External locations can be single sniffs, a whole directory of sniffs, or
-    * an entire coding standard. Locations start with the standard name. For
-    * example:
-    *  PEAR                              => include all sniffs in this standard
-    *  PEAR/Sniffs/Files                 => include all sniffs in this dir
-    *  PEAR/Sniffs/Files/LineLengthSniff => include this single sniff
-    *
-    * @return array
-    */
-    public function getIncludedSniffs()
-    {
-        return array();
-    }
-}

build/code_sniffer/ruleset-php-extensions.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<ruleset name="phpBB PHP Strict Standard Extensions">
+
+ <description>phpBB coding standard for PHP files of phpBB extensions</description>
+
+ <rule ref="./ruleset-php-strict.xml" />
+
+</ruleset>

build/code_sniffer/ruleset-php-legacy-core.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<ruleset name="phpBB PHP Legacy Standard Core">
+
+ <description>phpBB legacy coding standard for PHP files of phpBB core</description>
+
+ <rule ref="./ruleset-php-legacy.xml" />
+
+ <!-- Each file MUST start with a valid header as defined by the Coding Guidelines -->
+ <rule ref="./phpbb/Sniffs/Commenting/FileCommentSniff.php" />
+
+</ruleset>

build/code_sniffer/ruleset-php-legacy.xml

@@ -20,6 +20,16 @@
  <!-- Call-time pass-by-reference MUST not be used. -->
  <rule ref="Generic.Functions.CallTimePassByReference.NotAllowed" />
 
+ <!-- Filenames MUST be lowercase. -->
+ <rule ref="Generic.Files.LowercasedFilename" />
+
+ <!-- The function brace MUST be on the line following the function declaration
+      and MUST be indented to the same column as the start of the function declaration. -->
+ <rule ref="Generic.Functions.OpeningFunctionBraceBsdAllman" />
+
+ <!-- There MUST be exactly one space after a cast. -->
+ <rule ref="Generic.Formatting.SpaceAfterCast" />
+
  <!-- Class constants MUST be declared in all upper case with underscore separators. -->
  <rule ref="Generic.NamingConventions.UpperCaseConstantName" />
 
@@ -32,6 +42,20 @@
  <!-- Each file MUST end with exactly one newline character -->
  <rule ref="PSR2.Files.EndFileNewline" />
 
+ <!-- When referencing arrays there MUST NOT be any whitespace around the opening bracket
+      or before the closing bracket. -->
+ <rule ref="Squiz.Arrays.ArrayBracketSpacing" />
+
+ <!-- The "else if" statement MUST be written with a space between the words else and if. -->
+ <rule ref="Squiz.ControlStructures.ElseIfDeclaration" />
+
+ <!-- There MUST be a space between each element of a foreach loop. -->
+ <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration" />
+
+ <!-- In a for loop declaration, there MUST be no space inside the brackets
+      and there MUST be 0 spaces before and 1 space after semicolons. -->
+ <rule ref="Squiz.ControlStructures.ForLoopDeclaration" />
+
  <!-- In the argument list, there MUST NOT be a space before each comma,
       and there MUST be one space after each comma. -->
  <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
@@ -41,6 +65,12 @@
  </rule>
  <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint" />
 
+ <!-- All built-in PHP functions MUST be called lowercased. -->
+ <rule ref="Squiz.Functions.LowercaseFunctionKeywords" />
+
+ <!-- The eval() function MUST NOT be used. -->
+ <rule ref="Squiz.PHP.Eval" />
+
  <!-- There MUST NOT be trailing whitespace at the end of lines. -->
  <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace" />
 

build/code_sniffer/ruleset-php-strict-core.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<ruleset name="phpBB PHP Strict Standard Core">
+
+ <description>phpBB coding standard for PHP files of phpBB core</description>
+
+ <rule ref="./ruleset-php-legacy-core.xml" />
+ <rule ref="./ruleset-php-strict.xml" />
+
+</ruleset>

build/code_sniffer/ruleset-php-strict.xml

@@ -22,6 +22,9 @@
  <!-- PHP keywords MUST be in lower case. -->
  <rule ref="Generic.PHP.LowerCaseKeyword" />
 
+ <!-- Constructors MUST be called __construct() instead of after the class. -->
+ <rule ref="Generic.NamingConventions.ConstructorName" />
+
  <!-- Classes etc. MUST be namespaced -->
  <rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace" />
 
@@ -36,4 +39,10 @@
       There MUST be one blank line after the use block. -->
  <rule ref="PSR2.Namespaces.UseDeclaration" />
 
+ <!-- There MUST be one blank line after the namespace declaration -->
+ <rule ref="PSR2.Namespaces.NamespaceDeclaration" />
+
+ <!-- There MUST NOT be unused use statements. -->
+ <rule ref="./phpbb/Sniffs/Namespaces/UnusedUseSniff.php" />
+
 </ruleset>

build/package.php

@@ -2,9 +2,13 @@
 <?php
 /**
 *
-* @package build
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -45,6 +49,10 @@ if (sizeof($package->old_packages))
 			$package->get('patch_directory') . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.patch',
 			$_package_name
 		);
+		$diff_file_changes[$_package_name]['deleted'] = $package->collect_deleted_files(
+			$package->get('patch_directory') . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.deleted',
+			$_package_name
+		);
 	}
 
 	// Now put those files determined within the correct directories
@@ -187,12 +195,6 @@ if (sizeof($package->old_packages))
 		* referenced files from the same or subsequent directories.
 		*/
 		$copy_relative_directories = array(
-			'adm/style/admin.css'	=> array(
-				'copied'	=> false,
-				'copy'		=> array(
-					'adm/images/*' => 'adm/images',
-				),
-			),
 			'config/'	=> array(
 				'copied'	=> false,
 				'copy'		=> array(
@@ -261,6 +263,42 @@ if (sizeof($package->old_packages))
 			}
 		}
 
+		/**
+		* We need to always copy the template and asset files that we need in
+		* the update, to ensure that the page is displayed correctly.
+		*/
+		$copy_update_files = array(
+			'adm/images/*'			=> 'adm/images',
+			'adm/style/admin.css'	=> 'adm/style',
+			'adm/style/admin.js'	=> 'adm/style',
+			'adm/style/ajax.js'		=> 'adm/style',
+			'adm/style/install_*'	=> 'adm/style',
+			'assets/javascript/*'	=> 'assets/javascript',
+		);
+
+		foreach ($copy_update_files as $source_files => $destination_dir)
+		{
+			// Create directories along the way?
+			$directories = explode('/', $destination_dir);
+
+			chdir($dest_filename_dir . '/install/update/new');
+			foreach ($directories as $dir)
+			{
+				$dir = trim($dir);
+				if ($dir)
+				{
+					if (!file_exists('./' . $dir))
+					{
+						$package->run_command('mkdir ' . $dir);
+					}
+					chdir('./' . $dir);
+				}
+			}
+			$source_dir_files = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $source_files;
+			$destination_dir = $dest_filename_dir . '/install/update/new/' . $destination_dir;
+			$package->run_command('cp ' . $source_dir_files . ' ' . $destination_dir);
+		}
+
 		// Build index.php file for holding the file structure
 		$index_contents = '<?php
 
@@ -292,6 +330,15 @@ $update_info = array(
 			$index_contents .= "\t'binary'		=> array(),\n";
 		}
 
+		if (sizeof($file_contents['deleted']))
+		{
+			$index_contents .= "\t'deleted'		=> array(\n\t\t'" . implode("',\n\t\t'", $file_contents['deleted']) . "',\n\t),\n";
+		}
+		else
+		{
+			$index_contents .= "\t'deleted'		=> array(),\n";
+		}
+
 		$index_contents .= ");\n";
 
 		$fp = fopen($dest_filename_dir . '/install/update/index.php', 'wt');

build/phpdoc-phpbb.ini

@@ -1,145 +0,0 @@
-; Default configuration file for PHPDoctor
-
-; This config file will cause PHPDoctor to generate API documentation of
-; itself.
-
-
-; PHPDoctor settings
-; -----------------------------------------------------------------------------
-
-; Names of files to parse. This can be a single filename, or a comma separated
-; list of filenames. Wildcards are allowed.
-
-files = "*.php"
-
-; Names of files or directories to ignore. This can be a single filename, or a
-; comma separated list of filenames. Wildcards are NOT allowed.
-
-;ignore = "CVS, .svn, .git, _compiled"
-ignore = templates_c/,*HTML/default/*,spec/,*config.php*,*CVS/,test_chora.php,testupdate/,cache/,store/,*proSilver/,develop/,includes/utf/data/,includes/captcha/fonts/,install/update/,install/update.new/,files/,*phpinfo.php*,*update_script.php*,*upgrade.php*,*convert.php*,install/converter/,language/de/,script/,*swatch.php*,*test.php*,*test2.php*,*install.php*,*functions_diff.php*,*acp_update.php*,acm_xcache.php
-
-; The directory to look for files in, if not used the PHPDoctor will look in
-; the current directory (the directory it is run from).
-
-source_path = "../phpBB/"
-
-; If you do not want PHPDoctor to look in each sub directory for files
-; uncomment this line.
-
-;subdirs = off
-
-; Set how loud PHPDoctor is as it runs. Quiet mode suppresses all output other
-; than warnings and errors. Verbose mode outputs additional messages during
-; execution.
-
-quiet = on
-;verbose = on
-
-; Select the doclet to use for generating output.
-
-doclet = standard
-;doclet = debug
-
-; The directory to find the doclet in. Doclets control the HTML output of
-; phpDoctor and can be modified to suit your needs. They are expected to be 
-; in a directory named after themselves at the location given.
-
-;doclet_path = ./doclets
-
-; Select the formatter to use for generating output.
-
-;formatter = htmlStandardFormatter
-
-; The directory to find the formatter in. Formatters convert textual markup
-; for use by the doclet.
-
-;formatter_path = ./formatters
-
-; The directory to find taglets in. Taglets allow you to make PHPDoctor handle
-; new tags and to alter the behavour of existing tags and their output.
-
-;taglet_path = ./taglets
-
-; If the code you are parsing does not use package tags or not all elements
-; have package tags, use this setting to place unbound elements into a
-; particular package.
-
-default_package = "phpBB"
-
-use_class_path_as_package = off
-
-ignore_package_tags = off
-
-; Specifies the name of a HTML file containing text for the overview
-; documentation to be placed on the overview page. The path is relative to
-; "source_path" unless an absolute path is given.
-
-overview = ../README.md
-
-; Package comments will be looked for in a file named package.html in the same
-; directory as the first source file parsed in that package or in the directory
-; given below. If package comments are placed in the directory given below then
-; they should be named "<packageName>.html".
-
-package_comment_dir = ./
-
-; Parse out global variables and/or global constants?
-
-;globals = off
-;constants = off
-
-; Generate documentation for all class members
-
-;private = on
-
-; Generate documentation for public and protected class members
-
-;protected = on
-
-; Generate documentation for only public class members
-
-;public = on
-
-; Use the PEAR compatible handling of the docblock first sentence
-
-;pear_compat = on
-
-; Standard doclet settings
-; -----------------------------------------------------------------------------
-
-; The directory to place generated documentation in. If the given path is
-; relative to it will be relative to "source_path".
-
-d = "../build/api/"
-
-; Specifies the title to be placed in the HTML <title> tag.
-
-windowtitle = "phpBB3"
-
-; Specifies the title to be placed near the top of the overview summary file.
-
-doctitle = "phpBB3 Sourcecode Documentation"
-
-; Specifies the header text to be placed at the top of each output file. The
-; header will be placed to the right of the upper navigation bar. 
-
-header = "phpBB3"
-
-; Specifies the footer text to be placed at the bottom of each output file. The
-; footer will be placed to the right of the lower navigation bar.
-
-footer = "phpBB3"
-
-; Specifies the text to be placed at the bottom of each output file. The text
-; will be placed at the bottom of the page, below the lower navigation bar.
-
-;bottom = "This document was generated by <a href="http://peej.github.com/phpdoctor/">PHPDoctor: The PHP Documentation Creator</a>"
-
-; Create a class tree?
-
-;tree = off
-
-; Use GeSHi to include formatted source files in the documentation. PHPDoctor will look in the current doclet directory for a /geshi subdirectory. Unpack the GeSHi archive from http://qbnz.com/highlighter to get this directory - it will contain a php script and a subdirectory with formatting files.
-
-include_source = off
-

build/sami.conf.php

@@ -0,0 +1,59 @@
+<?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.
+*
+*/
+
+// Prevent 'Class "acm" does not exist.' exception on removeClass().
+class PhpbbArrayStore extends Sami\Store\ArrayStore
+{
+	public function removeClass(Sami\Project $project, $name)
+	{
+		unset($this->classes[$name]);
+	}
+}
+
+$iterator = Symfony\Component\Finder\Finder::create()
+	->files()
+	->name('*.php')
+	->in(__DIR__ . '/../phpBB/')
+	->notPath('#^cache/#')
+	->notPath('#^develop/#')
+	->notPath('#^ext/#')
+	->notPath('#^vendor/#')
+	->notPath('data')
+;
+
+$versions = Sami\Version\GitVersionCollection::create(__DIR__ . '/../')
+	/*
+	This would be nice, but currently causes various problems that need
+	debugging.
+	->addFromTags('release-3.0.*')
+	->add('develop-olympus', '3.0-next (olympus)')
+	->addFromTags('release-3.1.*')
+	->add('develop-ascraeus', '3.1-next (ascraeus)')
+	->add('develop')
+	*/
+	->add('develop-olympus')
+	->add('develop-ascraeus')
+;
+
+$config = array(
+	'theme'                => 'enhanced',
+	'versions'             => $versions,
+	'title'                => 'phpBB API Documentation',
+	'build_dir'            => __DIR__.'/api/output/%version%',
+	'cache_dir'            => __DIR__.'/api/cache/%version%',
+	'default_opened_level' => 2,
+	// Do not use JsonStore. See https://github.com/fabpot/Sami/issues/79
+	'store'                => new PhpbbArrayStore,
+);
+
+return new Sami\Sami($iterator, $config);

git-tools/commit-msg-hook-range.sh

@@ -1,7 +1,12 @@
 #!/bin/bash
 #
-# @copyright (c) 2014 phpBB Group
-# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+# 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.
 #
 # Calls the git commit-msg hook on all non-merge commits in a given commit range.
 #

git-tools/hooks/commit-msg

@@ -191,12 +191,12 @@ do
 				err=$ERR_HEADER;
 				echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] .+$"
 				result=$?
-				if ! echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] [A-Z].+$"
+				if ! echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] [a-zA-Z].+$"
 				then
 					# Don't be too strict.
 					# Commits may be temporary, intended to be squashed later.
 					# Just issue a warning here.
-					complain "$severity: heading should be a sentence beginning with a capital letter." 1>&2
+					complain "$severity: heading should be a sentence beginning with a letter." 1>&2
 					complain "You entered:" 1>&2
 					complain "$line" 1>&2
 				fi

git-tools/merge.php

@@ -2,9 +2,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 

git-tools/setup_github_network.php

@@ -2,9 +2,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 

phpBB/adm/index.php

@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package acp
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -50,7 +54,13 @@ $module_id		= request_var('i', '');
 $mode			= request_var('mode', '');
 
 // Set custom style for admin area
-$template->set_custom_style('adm', $phpbb_admin_path . 'style');
+$template->set_custom_style(array(
+	array(
+		'name' 		=> 'adm',
+		'ext_path' 	=> 'adm/style/',
+	),
+), $phpbb_admin_path . 'style');
+
 $template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
 $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
 

phpBB/adm/style/acp_attachments.html

@@ -205,8 +205,8 @@
 		</dl>
 		<dl>
 			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}{L_COLON}</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label>
-				<label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>
+			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label></dd>
+			<dd><label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>
 			<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
 		</dl>
 
@@ -284,8 +284,6 @@
 	</fieldset>
 	</form>
 
-	<br />
-
 	<form id="change_ext" method="post" action="{U_ACTION}">
 
 	<fieldset class="tabulated">
@@ -331,15 +329,15 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<table class="table1 zebra-table">
+	<table class="table1 zebra-table fixed-width-table">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
-		<th>{L_FILEDATE}</th>
-		<th>{L_FILESIZE}</th>
-		<th>{L_ATTACH_POST_ID}</th>
-		<th>{L_ATTACH_TO_POST}</th>
-		<th>{L_DELETE}</th>
+		<th style="width: 15%;">{L_FILEDATE}</th>
+		<th style="width: 15%;">{L_FILESIZE}</th>
+		<th style="width: 15%;">{L_ATTACH_POST_ID}</th>
+		<th style="width: 15%;">{L_ATTACH_TO_POST}</th>
+		<th style="width: 15%;">{L_DELETE}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -348,7 +346,7 @@
 			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
 			<td>{orphan.FILETIME}</td>
 			<td>{orphan.FILESIZE}</td>
-			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>
+			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" maxlength="10" value="{orphan.POST_ID}" style="width: 75%;" /></td>
 			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
 			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
 		</tr>
@@ -390,13 +388,13 @@
 	</div>
 
 <!-- IF .attachments -->
-	<table class="table1 zebra-table">
+	<table class="table1 zebra-table fixed-width-table">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
-		<th>{L_POSTED}</th>
-		<th class="centered-text">{L_FILESIZE}</th>
-		<th class="centered-text">{L_MARK}</th>
+		<th style="width: 15%;">{L_POSTED}</th>
+		<th style="width: 15%;" class="centered-text">{L_FILESIZE}</th>
+		<th style="width: 10%;" class="centered-text">{L_MARK}</th>
 	</tr>
 	</thead>
 	<tbody>

phpBB/adm/style/acp_avatar_options_local.html

@@ -1,7 +1,6 @@
 <dl>
 	<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
 	<dd><select name="avatar_local_cat" id="category">
-		<option value="">{L_NO_AVATAR_CATEGORY}</option>
 		<!-- BEGIN avatar_local_cats -->
 		<option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
 		<!-- END avatar_local_cats -->

phpBB/adm/style/acp_ban.html

@@ -13,27 +13,34 @@
 
 	var ban_length = new Array();
 		ban_length[-1] = '';
-	<!-- BEGIN ban_length -->
-		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}';
-	<!-- END ban_length -->
-
 	var ban_reason = new Array();
 		ban_reason[-1] = '';
-	<!-- BEGIN ban_reason -->
-		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}';
-	<!-- END ban_reason -->
-
 	var ban_give_reason = new Array();
 		ban_give_reason[-1] = '';
-	<!-- BEGIN ban_give_reason -->
-		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}';
-	<!-- END ban_give_reason -->
+
+	<!-- BEGIN bans -->
+		ban_length['{bans.BAN_ID}'] = '{bans.A_LENGTH}';
+		<!-- IF bans.A_REASON -->
+			ban_reason['{bans.BAN_ID}'] = '{bans.A_REASON}';
+		<!-- ENDIF -->
+		<!-- IF bans.A_GIVE_REASON -->
+			ban_give_reason['{bans.BAN_ID}'] = '{bans.A_GIVE_REASON}';
+		<!-- ENDIF -->
+	<!-- END bans -->
 
 	function display_details(option)
 	{
-		document.getElementById('acp_unban').unbangivereason.innerHTML = ban_give_reason[option];
-		document.getElementById('acp_unban').unbanreason.innerHTML = ban_reason[option];
-		document.getElementById('acp_unban').unbanlength.value = ban_length[option];
+		document.getElementById('unbanlength').value = ban_length[option];
+		if (option in ban_reason) {
+			document.getElementById('unbanreason').innerHTML = ban_reason[option];
+		} else {
+			document.getElementById('unbanreason').innerHTML = '';
+		}
+		if (option in ban_give_reason) {
+			document.getElementById('unbangivereason').innerHTML = ban_give_reason[option];
+		} else {
+			document.getElementById('unbangivereason').innerHTML = '';
+		}
 	}
 
 // ]]>

phpBB/adm/style/acp_board.html

@@ -33,9 +33,12 @@
 <!-- END options -->
 
 <!-- IF S_AUTH -->
+	</fieldset>
 	<!-- BEGIN auth_tpl -->
 		<!-- INCLUDE {auth_tpl.TEMPLATE_FILE} -->
 	<!-- END auth_tpl -->
+	<fieldset>
+		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
 <!-- ENDIF -->
 
 	<p class="submit-buttons">

phpBB/adm/style/acp_captcha.html

@@ -6,6 +6,7 @@
 
 <p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>
 
+<p>{L_ACP_VC_EXT_GET_MORE}</p>
 
 <form id="acp_captcha" method="post" action="{U_ACTION}">
 

phpBB/adm/style/acp_contact.html

@@ -0,0 +1,76 @@
+<!-- INCLUDE overall_header.html -->
+
+<script type="text/javascript">
+// <![CDATA[
+
+	var form_name = 'acp_contact';
+	var text_name = 'contact_admin_info';
+	var load_draft = false;
+	var upload = false;
+	var imageTag = false;
+
+// ]]>
+</script>
+
+<a id="maincontent"></a>
+
+<h1>{L_ACP_CONTACT_SETTINGS}</h1>
+
+<p>{L_ACP_CONTACT_SETTINGS_EXPLAIN}</p>
+
+<form id="acp_contact" method="post" action="{U_ACTION}">
+	<fieldset>
+		<legend>{L_GENERAL_OPTIONS}</legend>
+		<dl>
+			<dt><label for="contact_admin_form_enable">{L_CONTACT_US_ENABLE}{L_COLON}</label><br /><span>{L_CONTACT_US_ENABLE_EXPLAIN}</span></dt>
+			<dd>
+				<label><input type="radio" class="radio" id="contact_admin_form_enable" name="contact_admin_form_enable" value="1"<!-- IF CONTACT_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
+				<label><input type="radio" class="radio" name="contact_admin_form_enable" value="0"<!-- IF not CONTACT_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label>
+			</dd>
+		</dl>
+	</fieldset>
+
+	<!-- IF CONTACT_US_INFO_PREVIEW -->
+	<fieldset>
+		<legend>{L_CONTACT_US_INFO_PREVIEW}</legend>
+		<p>{CONTACT_US_INFO_PREVIEW}</p>
+	</fieldset>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend>{L_CONTACT_US_INFO}</legend>
+		<p>{L_CONTACT_US_INFO_EXPLAIN}</p>
+
+		<!-- INCLUDE acp_posting_buttons.html -->
+
+		<dl class="responsive-columns">
+			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
+			</dt>
+
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;">
+				<textarea name="contact_admin_info" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{CONTACT_US_INFO}</textarea>
+			</dd>
+
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
+				<!-- IF S_BBCODE_ALLOWED -->
+				<label><input type="checkbox" class="radio" name="disable_bbcode"<!-- IF S_BBCODE_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_BBCODE}</label>
+				<!-- ENDIF -->
+				<!-- IF S_SMILIES_ALLOWED -->
+				<label><input type="checkbox" class="radio" name="disable_smilies"<!-- IF S_SMILIES_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_SMILIES}</label>
+				<!-- ENDIF -->
+				<!-- IF S_LINKS_ALLOWED -->
+				<label><input type="checkbox" class="radio" name="disable_magic_url"<!-- IF S_MAGIC_URL_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_MAGIC_URL}</label>
+				<!-- ENDIF -->
+			</dd>
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
+		</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+</form>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_ext_details.html

@@ -6,6 +6,22 @@
 
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
+	<!-- IF S_VERSIONCHECK -->
+	<div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->">
+		<p>{UP_TO_DATE_MSG} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+	</div>
+	<!-- ELSE IF S_VERSIONCHECK_STATUS == 0 -->
+	<div class="errorbox notice">
+		<p>{L_VERSIONCHECK_FAIL}</p>
+		<p>{VERSIONCHECK_FAIL_REASON}</p>
+		<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+	</div>
+	<!-- ELSE IF S_VERSIONCHECK_STATUS == 1 -->
+	<div class="errorbox notice">
+		<p>{VERSIONCHECK_FAIL_REASON}</p>
+	</div>
+	<!-- ENDIF -->
+
 	<fieldset>
 		<legend>{L_EXT_DETAILS}</legend>
 		<!-- IF META_DISPLAY_NAME -->
@@ -46,6 +62,32 @@
 		</dl>
 	</fieldset>
 
+	<!-- IF S_VERSIONCHECK && not S_UP_TO_DATE -->
+	<fieldset>
+		<legend>{L_LATEST_VERSION}</legend>
+		<!-- BEGIN updates_available -->
+		<fieldset>
+			<dl>
+				<dt><label>{L_VERSION}{L_COLON}</label></dt>
+				<dd><strong>{updates_available.current}</strong></dd>
+			</dl>
+			<!-- IF updates_available.download-->
+			<dl>
+				<dt><label>{L_DOWNLOAD_LATEST}</label></dt>
+				<dd><strong><a href="{updates_available.download}">{L_DOWNLOAD} {META_NAME} {LATEST_VERSION}</a></strong></dd>
+			</dl>
+			<!-- ENDIF -->
+			<!-- IF updates_available.announcement -->
+			<dl>
+				<dt><label>{L_ANNOUNCEMENT_TOPIC}</label></dt>
+				<dd><strong><a href="{updates_available.announcement}">{L_RELEASE_ANNOUNCEMENT}</a></strong></dd>
+			</dl>
+			<!-- ENDIF -->
+		</fieldset>
+		<!-- END updates_available -->
+	</fieldset>
+	<!-- ENDIF -->
+
 	<!-- IF META_REQUIRE_PHPBB || META_REQUIRE_PHP -->
 	<fieldset>
 		<legend>{L_REQUIREMENTS}</legend>

phpBB/adm/style/acp_ext_disable.html

@@ -8,19 +8,19 @@
 	<p>{L_EXTENSION_DISABLE_EXPLAIN}</p>
 
 	<!-- IF PRE -->
-	<div class="errorbox">
+	<fieldset>
+		<h2>{L_CONFIRM}</h2>
 		<p>{L_CONFIRM_MESSAGE}</p>
-	</div>
+	</fieldset>
 
 	<form id="acp_extensions" method="post" action="{U_DISABLE}">
 	<fieldset class="submit-buttons">
-		<legend>{L_EXTENSION_DISABLE}</legend>
 		<input class="button1" type="submit" name="disable" value="{L_EXTENSION_DISABLE}" />
 		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="errorbox">
+		<div class="successbox notice">
 			<p>{L_EXTENSION_DISABLE_IN_PROGRESS}</p>
 		</div>
 	<!-- ELSE -->

phpBB/adm/style/acp_ext_enable.html

@@ -14,19 +14,19 @@
 		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 	</div>
 	<!-- ELSEIF PRE -->
-	<div class="errorbox">
+	<fieldset>
+		<h2>{L_CONFIRM}</h2>
 		<p>{L_CONFIRM_MESSAGE}</p>
-	</div>
+	</fieldset>
 
 	<form id="acp_extensions" method="post" action="{U_ENABLE}">
 	<fieldset class="submit-buttons">
-		<legend>{L_EXTENSION_ENABLE}</legend>
 		<input class="button1" type="submit" name="enable" value="{L_EXTENSION_ENABLE}" />
 		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="errorbox">
+		<div class="successbox notice">
 			<p>{L_EXTENSION_ENABLE_IN_PROGRESS}</p>
 		</div>
 	<!-- ELSE -->

phpBB/adm/style/acp_ext_list.html

@@ -6,23 +6,56 @@
 
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
+	<fieldset class="quick">
+		<span class="small"><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
+	</fieldset>
+
+	<form id="version_check_settings" method="post" action="{U_ACTION}" style="display:none">
+
+	<fieldset>
+		<legend>{L_EXTENSIONS_VERSION_CHECK_SETTINGS}</legend>
+		<dl>
+			<dt><label for="force_unstable">{L_FORCE_UNSTABLE}{L_COLON}</label></dt>
+			<dd>
+				<label><input type="radio" id="force_unstable" name="force_unstable" class="radio" value="1"<!-- IF FORCE_UNSTABLE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" name="force_unstable" class="radio" value="0"<!-- IF not FORCE_UNSTABLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
+			</dd>
+		</dl>
+
+		<p class="submit-buttons">
+			<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+			<input class="button2" type="reset" name="reset" value="{L_RESET}" />
+			<input type="hidden" name="action" value="set_config_version_check_force_unstable" />
+			{S_FORM_TOKEN}
+		</p>
+	</fieldset>
+	</form>
+
 	<table class="table1">
-		<col class="row1" ><col class="row2" ><col class="row2" >
+		<col class="row1" ><col class="row1" ><col class="row2" ><col class="row2" >
 	<thead>
 		<tr>
 			<th>{L_EXTENSION_NAME}</th>
-			<th>{L_EXTENSION_OPTIONS}</th>
-			<th>{L_EXTENSION_ACTIONS}</th>
+			<th style="text-align: center; width: 20%;">{L_CURRENT_VERSION}</th>
+			<th style="text-align: center; width: 10%;">{L_EXTENSION_OPTIONS}</th>
+			<th style="text-align: center; width: 25%;">{L_EXTENSION_ACTIONS}</th>
 		</tr>
 	</thead>
 	<tbody>
 		<!-- IF .enabled -->
 		<tr>
-			<td class="row3" colspan="3"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
+			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
 		</tr>
 		<!-- BEGIN enabled -->
 		<tr class="ext_enabled">
 			<td><strong>{enabled.META_DISPLAY_NAME}</strong></td>
+			<td style="text-align: center;">
+				<!-- IF enabled.S_VERSIONCHECK -->
+				<strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.META_VERSION}</strong>
+				<!-- ELSE -->
+				{enabled.META_VERSION}
+				<!-- ENDIF -->
+			</td>
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
 			<td style="text-align: center;">
 				<!-- BEGIN actions -->
@@ -36,11 +69,18 @@
 
 		<!-- IF .disabled -->
 		<tr>
-			<td class="row3" colspan="3"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
+			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
 		</tr>
 		<!-- BEGIN disabled -->
 		<tr class="ext_disabled">
 			<td><strong>{disabled.META_DISPLAY_NAME}</strong></td>
+			<td style="text-align: center;">
+				<!-- IF disabled.S_VERSIONCHECK -->
+				<strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.META_VERSION}</strong>
+				<!-- ELSE -->
+				{disabled.META_VERSION}
+				<!-- ENDIF -->
+			</td>
 			<td style="text-align: center;">
 				<!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF -->
 			</td>
@@ -55,7 +95,6 @@
 		<!-- ENDIF -->
 	</tbody>
 	</table>
-	<br />
 
 	<table class="table1">
 	<tr>

phpBB/adm/style/acp_forums.html

@@ -284,12 +284,12 @@
 				<label><input type="radio" class="radio" name="enable_shadow_prune" value="0"<!-- IF not S_PRUNE_SHADOW_ENABLE --> id="enable_shadow_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_SHADOW_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_FREQ_EXPLAIN}</span></dt>
+			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_SHADOW_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}</span></dt>
+			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		</fieldset>
 	</div>

phpBB/adm/style/acp_groups.html

@@ -56,6 +56,7 @@
 
 	<fieldset>
 		<legend>{L_GROUP_OPTIONS_SAVE}</legend>
+	<!-- EVENT acp_group_options_before -->
 	<!-- IF S_USER_FOUNDER -->
 	<dl>
 		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}{L_COLON}</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>
@@ -78,6 +79,7 @@
 		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}{L_COLON}</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>
 		<dd><input name="group_receive_pm" type="checkbox" value="1" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>
 	</dl>
+	<!-- EVENT acp_group_options_after -->
 	</fieldset>
 
 	<fieldset>
@@ -114,10 +116,9 @@
 	</dl>
 	<dl>
 		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
-		<dd><select name="avatar_driver" id="avatar_driver">
-			<option value="">{L_NO_AVATAR_CATEGORY}</option>
+		<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
 			<!-- BEGIN avatar_drivers -->
-			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 			<!-- END avatar_drivers -->
 		</select></dd>
 	</dl>
@@ -139,8 +140,6 @@
 	</fieldset>
 	</form>
 
-	<!-- INCLUDEJS avatars.js -->
-
 <!-- ELSEIF S_LIST -->
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>

phpBB/adm/style/acp_inactive.html

@@ -2,14 +2,12 @@
 
 <a id="maincontent"></a>
 
-<h2>{L_INACTIVE_USERS}</h2>
+<h1>{L_INACTIVE_USERS}</h1>
 
 <p>{L_INACTIVE_USERS_EXPLAIN}</p>
 
 <form id="inactive" method="post" action="{U_ACTION}">
 
-<div class="clearfix"></div>
-
 <!-- IF .pagination -->
 <div class="pagination">
 	<!-- INCLUDE pagination.html -->

phpBB/adm/style/acp_language.html

@@ -2,29 +2,7 @@
 
 <a id="maincontent"></a>
 
-<!-- IF S_SELECT_METHOD -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_SELECT_DOWNLOAD_FORMAT}</h1>
-
-	<form id="selectmethod" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_DOWNLOAD_AS}</legend>
-	<dl>
-		<dt><label for="use_method">{L_DOWNLOAD_AS}{L_COLON}</label></dt>
-		<dd>{RADIO_BUTTONS}</dd>
-	</dl>
-
-	<p class="quick">
-		<input type="submit" class="button2" value="{L_DOWNLOAD}" name="download" />
-	</p>
-	</fieldset>
-
-	</form>
-
-<!-- ELSEIF S_DETAILS -->
+<!-- IF S_DETAILS -->
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
@@ -58,153 +36,32 @@
 	</fieldset>
 	</form>
 
-	<br /><br />
+	<!-- IF .missing_files -->
+		<h3 class="error">{L_MISSING_FILES}</h3>
 
-	<!-- IF S_MISSING_FILES -->
-		<div class="errorbox">
-			<h3>{L_MISSING_FILES}</h3>
-			<p>{MISSING_FILES}</p>
-		</div>
-		<br /><br />
-	<!-- ENDIF -->
-
-	<!-- IF S_MISSING_VARS -->
-		<h1>{L_MISSING_LANG_VARIABLES}</h1>
-
-		<p>{L_MISSING_VARS_EXPLAIN}</p>
-
-		<form id="missing" method="post" action="{U_MISSING_ACTION}">
-
-		<table class="table1">
-		<thead>
-		<tr>
-			<th>{L_LANGUAGE_KEY}</th>
-			<th>{L_LANGUAGE_VARIABLE}</th>
-		</tr>
-		</thead>
-		<tbody>
-		<!-- BEGIN missing -->
-			<tr class="row4">
-				<td><strong>{missing.FILE}</strong></td>
-				<td style="text-align: right;"><input type="submit" name="missing_file[{missing.KEY}]" value="{L_SELECT}" class="button2" /></td>
-			</tr>
-			{missing.TPL}
-		<!-- END missing -->
-		</tbody>
-		</table>
-		<div>{S_FORM_TOKEN}</div>
-		</form>
-
-		<br /><br />
-	<!-- ENDIF -->
-
-	<a id="entries"></a>
-
-	<h1>{L_LANGUAGE_ENTRIES}</h1>
-
-	<p>{L_LANGUAGE_ENTRIES_EXPLAIN}</p>
-
-	<form id="lang_entries" method="post" action="{U_ENTRY_ACTION}">
-
-	<!-- IF S_FROM_STORE -->
-		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
-			<input type="submit" name="remove_store" value="{L_REMOVE_FROM_STORAGE_FOLDER}" class="button2" /> 
+		<fieldset>
+			<legend>{L_MISSING_LANG_FILES}</legend>
+			<!-- BEGIN missing_files -->
+			&raquo; {missing_files.FILE_NAME}<br />
+			<!-- END missing_files -->
 		</fieldset>
 	<!-- ENDIF -->
 
-	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<select name="language_file">{S_LANG_OPTIONS}</select>&nbsp;<input type="submit" class="button2" name="change" value="{L_SELECT}" />
-	</fieldset>
+	<!-- IF .missing_varfile -->
+		<h3 class="error">{L_MISSING_VARS_EXPLAIN}</h3>
 
-	<p>&nbsp;<br />&nbsp;</p>
-
-
-	<!--[if lt IE 8]>
-	<style type="text/css">
-	/* <![CDATA[ */
-		input.langvalue, textarea.langvalue {
-		width: 450px;
-		}
-	/* ]]> */
-	</style>
-	<![endif]-->
-
-	<table class="table1">
-	<thead>
-	<!-- IF S_EMAIL_FILE -->
-		<tr>
-			<th colspan="2">{L_FILE_CONTENTS}</th>
-		</tr>
-	<!-- ELSE -->
-		<tr>
-			<th>{L_LANGUAGE_KEY}</th>
-			<th>{L_LANGUAGE_VARIABLE}</th>
-		</tr>
+		<fieldset>
+			<legend>{L_MISSING_LANG_VARIABLES}</legend>
+			<!-- BEGIN missing_varfile -->
+			<dl>
+				<dt><label>{missing_varfile.FILE_NAME}</label></dt>
+				<!-- BEGIN variable -->
+				<dd>{missing_varfile.variable.VAR_NAME}</dd>
+				<!-- END variable -->
+			</dl>
+			<!-- END missing_varfile -->
+		</fieldset>
 	<!-- ENDIF -->
-	<tr>
-		<td rowspan="2" class="row3"><strong>{PRINT_MESSAGE}<!-- IF S_FROM_STORE --><br /><span style="color: red;">{L_FILE_FROM_STORAGE}</span><!-- ENDIF --></strong></td>
-		<td class="row3" style="text-align: right;"><input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
-	</tr>
-	<tr>
-		<td class="row3" style="text-align: right;">	
-		<!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}{L_COLON}&nbsp;<!-- BEGIN buttons --><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" />&nbsp;{buttons.VALUE}&nbsp;<!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- IF S_EMAIL_FILE -->
-		<tr>
-			<td class="row2" colspan="2" style="text-align: center;"><textarea name="entry" id="entry" cols="80" rows="20">{LANG}</textarea></td>
-		</tr>
-	<!-- ELSE -->
-		{TPL}
-	<!-- ENDIF -->
-	<tr>
-		<td class="row3" colspan="3" style="text-align: right;">{S_FORM_TOKEN}<input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
-	</tr>
-	</tbody>
-	</table>
-	</form>
-
-<!-- ELSEIF S_UPLOAD -->
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_UPLOAD_SETTINGS}</h1>
-
-	<form id="upload" method="post" action="{U_ACTION}">
-
-	<!-- IF S_CONNECTION_SUCCESS -->
-		<div class="successbox">
-			<p>{L_CONNECTION_SUCCESS}</p>
-		</div>
-	<!-- ELSEIF S_CONNECTION_FAILED -->
-		<div class="errorbox">
-			<p>{L_CONNECTION_FAILED}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_UPLOAD_SETTINGS}</legend>
-	<dl>
-		<dt><label>{L_UPLOAD_METHOD}{L_COLON}</label></dt>
-		<dd><strong>{NAME}</strong></dd>
-	</dl>
-	<!-- BEGIN data -->
-	<dl>
-		<dt><label for="{data.DATA}">{data.NAME}{L_COLON}</label><br /><span>{data.EXPLAIN}</span></dt>
-		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
-	</dl>
-	<!-- END data -->
-	</fieldset>
-	
-	<fieldset class="quick">
-		{HIDDEN}
-		{S_FORM_TOKEN}
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
-	</fieldset>
-	</form>
-
 <!-- ELSE -->
 
 	<h1>{L_ACP_LANGUAGE_PACKS}</h1>
@@ -231,7 +88,7 @@
 		<td>{lang.LOCAL_NAME}</td>
 		<td style="text-align: center;"><strong>{lang.ISO}</strong></td>
 		<td style="text-align: center;">{lang.USED_BY}</td>
-		<td style="text-align: center;">&nbsp;<a href="{lang.U_DOWNLOAD}">{L_DOWNLOAD}</a>&nbsp;|&nbsp;<a href="{lang.U_DELETE}">{L_DELETE}</a></td>
+		<td style="text-align: center;"><a href="{lang.U_DELETE}">{L_DELETE}</a></td>
 	</tr>
 	<!-- END lang -->
 	<!-- IF .notinst -->

phpBB/adm/style/acp_logs.html

@@ -8,7 +8,7 @@
 
 <form id="list" method="post" action="{U_ACTION}">
 
-<fieldset class="display-options" style="float: left">
+<fieldset class="display-options search-box">
 	{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
 </fieldset>
 
@@ -18,19 +18,16 @@
 </div>
 <!-- ENDIF -->
 
-<div class="clearfix">&nbsp;</div>
-<div><br style="clear: both;" /></div>
-
 <!-- IF .log -->
-	<table class="table1 zebra-table">
+	<table class="table1 zebra-table fixed-width-table">
 	<thead>
 	<tr>
-		<th>{L_USERNAME}</th>
-		<th>{L_IP}</th>
-		<th>{L_TIME}</th>
+		<th style="width: 15%;">{L_USERNAME}</th>
+		<th style="width: 15%;">{L_IP}</th>
+		<th style="width: 20%;">{L_TIME}</th>
 		<th>{L_ACTION}</th>
 		<!-- IF S_CLEARLOGS -->
-			<th>{L_MARK}</th>
+			<th style="width: 50px;">{L_MARK}</th>
 		<!-- ENDIF -->
 	</tr>
 	</thead>

phpBB/adm/style/acp_main.html

@@ -243,9 +243,6 @@
 		<!-- END log -->
 		</tbody>
 		</table>
-
-		<br />
-
 	<!-- ENDIF -->
 
 	<!-- IF S_INACTIVE_USERS -->
@@ -287,7 +284,6 @@
 		<!-- END inactive -->
 		</tbody>
 		</table>
-
 	<!-- ENDIF -->
 
 <!-- ENDIF -->

phpBB/adm/style/acp_posting_buttons.html

@@ -0,0 +1,70 @@
+<script type="text/javascript">
+// <![CDATA[
+
+	// Define the bbCode tags
+	var bbcode = new Array();
+	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
+
+	// Helpline messages
+	var help_line = {
+		b: '{LA_BBCODE_B_HELP}',
+		i: '{LA_BBCODE_I_HELP}',
+		u: '{LA_BBCODE_U_HELP}',
+		q: '{LA_BBCODE_Q_HELP}',
+		c: '{LA_BBCODE_C_HELP}',
+		l: '{LA_BBCODE_L_HELP}',
+		o: '{LA_BBCODE_O_HELP}',
+		p: '{LA_BBCODE_P_HELP}',
+		w: '{LA_BBCODE_W_HELP}',
+		a: '{LA_BBCODE_A_HELP}',
+		s: '{LA_BBCODE_S_HELP}',
+		f: '{LA_BBCODE_F_HELP}',
+		y: '{LA_BBCODE_Y_HELP}',
+		d: '{LA_BBCODE_D_HELP}'
+		<!-- BEGIN custom_tags -->
+			,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'
+		<!-- END custom_tags -->
+	}
+
+// ]]>
+</script>
+
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
+
+<!-- EVENT acp_posting_buttons_before -->
+<div id="format-buttons">
+	<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
+	<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
+	<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
+	<!-- IF S_BBCODE_QUOTE -->
+		<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
+	<!-- ENDIF -->
+	<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
+	<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
+	<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
+	<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
+	<!-- IF S_BBCODE_IMG -->
+		<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
+	<!-- ENDIF -->
+	<!-- IF S_LINKS_ALLOWED -->
+		<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
+	<!-- ENDIF -->
+	<!-- IF S_BBCODE_FLASH -->
+		<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
+	<!-- ENDIF -->
+	<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
+		<option value="50">{L_FONT_TINY}</option>
+		<option value="85">{L_FONT_SMALL}</option>
+		<option value="100" selected="selected">{L_FONT_NORMAL}</option>
+		<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
+		<option value="150">{L_FONT_LARGE}</option>
+		<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
+		<option value="200">{L_FONT_HUGE}</option>
+		<!-- ENDIF -->
+		<!-- ENDIF -->
+	</select>
+	<!-- BEGIN custom_tags -->
+	<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
+	<!-- END custom_tags -->
+</div>
+<!-- EVENT acp_posting_buttons_after -->

phpBB/adm/style/acp_ranks.html

@@ -24,6 +24,9 @@
 	
 	<fieldset>
 		<legend>{L_ACP_RANKS}</legend>
+
+	<!-- EVENT acp_ranks_edit_before -->
+
 	<dl>
 		<dt><label for="title">{L_RANK_TITLE}{L_COLON}</label></dt>
 		<dd><input name="title" type="text" id="title" value="{RANK_TITLE}" maxlength="255" /></dd>
@@ -38,13 +41,15 @@
 		<dd><label><input onclick="phpbb.toggleDisplay('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input onclick="phpbb.toggleDisplay('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
-	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
+	<div id="posts"<!-- IF S_SPECIAL_RANK --> style="display: none;"<!-- ENDIF -->>
 	<dl>
 		<dt><label for="min_posts">{L_RANK_MINIMUM}{L_COLON}</label></dt>
 		<dd><input name="min_posts" type="number" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
 	</dl>
 	</div>
 
+	<!-- EVENT acp_ranks_edit_after -->
+
 	<p class="submit-buttons">
 		<input type="hidden" name="action" value="save" />
 
@@ -68,18 +73,22 @@
 	<table class="table1 zebra-table">
 	<thead>
 	<tr>
+		<!-- EVENT acp_ranks_list_header_before -->
 		<th>{L_RANK_IMAGE}</th>
 		<th>{L_RANK_TITLE}</th>
 		<th>{L_RANK_MINIMUM}</th>
+		<!-- EVENT acp_ranks_list_header_after -->
 		<th>{L_ACTION}</th>
 	</tr>
 	</thead>
 	<tbody>
 	<!-- BEGIN ranks -->
 	<tr>
+		<!-- EVENT acp_ranks_list_column_before -->
 		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE -->&nbsp; - &nbsp;<!-- ENDIF --></td>
 		<td style="text-align: center;">{ranks.RANK_TITLE}</td>
 		<td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK -->&nbsp; - &nbsp;<!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td>
+		<!-- EVENT acp_ranks_list_column_after -->
 		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a></td>
 	</tr>
 	<!-- END ranks -->

phpBB/adm/style/acp_search.html

@@ -46,13 +46,13 @@
 		<legend>{L_SEARCH_TYPE}</legend>
 	<dl>
 		<dt><label for="search_type">{L_SEARCH_TYPE}{L_COLON}</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
-		<dd><select id="search_type" name="config[search_type]">{S_SEARCH_TYPES}</select></dd>
+		<dd><select id="search_type" name="config[search_type]" data-togglable-settings="true">{S_SEARCH_TYPES}</select></dd>
 	</dl>
 	</fieldset>
 
 	<!-- BEGIN backend -->
 
-		<fieldset>
+		<fieldset id="search_{backend.IDENTIFIER}_settings">
 			<legend>{backend.NAME}</legend>
 		{backend.SETTINGS}
 		</fieldset>

phpBB/adm/style/acp_users.html

@@ -164,14 +164,14 @@
 	</div>
 
 	<!-- IF .attach -->
-	<table class="table1 zebra-table">
+	<table class="table1 zebra-table fixed-width-table">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
-		<th>{L_POST_TIME}</th>
-		<th>{L_FILESIZE}</th>
-		<th>{L_DOWNLOADS}</th>
-		<th>{L_MARK}</th>
+		<th style="width: 20%;">{L_POST_TIME}</th>
+		<th style="width: 20%;">{L_FILESIZE}</th>
+		<th style="width: 20%;">{L_DOWNLOADS}</th>
+		<th style="width: 50px;">{L_MARK}</th>
 	</tr>
 	</thead>
 	<tbody>

phpBB/adm/style/acp_users_avatar.html

@@ -13,10 +13,9 @@
 		<legend>{L_AVATAR_SELECT}</legend>
 		<dl>
 			<dt><label>{L_AVATAR_TYPE}</label></dt>
-			<dd><select name="avatar_driver" id="avatar_driver">
-				<option value="">{L_NO_AVATAR_CATEGORY}</option>
+			<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
 				<!-- BEGIN avatar_drivers -->
-				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
 			</select></dd>
 		</dl>
@@ -35,5 +34,3 @@
 	{S_FORM_TOKEN}
 	</fieldset>
 	</form>
-
-	<!-- INCLUDEJS avatars.js -->

phpBB/adm/style/acp_users_signature.html

@@ -5,36 +5,10 @@
 	var text_name = 'signature';
 	var load_draft = false;
 	var upload = false;
-
-	// Define the bbCode tags
-	var bbcode = new Array();
-	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
 	var imageTag = false;
 
-	// Helpline messages
-	var help_line = {
-		b: '{LA_BBCODE_B_HELP}',
-		i: '{LA_BBCODE_I_HELP}',
-		u: '{LA_BBCODE_U_HELP}',
-		q: '{LA_BBCODE_Q_HELP}',
-		c: '{LA_BBCODE_C_HELP}',
-		l: '{LA_BBCODE_L_HELP}',
-		o: '{LA_BBCODE_O_HELP}',
-		p: '{LA_BBCODE_P_HELP}',
-		w: '{LA_BBCODE_W_HELP}',
-		a: '{LA_BBCODE_A_HELP}',
-		s: '{LA_BBCODE_S_HELP}',
-		f: '{LA_BBCODE_F_HELP}',
-		y: '{LA_BBCODE_Y_HELP}',
-		d: '{LA_BBCODE_D_HELP}'
-		<!-- BEGIN custom_tags -->
-			,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'
-		<!-- END custom_tags -->
-	}
-
 // ]]>
 </script>
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 
 <form id="user_signature" method="post" action="{U_ACTION}">
 
@@ -49,43 +23,7 @@
 		<legend>{L_SIGNATURE}</legend>
 		<p>{L_SIGNATURE_EXPLAIN}</p>
 
-		<!-- EVENT acp_users_signature_editor_buttons_before -->
-		<div id="format-buttons">
-			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
-			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
-			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
-			<!-- IF S_BBCODE_QUOTE -->
-				<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
-			<!-- ENDIF -->
-			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
-			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
-			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
-			<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
-			<!-- IF S_BBCODE_IMG -->
-				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
-			<!-- ENDIF -->
-			<!-- IF S_LINKS_ALLOWED -->
-				<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
-			<!-- ENDIF -->
-			<!-- IF S_BBCODE_FLASH -->
-				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
-			<!-- ENDIF -->
-			<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
-				<option value="50">{L_FONT_TINY}</option>
-				<option value="85">{L_FONT_SMALL}</option>
-				<option value="100" selected="selected">{L_FONT_NORMAL}</option>
-				<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
-					<option value="150">{L_FONT_LARGE}</option>
-					<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
-						<option value="200">{L_FONT_HUGE}</option>
-					<!-- ENDIF -->
-				<!-- ENDIF -->
-			</select>
-			<!-- BEGIN custom_tags -->
-				<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
-			<!-- END custom_tags -->
-		</div>
-		<!-- EVENT acp_users_signature_editor_buttons_after -->
+		<!-- INCLUDE acp_posting_buttons.html -->
 
 		<dl class="responsive-columns">
 			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">

phpBB/adm/style/admin.css

@@ -1,7 +1,10 @@
 /*  phpBB 3.1 Admin Style Sheet
 	------------------------------------------------------------------------
 	Original author:	subBlue ( http://www.subblue.com/ )
-	Copyright 2007 phpBB Group ( http://www.phpbb.com/ )
+	Copyright (c) phpBB Limited <https://www.phpbb.com>
+
+	For full copyright and license information, please see
+	the docs/CREDITS.txt file.
 	------------------------------------------------------------------------
 */
 
@@ -106,6 +109,14 @@ hr {
 	text-align: center;
 }
 
+.search-box {
+	float: left;
+}
+
+.rtl .search-box {
+	float: right;
+}
+
 .small {
 	font-size: 0.85em;
 }
@@ -151,6 +162,10 @@ a:active {
 	font-weight: bold;
 }
 
+a#maincontent, a#acl, a#assigned_to {
+	display: block;
+}
+
 /* List items */
 ul, ol {
 	list-style-position: inside;
@@ -171,7 +186,6 @@ li {
 }
 
 #page-header {
-	clear: both;
 	text-align: right;
 	background: url("../images/phpbb_logo.png") top left no-repeat;
 	height: 54px;
@@ -200,12 +214,10 @@ li {
 }
 
 #page-body {
-	clear: both;
 	min-width: 650px;
 }
 
-#page-footer {
-	clear: both;
+.copyright {
 	font-size: 0.75em;
 	text-align: center;
 }
@@ -314,182 +326,155 @@ li {
 
 
 /* Tabbed menu
-	Based on: http://www.alistapart.com/articles/slidingdoors2/
 ----------------------------------------*/
 #tabs {
+	font-family: Arial, Helvetica, sans-serif;
 	line-height: normal;
 	margin: 0 7px;
-	min-width: 600px;
 	position: relative;
 	z-index: 2;
 }
 
-#tabs ul {
-	margin:0;
-	padding: 0;
+#tabs > ul {
 	list-style: none;
-}
-
-#tabs ul:after {
-	content: '';
-	display: block;
-	clear: both;
-}
-
-#tabs li {
-	display: block;
-	float: left;
 	margin: 0;
 	padding: 0;
+}
+
+#tabs .tab {
+	display: inline-block;
+	float: left;
 	font-size: 0.85em;
 	font-weight: bold;
+	line-height: 14px;
 }
 
-#tabs li:after {
-	content: '';
-	display: block;
-	clear: both;
-}
-
-#tabs a {
-	float: left;
-	background:url("../images/bg_tabs1.gif") no-repeat 0% -34px;
-	margin: 0 1px 0 0;
-	padding: 0 0 0 7px;
-	text-decoration: none;
-	position: relative;
-}
-
-.rtl #tabs li {
+.rtl #tabs .tab {
 	float: right;
 }
 
-#tabs a span {
-	float: left;
-	display: block;
-	background: url("../images/bg_tabs2.gif") no-repeat 100% -34px;
-	padding: 7px 10px 4px 4px;
-	min-height: 14px;
+#tabs .tab > a {
+	background: #D4D6DA;
+	background: -moz-linear-gradient(top, #CACBCF 0%, #D4D6DA 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #CACBCF), color-stop(100%, #D4D6DA));
+	background: -webkit-linear-gradient(top, #CACBCF 0%, #D4D6DA 100%);
+	background: -o-linear-gradient(top, #CACBCF 0%, #D4D6DA 100%);
+	background: -ms-linear-gradient(top, #CACBCF 0%, #D4D6DA 100%);
+	background: linear-gradient(to bottom, #CACBCF 0%, #D4D6DA 100%);
+	border: 1px solid #BBB;
+	border-bottom-width: 0;
+	border-radius: 5px 5px 0 0;
 	color: #767676;
-	white-space: nowrap;
-	font-family: Arial, Helvetica, sans-serif;
-	text-transform: uppercase;
+	display: block;
 	font-weight: bold;
+	margin: 1px 1px 2px 0;
+	padding: 6px 9px 4px;
+	position: relative;
+	text-decoration: none;
+	text-transform: uppercase;
+	white-space: nowrap;
+	cursor: pointer;
 }
 
-.rtl #tabs a span {
-	float: right;
-}
-
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-#tabs a span, .rtl #tabs a span { float:none;}
-/* End hack */
-
-#tabs a:hover span {
+#tabs .tab > a:hover {
+	background: #F1F1EE;
+	border-color: #C0BFBB;
 	color: #BC2A4D;
 }
 
-#tabs a:hover {
-	background-position: 0 -69px;
-}
-
-#tabs a:hover span {
-	background-position: 100% -69px;
-}
-
-#tabs .activetab a {
-	background-position: 0 0;
-	border-bottom: 1px solid #DCDEE2;
-}
-
-#tabs .activetab a span {
-	background-position: 100% 0;
-	padding-bottom: 5px;
+#tabs .activetab > a,
+#tabs .activetab > a:hover {
+	background: #DCDEE2;
+	background: -moz-linear-gradient(top, #F2F2F2 0%, #DCDEE2 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F2F2F2), color-stop(100%, #DCDEE2));
+	background: -webkit-linear-gradient(top, #F2F2F2 0%, #DCDEE2 100%);
+	background: -o-linear-gradient(top, #F2F2F2 0%, #DCDEE2 100%);
+	background: -ms-linear-gradient(top, #F2F2F2 0%, #DCDEE2 100%);
+	background: linear-gradient(to bottom, #F2F2F2 0%, #DCDEE2 100%);
+	border-color: #999;
+	border-bottom: 2px solid #DCDEE2;
+	box-shadow: 0 1px 1px #FFF inset;
 	color: #23649F;
+	margin: 0 1px 0 0;
+	padding: 7px 10px 4px;
 }
 
-#tabs .activetab a:hover span {
+#tabs .activetab > a:hover {
 	color: #115098;
 }
 
+/* Responsive tabs
+----------------------------------------*/
 .responsive-tab {
 	position: relative;
 }
 
-.responsive-tab .responsive-tab-link span {
-	display: inline-block;
+.responsive-tab > a.responsive-tab-link {
+	display: block;
 	font-size: 16px;
 	position: relative;
 	width: 16px;
 	line-height: 14px;
 	text-decoration: none;
+	padding-left: 9px !important;
+	padding-right: 9px !important;
 }
 
-.responsive-tab .responsive-tab-link span:before {
+.responsive-tab .responsive-tab-link:before {
 	content: '';
 	position: absolute;
-	left: 5px;
-	top: 8px;
+	left: 10px;
+	top: 7px;
 	height: .125em;
 	width: 14px;
 	border-bottom: 0.125em solid #767676;
 	border-top: 0.375em double #767676;
 }
 
-.responsive-tab .responsive-tab-link:hover span:before {
+.responsive-tab .responsive-tab-link:hover:before {
 	border-color: #BC2A4D;
 }
 
-.responsive-tab.activetab .responsive-tab-link span:before {
+.responsive-tab.activetab .responsive-tab-link:before {
 	border-color: #23649F;
 }
 
-.responsive-tab.activetab .responsive-tab-link:hover span:before {
+.responsive-tab.activetab .responsive-tab-link:hover:before {
 	border-color: #115098;
 }
 
-#tabs .dropdown {
-	top: 18px;
-	margin-right: -1px;
+#tabs .dropdown, #minitabs .dropdown {
+	top: 20px;
+	margin-right: -2px;
+	font-weight: normal;
 }
 
 #tabs .dropdown-right .dropdown {
 	margin-left: -2px;
 }
 
-#tabs .dropdown li {
-	display: block !important;
-	float: none;
-	background: transparent none;
-	padding: 0;
-}
-
-#tabs .dropdown a, #tabs .dropdown a span {
-	background: transparent;
-	display: block;
-	border-width: 0;
-	float: none;
+#tabs .dropdown-contents {
+	list-style: none;
 	margin: 0;
-	padding: 0;
-	text-align: right;
 }
 
-#tabs .dropdown a span {
+#tabs .dropdown li {
+	border-bottom: 1px dotted #DCDCDC;
+}
+
+#tabs .dropdown li:last-child {
+	border-bottom: none;
+}
+
+#tabs .dropdown a {
+	display: block;
 	padding: 4px 8px;
-	color: inherit !important;
-}
-
-@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
-{
-	#tabs {
-		min-width: 0;
-	}
+	text-align: right;
 }
 
 /* Main Panel
 ---------------------------------------- */
 #acp {
-	clear: both;
 	position: relative;
 	top: -2px;
 	margin: 0 0 2px;
@@ -737,6 +722,7 @@ td {
 .table1 {
 	border-collapse: separate;
 	border-spacing: 1px;
+	clear: both;
 }
 
 dt#color_palette_placeholder table {
@@ -876,10 +862,10 @@ table.zebra-table tbody tr:nth-child(even) {
 }
 
 /* Deactivated row */
-.row-inactive { 
-	color: #999; 
+.row-inactive {
+	color: #999;
 }
-.row-inactive a, .row-inactive strong { 
+.row-inactive a, .row-inactive strong {
 	color: #888;
 }
 .row-inactive a:hover {
@@ -911,6 +897,11 @@ table.styles td.users, table td.mark {
 	text-align: center;
 }
 
+table.fixed-width-table {
+	table-layout: fixed;
+	word-break: break-word;
+}
+
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
 {
 	table.responsive, table.responsive tbody, table.responsive tr, table.responsive td {
@@ -976,6 +967,10 @@ table.styles td.users, table td.mark {
 		margin-bottom: 1px;
 	}
 
+	.rtl table.responsive td {
+		text-align: right !important;
+	}
+
 	table.responsive td.empty {
 		display: none !important;
 	}
@@ -996,6 +991,10 @@ table.styles td.users, table td.mark {
 		box-sizing: border-box;
 	}
 
+	.rtl table.responsive.two-columns td {
+		float: right;
+	}
+
 	table.responsive.two-columns td:nth-child(2n+1) {
 		clear: left;
 	}
@@ -1071,6 +1070,10 @@ fieldset {
 	border-radius: 3px;
 }
 
+fieldset h2 {
+	margin-top: 0;
+}
+
 .rtl fieldset {
 	border-top: 1px solid #D7D7D7;
 	border-right: 1px solid #D7D7D7;
@@ -1129,6 +1132,11 @@ input.langvalue, textarea.langvalue {
 	width: 90%;
 }
 
+input[type="number"] {
+	width: 60px;
+	-moz-padding-end: 0;
+}
+
 optgroup, select {
 	background-color: #FAFAFA;
 	border: 1px solid #666666;
@@ -1223,8 +1231,8 @@ fieldset.quick legend {
 fieldset.tabulated {
 	background: none;
 	margin: 0;
+	margin-top: 5px;
 	padding: 0;
-	padding-top: 5px;
 	border: 0;
 }
 
@@ -1461,7 +1469,7 @@ input:focus, textarea:focus {
 {
 	select, dd select, dd input {
 		max-width: 240px;
-	}	
+	}
 }
 
 /* Submit button fieldset or paragraph
@@ -1582,7 +1590,6 @@ input.button1:focus, input.button2:focus {
 	z-index: 50;
 	padding: 25px;
 	padding: 0 25px 20px 25px;
-	text-align: left;
 }
 
 .phpbb_alert .alert_close {
@@ -1674,12 +1681,12 @@ input.button1:focus, input.button2:focus {
 	height: 1%; /* IE tweak (holly hack) */
 	width: auto;
 	text-align: right;
-	margin-top: 5px;
+	margin: 5px 0;
 }
 
 .top-pagination {
 	float: right;
-	margin: 15px 0 2px 0;
+	margin: 15px 0 5px 0;
 }
 
 .rtl .pagination {
@@ -1774,6 +1781,7 @@ li.pagination ul {
 	margin: 10px 0;
 	color: #FFFFFF;
 	text-align: center;
+	clear: both;
 }
 
 .success {
@@ -1875,17 +1883,7 @@ li.pagination ul {
 	vertical-align: middle;
 }
 
-/* Nice method for clearing floated blocks without having to insert any extra markup
-	From http://www.positioniseverything.net/easyclearing.html
-.clearfix:after, #tabs:after, .row:after, #content:after, fieldset dl:after, #page-body:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}*/
-
-.clearfix, .row, #content, fieldset dl, #page-body {
+.row, fieldset dl {
 	overflow: hidden;
 }
 
@@ -2468,3 +2466,20 @@ fieldset.permissions .padding {
 	.responsive-show-inline { display: inline !important; }
 	.responsive-show-inline-block { display: inline-block !important; }
 }
+
+.clearfix {
+	overflow: hidden;
+}
+
+.pagination:after,
+#page-header:after,
+#page-body:after,
+#tabs:after,
+#tabs > ul:after,
+#tabs li:after,
+#acp:after,
+#content:after {
+	content: '';
+	clear: both;
+	display: block;
+}

phpBB/adm/style/admin.js

@@ -75,7 +75,7 @@ function parse_document(container)
 				var cell = $(this),
 					colspan = parseInt(cell.attr('colspan')),
 					dfn = cell.attr('data-dfn'),
-					text = dfn ? dfn : cell.text().trim();
+					text = dfn ? dfn : $.trim(cell.text());
 
 				if (text == ' ') text = '';
 				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
@@ -114,7 +114,7 @@ function parse_document(container)
 			cells.each(function() {
 				var cell = $(this),
 					colspan = parseInt(cell.attr('colspan')),
-					text = cell.text().trim();
+					text = $.trim(cell.text());
 
 				if (headersLength <= column) {
 					return;
@@ -169,7 +169,7 @@ function parse_document(container)
 			ul = $this.children(),
 			tabs = ul.children().not('[data-skip-responsive]'),
 			links = tabs.children('a'),
-			item = ul.append('<li class="responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"><span>&nbsp;</span></a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
+			item = ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
 			menu = item.find('.dropdown-contents'),
 			maxHeight = 0,
 			lastWidth = false,
@@ -211,7 +211,7 @@ function parse_document(container)
 
 			for (i = total - 1; i >= 0; i --) {
 				tab = availableTabs.eq(i);
-				menu.prepend(tab.clone(true));
+				menu.prepend(tab.clone(true).removeClass('tab'));
 				tab.hide();
 				if ($this.height() <= maxHeight) {
 					menu.find('a').click(function() { check(true); });

phpBB/adm/style/ajax.js

@@ -1,6 +1,8 @@
+/* global phpbb */
+
 (function($) {  // Avoid conflicts with other libraries
 
-"use strict";
+'use strict';
 
 /**
  * The following callbacks are for reording items. row_down
@@ -13,11 +15,10 @@ phpbb.addAjaxCallback('row_down', function(res) {
 		return;
 	}
 
-	var el = $(this),
-		tr = el.parents('tr'),
-		trSwap = tr.next();
+	var $firstTr = $(this).parents('tr'),
+		$secondTr = $firstTr.next();
 
-	tr.insertAfter(trSwap);
+	$firstTr.insertAfter($secondTr);
 });
 
 phpbb.addAjaxCallback('row_up', function(res) {
@@ -25,11 +26,10 @@ phpbb.addAjaxCallback('row_up', function(res) {
 		return;
 	}
 
-	var el = $(this),
-		tr = el.parents('tr'),
-		trSwap = tr.prev();
+	var $secondTr = $(this).parents('tr'),
+		$firstTr = $secondTr.prev();
 
-	tr.insertBefore(trSwap);
+	$secondTr.insertBefore($firstTr);
 });
 
 /**
@@ -38,10 +38,10 @@ phpbb.addAjaxCallback('row_up', function(res) {
  * in the href with "deactivate", and vice versa.
  */
 phpbb.addAjaxCallback('activate_deactivate', function(res) {
-	var el = $(this),
-		newHref = el.attr('href');
+	var $this = $(this),
+		newHref = $this.attr('href');
 
-	el.text(res.text);
+	$this.text(res.text);
 
 	if (newHref.indexOf('deactivate') !== -1) {
 		newHref = newHref.replace('deactivate', 'activate');
@@ -49,7 +49,7 @@ phpbb.addAjaxCallback('activate_deactivate', function(res) {
 		newHref = newHref.replace('activate', 'deactivate');
 	}
 
-	el.attr('href', newHref);
+	$this.attr('href', newHref);
 });
 
 /**
@@ -66,11 +66,10 @@ phpbb.addAjaxCallback('row_delete', function(res) {
 
 $('[data-ajax]').each(function() {
 	var $this = $(this),
-		ajax = $this.attr('data-ajax'),
-		fn;
+		ajax = $this.attr('data-ajax');
 
 	if (ajax !== 'false') {
-		fn = (ajax !== 'true') ? ajax : null;
+		var fn = (ajax !== 'true') ? ajax : null;
 		phpbb.ajaxify({
 			selector: this,
 			refresh: $this.attr('data-refresh') !== undefined,
@@ -82,7 +81,7 @@ $('[data-ajax]').each(function() {
 /**
 * Automatically resize textarea
 */
-$(document).ready(function() {
+$(function() {
 	phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), {minHeight: 75});
 });
 

phpBB/adm/style/auth_provider_ldap.html

@@ -1,32 +1,35 @@
-<dl>
-	<dt><label for="ldap_server">{L_LDAP_SERVER}{L_COLON}</label><br /><span>{L_LDAP_SERVER_EXPLAIN}</span></dt>
-	<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="{AUTH_LDAP_SERVER}" /></dd>
-</dl>
-<dl>
-	<dt><label for="ldap_port">{L_LDAP_PORT}{L_COLON}</label><br /><span>{L_LDAP_PORT_EXPLAIN}</span></dt>
-	<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="{AUTH_LDAP_PORT}" /></dd>
-</dl>
-<dl>
-	<dt><label for="ldap_dn">{L_LDAP_DN}{L_COLON}</label><br /><span>{L_LDAP_DN_EXPLAIN}</span></dt>
-	<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="{AUTH_LDAP_BASE_DN}" /></dd>
-</dl>
-<dl>
-	<dt><label for="ldap_uid">{L_LDAP_UID}{L_COLON}</label><br /><span>{L_LDAP_UID_EXPLAIN}</span></dt>
-	<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="{AUTH_LDAP_UID}" /></dd>
-</dl>
-<dl>
-	<dt><label for="ldap_user_filter">{L_LDAP_USER_FILTER}{L_COLON}</label><br /><span>{L_LDAP_USER_FILTER_EXPLAIN}</span></dt>
-	<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="{AUTH_LDAP_USER_FILTER}" /></dd>
-</dl>
-<dl>
-	<dt><label for="ldap_email">{L_LDAP_EMAIL}{L_COLON}</label><br /><span>{L_LDAP_EMAIL_EXPLAIN}</span></dt>
-	<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="{AUTH_LDAP_EMAIL}" /></dd>
-</dl>
-<dl>
-	<dt><label for="ldap_user">{L_LDAP_USER}{L_COLON}</label><br /><span>{L_LDAP_USER_EXPLAIN}</span></dt>
-	<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="{AUTH_LDAP_USER}" /></dd>
-</dl>
-<dl>
-	<dt><label for="ldap_password">{L_LDAP_PASSWORD}{L_COLON}</label><br /><span>{L_LDAP_PASSWORD_EXPLAIN}</span></dt>
-	<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="{AUTH_LDAP_PASSWORD}" autocomplete="off" /></dd>
-</dl>
+<fieldset id="auth_ldap_settings">
+	<legend>{L_LDAP}</legend>
+	<dl>
+		<dt><label for="ldap_server">{L_LDAP_SERVER}{L_COLON}</label><br /><span>{L_LDAP_SERVER_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="{AUTH_LDAP_SERVER}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="ldap_port">{L_LDAP_PORT}{L_COLON}</label><br /><span>{L_LDAP_PORT_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="{AUTH_LDAP_PORT}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="ldap_dn">{L_LDAP_DN}{L_COLON}</label><br /><span>{L_LDAP_DN_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="{AUTH_LDAP_BASE_DN}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="ldap_uid">{L_LDAP_UID}{L_COLON}</label><br /><span>{L_LDAP_UID_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="{AUTH_LDAP_UID}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="ldap_user_filter">{L_LDAP_USER_FILTER}{L_COLON}</label><br /><span>{L_LDAP_USER_FILTER_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="{AUTH_LDAP_USER_FILTER}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="ldap_email">{L_LDAP_EMAIL}{L_COLON}</label><br /><span>{L_LDAP_EMAIL_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_email" size="40" name="config[ldap_email]" value="{AUTH_LDAP_EMAIL}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="ldap_user">{L_LDAP_USER}{L_COLON}</label><br /><span>{L_LDAP_USER_EXPLAIN}</span></dt>
+		<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="{AUTH_LDAP_USER}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="ldap_password">{L_LDAP_PASSWORD}{L_COLON}</label><br /><span>{L_LDAP_PASSWORD_EXPLAIN}</span></dt>
+		<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="{AUTH_LDAP_PASSWORD}" autocomplete="off" /></dd>
+	</dl>
+</fieldset>

phpBB/adm/style/auth_provider_oauth.html

@@ -1,17 +1,18 @@
-<h2>{L_AUTH_PROVIDER_OAUTH_TITLE}</h2>
 
-<p>{L_AUTH_PROVIDER_OAUTH_EXPLAIN}</p>
+<div id="auth_oauth_settings">
+	<p>{L_AUTH_PROVIDER_OAUTH_EXPLAIN}</p>
 
-<!-- BEGIN oauth_services -->
-<fieldset>
-	<legend>{oauth_services.ACTUAL_NAME}</legend>
-	<dl>
-		<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label></dt>
-		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{oauth_services.KEY}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label></dt>
-		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{oauth_services.SECRET}" /></dd>
-	</dl>
-</fieldset>
-<!-- END oauth_services -->
+	<!-- BEGIN oauth_services -->
+	<fieldset>
+		<legend>{oauth_services.ACTUAL_NAME}</legend>
+		<dl>
+			<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label></dt>
+			<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{oauth_services.KEY}" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label></dt>
+			<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{oauth_services.SECRET}" /></dd>
+		</dl>
+	</fieldset>
+	<!-- END oauth_services -->
+</div>

phpBB/adm/style/avatars.js

@@ -1,15 +0,0 @@
-(function($) {  // Avoid conflicts with other libraries
-
-"use strict";
-
-function avatarHide() {
-    $('#avatar_options > div').hide();
-
-    var selected = $('#avatar_driver').val();
-    $('#avatar_option_' + selected).show();
-}
-
-avatarHide();
-$('#avatar_driver').bind('change', avatarHide);
-
-})(jQuery); // Avoid conflicts with other libraries

phpBB/adm/style/install_footer.html

@@ -5,12 +5,14 @@
 	</div>
 
 	<div id="page-footer">
-		Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+		<div class="copyright">
+			Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited
+		</div>
 	</div>
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}

phpBB/adm/style/install_header.html

@@ -29,7 +29,7 @@
 		<div id="tabs">
 			<ul>
 			<!-- BEGIN t_block1 -->
-				<li<!-- IF t_block1.S_SELECTED --> class="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
+				<li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li>
 			<!-- END t_block1 -->
 			</ul>
 		</div>

phpBB/adm/style/install_update.html

@@ -184,26 +184,138 @@
 
 		<form id="install_update" method="post" action="{U_UPDATE_ACTION}">
 
-		<!-- IF .up_to_date -->
-			<h2>{L_FILES_UP_TO_DATE}</h2>
-			<p>{L_FILES_UP_TO_DATE_EXPLAIN}</p>
+		<!-- IF .deleted -->
+			<h2>{L_FILES_DELETED}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('deleted', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<p>{L_FILES_DELETED_EXPLAIN}</p>
 
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_up_to_date.gif" alt="{L_STATUS_UP_TO_DATE}" /></legend>
-			<!-- BEGIN up_to_date -->
+			<fieldset id="deleted">
+				<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
+				<!-- BEGIN deleted -->
 				<dl>
-					<dd class="full" style="text-align: {S_CONTENT_FLOW_BEGIN};"><strong>{up_to_date.FILENAME}</strong></dd>
+					<dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br /><!-- ENDIF -->{deleted.FILE_PART}</strong></dt>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;">
+						<!-- IF not deleted.S_BINARY -->[<a href="{deleted.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{deleted.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
+					</dd>
 				</dl>
-			<!-- END up_to_date -->
+				<!-- END deleted -->
 			</fieldset>
 
 		<!-- ENDIF -->
 
+		<!-- IF .conflict -->
+			<h2>{L_FILES_CONFLICT}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('conflict', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<p>{L_FILES_CONFLICT_EXPLAIN}</p>
+
+			<!-- BEGIN conflict -->
+			<fieldset id="conflict">
+				<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
+				<dl>
+					<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong>
+						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
+					</dt>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
+						<!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}
+						<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
+					</dd>
+					<!-- IF conflict.S_CUSTOM -->
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+					<!-- ENDIF -->
+				</dl>
+				<!-- IF conflict.S_BINARY -->
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">&nbsp;</dd>
+					</dl>
+				<!-- ELSE -->
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
+					</dl>
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
+					</dl>
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+					</dl>
+					<dl>
+						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
+						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
+					</dl>
+				<!-- ENDIF -->
+			</fieldset>
+			<!-- END conflict -->
+
+		<!-- ENDIF -->
+
+		<!-- IF .new_conflict -->
+			<h2>{L_FILES_NEW_CONFLICT}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('new_conflict', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<p>{L_FILES_NEW_CONFLICT_EXPLAIN}</p>
+
+			<fieldset id="new_conflict">
+				<legend><img src="{T_IMAGE_PATH}file_new_conflict.gif" alt="{L_STATUS_NEW_CONFLICT}" /></legend>
+			<!-- BEGIN new_conflict -->
+				<dl>
+					<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong>
+					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+				</dt>
+				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
+					<!-- IF not new_conflict.S_BINARY -->[<a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
+				</dd>
+				<!-- IF new_conflict.S_CUSTOM -->
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+				<!-- ENDIF -->
+				</dl>
+			<!-- END new_conflict -->
+			</fieldset>
+
+		<!-- ENDIF -->
+
+		<!-- IF .modified -->
+			<h2>{L_FILES_MODIFIED}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<p>{L_FILES_MODIFIED_EXPLAIN}</p>
+
+			<!-- BEGIN modified -->
+			<fieldset id="modified">
+				<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
+				<dl>
+					<dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br /><!-- ENDIF -->{modified.FILE_PART}</strong>
+					<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
+				</dt>
+				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">&nbsp;</dd>
+				<!-- IF modified.S_CUSTOM -->
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
+				<!-- ENDIF -->
+				</dl>
+				<dl>
+					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
+				</dl>
+				<dl>
+					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+				</dl>
+				<dl>
+					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
+					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+				</dl>
+			</fieldset>
+			<!-- END modified -->
+
+		<!-- ENDIF -->
+
 		<!-- IF .new -->
 			<h2>{L_FILES_NEW}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('new_files', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
 			<p>{L_FILES_NEW_EXPLAIN}</p>
 
-			<fieldset>
+			<fieldset id="new_files" style="display: none;">
 				<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
 			<!-- BEGIN new -->
 				<dl>
@@ -244,107 +356,19 @@
 
 		<!-- ENDIF -->
 
-		<!-- IF .modified -->
-			<h2>{L_FILES_MODIFIED}</h2>
-			<p>{L_FILES_MODIFIED_EXPLAIN}</p>
+		<!-- IF .up_to_date -->
+			<h2>{L_FILES_UP_TO_DATE}</h2>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('up_to_date', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<p>{L_FILES_UP_TO_DATE_EXPLAIN}</p>
 
-			<!-- BEGIN modified -->
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
+			<fieldset id="up_to_date" style="display: none;">
+				<legend><img src="{T_IMAGE_PATH}file_up_to_date.gif" alt="{L_STATUS_UP_TO_DATE}" /></legend>
+			<!-- BEGIN up_to_date -->
 				<dl>
-					<dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br /><!-- ENDIF -->{modified.FILE_PART}</strong>
-					<!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-				</dt>
-				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">&nbsp;</dd>
-				<!-- IF modified.S_CUSTOM -->
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-				<!-- ENDIF -->
-				</dl>
-				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
-				</dl>
-				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
-				</dl>
-				<dl>
-					<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
+					<dd class="full" style="text-align: {S_CONTENT_FLOW_BEGIN};"><strong>{up_to_date.FILENAME}</strong></dd>
 				</dl>
+			<!-- END up_to_date -->
 			</fieldset>
-			<!-- END modified -->
-
-		<!-- ENDIF -->
-
-		<!-- IF .new_conflict -->
-			<h2>{L_FILES_NEW_CONFLICT}</h2>
-			<p>{L_FILES_NEW_CONFLICT_EXPLAIN}</p>
-
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_new_conflict.gif" alt="{L_STATUS_NEW_CONFLICT}" /></legend>
-			<!-- BEGIN new_conflict -->
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong>
-					<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-				</dt>
-				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
-					<!-- IF not new_conflict.S_BINARY -->[<a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-				</dd>
-				<!-- IF new_conflict.S_CUSTOM -->
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-				<!-- ENDIF -->
-				</dl>
-			<!-- END new_conflict -->
-			</fieldset>
-
-		<!-- ENDIF -->
-
-		<!-- IF .conflict -->
-			<h2>{L_FILES_CONFLICT}</h2>
-			<p>{L_FILES_CONFLICT_EXPLAIN}</p>
-
-			<!-- BEGIN conflict -->
-			<fieldset>
-				<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
-				<dl>
-					<dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong>
-						<!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
-						<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
-					</dt>
-					<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">
-						<!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}
-						<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
-					</dd>
-					<!-- IF conflict.S_CUSTOM -->
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
-					<!-- ENDIF -->
-				</dl>
-				<!-- IF conflict.S_BINARY -->
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">&nbsp;</dd>
-					</dl>
-				<!-- ELSE -->
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-					</dl>
-					<dl>
-						<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
-						<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
-					</dl>
-				<!-- ENDIF -->
-			</fieldset>
-			<!-- END conflict -->
 
 		<!-- ENDIF -->
 

phpBB/adm/style/overall_footer.html

@@ -5,15 +5,17 @@
 	</div>
 
 	<div id="page-footer">
-		<!-- IF S_COPYRIGHT_HTML -->
-			{CREDIT_LINE}
-			<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
-		<!-- ENDIF -->
+		<div class="copyright">
+			<!-- IF S_COPYRIGHT_HTML -->
+				{CREDIT_LINE}
+				<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
+			<!-- ENDIF -->
 
-		<!-- IF DEBUG_OUTPUT -->
-			<!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF -->
-			{DEBUG_OUTPUT}
-		<!-- ENDIF -->
+			<!-- IF DEBUG_OUTPUT -->
+				<!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF -->
+				{DEBUG_OUTPUT}
+			<!-- ENDIF -->
+		</div>
 
 		<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
 			<div id="darken">&nbsp;</div>
@@ -32,7 +34,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 <!-- INCLUDEJS admin.js -->

phpBB/adm/style/overall_header.html

@@ -89,6 +89,8 @@ function popup(url, width, height, name)
 
 {$STYLESHEETS}
 
+<!-- EVENT acp_overall_header_stylesheets_after -->
+
 </head>
 
 <body class="{S_CONTENT_DIRECTION} {BODY_CLASS} nojs">
@@ -106,7 +108,7 @@ function popup(url, width, height, name)
 		<div id="tabs">
 			<ul>
 			<!-- BEGIN t_block1 -->
-				<li<!-- IF t_block1.S_SELECTED --> class="activetab"<!-- ENDIF -->><a href="{t_block1.U_TITLE}"><span>{t_block1.L_TITLE}</span></a></li>
+				<li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li>
 			<!-- END t_block1 -->
 			</ul>
 		</div>

phpBB/adm/style/pagination.html

@@ -1,5 +1,5 @@
 
- 	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; 
+ 	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE_CLICK}">{PAGE_NUMBER}</a> &bull; 
 	<ul>
 	<!-- BEGIN pagination -->
 		<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>

phpBB/adm/style/simple_footer.html

@@ -17,10 +17,11 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 
 <!-- EVENT acp_simple_footer_after -->
+{$SCRIPTS}
 
 </body>
 </html>

phpBB/adm/style/simple_header.html

@@ -83,6 +83,8 @@ function find_username(url)
 // ]]>
 </script>
 <!-- EVENT acp_simple_header_head_append -->
+{$STYLESHEETS}
+<!-- EVENT acp_simple_header_stylesheets_after -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">

phpBB/adm/style/timezone_option.html

@@ -1,17 +1,25 @@
 <dl>
 	<dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt>
-	<!-- IF S_TZ_DATE_OPTIONS -->
+	<!-- IF .timezone_date -->
 	<dd id="tz_select_date" style="display: none;">
 		<select name="tz_date" id="tz_date" class="autowidth tz_select">
 			<option value="">{L_SELECT_CURRENT_TIME}</option>
-			{S_TZ_DATE_OPTIONS}
+			<!-- BEGIN timezone_date -->
+			<option value="{timezone_date.VALUE}"<!-- IF timezone_date.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_date.TITLE}</option>
+			<!-- END timezone_date -->
 		</select>
 	</dd>
 	<!-- ENDIF -->
 	<dd>
 		<select name="tz" id="timezone" class="autowidth tz_select">
 			<option value="">{L_SELECT_TIMEZONE}</option>
-			{S_TZ_OPTIONS}
+			<!-- BEGIN timezone_select -->
+			<optgroup label="{timezone_select.LABEL}" data-tz-value="{timezone_select.VALUE}">
+				<!-- BEGIN timezone_options -->
+				<option title="{timezone_select.timezone_options.TITLE}" value="{timezone_select.timezone_options.VALUE}"<!-- IF timezone_select.timezone_options.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_select.timezone_options.LABEL}</option>
+				<!-- END timezone_options -->
+			</optgroup>
+			<!-- END timezone_select -->
 		</select>
 
 		<!-- INCLUDEJS timezone.js -->

phpBB/app.php

@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 

phpBB/assets/javascript/editor.js

@@ -266,10 +266,6 @@ function mozWrap(txtarea, open, close) {
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd === 1 || selEnd === 2) {
-		selEnd = selLength;
-	}
-
 	var s1 = (txtarea.value).substring(0,selStart);
 	var s2 = (txtarea.value).substring(selStart, selEnd);
 	var s3 = (txtarea.value).substring(selEnd, selLength);

phpBB/assets/javascript/plupload.js

@@ -586,6 +586,11 @@ uploader.bind('FilesAdded', function(up, files) {
 		return;
 	}
 
+	// Switch the active tab if the style supports it
+	if (typeof activateSubPanel == 'function') {
+		activateSubPanel('attach-panel');
+	}
+
 	// Show the file list if there aren't any files currently.
 	if (!$('#file-list-container').is(':visible')) {
 		$('#file-list-container').show(100);

phpBB/bin/phpbbcli.php

@@ -2,12 +2,18 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
+use Symfony\Component\Console\Input\ArgvInput;
+
 if (php_sapi_name() != 'cli')
 {
 	echo 'This program must be run from the command line.' . PHP_EOL;
@@ -18,22 +24,44 @@ define('IN_PHPBB', true);
 $phpbb_root_path = __DIR__ . '/../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 require($phpbb_root_path . 'includes/startup.' . $phpEx);
-require($phpbb_root_path . 'config.' . $phpEx);
-require($phpbb_root_path . 'includes/constants.' . $phpEx);
-require($phpbb_root_path . 'includes/functions.' . $phpEx);
-require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
-require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
 
 $phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx);
 $phpbb_class_loader->register();
-$phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
-$phpbb_class_loader_ext->register();
 
-$phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, "$phpbb_root_path/config");
+$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
+extract($phpbb_config_php_file->get_all());
+
+require($phpbb_root_path . 'includes/constants.' . $phpEx);
+require($phpbb_root_path . 'includes/functions.' . $phpEx);
+require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
+
+$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
+$phpbb_container_builder->set_dump_container(false);
+
+$input = new ArgvInput();
+
+if ($input->hasParameterOption(array('--safe-mode')))
+{
+	$phpbb_container_builder->set_use_extensions(false);
+	$phpbb_container_builder->set_dump_container(false);
+}
+else
+{
+	$phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
+	$phpbb_class_loader_ext->register();
+	phpbb_load_extensions_autoloaders($phpbb_root_path);
+}
+
+$phpbb_container = $phpbb_container_builder->get_container();
 $phpbb_container->get('request')->enable_super_globals();
 require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
 
-$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION);
-$application->register_container_commands($phpbb_container);
-$application->run();
+$user = $phpbb_container->get('user');
+$user->add_lang('acp/common');
+$user->add_lang('cli');
+
+$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $user);
+$application->register_container_commands($phpbb_container->get('console.command_collection'));
+$application->run($input);

phpBB/common.php

@@ -1,26 +1,33 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
-* Minimum Requirement: PHP 5.3.3
 */
 
 /**
+* Minimum Requirement: PHP 5.3.3
 */
+
 if (!defined('IN_PHPBB'))
 {
 	exit;
 }
 
 require($phpbb_root_path . 'includes/startup.' . $phpEx);
+require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
 
-if (file_exists($phpbb_root_path . 'config.' . $phpEx))
-{
-	require($phpbb_root_path . 'config.' . $phpEx);
-}
+$phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx);
+$phpbb_class_loader->register();
+
+$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
+extract($phpbb_config_php_file->get_all());
 
 if (!defined('PHPBB_INSTALLED'))
 {
@@ -71,11 +78,8 @@ $phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relati
 $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $phpbb_adm_relative_path;
 
 // Include files
-require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
-
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
-require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
 include($phpbb_root_path . 'includes/functions_compatibility.' . $phpEx);
 
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
@@ -84,14 +88,14 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 // Set PHP error handler to ours
 set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
-// Setup class loader first
-$phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx);
-$phpbb_class_loader->register();
 $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
 $phpbb_class_loader_ext->register();
 
+phpbb_load_extensions_autoloaders($phpbb_root_path);
+
 // Set up container
-$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
+$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
+$phpbb_container = $phpbb_container_builder->get_container();
 
 $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
 $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
@@ -108,11 +112,6 @@ foreach ($phpbb_hook_finder->find() as $hook)
 	@include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
 }
 
-if (!$config['use_system_cron'])
-{
-	$cron = $phpbb_container->get('cron.manager');
-}
-
 /**
 * Main event which is triggered on every page
 *

phpBB/composer.json

@@ -1,9 +1,31 @@
 {
-	"_readme": [
-		"You MUST update the clean-vendor-dir target in build/build.xml",
-		"accordingly when adding or upgrading dependencies."
+	"name": "phpbb/phpbb",
+	"description": "phpBB Forum Software application",
+	"type": "project",
+	"keywords": ["phpbb", "forum"],
+	"homepage": "https://www.phpbb.com",
+	"license": "GPL-2.0",
+	"authors": [
+		{
+			"name": "phpBB Limited",
+			"email": "operations@phpbb.com",
+			"homepage": "https://www.phpbb.com/go/authors"
+		}
 	],
+	"support": {
+		"issues": "https://tracker.phpbb.com",
+		"forum": "https://www.phpbb.com/community/",
+		"wiki": "https://wiki.phpbb.com",
+		"irc": "irc://irc.freenode.org/phpbb"
+	},
+	"scripts": {
+		"post-update-cmd": "echo 'You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies.'"
+	},
+	"replace": {
+		"phpbb/phpbb-core": "self.version"
+	},
 	"require": {
+		"php": ">=5.3.3",
 		"lusitanian/oauth": "0.2.*",
 		"symfony/config": "2.3.*",
 		"symfony/console": "2.3.*",
@@ -19,6 +41,15 @@
 		"phpunit/dbunit": "1.3.*",
 		"phpunit/phpunit": "4.1.*",
 		"phing/phing": "2.4.*",
-		"squizlabs/php_codesniffer": "1.*"
+		"sami/sami": "1.*",
+		"squizlabs/php_codesniffer": "1.*",
+		"symfony/browser-kit": "2.3.*",
+		"symfony/css-selector": "2.3.*",
+		"symfony/debug": "2.3.*",
+		"symfony/dom-crawler": "2.3.*",
+		"symfony/filesystem": "2.3.*",
+		"symfony/finder": "2.3.*",
+		"symfony/http-foundation": "2.3.*",
+		"symfony/process": "2.3.*"
 	}
 }

phpBB/composer.lock

@@ -3,7 +3,7 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "194c86e9ae52700a8f6c1b10d7b2e4d0",
+    "hash": "d93446768ea0665b7c55c01890153a67",
     "packages": [
         {
             "name": "lusitanian/oauth",
@@ -108,17 +108,17 @@
         },
         {
             "name": "symfony/config",
-            "version": "v2.3.12",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/Config",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Config.git",
-                "reference": "91faa2d4944d0c8a94d5b73cb7ccfb219aee9d21"
+                "reference": "b34d2b32a92938476f0689486e7a11ea1aeb079e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Config/zipball/91faa2d4944d0c8a94d5b73cb7ccfb219aee9d21",
-                "reference": "91faa2d4944d0c8a94d5b73cb7ccfb219aee9d21",
+                "url": "https://api.github.com/repos/symfony/Config/zipball/b34d2b32a92938476f0689486e7a11ea1aeb079e",
+                "reference": "b34d2b32a92938476f0689486e7a11ea1aeb079e",
                 "shasum": ""
             },
             "require": {
@@ -141,34 +141,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Config Component",
             "homepage": "http://symfony.com",
-            "time": "2014-03-31 10:15:50"
+            "time": "2014-08-02 07:53:48"
         },
         {
             "name": "symfony/console",
-            "version": "v2.3.12",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/Console",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Console.git",
-                "reference": "df17996d37eb113a5675ca4cc2ac45f4fc057cb7"
+                "reference": "a2723f99716c2fa6411e2eb5842edbe680e4b462"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/df17996d37eb113a5675ca4cc2ac45f4fc057cb7",
-                "reference": "df17996d37eb113a5675ca4cc2ac45f4fc057cb7",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/a2723f99716c2fa6411e2eb5842edbe680e4b462",
+                "reference": "a2723f99716c2fa6411e2eb5842edbe680e4b462",
                 "shasum": ""
             },
             "require": {
@@ -196,34 +194,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Console Component",
             "homepage": "http://symfony.com",
-            "time": "2014-03-01 17:25:29"
+            "time": "2014-08-07 15:55:24"
         },
         {
             "name": "symfony/debug",
-            "version": "v2.4.4",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/Debug",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Debug.git",
-                "reference": "6a8eb9aba50595014fef52d6b4d99b31dfaa6f02"
+                "reference": "91e3a1480c67601d2406cd938735abe0243e1c95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Debug/zipball/6a8eb9aba50595014fef52d6b4d99b31dfaa6f02",
-                "reference": "6a8eb9aba50595014fef52d6b4d99b31dfaa6f02",
+                "url": "https://api.github.com/repos/symfony/Debug/zipball/91e3a1480c67601d2406cd938735abe0243e1c95",
+                "reference": "91e3a1480c67601d2406cd938735abe0243e1c95",
                 "shasum": ""
             },
             "require": {
@@ -234,13 +230,14 @@
                 "symfony/http-kernel": "~2.1"
             },
             "suggest": {
+                "symfony/class-loader": "",
                 "symfony/http-foundation": "",
                 "symfony/http-kernel": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-master": "2.3-dev"
                 }
             },
             "autoload": {
@@ -253,34 +250,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Debug Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-16 10:34:42"
+            "time": "2014-07-07 10:13:42"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v2.3.12",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/DependencyInjection",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/DependencyInjection.git",
-                "reference": "41e9e2078e8edf261c11be478300c8fcddb64e30"
+                "reference": "5ee5795515be251c56057d79154e561ee1efecd2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/41e9e2078e8edf261c11be478300c8fcddb64e30",
-                "reference": "41e9e2078e8edf261c11be478300c8fcddb64e30",
+                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/5ee5795515be251c56057d79154e561ee1efecd2",
+                "reference": "5ee5795515be251c56057d79154e561ee1efecd2",
                 "shasum": ""
             },
             "require": {
@@ -311,34 +306,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "http://symfony.com",
-            "time": "2014-03-27 18:14:33"
+            "time": "2014-08-27 08:32:18"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.3.12",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/EventDispatcher",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "15645237c6ff70e74a28e8836362d82492765055"
+                "reference": "2c64e46d7e22bcafcab4413ff62bc389abf87ea5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/15645237c6ff70e74a28e8836362d82492765055",
-                "reference": "15645237c6ff70e74a28e8836362d82492765055",
+                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/2c64e46d7e22bcafcab4413ff62bc389abf87ea5",
+                "reference": "2c64e46d7e22bcafcab4413ff62bc389abf87ea5",
                 "shasum": ""
             },
             "require": {
@@ -367,34 +360,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "http://symfony.com",
-            "time": "2014-02-11 10:29:24"
+            "time": "2014-07-25 15:00:14"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v2.4.4",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/Filesystem",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "a3af8294bcce4a7c1b2892363b0c9d8109affad4"
+                "reference": "007359d2822d5eba4f04f6507bc9b46877c622b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a3af8294bcce4a7c1b2892363b0c9d8109affad4",
-                "reference": "a3af8294bcce4a7c1b2892363b0c9d8109affad4",
+                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/007359d2822d5eba4f04f6507bc9b46877c622b4",
+                "reference": "007359d2822d5eba4f04f6507bc9b46877c622b4",
                 "shasum": ""
             },
             "require": {
@@ -403,7 +394,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-master": "2.3-dev"
                 }
             },
             "autoload": {
@@ -416,46 +407,41 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-16 10:34:31"
+            "time": "2014-08-31 03:30:23"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v2.4.4",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/HttpFoundation",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpFoundation.git",
-                "reference": "22c4dee84271ad0cd08d19f26d89f2878e11159b"
+                "reference": "d0125fed988da9e189864c2e6de967b3ee7f1d98"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/22c4dee84271ad0cd08d19f26d89f2878e11159b",
-                "reference": "22c4dee84271ad0cd08d19f26d89f2878e11159b",
+                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/d0125fed988da9e189864c2e6de967b3ee7f1d98",
+                "reference": "d0125fed988da9e189864c2e6de967b3ee7f1d98",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
-            "require-dev": {
-                "symfony/expression-language": "~2.4"
-            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-master": "2.3-dev"
                 }
             },
             "autoload": {
@@ -471,34 +457,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-18 21:02:05"
+            "time": "2014-09-03 07:39:11"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v2.3.12",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/HttpKernel",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpKernel.git",
-                "reference": "48d61b3622ca35dd924b167441a9810ad55906ce"
+                "reference": "a24817f69012b23ce7c554af6b4c7b53235c7c55"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/48d61b3622ca35dd924b167441a9810ad55906ce",
-                "reference": "48d61b3622ca35dd924b167441a9810ad55906ce",
+                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/a24817f69012b23ce7c554af6b4c7b53235c7c55",
+                "reference": "a24817f69012b23ce7c554af6b4c7b53235c7c55",
                 "shasum": ""
             },
             "require": {
@@ -544,34 +528,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-03 05:42:39"
+            "time": "2014-09-03 09:45:27"
         },
         {
             "name": "symfony/routing",
-            "version": "v2.3.12",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/Routing",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Routing.git",
-                "reference": "08afcafd9af22a24a8055669f85d63b863c4711b"
+                "reference": "aa2beef5d5f1d84250b5ca73a4056c0504e5969e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Routing/zipball/08afcafd9af22a24a8055669f85d63b863c4711b",
-                "reference": "08afcafd9af22a24a8055669f85d63b863c4711b",
+                "url": "https://api.github.com/repos/symfony/Routing/zipball/aa2beef5d5f1d84250b5ca73a4056c0504e5969e",
+                "reference": "aa2beef5d5f1d84250b5ca73a4056c0504e5969e",
                 "shasum": ""
             },
             "require": {
@@ -604,34 +586,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Routing Component",
             "homepage": "http://symfony.com",
-            "time": "2014-03-28 10:34:27"
+            "time": "2014-08-15 09:05:55"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.3.12",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/Yaml",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Yaml.git",
-                "reference": "3acf34f6993db3d873fa77ac2cb6e595db00b88d"
+                "reference": "71ceeca3d8164f0c5313127b24ad056071ccf2c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/3acf34f6993db3d873fa77ac2cb6e595db00b88d",
-                "reference": "3acf34f6993db3d873fa77ac2cb6e595db00b88d",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/71ceeca3d8164f0c5313127b24ad056071ccf2c6",
+                "reference": "71ceeca3d8164f0c5313127b24ad056071ccf2c6",
                 "shasum": ""
             },
             "require": {
@@ -653,20 +633,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Yaml Component",
             "homepage": "http://symfony.com",
-            "time": "2014-03-04 16:04:39"
+            "time": "2014-08-28 01:42:35"
         },
         {
             "name": "twig/twig",
@@ -978,6 +956,101 @@
             ],
             "time": "2013-07-30 22:07:23"
         },
+        {
+            "name": "michelf/php-markdown",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/michelf/php-markdown.git",
+                "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/michelf/php-markdown/zipball/de9a19c7bf352d41cc99ed86c3c0ef17e87394b6",
+                "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-lib": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Michelf": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Michel Fortin",
+                    "email": "michel.fortin@michelf.ca",
+                    "homepage": "http://michelf.ca/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "John Gruber",
+                    "homepage": "http://daringfireball.net/"
+                }
+            ],
+            "description": "PHP Markdown",
+            "homepage": "http://michelf.ca/projects/php-markdown/",
+            "keywords": [
+                "markdown"
+            ],
+            "time": "2014-05-05 02:43:50"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v0.9.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "1e5e280ae88a27effa2ae4aa2bd088494ed8594f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1e5e280ae88a27effa2ae4aa2bd088494ed8594f",
+                "reference": "1e5e280ae88a27effa2ae4aa2bd088494ed8594f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "PHPParser": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "time": "2013-08-25 17:11:40"
+        },
         {
             "name": "phing/phing",
             "version": "2.4.14",
@@ -1468,6 +1541,113 @@
             ],
             "time": "2014-05-02 07:04:11"
         },
+        {
+            "name": "pimple/pimple",
+            "version": "v1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fabpot/Pimple.git",
+                "reference": "ae11e57e8c2bb414b2ff93396dbbfc0eb92feb94"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fabpot/Pimple/zipball/ae11e57e8c2bb414b2ff93396dbbfc0eb92feb94",
+                "reference": "ae11e57e8c2bb414b2ff93396dbbfc0eb92feb94",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Pimple": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                }
+            ],
+            "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
+            "homepage": "http://pimple.sensiolabs.org",
+            "keywords": [
+                "container",
+                "dependency injection"
+            ],
+            "time": "2013-03-08 08:21:40"
+        },
+        {
+            "name": "sami/sami",
+            "version": "v1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fabpot/Sami.git",
+                "reference": "76f2ed80b3420f7e2f6dcd5b7218b5a5781f4110"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fabpot/Sami/zipball/76f2ed80b3420f7e2f6dcd5b7218b5a5781f4110",
+                "reference": "76f2ed80b3420f7e2f6dcd5b7218b5a5781f4110",
+                "shasum": ""
+            },
+            "require": {
+                "michelf/php-markdown": "~1.3",
+                "nikic/php-parser": "0.9.*",
+                "php": ">=5.3.0",
+                "pimple/pimple": "1.0.*",
+                "symfony/console": "~2.1",
+                "symfony/filesystem": "~2.1",
+                "symfony/finder": "~2.1",
+                "symfony/process": "~2.1",
+                "symfony/yaml": "~2.1",
+                "twig/twig": "1.*"
+            },
+            "bin": [
+                "sami.php"
+            ],
+            "type": "application",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Sami": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                }
+            ],
+            "description": "Sami, an API documentation generator",
+            "homepage": "http://sami.sensiolabs.org",
+            "keywords": [
+                "phpdoc"
+            ],
+            "time": "2013-11-30 17:16:25"
+        },
         {
             "name": "sebastian/comparator",
             "version": "1.0.0",
@@ -1807,17 +1987,17 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v2.3.4",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/BrowserKit",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/BrowserKit.git",
-                "reference": "2639dc4eec81f92760e05396a93bb78000b4f5ca"
+                "reference": "262d698efaa788ce24ff9c987378789bf3f81ce9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/2639dc4eec81f92760e05396a93bb78000b4f5ca",
-                "reference": "2639dc4eec81f92760e05396a93bb78000b4f5ca",
+                "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/262d698efaa788ce24ff9c987378789bf3f81ce9",
+                "reference": "262d698efaa788ce24ff9c987378789bf3f81ce9",
                 "shasum": ""
             },
             "require": {
@@ -1847,34 +2027,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "http://symfony.com",
-            "time": "2013-07-21 12:12:18"
+            "time": "2014-08-05 07:20:55"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v2.3.4",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/CssSelector",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/CssSelector.git",
-                "reference": "885544201cb24e79754da1dbd61bd779c2e4353e"
+                "reference": "8953d325d3341c246abadb79be172de95ef80664"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/CssSelector/zipball/885544201cb24e79754da1dbd61bd779c2e4353e",
-                "reference": "885544201cb24e79754da1dbd61bd779c2e4353e",
+                "url": "https://api.github.com/repos/symfony/CssSelector/zipball/8953d325d3341c246abadb79be172de95ef80664",
+                "reference": "8953d325d3341c246abadb79be172de95ef80664",
                 "shasum": ""
             },
             "require": {
@@ -1896,12 +2074,6 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
@@ -1909,25 +2081,29 @@
                 {
                     "name": "Jean-François Simon",
                     "email": "jeanfrancois.simon@sensiolabs.com"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "http://symfony.com",
-            "time": "2013-07-21 12:12:18"
+            "time": "2014-08-27 08:24:06"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v2.3.4",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/DomCrawler",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/DomCrawler.git",
-                "reference": "e05e07fe8958a304b5e135f8e65d4ae6148cf59b"
+                "reference": "bad8d98561f071639fa67b20680bffcc256ce252"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/e05e07fe8958a304b5e135f8e65d4ae6148cf59b",
-                "reference": "e05e07fe8958a304b5e135f8e65d4ae6148cf59b",
+                "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/bad8d98561f071639fa67b20680bffcc256ce252",
+                "reference": "bad8d98561f071639fa67b20680bffcc256ce252",
                 "shasum": ""
             },
             "require": {
@@ -1955,34 +2131,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "http://symfony.com",
-            "time": "2013-07-21 12:12:18"
+            "time": "2014-08-21 00:21:59"
         },
         {
             "name": "symfony/finder",
-            "version": "v2.3.4",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/Finder",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Finder.git",
-                "reference": "4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1"
+                "reference": "f7a5a5a3b1fc0ec9a1a5b4429223a8726e0f4b55"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Finder/zipball/4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1",
-                "reference": "4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1",
+                "url": "https://api.github.com/repos/symfony/Finder/zipball/f7a5a5a3b1fc0ec9a1a5b4429223a8726e0f4b55",
+                "reference": "f7a5a5a3b1fc0ec9a1a5b4429223a8726e0f4b55",
                 "shasum": ""
             },
             "require": {
@@ -2004,34 +2178,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Finder Component",
             "homepage": "http://symfony.com",
-            "time": "2013-08-13 20:18:00"
+            "time": "2014-08-31 04:03:32"
         },
         {
             "name": "symfony/process",
-            "version": "v2.3.4",
+            "version": "v2.3.19",
             "target-dir": "Symfony/Component/Process",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Process.git",
-                "reference": "1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b"
+                "reference": "b8fc0e4b6750e4c458a38d038e6b4d538d4fe2bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Process/zipball/1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b",
-                "reference": "1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b",
+                "url": "https://api.github.com/repos/symfony/Process/zipball/b8fc0e4b6750e4c458a38d038e6b4d538d4fe2bb",
+                "reference": "b8fc0e4b6750e4c458a38d038e6b4d538d4fe2bb",
                 "shasum": ""
             },
             "require": {
@@ -2053,20 +2225,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Process Component",
             "homepage": "http://symfony.com",
-            "time": "2013-08-22 06:42:25"
+            "time": "2014-08-28 09:02:24"
         }
     ],
     "aliases": [
@@ -2076,9 +2246,9 @@
     "stability-flags": [
 
     ],
-    "platform": [
-
-    ],
+    "platform": {
+        "php": ">=5.3.3"
+    },
     "platform-dev": [
 
     ]

phpBB/config/auth.yml

@@ -1,10 +1,17 @@
 services:
+# ----- Auth management -----
+    auth:
+        class: phpbb\auth\auth
+
+# ----- Auth providers -----
     auth.provider_collection:
-        class: phpbb\di\service_collection
+        class: phpbb\auth\provider_collection
         arguments:
             - @service_container
+            - @config
         tags:
             - { name: service_collection, tag: auth.provider }
+
     auth.provider.db:
         class: phpbb\auth\provider\db
         arguments:
@@ -13,10 +20,12 @@ services:
             - @passwords.manager
             - @request
             - @user
+            - @service_container
             - %core.root_path%
             - %core.php_ext%
         tags:
             - { name: auth.provider }
+
     auth.provider.apache:
         class: phpbb\auth\provider\apache
         arguments:
@@ -29,6 +38,7 @@ services:
             - %core.php_ext%
         tags:
             - { name: auth.provider }
+
     auth.provider.ldap:
         class: phpbb\auth\provider\ldap
         arguments:
@@ -38,6 +48,7 @@ services:
             - @user
         tags:
             - { name: auth.provider }
+
     auth.provider.oauth:
         class: phpbb\auth\provider\oauth\oauth
         arguments:
@@ -50,16 +61,20 @@ services:
             - %tables.auth_provider_oauth_account_assoc%
             - @auth.provider.oauth.service_collection
             - %tables.users%
+            - @service_container
             - %core.root_path%
             - %core.php_ext%
         tags:
             - { name: auth.provider }
+
+# ----- OAuth services providers -----
     auth.provider.oauth.service_collection:
         class: phpbb\di\service_collection
         arguments:
             - @service_container
         tags:
             - { name: service_collection, tag: auth.provider.oauth.service }
+
     auth.provider.oauth.service.bitly:
         class: phpbb\auth\provider\oauth\service\bitly
         arguments:
@@ -67,6 +82,7 @@ services:
             - @request
         tags:
             - { name: auth.provider.oauth.service }
+
     auth.provider.oauth.service.facebook:
         class: phpbb\auth\provider\oauth\service\facebook
         arguments:
@@ -74,6 +90,7 @@ services:
             - @request
         tags:
             - { name: auth.provider.oauth.service }
+
     auth.provider.oauth.service.google:
         class: phpbb\auth\provider\oauth\service\google
         arguments:

phpBB/config/avatar.yml

@@ -1,4 +1,18 @@
 services:
+    avatar.manager:
+        class: phpbb\avatar\manager
+        arguments:
+            - @config
+            - @avatar.driver_collection
+
+# ----- Avatar drivers -----
+    avatar.driver_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: avatar.driver }
+
     avatar.driver.gravatar:
         class: phpbb\avatar\driver\gravatar
         arguments:
@@ -45,15 +59,9 @@ services:
             - %core.root_path%
             - %core.php_ext%
             - @path_helper
+            - @mimetype.guesser
             - @cache.driver
         calls:
             - [set_name, [avatar.driver.upload]]
         tags:
             - { name: avatar.driver }
-
-    avatar.driver_collection:
-        class: phpbb\di\service_collection
-        arguments:
-            - @service_container
-        tags:
-            - { name: service_collection, tag: avatar.driver }

phpBB/config/captcha.yml

@@ -0,0 +1,59 @@
+services:
+    captcha.factory:
+        class: phpbb\captcha\factory
+        arguments:
+            - @service_container
+            - @captcha.plugins.service_collection
+
+# ----- Captcha plugins -----
+# Scope MUST be prototype for all the plugins to work.
+    captcha.plugins.service_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: captcha.plugins }
+
+    core.captcha.plugins.gd:
+        class: phpbb\captcha\plugins\gd
+        scope: prototype
+        calls:
+            - [set_name, [core.captcha.plugins.gd]]
+        tags:
+            - { name: captcha.plugins }
+
+    core.captcha.plugins.gd_wave:
+        class: phpbb\captcha\plugins\gd_wave
+        scope: prototype
+        calls:
+            - [set_name, [core.captcha.plugins.gd_wave]]
+        tags:
+            - { name: captcha.plugins }
+
+    core.captcha.plugins.nogd:
+        class: phpbb\captcha\plugins\nogd
+        scope: prototype
+        calls:
+            - [set_name, [core.captcha.plugins.nogd]]
+        tags:
+            - { name: captcha.plugins }
+
+    core.captcha.plugins.qa:
+        class: phpbb\captcha\plugins\qa
+        scope: prototype
+        arguments:
+            - %tables.captcha_qa_questions%
+            - %tables.captcha_qa_answers%
+            - %tables.captcha_qa_confirm%
+        calls:
+            - [set_name, [core.captcha.plugins.qa]]
+        tags:
+            - { name: captcha.plugins }
+
+    core.captcha.plugins.recaptcha:
+        class: phpbb\captcha\plugins\recaptcha
+        scope: prototype
+        calls:
+            - [set_name, [core.captcha.plugins.recaptcha]]
+        tags:
+            - { name: captcha.plugins }

phpBB/config/console.yml

@@ -1,7 +1,27 @@
 services:
+    console.command_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: console.command }
+
+    console.command.cache.purge:
+        class: phpbb\console\command\cache\purge
+        arguments:
+            - @user
+            - @cache.driver
+            - @dbal.conn
+            - @auth
+            - @log
+            - @config
+        tags:
+            - { name: console.command }
+
     console.command.config.delete:
         class: phpbb\console\command\config\delete
         arguments:
+            - @user
             - @config
         tags:
             - { name: console.command }
@@ -9,6 +29,7 @@ services:
     console.command.config.increment:
         class: phpbb\console\command\config\increment
         arguments:
+            - @user
             - @config
         tags:
             - { name: console.command }
@@ -16,6 +37,7 @@ services:
     console.command.config.get:
         class: phpbb\console\command\config\get
         arguments:
+            - @user
             - @config
         tags:
             - { name: console.command }
@@ -23,6 +45,7 @@ services:
     console.command.config.set:
         class: phpbb\console\command\config\set
         arguments:
+            - @user
             - @config
         tags:
             - { name: console.command }
@@ -30,53 +53,88 @@ services:
     console.command.config.set_atomic:
         class: phpbb\console\command\config\set_atomic
         arguments:
+            - @user
             - @config
         tags:
             - { name: console.command }
 
+    console.command.cron.list:
+        class: phpbb\console\command\cron\cron_list
+        arguments:
+            - @user
+            - @cron.manager
+        tags:
+            - { name: console.command }
+
+    console.command.cron.run:
+        class: phpbb\console\command\cron\run
+        arguments:
+            - @user
+            - @cron.manager
+            - @cron.lock_db
+        tags:
+            - { name: console.command }
+
     console.command.db.migrate:
         class: phpbb\console\command\db\migrate
         arguments:
+            - @user
             - @migrator
             - @ext.manager
             - @config
             - @cache
             - @log
+        tags:
+            - { name: console.command }
+
+    console.command.dev.migration_tips:
+        class: phpbb\console\command\dev\migration_tips
+        arguments:
             - @user
+            - @ext.manager
         tags:
             - { name: console.command }
 
     console.command.extension.disable:
         class: phpbb\console\command\extension\disable
         arguments:
+            - @user
             - @ext.manager
+            - @log
         tags:
             - { name: console.command }
 
     console.command.extension.enable:
         class: phpbb\console\command\extension\enable
         arguments:
+            - @user
             - @ext.manager
+            - @log
         tags:
             - { name: console.command }
 
     console.command.extension.purge:
         class: phpbb\console\command\extension\purge
         arguments:
+            - @user
             - @ext.manager
+            - @log
         tags:
             - { name: console.command }
 
     console.command.extension.show:
         class: phpbb\console\command\extension\show
         arguments:
+            - @user
             - @ext.manager
+            - @log
         tags:
             - { name: console.command }
 
     console.command.fixup.recalculate_email_hash:
         class: phpbb\console\command\fixup\recalculate_email_hash
         arguments:
+            - @user
             - @dbal.conn
         tags:
             - { name: console.command }

phpBB/config/content.yml

@@ -0,0 +1,71 @@
+services:
+    content.visibility:
+        class: phpbb\content_visibility
+        arguments:
+            - @auth
+            - @config
+            - @dbal.conn
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+            - %tables.forums%
+            - %tables.posts%
+            - %tables.topics%
+            - %tables.users%
+
+    groupposition.legend:
+        class: phpbb\groupposition\legend
+        arguments:
+            - @dbal.conn
+            - @user
+
+    groupposition.teampage:
+        class: phpbb\groupposition\teampage
+        arguments:
+            - @dbal.conn
+            - @user
+            - @cache.driver
+
+    message.form.admin:
+        class: phpbb\message\admin_form
+        arguments:
+            - @auth
+            - @config
+            - @config_text
+            - @dbal.conn
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+
+    message.form.topic:
+        class: phpbb\message\topic_form
+        arguments:
+            - @auth
+            - @config
+            - @dbal.conn
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+
+    message.form.user:
+        class: phpbb\message\user_form
+        arguments:
+            - @auth
+            - @config
+            - @dbal.conn
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+
+    pagination:
+        class: phpbb\pagination
+        arguments:
+            - @template
+            - @user
+            - @controller.helper
+            - @dispatcher
+
+    viewonline_helper:
+        class: phpbb\viewonline_helper
+        arguments:
+            - @filesystem

phpBB/config/cron.yml

@@ -1,4 +1,26 @@
 services:
+    cron.manager:
+        class: phpbb\cron\manager
+        arguments:
+            - @cron.task_collection
+            - %core.root_path%
+            - %core.php_ext%
+
+    cron.lock_db:
+        class: phpbb\lock\db
+        arguments:
+            - cron_lock
+            - @config
+            - @dbal.conn
+
+# ----- Cron tasks -----
+    cron.task_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: cron.task }
+
     cron.task.core.prune_all_forums:
         class: phpbb\cron\task\core\prune_all_forums
         arguments:
@@ -31,6 +53,7 @@ services:
             - @config
             - @dbal.conn
             - @log
+            - @user
         calls:
             - [set_name, [cron.task.core.prune_shadow_topics]]
         tags:

phpBB/config/db.yml

@@ -1,4 +1,20 @@
 services:
+    dbal.conn:
+        class: phpbb\db\driver\factory
+        arguments:
+            - @service_container
+
+    dbal.conn.driver:
+        class: %dbal.driver.class%
+        calls:
+            - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]]
+
+    dbal.tools:
+        class: phpbb\db\tools
+        arguments:
+            - @dbal.conn
+
+# ----- Migrator -----
     migrator:
         class: phpbb\db\migrator
         arguments:
@@ -15,6 +31,7 @@ services:
     migrator.helper:
         class: phpbb\db\migration\helper
 
+# ----- Migrator's tools -----
     migrator.tool_collection:
         class: phpbb\di\service_collection
         arguments:
@@ -29,6 +46,13 @@ services:
         tags:
             - { name: migrator.tool }
 
+    migrator.tool.config_text:
+        class: phpbb\db\migration\tool\config_text
+        arguments:
+            - @config_text
+        tags:
+            - { name: migrator.tool }
+
     migrator.tool.module:
         class: phpbb\db\migration\tool\module
         arguments:

phpBB/config/event.yml

@@ -0,0 +1,34 @@
+services:
+    dispatcher:
+        class: phpbb\event\dispatcher
+        arguments:
+            - @service_container
+
+    hook_finder:
+        class: phpbb\hook\finder
+        arguments:
+            - %core.root_path%
+            - %core.php_ext%
+            - @cache.driver
+
+    kernel_request_subscriber:
+        class: phpbb\event\kernel_request_subscriber
+        arguments:
+            - @ext.manager
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: kernel.event_subscriber }
+
+    kernel_exception_subscriber:
+        class: phpbb\event\kernel_exception_subscriber
+        arguments:
+            - @template
+            - @user
+        tags:
+            - { name: kernel.event_subscriber }
+
+    kernel_terminate_subscriber:
+        class: phpbb\event\kernel_terminate_subscriber
+        tags:
+            - { name: kernel.event_subscriber }

phpBB/config/mimetype_guesser.yml

@@ -1,11 +1,11 @@
-parameters:
-    mimetype.guesser.priority.lowest: -2
-    mimetype.guesser.priority.low: -1
-    mimetype.guesser.priority.default: 0
-    mimetype.guesser.priority.high: 1
-    mimetype.guesser.priority.highest: 2
-
 services:
+    mimetype.guesser_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: mimetype.guessers }
+
     mimetype.fileinfo_mimetype_guesser:
         class: Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser
         tags:
@@ -30,13 +30,6 @@ services:
         tags:
             - { name: mimetype.guessers }
 
-    mimetype.guesser_collection:
-        class: phpbb\di\service_collection
-        arguments:
-            - @service_container
-        tags:
-            - { name: service_collection, tag: mimetype.guessers }
-
     mimetype.guesser:
         class: phpbb\mimetype\guesser
         arguments:

phpBB/config/notification.yml

@@ -1,4 +1,23 @@
 services:
+    notification_manager:
+        class: phpbb\notification\manager
+        arguments:
+            - @notification.type_collection
+            - @notification.method_collection
+            - @service_container
+            - @user_loader
+            - @config
+            - @dbal.conn
+            - @cache
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
+            - %tables.notification_types%
+            - %tables.notifications%
+            - %tables.user_notifications%
+
+# ----- Notification's types -----
+# Scope MUST be prototype for all the plugins to work.
     notification.type_collection:
         class: phpbb\di\service_collection
         arguments:
@@ -6,16 +25,9 @@ services:
         tags:
             - { name: service_collection, tag: notification.type }
 
-    notification.method_collection:
-        class: phpbb\di\service_collection
-        arguments:
-            - @service_container
-        tags:
-            - { name: service_collection, tag: notification.method }
-
     notification.type.approve_post:
         class: phpbb\notification\type\approve_post
-        scope: prototype # scope MUST be prototype for this to work! # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -33,7 +45,7 @@ services:
 
     notification.type.approve_topic:
         class: phpbb\notification\type\approve_topic
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -51,7 +63,7 @@ services:
 
     notification.type.bookmark:
         class: phpbb\notification\type\bookmark
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -69,7 +81,7 @@ services:
 
     notification.type.disapprove_post:
         class: phpbb\notification\type\disapprove_post
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -87,7 +99,7 @@ services:
 
     notification.type.disapprove_topic:
         class: phpbb\notification\type\disapprove_topic
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -105,7 +117,7 @@ services:
 
     notification.type.group_request:
         class: phpbb\notification\type\group_request
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -123,7 +135,7 @@ services:
 
     notification.type.group_request_approved:
         class: phpbb\notification\type\group_request_approved
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -141,7 +153,7 @@ services:
 
     notification.type.pm:
         class: phpbb\notification\type\pm
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -159,7 +171,7 @@ services:
 
     notification.type.post:
         class: phpbb\notification\type\post
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -177,7 +189,7 @@ services:
 
     notification.type.post_in_queue:
         class: phpbb\notification\type\post_in_queue
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -195,7 +207,7 @@ services:
 
     notification.type.quote:
         class: phpbb\notification\type\quote
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -213,7 +225,7 @@ services:
 
     notification.type.report_pm:
         class: phpbb\notification\type\report_pm
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -231,7 +243,7 @@ services:
 
     notification.type.report_pm_closed:
         class: phpbb\notification\type\report_pm_closed
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -249,7 +261,7 @@ services:
 
     notification.type.report_post:
         class: phpbb\notification\type\report_post
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -267,7 +279,7 @@ services:
 
     notification.type.report_post_closed:
         class: phpbb\notification\type\report_post_closed
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -285,7 +297,7 @@ services:
 
     notification.type.topic:
         class: phpbb\notification\type\topic
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -303,7 +315,7 @@ services:
 
     notification.type.topic_in_queue:
         class: phpbb\notification\type\topic_in_queue
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -321,7 +333,7 @@ services:
 
     notification.type.admin_activate_user:
         class: phpbb\notification\type\admin_activate_user
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -336,10 +348,19 @@ services:
             - %tables.user_notifications%
         tags:
             - { name: notification.type }
+            
+# ----- Notification's methods -----
+# Scope MUST be prototype for all the plugins to work.
+    notification.method_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: notification.method }
 
     notification.method.email:
         class: phpbb\notification\method\email
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn
@@ -354,7 +375,7 @@ services:
 
     notification.method.jabber:
         class: phpbb\notification\method\jabber
-        scope: prototype # scope MUST be prototype for this to work!
+        scope: prototype
         arguments:
             - @user_loader
             - @dbal.conn

phpBB/config/parameters.yml

@@ -0,0 +1,20 @@
+parameters:
+    # Disable the usage of the super globals (_GET, _POST, _SERVER...)
+    core.disable_super_globals: true
+
+    # Datetime class to use
+    datetime.class: \phpbb\datetime
+
+    # Mimetype guesser priorities
+    mimetype.guesser.priority.lowest: -2
+    mimetype.guesser.priority.low: -1
+    mimetype.guesser.priority.default: 0
+    mimetype.guesser.priority.high: 1
+    mimetype.guesser.priority.highest: 2
+
+    # List of default password driver types
+    passwords.algorithms:
+        - passwords.driver.bcrypt_2y
+        - passwords.driver.bcrypt
+        - passwords.driver.salted_md5
+        - passwords.driver.phpass

phpBB/config/password.yml

@@ -0,0 +1,123 @@
+services:
+# ----- Password management -----
+    passwords.manager:
+        class: phpbb\passwords\manager
+        arguments:
+            - @config
+            - @passwords.driver_collection
+            - @passwords.helper
+            - %passwords.algorithms%
+
+    passwords.helper:
+        class: phpbb\passwords\helper
+
+    passwords.driver_helper:
+        class: phpbb\passwords\driver\helper
+        arguments:
+            - @config
+
+# ----- Password's drivers -----
+    passwords.driver_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: passwords.driver }
+
+    passwords.driver.bcrypt:
+        class: phpbb\passwords\driver\bcrypt
+        arguments:
+            - @config
+            - @passwords.driver_helper
+        tags:
+            - { name: passwords.driver }
+
+    passwords.driver.bcrypt_2y:
+        class: phpbb\passwords\driver\bcrypt_2y
+        arguments:
+            - @config
+            - @passwords.driver_helper
+        tags:
+            - { name: passwords.driver }
+
+    passwords.driver.bcrypt_wcf2:
+        class: phpbb\passwords\driver\bcrypt_wcf2
+        arguments:
+            - @passwords.driver.bcrypt
+            - @passwords.driver_helper
+        tags:
+            - { name: passwords.driver }
+
+    passwords.driver.salted_md5:
+        class: phpbb\passwords\driver\salted_md5
+        arguments:
+            - @config
+            - @passwords.driver_helper
+        tags:
+            - { name: passwords.driver }
+
+    passwords.driver.phpass:
+        class: phpbb\passwords\driver\phpass
+        arguments:
+            - @config
+            - @passwords.driver_helper
+        tags:
+            - { name: passwords.driver }
+
+    passwords.driver.convert_password:
+        class: phpbb\passwords\driver\convert_password
+        arguments:
+            - @config
+            - @passwords.driver_helper
+        tags:
+            - { name: passwords.driver }
+
+    passwords.driver.sha1_smf:
+        class: phpbb\passwords\driver\sha1_smf
+        arguments:
+            - @config
+            - @passwords.driver_helper
+        tags:
+            - { name: passwords.driver }
+
+    passwords.driver.sha1_wcf1:
+        class: phpbb\passwords\driver\sha1_wcf1
+        arguments:
+            - @config
+            - @passwords.driver_helper
+        tags:
+            - { name: passwords.driver }
+
+    passwords.driver.sha1:
+        class: phpbb\passwords\driver\sha1
+        arguments:
+            - @config
+            - @passwords.driver_helper
+        tags:
+            - { name: passwords.driver }
+
+    passwords.driver.md5_phpbb2:
+        class: phpbb\passwords\driver\md5_phpbb2
+        arguments:
+            - @request
+            - @passwords.driver.salted_md5
+            - %core.root_path%
+            - %core.php_ext%
+        tags:
+            - { name: passwords.driver }
+
+    passwords.driver.md5_mybb:
+        class: phpbb\passwords\driver\md5_mybb
+        arguments:
+            - @config
+            - @passwords.driver_helper
+        tags:
+            - { name: passwords.driver }
+
+    passwords.driver.md5_vb:
+        class: phpbb\passwords\driver\md5_vb
+        arguments:
+            - @config
+            - @passwords.driver_helper
+        tags:
+            - { name: passwords.driver }

phpBB/config/passwords.yml

@@ -1,62 +0,0 @@
-parameters:
-    passwords.algorithms:
-        - passwords.driver.bcrypt_2y
-        - passwords.driver.bcrypt
-        - passwords.driver.salted_md5
-        - passwords.driver.phpass
-
-services:
-    passwords.driver.bcrypt:
-        class: phpbb\passwords\driver\bcrypt
-        arguments:
-            - @config
-            - @passwords.driver_helper
-        tags:
-            - { name: passwords.driver }
-
-    passwords.driver.bcrypt_2y:
-        class: phpbb\passwords\driver\bcrypt_2y
-        arguments:
-            - @config
-            - @passwords.driver_helper
-        tags:
-            - { name: passwords.driver }
-
-    passwords.driver.salted_md5:
-        class: phpbb\passwords\driver\salted_md5
-        arguments:
-            - @config
-            - @passwords.driver_helper
-        tags:
-            - { name: passwords.driver }
-
-    passwords.driver.phpass:
-        class: phpbb\passwords\driver\phpass
-        arguments:
-            - @config
-            - @passwords.driver_helper
-        tags:
-            - { name: passwords.driver }
-
-    passwords.driver_collection:
-        class: phpbb\di\service_collection
-        arguments:
-            - @service_container
-        tags:
-            - { name: service_collection, tag: passwords.driver }
-
-    passwords.driver_helper:
-        class: phpbb\passwords\driver\helper
-        arguments:
-            - @config
-
-    passwords.manager:
-        class: phpbb\passwords\manager
-        arguments:
-            - @config
-            - @passwords.driver_collection
-            - @passwords.helper
-            - %passwords.algorithms%
-
-    passwords.helper:
-        class: phpbb\passwords\helper

phpBB/config/profilefield.yml

@@ -19,6 +19,7 @@ services:
             - @dbal.conn
             - %tables.profile_fields_options_language%
 
+# ----- Profile fields types -----
     profilefields.type_collection:
         class: phpbb\di\service_collection
         arguments:
@@ -55,6 +56,15 @@ services:
         tags:
             - { name: profilefield.type }
 
+    profilefields.type.googleplus:
+        class: phpbb\profilefields\type\type_googleplus
+        arguments:
+            - @request
+            - @template
+            - @user
+        tags:
+            - { name: profilefield.type }
+
     profilefields.type.int:
         class: phpbb\profilefields\type\type_int
         arguments:

phpBB/config/services.yml

@@ -1,32 +1,23 @@
 imports:
-    - { resource: tables.yml }
-    - { resource: cron_tasks.yml }
-    - { resource: notifications.yml }
-    - { resource: migrator.yml }
-    - { resource: avatars.yml }
-    - { resource: feed.yml }
-    - { resource: auth_providers.yml }
+    - { resource: auth.yml }
+    - { resource: avatar.yml }
+    - { resource: captcha.yml }
     - { resource: console.yml }
-    - { resource: mimetype_guessers.yml }
-    - { resource: passwords.yml }
-    - { resource: profilefields.yml }
+    - { resource: content.yml }
+    - { resource: cron.yml }
+    - { resource: db.yml }
+    - { resource: event.yml }
+    - { resource: feed.yml }
+    - { resource: mimetype_guesser.yml }
+    - { resource: notification.yml }
+    - { resource: password.yml }
+    - { resource: profilefield.yml }
+    - { resource: user.yml }
+
+    - { resource: tables.yml }
+    - { resource: parameters.yml }
 
 services:
-    acl.permissions:
-        class: phpbb\permissions
-        arguments:
-            - @dispatcher
-            - @user
-
-    auth:
-        class: phpbb\auth\auth
-
-    avatar.manager:
-        class: phpbb\avatar\manager
-        arguments:
-            - @config
-            - @avatar.driver_collection
-
     cache:
         class: phpbb\cache\service
         arguments:
@@ -39,9 +30,6 @@ services:
     cache.driver:
         class: %cache.driver.class%
 
-    cache.driver.install:
-        class: phpbb\cache\driver\file
-
     class_loader:
         class: phpbb\class_loader
         arguments:
@@ -69,25 +57,15 @@ services:
             - @cache.driver
             - %tables.config%
 
+    config.php:
+        synthetic: true
+
     config_text:
         class: phpbb\config\db_text
         arguments:
             - @dbal.conn
             - %tables.config_text%
 
-    content.visibility:
-        class: phpbb\content_visibility
-        arguments:
-            - @auth
-            - @dbal.conn
-            - @user
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.forums%
-            - %tables.posts%
-            - %tables.topics%
-            - %tables.users%
-
     controller.helper:
         class: phpbb\controller\helper
         arguments:
@@ -95,6 +73,9 @@ services:
             - @user
             - @config
             - @controller.provider
+            - @ext.manager
+            - @symfony_request
+            - @filesystem
             - %core.root_path%
             - %core.php_ext%
 
@@ -103,66 +84,14 @@ services:
         arguments:
             - @user
             - @service_container
+            - %core.root_path%
             - @template
 
     controller.provider:
         class: phpbb\controller\provider
-        arguments:
-            - @ext.finder
         calls:
             - [find, [%core.root_path%]]
 
-    cron.task_collection:
-        class: phpbb\di\service_collection
-        arguments:
-            - @service_container
-        tags:
-            - { name: service_collection, tag: cron.task }
-
-    cron.manager:
-        class: phpbb\cron\manager
-        arguments:
-            - @cron.task_collection
-            - %core.root_path%
-            - %core.php_ext%
-
-    cron.lock_db:
-        class: phpbb\lock\db
-        arguments:
-            - cron_lock
-            - @config
-            - @dbal.conn
-
-    dispatcher:
-        class: phpbb\event\dispatcher
-        arguments:
-            - @service_container
-
-    dbal.conn:
-        class: %dbal.driver.class%
-        calls:
-            - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]]
-
-    dbal.tools:
-        class: phpbb\db\tools
-        arguments:
-            - @dbal.conn
-
-    event.subscriber_loader:
-        class: phpbb\event\extension_subscriber_loader
-        arguments:
-            - @dispatcher
-            - @event.listener_collection
-        calls:
-            - [load, []]
-
-    event.listener_collection:
-        class: phpbb\di\service_collection
-        arguments:
-            - @service_container
-        tags:
-            - { name: service_collection, tag: event.listener }
-
     ext.manager:
         class: phpbb\extension\manager
         arguments:
@@ -170,72 +99,21 @@ services:
             - @dbal.conn
             - @config
             - @filesystem
+            - @user
             - %tables.ext%
             - %core.root_path%
             - %core.php_ext%
             - @cache.driver
 
-    ext.finder:
-        class: phpbb\extension\finder
-        arguments:
-            - @ext.manager
-            - @filesystem
-            - %core.root_path%
-            - @cache.driver
-            - %core.php_ext%
-            - _ext_finder
-
     filesystem:
         class: phpbb\filesystem
 
-    groupposition.legend:
-        class: phpbb\groupposition\legend
-        arguments:
-            - @dbal.conn
-            - @user
-
-    groupposition.teampage:
-        class: phpbb\groupposition\teampage
-        arguments:
-            - @dbal.conn
-            - @user
-            - @cache.driver
-
     http_kernel:
         class: Symfony\Component\HttpKernel\HttpKernel
         arguments:
             - @dispatcher
             - @controller.resolver
 
-    hook_finder:
-        class: phpbb\hook\finder
-        arguments:
-            - %core.root_path%
-            - %core.php_ext%
-            - @cache.driver
-
-    kernel_request_subscriber:
-        class: phpbb\event\kernel_request_subscriber
-        arguments:
-            - @ext.finder
-            - %core.root_path%
-            - %core.php_ext%
-        tags:
-            - { name: kernel.event_subscriber }
-
-    kernel_exception_subscriber:
-        class: phpbb\event\kernel_exception_subscriber
-        arguments:
-            - @template
-            - @user
-        tags:
-            - { name: kernel.event_subscriber }
-
-    kernel_terminate_subscriber:
-        class: phpbb\event\kernel_terminate_subscriber
-        tags:
-            - { name: kernel.event_subscriber }
-
     log:
         class: phpbb\log\log
         arguments:
@@ -248,35 +126,12 @@ services:
             - %core.php_ext%
             - %tables.log%
 
-    notification_manager:
-        class: phpbb\notification\manager
-        arguments:
-            - @notification.type_collection
-            - @notification.method_collection
-            - @service_container
-            - @user_loader
-            - @config
-            - @dbal.conn
-            - @cache
-            - @user
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.notification_types%
-            - %tables.notifications%
-            - %tables.user_notifications%
-
-    pagination:
-        class: phpbb\pagination
-        arguments:
-            - @template
-            - @user
-            - @controller.helper
-
     path_helper:
         class: phpbb\path_helper
         arguments:
             - @symfony_request
             - @filesystem
+            - @request
             - %core.root_path%
             - %core.php_ext%
             - %core.adm_relative_path%
@@ -296,6 +151,9 @@ services:
 
     request:
         class: phpbb\request\request
+        arguments:
+            - null
+            - %core.disable_super_globals%
 
     symfony_request:
         class: phpbb\symfony_request
@@ -314,17 +172,6 @@ services:
     template_context:
         class: phpbb\template\context
 
-    user:
-        class: phpbb\user
-
-    user_loader:
-        class: phpbb\user_loader
-        arguments:
-            - @dbal.conn
-            - %core.root_path%
-            - %core.php_ext%
-            - %tables.users%
-
     version_helper:
         class: phpbb\version_helper
         scope: prototype

phpBB/config/tables.yml

@@ -1,6 +1,9 @@
 parameters:
     tables.auth_provider_oauth_token_storage: %core.table_prefix%oauth_tokens
     tables.auth_provider_oauth_account_assoc: %core.table_prefix%oauth_accounts
+    tables.captcha_qa_questions: %core.table_prefix%captcha_questions
+    tables.captcha_qa_answers: %core.table_prefix%captcha_answers
+    tables.captcha_qa_confirm: %core.table_prefix%qa_confirm
     tables.config: %core.table_prefix%config
     tables.config_text: %core.table_prefix%config_text
     tables.ext: %core.table_prefix%ext