[prep-release-3.2.0-a2] Add changelog for 3.2.0-a2

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +0,0 @@
-Checklist:
-
-- [ ] Correct branch: master for new features; 3.2.x, 3.1.x for fixes
-- [ ] Tests pass
-- [ ] Code follows coding guidelines: [master / 3.2.x](https://area51.phpbb.com/docs/master/coding-guidelines.html), [3.1.x](https://area51.phpbb.com/docs/31x/coding-guidelines.html)
-- [ ] Commit follows commit message [format](https://wiki.phpbb.com/Git#Commit_Messages)
-
-Tracker ticket (set the ticket ID to **your ticket ID**):
-
-https://tracker.phpbb.com/browse/PHPBB3-12345

.gitignore

@@ -4,7 +4,7 @@
 !/phpBB/cache/.htaccess
 !/phpBB/cache/index.html
 /phpBB/composer.phar
-/phpBB/config*.php*
+/phpBB/config*.php
 /phpBB/ext/*
 /phpBB/files/*
 /phpBB/images/avatars/gallery/*
@@ -22,5 +22,3 @@
 /tests/test_config*.php
 /tests/tmp/*
 /tests/vendor
-/vagrant/phpbb-install-config.yml
-.vagrant

.jshintrc

@@ -19,7 +19,6 @@
   "jquery": true,
 
   "globals": {
-    "JSON": true,
-    "phpbb": true
+    "JSON": true
   }
 }

.travis.yml

@@ -22,15 +22,10 @@ matrix:
       env: DB=mysqli
     - php: 7.0
       env: DB=mysqli
-    - php: 7.1
-      env: DB=mysqli
-    - php: nightly
-      env: DB=mysqli
     - php: hhvm
       env: DB=mysqli
   allow_failures:
     - php: hhvm
-    - php: nightly
   fast_finish: true
 
 services:
@@ -49,6 +44,6 @@ script:
   - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
   - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION $NOTESTS ./
   - sh -c "if [ '$SLOWTESTS' != '1' -a '$DB' = 'mysqli' ]; then phpBB/vendor/bin/phpunit tests/lint_test.php; fi"
-  - sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --verbose --stop-on-error; fi"
+  - sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
   - sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi"
   - sh -c "set -x;if [ '$NOTESTS' = '1' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"

CONTRIBUTING.md

@@ -2,5 +2,5 @@
 
 1. [Create an account on phpBB.com](http://www.phpbb.com/community/ucp.php?mode=register)
 2. [Create a ticket (unless there already is one)](http://tracker.phpbb.com/secure/CreateIssue!default.jspa)
-3. Read our [Coding guidelines](https://wiki.phpbb.com/Coding_guidelines) and [Git Contribution Guidelines](http://wiki.phpbb.com/Git)
+3. Read our [Coding guidelines](https://wiki.phpbb.com/Coding_guidelines) and [Git Contribution Guidelines](http://wiki.phpbb.com/Git); if you're new to git, also read [the introduction guide](http://wiki.phpbb.com/display/DEV/Working+with+Git)
 4. Send us a pull request

README.md

@@ -2,38 +2,34 @@
 
 ## ABOUT
 
-phpBB is a free open-source bulletin board written in PHP.
+phpBB is a free bulletin board written in PHP.
 
 ## COMMUNITY
 
-Get your copy of phpBB, find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the development on [area51](http://area51.phpbb.com/phpBB/index.php).
+Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the development on [area51](http://area51.phpbb.com/phpBB/index.php).
 
 ## INSTALLING DEPENDENCIES
 
 To be able to run an installation from the repo (and not from a pre-built package) you need to run the following commands to install phpBB's dependencies.
 
 	cd phpBB
-	php ../composer.phar install
+	php ../composer.phar install --dev
 
 
 ## CONTRIBUTE
 
 1. [Create an account on phpBB.com](http://www.phpbb.com/community/ucp.php?mode=register)
 2. [Create a ticket (unless there already is one)](http://tracker.phpbb.com/secure/CreateIssue!default.jspa)
-3. Read our [Coding guidelines](https://wiki.phpbb.com/Coding_guidelines) and [Git Contribution Guidelines](http://wiki.phpbb.com/Git)
+3. [Read our Git Contribution Guidelines](http://wiki.phpbb.com/Git); if you're new to git, also read [the introduction guide](http://wiki.phpbb.com/display/DEV/Working+with+Git)
 4. Send us a pull request
 
-## VAGRANT
-
-Read our [Vagrant documentation](phpBB/docs/vagrant.md) to find out how to use Vagrant to develop and contribute to phpBB.
-
 ## AUTOMATED TESTING
 
-We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](http://bamboo.phpbb.com) or check our travis builds below:
+We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](http://bamboo.phpbb.com) or check our travis build below:
 
 * [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=master)](http://travis-ci.org/phpbb/phpbb) **master** - Latest development version
-* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=3.2.x)](http://travis-ci.org/phpbb/phpbb) **3.2.x** - Development of version 3.2.x
 * [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=3.1.x)](http://travis-ci.org/phpbb/phpbb) **3.1.x** - Development of version 3.1.x
+* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=3.0.x)](http://travis-ci.org/phpbb/phpbb) **3.0.x** - Development of version 3.0.x
 
 ## LICENSE
 

Vagrantfile

@@ -1,25 +0,0 @@
-require 'json'
-require 'yaml'
-
-VAGRANTFILE_API_VERSION ||= "2"
-confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.dirname(__FILE__))
-
-homesteadYamlPath = "vagrant/bootstrap.yaml"
-afterScriptPath = "vagrant/after.sh"
-aliasesPath = "vagrant/aliases"
-
-require File.expand_path(confDir + '/scripts/homestead.rb')
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-    if File.exists? aliasesPath then
-        config.vm.provision "file", source: aliasesPath, destination: "~/.bash_aliases"
-    end
-
-    if File.exists? homesteadYamlPath then
-        Homestead.configure(config, YAML::load(File.read(homesteadYamlPath)))
-    end
-
-    if File.exists? afterScriptPath then
-        config.vm.provision "shell", path: afterScriptPath
-    end
-end

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.2.1-RC1" />
-	<property name="prevversion" value="3.2.0" />
-	<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11-RC1, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2" />
+	<property name="newversion" value="3.2.0-a2" />
+	<property name="prevversion" value="3.2.0-a1" />
+	<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -49,7 +49,7 @@
 	-->
 	<target name="composer">
 		<exec dir="phpBB"
-			command="php ../composer.phar install --ignore-platform-reqs"
+			command="php ../composer.phar install --dev"
 			checkreturn="true"
 			passthru="true" />
 	</target>
@@ -142,9 +142,7 @@
 
 		<phingcall target="export">
 			<property name="revision" value="release-${version}" />
-			<property name="version" value="${version}" />
 			<property name="dir" value="build/old_versions/release-${version}" />
-			<property name="skip-composer" value="true" />
 		</phingcall>
 
 		<phingcall target="clean-diff-dir">
@@ -250,35 +248,26 @@
 			<equals arg1="${composer-has-dependencies}" arg2="1" trim="true" />
 			<then>
 				<!-- We have non-dev composer dependencies -->
+				<exec dir="."
+					command="git ls-tree ${revision} composer.phar"
+					checkreturn="true"
+					outputProperty='composer-ls-tree-output' />
 				<if>
-					<not><isset property="skip-composer" /></not>
+					<equals arg1="${composer-ls-tree-output}" arg2="" trim="true" />
 					<then>
-						<exec dir="."
-							command="git ls-tree ${revision} composer.phar"
-							checkreturn="true"
-							outputProperty='composer-ls-tree-output' />
-						<if>
-							<equals arg1="${composer-ls-tree-output}" arg2="" trim="true" />
-							<then>
-								<fail message="There are composer dependencies, but composer.phar is missing." />
-							</then>
-							<else>
-								<!-- Export the phar, install dependencies, delete phar. -->
-								<exec dir="."
-									command="git archive ${revision} composer.phar | tar -xf - -C ${dir}"
-									checkreturn="true" />
-								<exec dir="${dir}"
-									command="php composer.phar install --no-dev --optimize-autoloader --ignore-platform-reqs"
-									checkreturn="true"
-									passthru="true" />
-								<delete file="${dir}/composer.phar" />
-
-								<phingcall target="clean-vendor-dir">
-									<property name="dir" value="${dir}" />
-								</phingcall>
-							</else>
-						</if>
+						<fail message="There are composer dependencies, but composer.phar is missing." />
 					</then>
+					<else>
+						<!-- Export the phar, install dependencies, delete phar. -->
+						<exec dir="."
+							command="git archive ${revision} composer.phar | tar -xf - -C ${dir}"
+							checkreturn="true" />
+						<exec dir="${dir}"
+							command="php composer.phar install --no-dev --optimize-autoloader"
+							checkreturn="true"
+							passthru="true" />
+						<delete file="${dir}/composer.phar" />
+					</else>
 				</if>
 			</then>
 			<else>
@@ -288,54 +277,6 @@
 			</else>
 		</if>
 
-		<!-- Checkout latest viglink to ext folder -->
-		<available file="${dir}/ext" type="dir" property="add-viglink-ext" />
-		<exec dir="${dir}"
-			command='php -r "echo version_compare(&apos;${version}&apos;, &apos;3.2.0-RC2&apos;, &apos;>=&apos;) ? &apos;true&apos; : &apos;false&apos;;"'
-			checkreturn="true"
-			outputProperty='viglink-available' />
-		<if>
-			<and>
-				<equals arg1="${add-viglink-ext}" arg2="1" trim="true" />
-				<or>
-					<equals arg1="${revision}" arg2="HEAD" trim="true" />
-					<equals arg1="${viglink-available}" arg2="1" trim="true" />
-				</or>
-			</and>
-			<then>
-				<exec dir="${dir}/ext" command="mkdir phpbb" passthru="true" />
-
-				<exec dir="${dir}/ext/phpbb" command="git clone https://github.com/phpbb-extensions/viglink.git viglink" passthru="true" checkreturn="true" />
-				<if>
-					<equals arg1="${revision}" arg2="HEAD" trim="true" />
-					<then>
-						<exec dir="${dir}/ext/phpbb/viglink"
-							command="git rev-parse release-phpbb-${version}"
-							returnProperty='viglink_head_tag_exists' />
-						<if>
-							<equals arg1="${viglink_head_tag_exists}" arg2="0" trim="true" />
-							<then>
-								<exec dir="${dir}/ext/phpbb/viglink" command="git checkout release-phpbb-${version}" passthru="true" />
-							</then>
-							<else>
-								<exec dir="${dir}/ext/phpbb/viglink" command="git checkout master" passthru="true" />
-							</else>
-						</if>
-					</then>
-					<else>
-						<exec dir="${dir}/ext/phpbb/viglink" command="git checkout release-phpbb-${version}" passthru="true" />
-					</else>
-				</if>
-				<delete dir="${dir}/ext/phpbb/viglink/.git" />
-				<delete dir="${dir}/ext/phpbb/viglink/tests" />
-				<delete dir="${dir}/ext/phpbb/viglink/travis" />
-				<delete file="${dir}/ext/phpbb/viglink/.gitattributes" />
-				<delete file="${dir}/ext/phpbb/viglink/.travis.yml" />
-				<delete file="${dir}/ext/phpbb/viglink/phpunit.xml.dist" />
-				<delete file="${dir}/ext/phpbb/viglink/README.md" />
-			</then>
-		</if>
-
 		<!-- Create schema.json -->
 		<exec dir="${dir}" command="php develop/create_schema_files.php" />
 
@@ -345,6 +286,10 @@
 		<delete dir="${dir}/config/development" />
 		<delete dir="${dir}/config/test" />
 
+		<phingcall target="clean-vendor-dir">
+			<property name="dir" value="${dir}" />
+		</phingcall>
+
 		<echo msg="Setting permissions for checkout of ${revision} in ${dir}" />
 		<!-- set permissions of all files to 644, directories to 755 -->
 		<exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" />
@@ -358,65 +303,13 @@
 
 	<target name="clean-vendor-dir">
 		<!-- Delete unrelated files from vendor/, see PHPBB3-12390 -->
-		<delete dir="${dir}/vendor/bantu/ini-get-wrapper/tests" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.gitignore" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.scrutinizer.yml" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.travis.yml" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/README.md" />
-
-		<delete dir="${dir}/vendor/google/recaptcha/examples" />
-		<delete dir="${dir}/vendor/google/recaptcha/tests" />
-		<delete file="${dir}/vendor/google/recaptcha/.gitignore" />
-		<delete file="${dir}/vendor/google/recaptcha/.travis.yml" />
-		<delete file="${dir}/vendor/google/recaptcha/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/google/recaptcha/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/google/recaptcha/README.md" />
-
-		<delete dir="${dir}/vendor/guzzlehttp/guzzle/build" />
-		<delete dir="${dir}/vendor/guzzlehttp/guzzle/docs" />
-		<delete dir="${dir}/vendor/guzzlehttp/guzzle/tests" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/CHANGELOG.md" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/.editorconfig" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/.gitignore" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/Makefile" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/README.md" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/.travis.yml" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/UPGRADING.md" />
-
-		<delete dir="${dir}/vendor/guzzlehttp/ringphp/docs" />
-		<delete dir="${dir}/vendor/guzzlehttp/ringphp/tests" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/CHANGELOG.md" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/.gitignore" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/Makefile" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/README.rst" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/.travis.yml" />
-
-		<delete dir="${dir}/vendor/guzzlehttp/streams/tests" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/CHANGELOG.rst" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/.gitignore" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/Makefile" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/README.rst" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/.travis.yml" />
-
 		<delete dir="${dir}/vendor/lusitanian/oauth/examples" />
 		<delete dir="${dir}/vendor/lusitanian/oauth/tests" />
 		<delete file="${dir}/vendor/lusitanian/oauth/.gitignore" />
-		<delete file="${dir}/vendor/lusitanian/oauth/.scrutinizer.yml" />
 		<delete file="${dir}/vendor/lusitanian/oauth/.travis.yml" />
 		<delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" />
 		<delete file="${dir}/vendor/lusitanian/oauth/README.md" />
 
-		<delete dir="${dir}/vendor/paragonie/random_compat/dist" />
-		<delete dir="${dir}/vendor/paragonie/random_compat/other" />
-		<delete file="${dir}/vendor/paragonie/random_compat/CHANGELOG.md" />
-		<delete file="${dir}/vendor/paragonie/random_compat/ERRATA.md" />
-		<delete file="${dir}/vendor/paragonie/random_compat/README.md" />
-		<delete file="${dir}/vendor/paragonie/random_compat/SECURITY.md" />
-
 		<delete file="${dir}/vendor/patchwork/utf8/.travis.yml" />
 		<delete file="${dir}/vendor/patchwork/utf8/CHANGELOG.md" />
 		<delete file="${dir}/vendor/patchwork/utf8/phpunit.xml.dist" />
@@ -426,13 +319,6 @@
 		<delete file="${dir}/vendor/psr/log/.gitignore" />
 		<delete file="${dir}/vendor/psr/log/README.md" />
 
-		<delete dir="${dir}/vendor/react/promise/tests" />
-		<delete file="${dir}/vendor/react/promise/CHANGELOG.md" />
-		<delete file="${dir}/vendor/react/promise/.gitignore" />
-		<delete file="${dir}/vendor/react/promise/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/react/promise/README.md" />
-		<delete file="${dir}/vendor/react/promise/.travis.yml" />
-
 		<delete dir="${dir}/vendor/s9e/text-formatter/.git" />
 
 		<delete dir="${dir}/vendor/symfony/config/.git" />
@@ -498,13 +384,6 @@
 		<delete file="${dir}/vendor/symfony/http-kernel/README.md" />
 		<delete file="${dir}/vendor/symfony/http-kernel/phpunit.xml.dist" />
 
-		<delete dir="${dir}/vendor/symfony/proxy-manager-bridge/.git" />
-		<delete dir="${dir}/vendor/symfony/proxy-manager-bridge/Tests" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/.gitignore" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/README.md" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/phpunit.xml.dist" />
-
 		<delete dir="${dir}/vendor/symfony/routing/.git" />
 		<delete dir="${dir}/vendor/symfony/routing/Tests" />
 		<delete file="${dir}/vendor/symfony/routing/.gitignore" />
@@ -512,19 +391,12 @@
 		<delete file="${dir}/vendor/symfony/routing/README.md" />
 		<delete file="${dir}/vendor/symfony/routing/phpunit.xml.dist" />
 
-		<delete dir="${dir}/vendor/symfony/twig-bridge/.git" />
-		<delete dir="${dir}/vendor/symfony/twig-bridge/Tests" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/.gitignore" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/README.md" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/phpunit.xml.dist" />
-
 		<delete dir="${dir}/vendor/symfony/yaml/.git" />
-		<delete dir="${dir}/vendor/symfony/yaml/Tests" />
-		<delete file="${dir}/vendor/symfony/yaml/.gitignore" />
-		<delete file="${dir}/vendor/symfony/yaml/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/yaml/README.md" />
-		<delete file="${dir}/vendor/symfony/yaml/phpunit.xml.dist" />
+		<delete dir="${dir}/vendor/symfony/yaml/Symfony/Tests" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/.gitignore" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/README.md" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/phpunit.xml.dist" />
 
 		<delete dir="${dir}/vendor/twig/twig/doc" />
 		<delete dir="${dir}/vendor/twig/twig/ext" />
@@ -532,18 +404,38 @@
 		<delete file="${dir}/vendor/twig/twig/.editorconfig" />
 		<delete file="${dir}/vendor/twig/twig/.gitignore" />
 		<delete file="${dir}/vendor/twig/twig/.travis.yml" />
+		<delete file="${dir}/vendor/twig/twig/AUTHORS" />
 		<delete file="${dir}/vendor/twig/twig/CHANGELOG" />
 		<delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/twig/twig/README.rst" />
+		<delete file="${dir}/vendor/twig/twig/README.markdown" />
 
-		<delete file="${dir}/vendor/zendframework/zend-code/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-code/README.md" />
+		<delete dir="${dir}/vendor/symfony/security-core/.git" />
+		<delete dir="${dir}/vendor/symfony/security-core/Core/Tests" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/.gitignore" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/README.md" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/phpunit.xml.dist" />
 
-		<delete file="${dir}/vendor/zendframework/zend-eventmanager/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-eventmanager/README.md" />
+		<delete dir="${dir}/vendor/symfony/security-csrf/.git" />
+		<delete dir="${dir}/vendor/symfony/security-csrf/Csrf/Tests" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/.gitignore" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/README.md" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/phpunit.xml.dist" />
 
-		<delete file="${dir}/vendor/zendframework/zend-stdlib/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-stdlib/README.md" />
+		<delete dir="${dir}/vendor/symfony/twig-bridge/.git" />
+		<delete dir="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/Tests" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/.gitignore" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/README.md" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/security/.git" />
+		<delete dir="${dir}/vendor/symfony/security/Tests" />
+		<delete file="${dir}/vendor/symfony/security/.gitignore" />
+		<delete file="${dir}/vendor/symfony/security/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/security/README.md" />
+		<delete file="${dir}/vendor/symfony/security/phpunit.xml.dist" />
 	</target>
 
 	<target name="clean-diff-dir">

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

@@ -87,11 +87,6 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
 				$old_simple_statement = $simple_statement;
 
 				$simple_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($simple_statement + 1));
-
-				if ($simple_class_name_start === false) {
-					continue;
-				}
-
 				$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)));
@@ -134,19 +129,53 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
 			}
 		}
 
-		$old_docblock = $stackPtr;
-		while (($docblock = $phpcsFile->findNext(T_DOC_COMMENT_CLOSE_TAG, ($old_docblock + 1))) !== false)
-		{
-			$old_docblock = $docblock;
-			$ok = $this->checkDocblock($phpcsFile, $docblock, $tokens, $class_name_full, $class_name_short) ? true : $ok;
-		}
-
 		// 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;
 
+			// Check docblocks
+			$find = array(
+				T_COMMENT,
+				T_DOC_COMMENT_CLOSE_TAG,
+				T_DOC_COMMENT,
+				T_CLASS,
+				T_FUNCTION,
+				T_OPEN_TAG,
+			);
+
+			$comment_end = $phpcsFile->findPrevious($find, ($function_declaration - 1));
+			if ($comment_end !== false)
+			{
+				if ($tokens[$comment_end]['code'] === T_DOC_COMMENT_CLOSE_TAG)
+				{
+					$comment_start = $tokens[$comment_end]['comment_opener'];
+					foreach ($tokens[$comment_start]['comment_tags'] as $tag) {
+						if ($tokens[$tag]['content'] !== '@param' && $tokens[$tag]['content'] !== '@return' && $tokens[$tag]['content'] !== '@throws') {
+							continue;
+						}
+
+						$classes = $tokens[($tag + 2)]['content'];
+						$space = strpos($classes, ' ');
+						if ($space !== false) {
+							$classes = substr($classes, 0, $space);
+						}
+
+						$tab = strpos($classes, "\t");
+						if ($tab !== false) {
+							$classes = substr($classes, 0, $tab);
+						}
+
+						$classes = explode('|', str_replace('[]', '', $classes));
+						foreach ($classes as $class)
+						{
+							$ok = $this->check($phpcsFile, $class, $class_name_full, $class_name_short, $tokens[$tag + 2]['line']) ? true : $ok;
+						}
+					}
+				}
+			}
+
 			// Check type hint
 			$params = $phpcsFile->getMethodParameters($function_declaration);
 			foreach ($params as $param)
@@ -205,49 +234,4 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
 		return false;
 
 	}
-
-	/**
-	 * @param PHP_CodeSniffer_File $phpcsFile
-	 * @param int $field
-	 * @param array $tokens
-	 * @param string $class_name_full
-	 * @param string $class_name_short
-	 * @param bool $ok
-	 *
-	 * @return bool
-	 */
-	private function checkDocblock(PHP_CodeSniffer_File $phpcsFile, $comment_end, $tokens, $class_name_full, $class_name_short)
-	{
-		$ok = false;
-
-		$comment_start = $tokens[$comment_end]['comment_opener'];
-		foreach ($tokens[$comment_start]['comment_tags'] as $tag)
-		{
-			if (!in_array($tokens[$tag]['content'], array('@param', '@var', '@return', '@throws'), true))
-			{
-				continue;
-			}
-
-			$classes = $tokens[($tag + 2)]['content'];
-			$space = strpos($classes, ' ');
-			if ($space !== false)
-			{
-				$classes = substr($classes, 0, $space);
-			}
-
-			$tab = strpos($classes, "\t");
-			if ($tab !== false)
-			{
-				$classes = substr($classes, 0, $tab);
-			}
-
-			$classes = explode('|', str_replace('[]', '', $classes));
-			foreach ($classes as $class)
-			{
-				$ok = $this->check($phpcsFile, $class, $class_name_full, $class_name_short, $tokens[$tag + 2]['line']) ? true : $ok;
-			}
-		}
-
-		return $ok;
-	}
 }

build/sami-all.conf.php

@@ -25,7 +25,6 @@ $config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../'
 	*/
 	->add('3.0.x')
 	->add('3.1.x')
-	->add('3.2.x')
 	->add('master')
 ;
 

git-tools/setup_github_network.php

@@ -0,0 +1,292 @@
+#!/usr/bin/env php
+<?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.
+*
+*/
+
+function show_usage()
+{
+	$filename = basename(__FILE__);
+
+	echo "$filename adds repositories of a github network as remotes to a local git repository.\n";
+	echo "\n";
+
+	echo "Usage: [php] $filename -s collaborators|organisation|contributors|forks [OPTIONS]\n";
+	echo "\n";
+
+	echo "Scopes:\n";
+	echo "  collaborators                 Repositories of people who have push access to the specified repository\n";
+	echo "  contributors                  Repositories of people who have contributed to the specified repository\n";
+	echo "  organisation                  Repositories of members of the organisation at github\n";
+	echo "  forks                         All repositories of the whole github network\n";
+	echo "\n";
+
+	echo "Options:\n";
+	echo " -s scope                       See description above (mandatory)\n";
+	echo " -u github_username             Overwrites the github username (optional)\n";
+	echo " -r repository_name             Overwrites the repository name (optional)\n";
+	echo " -m your_github_username        Sets up ssh:// instead of git:// for pushable repositories (optional)\n";
+	echo " -d                             Outputs the commands instead of running them (optional)\n";
+	echo " -h                             This help text\n";
+
+	exit(1);
+}
+
+// Handle arguments
+$opts = getopt('s:u:r:m:dh');
+
+if (empty($opts) || isset($opts['h']))
+{
+	show_usage();
+}
+
+$scope			= get_arg($opts, 's', '');
+$username		= get_arg($opts, 'u', 'phpbb');
+$repository 	= get_arg($opts, 'r', 'phpbb3');
+$developer		= get_arg($opts, 'm', '');
+$dry_run		= !get_arg($opts, 'd', true);
+run(null, $dry_run);
+exit(work($scope, $username, $repository, $developer));
+
+function work($scope, $username, $repository, $developer)
+{
+	// Get some basic data
+	$forks		= get_forks($username, $repository);
+	$collaborators	= get_collaborators($username, $repository);
+
+	if ($forks === false || $collaborators === false)
+	{
+		echo "Error: failed to retrieve forks or collaborators\n";
+		return 1;
+	}
+
+	switch ($scope)
+	{
+		case 'collaborators':
+			$remotes = array_intersect_key($forks, $collaborators);
+		break;
+
+		case 'organisation':
+			$remotes = array_intersect_key($forks, get_organisation_members($username));
+		break;
+
+		case 'contributors':
+			$remotes = array_intersect_key($forks, get_contributors($username, $repository));
+		break;
+
+		case 'forks':
+			$remotes = $forks;
+		break;
+
+		default:
+			show_usage();
+	}
+
+	if (file_exists('.git'))
+	{
+		add_remote($username, $repository, isset($collaborators[$developer]));
+	}
+	else
+	{
+		clone_repository($username, $repository, isset($collaborators[$developer]));
+	}
+
+	// Add private security repository for developers
+	if ($username == 'phpbb' && $repository == 'phpbb3' && isset($collaborators[$developer]))
+	{
+		run("git remote add $username-security " . get_repository_url($username, "$repository-security", true));
+	}
+
+	// Skip blessed repository.
+	unset($remotes[$username]);
+
+	foreach ($remotes as $remote)
+	{
+		add_remote($remote['username'], $remote['repository'], $remote['username'] == $developer);
+	}
+
+	run('git remote update');
+}
+
+function clone_repository($username, $repository, $pushable = false)
+{
+	$url = get_repository_url($username, $repository, false);
+	run("git clone $url ./ --origin $username");
+
+	if ($pushable)
+	{
+		$ssh_url = get_repository_url($username, $repository, true);
+		run("git remote set-url --push $username $ssh_url");
+	}
+}
+
+function add_remote($username, $repository, $pushable = false)
+{
+	$url = get_repository_url($username, $repository, false);
+	run("git remote add $username $url");
+
+	if ($pushable)
+	{
+		$ssh_url = get_repository_url($username, $repository, true);
+		run("git remote set-url --push $username $ssh_url");
+	}
+}
+
+function get_repository_url($username, $repository, $ssh = false)
+{
+	$url_base = ($ssh) ? 'git@github.com:' : 'git://github.com/';
+
+	return $url_base . $username . '/' . $repository . '.git';
+}
+
+function api_request($query)
+{
+	return api_url_request("https://api.github.com/$query?per_page=100");
+}
+
+function api_url_request($url)
+{
+	$contents = file_get_contents($url, false, stream_context_create(array(
+		'http' => array(
+			'header' => "User-Agent: phpBB/1.0\r\n",
+		),
+	)));
+
+	$sub_request_result = array();
+	// Check headers for pagination links
+	if (!empty($http_response_header))
+	{
+		foreach ($http_response_header as $header_element)
+		{
+			// Find Link Header which gives us a link to the next page
+			if (strpos($header_element, 'Link: ') === 0)
+			{
+				list($head, $header_content) = explode(': ', $header_element);
+				foreach (explode(', ', $header_content) as $links)
+				{
+					list($url, $rel) = explode('; ', $links);
+					if ($rel == 'rel="next"')
+					{
+						// Found a next link, follow it and merge the results
+						$sub_request_result = api_url_request(substr($url, 1, -1));
+					}
+				}
+			}
+		}
+	}
+
+	if ($contents === false)
+	{
+		return false;
+	}
+	$contents = json_decode($contents);
+
+	if (isset($contents->message) && strpos($contents->message, 'API Rate Limit') === 0)
+	{
+		throw new RuntimeException('Reached github API Rate Limit. Please try again later' . "\n", 4);
+	}
+
+	return ($sub_request_result) ? array_merge($sub_request_result, $contents) : $contents;
+}
+
+function get_contributors($username, $repository)
+{
+	$request = api_request("repos/$username/$repository/stats/contributors");
+	if ($request === false)
+	{
+		return false;
+	}
+
+	$usernames = array();
+	foreach ($request as $contribution)
+	{
+		$usernames[$contribution->author->login] = $contribution->author->login;
+	}
+
+	return $usernames;
+}
+
+function get_organisation_members($username)
+{
+	$request = api_request("orgs/$username/public_members");
+	if ($request === false)
+	{
+		return false;
+	}
+
+	$usernames = array();
+	foreach ($request as $member)
+	{
+		$usernames[$member->login] = $member->login;
+	}
+
+	return $usernames;
+}
+
+function get_collaborators($username, $repository)
+{
+	$request = api_request("repos/$username/$repository/collaborators");
+	if ($request === false)
+	{
+		return false;
+	}
+
+	$usernames = array();
+	foreach ($request as $collaborator)
+	{
+		$usernames[$collaborator->login] = $collaborator->login;
+	}
+
+	return $usernames;
+}
+
+function get_forks($username, $repository)
+{
+	$request = api_request("repos/$username/$repository/forks");
+	if ($request === false)
+	{
+		return false;
+	}
+
+	$usernames = array();
+	foreach ($request as $fork)
+	{
+		$usernames[$fork->owner->login] = array(
+			'username'		=> $fork->owner->login,
+			'repository'	=> $fork->name,
+		);
+	}
+
+	return $usernames;
+}
+
+function get_arg($array, $index, $default)
+{
+	return isset($array[$index]) ? $array[$index] : $default;
+}
+
+function run($cmd, $dry = false)
+{
+	static $dry_run;
+
+	if (is_null($cmd))
+	{
+		$dry_run = $dry;
+	}
+	else if (!empty($dry_run))
+	{
+		echo "$cmd\n";
+	}
+	else
+	{
+		passthru(escapeshellcmd($cmd));
+	}
+}

phpBB/.htaccess

@@ -1,16 +1,6 @@
 <IfModule mod_rewrite.c>
 RewriteEngine on
 
-#
-# Uncomment the statement below if URL rewriting doesn't
-# work properly. If you installed phpBB in a subdirectory
-# of your site, properly set the argument for the statement.
-# e.g.: if your domain is test.com and you installed phpBB
-# in http://www.test.com/phpBB/index.php you have to set
-# the statement RewriteBase /phpBB/
-#
-#RewriteBase /
-
 #
 # Uncomment the statement below if you want to make use of
 # HTTP authentication and it does not already work.

phpBB/adm/index.php

@@ -41,7 +41,6 @@ if (!isset($user->data['session_admin']) || !$user->data['session_admin'])
 // check specific permissions but this is a catchall
 if (!$auth->acl_get('a_'))
 {
-	send_status_line(403, 'Forbidden');
 	trigger_error('NO_ADMIN');
 }
 

phpBB/adm/style/acp_attachments.html

@@ -196,7 +196,7 @@
 		</dl>
 		<dl>
 			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt>
-			<dd><input type="number" id="extgroup_filesize" min="0" max="999999999999999" step="any" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
+			<dd><input type="number" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
 		</dl>
 		<dl>
 			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}{L_COLON}</label></dt>
@@ -346,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" min="0" max="9999999999" name="post_id[{orphan.ATTACH_ID}]" value="{orphan.POST_ID}" style="width: 75%;" /></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>

phpBB/adm/style/acp_avatar_options_gravatar.html

@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<input type="number" name="avatar_gravatar_width" id="avatar_gravatar_width" min="{AVATAR_MIN_WIDTH}" max="{AVATAR_MAX_WIDTH}" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp;
-		<input type="number" name="avatar_gravatar_height" id="avatar_gravatar_height" min="{AVATAR_MIN_HEIGHT}" max="{AVATAR_MAX_HEIGHT}" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
+		<input type="number" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
+		<input type="number" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 	</dd>
 </dl>

phpBB/adm/style/acp_avatar_options_remote.html

@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<input type="number" name="avatar_remote_width" id="avatar_remote_width" min="{AVATAR_MIN_WIDTH}" max="{AVATAR_MAX_WIDTH}" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp;
-		<input type="number" name="avatar_remote_height" id="avatar_remote_height" min="{AVATAR_MIN_HEIGHT}" max="{AVATAR_MAX_HEIGHT}" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
+		<input type="number" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
+		<input type="number" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 	</dd>
 </dl>

phpBB/adm/style/acp_captcha.html

@@ -27,11 +27,11 @@
 </dl>
 <dl>
 	<dt><label for="max_reg_attempts">{L_REG_LIMIT}{L_COLON}</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
-	<dd><input id="max_reg_attempts" type="number" min="0" max="9999" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
+	<dd><input id="max_reg_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
 </dl>
 <dl>
 	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}{L_COLON}</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt>
-	<dd><input id="max_login_attempts" type="number" min="0" max="9999" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>
+	<dd><input id="max_login_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>
 </dl>
 <dl>
 	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>

phpBB/adm/style/acp_database.html

@@ -14,7 +14,7 @@
 		<legend>{L_RESTORE_OPTIONS}</legend>
 	<dl>
 		<dt><label for="file">{L_SELECT_FILE}{L_COLON}</label></dt>
-		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_FIRST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
+		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
 	</dl>
 
 	<p class="submit-buttons">

phpBB/adm/style/acp_ext_details.html

@@ -7,19 +7,20 @@
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<!-- IF S_VERSIONCHECK -->
-		<!-- IF S_VERSIONCHECK_FAIL -->
-		<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 -->
-		<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>
-		<!-- ENDIF -->
+	<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 -->
-<!-- EVENT acp_ext_details_notice -->
 
 	<fieldset>
 		<legend>{L_EXT_DETAILS}</legend>
@@ -135,5 +136,4 @@
 		<!-- END meta_authors -->
 	</fieldset>
 
-	<!-- EVENT acp_ext_details_end -->
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_ext_list.html

@@ -44,11 +44,11 @@
 	<tbody>
 		<!-- IF .enabled -->
 		<tr>
-			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong><!-- EVENT acp_ext_list_enabled_title_after --></td>
+			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
 		</tr>
 		<!-- BEGIN enabled -->
 		<tr class="ext_enabled row-highlight">
-			<td><strong title="{enabled.NAME}">{enabled.META_DISPLAY_NAME}</strong><!-- EVENT acp_ext_list_enabled_name_after --></td>
+			<td><strong title="{enabled.NAME}">{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>
@@ -69,11 +69,11 @@
 
 		<!-- IF .disabled -->
 		<tr>
-			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong><!-- EVENT acp_ext_list_disabled_title_after --></td>
+			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
 		</tr>
 		<!-- BEGIN disabled -->
 		<tr class="ext_disabled row-highlight">
-			<td><strong title="{disabled.NAME}">{disabled.META_DISPLAY_NAME}</strong><!-- EVENT acp_ext_list_disabled_name_after --></td>
+			<td><strong title="{disabled.NAME}">{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>

phpBB/adm/style/acp_forums.html

@@ -242,7 +242,7 @@
 		</dl>
 		<dl>
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
-			<dd><input type="number" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" min="0" max="9999" /></dd>
+			<dd><input type="number" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" min="0" max="9999" /></dd>
 		</dl>
 		<!-- EVENT acp_forums_normal_settings_append -->
 		</fieldset>
@@ -257,15 +257,15 @@
 		</dl>
 		<dl>
 			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
@@ -289,11 +289,11 @@
 		</dl>
 		<dl>
 			<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}" min="0" max="9999" /> {L_DAYS}</dd>
+			<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_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}" min="0" max="9999" /> {L_DAYS}</dd>
+			<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>
 		<!-- EVENT acp_forums_prune_settings_append -->
 		</fieldset>

phpBB/adm/style/acp_groups.html

@@ -86,11 +86,11 @@
 		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
 	<dl>
 		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}{L_COLON}</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
-		<dd><input name="group_message_limit" type="number" id="group_message_limit" min="0" max="9999" value="{GROUP_MESSAGE_LIMIT}" /></dd>
+		<dd><input name="group_message_limit" type="number" id="group_message_limit" maxlength="4" size="4" min="0" max="9999" value="{GROUP_MESSAGE_LIMIT}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}{L_COLON}</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
-		<dd><input name="group_max_recipients" type="number" id="group_max_recipients" min="0" max="9999" value="{GROUP_MAX_RECIPIENTS}" /></dd>
+		<dd><input name="group_max_recipients" type="number" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
@@ -267,12 +267,11 @@
 
 	<!-- EVENT acp_groups_manage_before -->
 	<table class="table1">
-		<col class="col1" /><col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
+		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
 		<th style="width: 50%">{L_GROUP}</th>
 		<th>{L_TOTAL_MEMBERS}</th>
-		<th>{L_PENDING_MEMBERS}</th>
 		<th colspan="2">{L_OPTIONS}</th>
 		<th>{L_ACTION}</th>
 	</tr>
@@ -282,7 +281,7 @@
 		<!-- IF groups.S_SPECIAL -->
 		<!-- IF groups.S_FIRST_ROW -->
 			<tr>
-				<td colspan="6" class="row3">{L_NO_GROUPS_CREATED}</td>
+				<td colspan="5" class="row3">{L_NO_GROUPS_CREATED}</td>
 			</tr>
 		<!-- ENDIF -->
 	</tbody>
@@ -303,12 +302,11 @@
 	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p>
 
 	<table class="table1">
-		<col class="col1" /><col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" />
+		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
 		<th style="width: 50%">{L_GROUP}</th>
 		<th>{L_TOTAL_MEMBERS}</th>
-		<th>{L_PENDING_MEMBERS}</th>
 		<th colspan="2">{L_OPTIONS}</th>
 		<th>{L_ACTION}</th>
 	</tr>
@@ -318,7 +316,6 @@
 		<tr>
 			<td><strong>{groups.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
-			<td style="text-align: center;">{groups.PENDING_MEMBERS}</td>
 			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>
 			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td>
 			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>

phpBB/adm/style/acp_help_phpbb.html

@@ -1,61 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-
-<h1>{L_ACP_HELP_PHPBB}</h1>
-
-<form id="acp_help_phpbb" method="post" action="{U_ACTION}" data-ajax-action="{U_COLLECT_STATS}">
-<div class="send-stats-row">
-	<!-- EVENT acp_help_phpbb_stats_before -->
-	<div class="send-stats-tile">
-		<h2><i class="icon fa-bar-chart"></i>{L_SEND_STATISTICS}</h2>
-		<p>{L_EXPLAIN_SEND_STATISTICS}</p>
-		<div class="send-stats-row">
-			<div class="send-stats-data-row send-stats-data-only-row">
-				<a id="trigger-configlist" data-ajax="toggle_link" data-overlay="false" data-toggle-text="{L_HIDE_STATISTICS}"><span>{L_SHOW_STATISTICS}</span><i class="icon fa-angle-down"></i></a>
-			</div>
-			<div class="send-stats-data-row">
-				<div class="configlist" id="configlist">
-					<!-- BEGIN providers -->
-					<fieldset>
-						<legend>{providers.NAME}</legend>
-						<!-- BEGIN values -->
-						<dl>
-							<dt>{providers.values.KEY}</dt>
-							<dd>{providers.values.VALUE}</dd>
-						</dl>
-						<!-- END values -->
-					</fieldset>
-					<!-- END providers -->
-				</div>
-			</div>
-		</div>
-		<dl class="send-stats-settings">
-			<dt>
-				<input name="help_send_statistics" id="help_send_statistics" type="checkbox"<!-- IF S_COLLECT_STATS --> checked="checked"<!-- ENDIF --> />
-				<label for="help_send_statistics"></label>
-			</dt>
-			<dd>{L_SEND_STATISTICS_LONG}</dd>
-		</dl>
-	</div>
-	<!-- EVENT acp_help_phpbb_stats_after -->
-	<fieldset>
-		<p class="submit-buttons">
-			<input type="hidden" name="systemdata" value="{RAW_DATA}" />
-			<input type="hidden" name="help_send_statistics_time" value="{COLLECT_STATS_TIME}" />
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
-		</p>
-		{S_FORM_TOKEN}
-	</fieldset>
-</div>
-</form>
-<form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
-	<fieldset>
-		<p class="submit-buttons">
-			<input type="hidden" name="systemdata" value="{RAW_DATA}" />
-			<input class="button1" type="submit" id="submit_stats" name="submit" value="{L_SEND_STATISTICS}" />
-		</p>
-	</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_icons.html

@@ -111,8 +111,8 @@
 			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
 			<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
 		<!-- ENDIF -->
-		<td><input class="text post" type="number" min="0" max="999" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
-		<td><input class="text post" type="number" min="0" max="999" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
+		<td><input class="text post" type="number" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
+		<td><input class="text post" type="number" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
 		<!-- IF not S_SMILIES -->
 			<td><input class="text post" type="text" name="alt[{items.IMG}]" value="{items.ALT}" size="10" maxlength="50" /></td>
 		<!-- ENDIF -->
@@ -142,8 +142,8 @@
 		<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td>
 		<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td>
 		<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td>
-		<td><input class="text post" type="number" min="0" max="999" name="add_width" id="add_width" value="{WIDTH}" /></td>
-		<td><input class="text post" type="number" min="0" max="999" name="add_height" id="add_height" value="{HEIGHT}" /></td>
+		<td><input class="text post" type="number" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
+		<td><input class="text post" type="number" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
 		<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td>
  		<td><select id="order_add_order" name="add_order">
 				<optgroup id="order_disp_add_order" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup>

phpBB/adm/style/acp_inactive.html

@@ -52,7 +52,7 @@
 </table>
 
 <fieldset class="display-options">
-	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;{L_USERS_PER_PAGE}{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" min="0" max="999" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
+	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;{L_USERS_PER_PAGE}{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
 	<input class="button2" type="submit" value="{L_GO}" name="sort" />
 </fieldset>
 

phpBB/adm/style/acp_jabber.html

@@ -31,7 +31,7 @@
 </dl>
 <dl>
 	<dt><label for="jab_port">{L_JAB_PORT}{L_COLON}</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
-	<dd><input type="number" id="jab_port" name="jab_port" value="{JAB_PORT}" min="0" max="99999" /></dd>
+	<dd><input type="number" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
 </dl>
 <dl>
 	<dt><label for="jab_username">{L_JAB_USERNAME}{L_COLON}</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
@@ -47,25 +47,10 @@
 	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
-<dl>
-	<dt><label for="jab_verify_peer">{L_JAB_VERIFY_PEER}{L_COLON}</label><br /><span>{L_JAB_VERIFY_PEER_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_verify_peer" name="jab_verify_peer" value="1"<!-- IF JAB_VERIFY_PEER --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_verify_peer" value="0"<!-- IF not JAB_VERIFY_PEER --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="jab_verify_peer_name">{L_JAB_VERIFY_PEER_NAME}{L_COLON}</label><br /><span>{L_JAB_VERIFY_PEER_NAME_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_verify_peer_name" name="jab_verify_peer_name" value="1"<!-- IF JAB_VERIFY_PEER_NAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_verify_peer_name" value="0"<!-- IF not JAB_VERIFY_PEER_NAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="jab_allow_self_signed">{L_JAB_ALLOW_SELF_SIGNED}{L_COLON}</label><br /><span>{L_JAB_ALLOW_SELF_SIGNED_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_allow_self_signed" name="jab_allow_self_signed" value="1"<!-- IF JAB_ALLOW_SELF_SIGNED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_allow_self_signed" value="0"<!-- IF not JAB_ALLOW_SELF_SIGNED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
 <!-- ENDIF -->
 <dl>
 	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}{L_COLON}</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
-	<dd><input type="number" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" min="0" max="99999" /></dd>
+	<dd><input type="number" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" min="0" max="99999" /></dd>
 </dl>
 
 </fieldset>

phpBB/adm/style/acp_main.html

@@ -14,11 +14,7 @@
 
 	<p>{L_ADMIN_INTRO}</p>
 
-	<!-- IF S_UPDATE_INCOMPLETE -->
-		<div class="errorbox">
-			<p>{L_UPDATE_INCOMPLETE} <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
-		</div>
-	<!-- ELSEIF S_VERSIONCHECK_FAIL -->
+	<!-- IF S_VERSIONCHECK_FAIL -->
 		<div class="errorbox notice">
 			<p>{L_VERSIONCHECK_FAIL}</p>
 			<p>{VERSIONCHECK_FAIL_REASON}</p>
@@ -30,11 +26,6 @@
 			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
 		</div>
 	<!-- ENDIF -->
-	<!-- IF S_VERSION_UPGRADEABLE -->
-		<div class="errorbox notice">
-			<p>{UPGRADE_INSTRUCTIONS}</p>
-		</div>
-	<!-- ENDIF -->
 
 	<!-- IF S_SEARCH_INDEX_MISSING -->
 		<div class="errorbox">
@@ -130,6 +121,8 @@
 		<td>{L_FILES_PER_DAY}{L_COLON} </td>
 		<td><strong>{FILES_PER_DAY}</strong></td>
 	</tr>
+
+
 	<tr>
 		<td>{L_BOARD_STARTED}{L_COLON} </td>
 		<td><strong>{START_DATE}</strong></td>
@@ -148,25 +141,22 @@
 		<td>{L_GZIP_COMPRESSION}{L_COLON} </td>
 		<td><strong>{GZIP_COMPRESSION}</strong></td>
 	</tr>
+	<!-- IF S_TOTAL_ORPHAN or S_VERSIONCHECK -->
 	<tr>
-		<td>{L_PHP_VERSION}{L_COLON} </td>
-		<td><strong>{PHP_VERSION_INFO}</strong></td>
-	<!-- IF S_TOTAL_ORPHAN -->
-		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
-		<td><strong>{TOTAL_ORPHAN}</strong></td>
-	<!-- ELSE -->
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	<!-- ENDIF -->
-	</tr>
 	<!-- IF S_VERSIONCHECK -->
-	<tr>
 		<td>{L_BOARD_VERSION}{L_COLON} </td>
 		<td>
 			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
 		</td>
+	<!-- ENDIF -->
+	<!-- IF S_TOTAL_ORPHAN -->
+		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
+		<td><strong>{TOTAL_ORPHAN}</strong></td>
+	<!-- ENDIF -->
+	<!-- IF not S_TOTAL_ORPHAN or not S_VERSIONCHECK -->
 		<td>&nbsp;</td>
 		<td>&nbsp;</td>
+	<!-- ENDIF -->
 	</tr>
 	<!-- ENDIF -->
 	</tbody>

phpBB/adm/style/acp_posting_buttons.html

@@ -63,7 +63,6 @@
 		<!-- ENDIF -->
 		<!-- ENDIF -->
 	</select>
-	<!-- EVENT acp_posting_buttons_custom_tags_before -->
 	<!-- 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 -->

phpBB/adm/style/acp_profile.html

@@ -85,7 +85,6 @@
 			<dd><input type="checkbox" class="radio" id="field_is_contact" name="field_is_contact" value="1"<!-- IF S_FIELD_CONTACT --> checked="checked"<!-- ENDIF --> /></dd>
 			<dd><input class="text medium" type="text" name="field_contact_desc" id="field_contact_desc" value="{FIELD_CONTACT_DESC}" /> <label for="field_contact_desc">{L_FIELD_CONTACT_DESC}</label></dd>
 			<dd><input class="text medium" type="text" name="field_contact_url" id="field_contact_url" value="{FIELD_CONTACT_URL}" /> <label for="field_contact_url">{L_FIELD_CONTACT_URL}</label></dd>
-			<!-- EVENT acp_profile_contact_last -->
 		</dl>
 		</fieldset>
 
@@ -128,7 +127,6 @@
 			<!-- ENDIF -->
 			</dl>
 		<!-- ENDIF -->
-		<!-- EVENT acp_profile_step_one_lang_after -->
 		</fieldset>
 
 		<fieldset class="quick">

phpBB/adm/style/acp_ranks.html

@@ -44,7 +44,7 @@
 	<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" min="0" max="9999999999" value="{MIN_POSTS}" /></dd>
+		<dd><input name="min_posts" type="number" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
 	</dl>
 	</div>
 

phpBB/adm/style/acp_search.html

@@ -18,11 +18,11 @@
 	</dl>
 	<dl>
 		<dt><label for="search_interval">{L_SEARCH_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_interval" type="number" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
+		<dd><input id="search_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
 		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_anonymous_interval" type="number" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
+		<dd><input id="search_anonymous_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
 		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}{L_COLON}</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
@@ -30,15 +30,15 @@
 	</dl>
 	<dl>
 		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}{L_COLON}</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
-		<dd><input id="min_search_author_chars" type="number" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
+		<dd><input id="min_search_author_chars" type="number" size="4" maxlength="4" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
-		<dd><input id="max_num_search_keywords" type="number" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
+		<dd><input id="max_num_search_keywords" type="number" size="4" maxlength="4" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}{L_COLON}</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
-		<dd><input id="search_store_results" type="number" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
+		<dd><input id="search_store_results" type="number" size="4" maxlength="6" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
 	</dl>
 	</fieldset>
 

phpBB/adm/style/acp_send_statistics.html

@@ -0,0 +1,64 @@
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+
+<h1>{L_SEND_STATISTICS}</h1>
+
+<p>{L_EXPLAIN_SEND_STATISTICS}</p>
+
+<script type="text/javascript">
+//<![CDATA[
+var iframect = 0;
+
+function iframe_updated()
+{
+	if (iframect++ == 0)
+	{
+		return;
+	}
+
+	phpbb.toggleDisplay('questionnaire-form', -1);
+	phpbb.toggleDisplay('questionnaire-thanks', 1);
+}
+//]]>
+</script>
+
+<iframe onload="iframe_updated();" name="questionaire_result" style="display: none;"></iframe>
+
+<form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
+
+	<p><a href="{U_ACP_MAIN}">{L_DONT_SEND_STATISTICS}</a></p>
+
+	<p>{L_EXPLAIN_SHOW_STATISTICS}</p>
+
+	<p id="show-button"><input type="button" class="button2" onclick="phpbb.toggleDisplay('configlist', 1); phpbb.toggleDisplay('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p>
+
+	<div id="configlist">
+		<input type="button" class="button2" onclick="phpbb.toggleDisplay('show-button', 1); phpbb.toggleDisplay('configlist', -1);" value="{L_HIDE_STATISTICS}" />
+		<p class="submit-buttons">
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
+		</p>
+
+		<!-- BEGIN providers -->
+		<fieldset>
+			<legend>{providers.NAME}</legend>
+			<!-- BEGIN values -->
+			<dl>
+				<dt>{providers.values.KEY}</dt>
+				<dd>{providers.values.VALUE}</dd>
+			</dl>
+			<!-- END values -->
+		</fieldset>
+		<!-- END providers -->
+	</div>
+	<p class="submit-buttons">
+		<input type="hidden" name="systemdata" value="{RAW_DATA}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
+	</p>
+</form>
+
+<div id="questionnaire-thanks" class="successbox">
+	<p><strong>{L_THANKS_SEND_STATISTICS}</strong><br /><br /><a href="{U_ACP_MAIN}">&laquo; {L_GO_ACP_MAIN}</a></p>
+</div>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_styles.html

@@ -51,10 +51,6 @@
 		<dt><label>{L_STYLE_PATH}{L_COLON}</label></dt>
 		<dd><strong>{STYLE_PATH}</strong></dd>
 	</dl>
-	<dl>
-		<dt><label>{L_STYLE_VERSION}{L_COLON}</label></dt>
-		<dd><strong>{STYLE_VERSION}</strong></dd>
-	</dl>
 	<dl>
 		<dt><label for="name">{L_COPYRIGHT}{L_COLON}</label></dt>
 		<dd><strong>{STYLE_COPYRIGHT}</strong></dd>

phpBB/adm/style/acp_update.html

@@ -6,43 +6,22 @@
 
 <p>{L_VERSION_CHECK_EXPLAIN}</p>
 
-<!-- IF S_UPDATE_INCOMPLETE -->
-	<div class="errorbox">
-		<p>{L_UPDATE_INCOMPLETE} {L_UPDATE_INCOMPLETE_MORE}</p>
-	</div>
-<!-- ENDIF -->
 <!-- IF S_UP_TO_DATE -->
 	<div class="successbox">
 		<p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
 	</div>
-<!-- ELSEIF not S_UPDATE_INCOMPLETE -->
+<!-- ELSE -->
 	<div class="errorbox">
 		<p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
 	</div>
 <!-- ENDIF -->
-<!-- IF S_VERSION_UPGRADEABLE -->
-	<div class="errorbox notice">
-		<p>{UPGRADE_INSTRUCTIONS}</p>
-	</div>
-<!-- ENDIF -->
 
 <fieldset>
 	<legend></legend>
-	<!-- IF not S_UPDATE_INCOMPLETE -->
 	<dl>
 		<dt><label>{L_CURRENT_VERSION}</label></dt>
 		<dd><strong>{CURRENT_VERSION}</strong></dd>
 	</dl>
-	<!-- ELSE -->
-	<dl>
-		<dt><label>{L_FILES_VERSION}</label></dt>
-		<dd><strong>{FILES_VERSION}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_DATABASE_VERSION}</label></dt>
-		<dd><strong>{CURRENT_VERSION}</strong></dd>
-	</dl>
-	<!-- ENDIF -->
 </fieldset>
 
 <!-- BEGIN updates_available -->
@@ -59,11 +38,6 @@
 	</fieldset>
 <!-- END updates_available -->
 
-<!-- IF S_UPDATE_INCOMPLETE -->
-	{INCOMPLETE_INSTRUCTIONS}
-	<br>
-<!-- ENDIF -->
-
 <!-- IF not S_UP_TO_DATE -->
 	{UPDATE_INSTRUCTIONS}
 	<br /><br />

phpBB/adm/style/acp_users_prefs.html

@@ -52,7 +52,7 @@
 	<dl> 
 		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
 		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){phpbb.toggleDisplay('custom_date',1);}else{phpbb.toggleDisplay('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
-		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="64" /></div></dd>
+		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
 	</dl>
 	<!-- EVENT acp_users_prefs_personal_append -->
 	</fieldset>

phpBB/adm/style/admin.css

@@ -1,4 +1,4 @@
-/*  phpBB 3.2 Admin Style Sheet
+/*  phpBB 3.1 Admin Style Sheet
 	------------------------------------------------------------------------
 	Original author:	subBlue ( http://www.subblue.com/ )
 	Copyright (c) phpBB Limited <https://www.phpbb.com>
@@ -2471,7 +2471,7 @@ fieldset.permissions .padding {
 
 .roles-options > .dropdown {
 	left: auto;
-	top: 3.2em;
+	top: 3em;
 	width: 250px;
 }
 
@@ -2489,7 +2489,7 @@ fieldset.permissions .padding {
 	border-radius: 3px;
 	padding: 4px;
 	width: 250px;
-	display: none;
+	display: block;
 	background: url('../images/arrow_down.gif') no-repeat 245px .7em;
 }
 
@@ -2554,7 +2554,6 @@ fieldset.permissions .padding {
 #progress-bar {
 	position: relative;
 	width: 90%;
-	text-align: center;
 	height: 25px;
 	margin: 20px auto;
 	border: 1px solid #cecece;
@@ -2564,7 +2563,10 @@ fieldset.permissions .padding {
 	position: absolute;
 	top: 0;
 	width: 100%;
-	color: #000;
+	text-align: center;
+	line-height: 25px;
+	font-weight: bold;
+	color: #fff;
 }
 
 #progress-bar #progress-bar-filler {
@@ -2575,128 +2577,4 @@ fieldset.permissions .padding {
 	background-color: #3c84ad;
 	width: 0;
 	height: 25px;
-	overflow: hidden;
-	color: #fff;
 }
-
-#progress-bar p {
-	line-height: 25px;
-	font-weight: bold;
-}
-
-.send-stats-row {
-	margin: 15px 0;
-}
-
-.send-stats-row:before {
-	display: table;
-	content: " ";
-}
-
-.send-stats-tile {
-	position: relative;
-	padding: 14px;
-	margin-bottom: 20px;
-	background-color: #eff0f2;
-	border-radius: 6px;
-	box-shadow: rgba(0,0,0,0.3) 1px 1px 5px;
-}
-
-.send-stats-tile h2 {
-	margin-top: 0;
-	text-align: center;
-    padding-bottom: 1em;
-}
-
-.send-stats-tile i {
-	padding-right: 0.3em;
-}
-
-.icon {
-	font-family: FontAwesome;
-	font-style: normal;
-}
-
-.send-stats-data-row {
-	background: #f9f9f9;
-	border-radius: 6px;
-	border: #DEDEDE 1px solid;
-	padding: 10px;
-	border-top-width: 0;
-	border-top-right-radius: 0;
-	border-top-left-radius: 0;
-}
-
-.send-stats-data-hidden .configlist {
-	display: none;
-}
-
-.send-stats-data-only-row {
-	border-radius: 6px !important;
-	border-bottom-width: 1px !important;
-}
-
-.send-stats-data-hidden {
-	padding: 0;
-	border: none;
-}
-
-.send-stats-row > .send-stats-data-row:first-child {
-	background-color: #d9edf7;
-	border-bottom-width: 0;
-	border-top-right-radius: 6px;
-	border-top-left-radius: 6px;
-	border-top-width: 1px;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-.send-stats-settings dt, .send-stats-settings dd {
-	min-width: 25px;
-}
-
-.send-stats-settings dd {
-	line-height: 1.5em;
-}
-
-.send-stats-settings input {
-	display: none;
-}
-
-.send-stats-settings input[type=checkbox] + label:before {
-	content: "\f096";
-	font-family: FontAwesome;
-	font-size: 1.5em;
-}
-
-.send-stats-settings input[type=checkbox]:checked + label:before {
-	content: "\f14a";
-	color: #3c763d;
-}
-
-.send-stats-data-row a:hover span {
-	text-decoration: underline;
-}
-
-.send-stats-data-row a {
-	text-decoration: none;
-	cursor: default;
-}
-
-.send-stats-data-row i {
-	padding-left: 6px;
-}
-
-.configlist {
-	word-wrap: break-word;
-	word-break: break-all;
-}
-
-/* stylelint-disable declaration-property-unit-whitelist */
-.emoji {
-	min-height: 18px;
-	min-width: 18px;
-	height: 1em;
-	width: 1em;
-}
-/* stylelint-enable declaration-property-unit-whitelist */

phpBB/adm/style/admin.js

@@ -243,16 +243,8 @@ function parse_document(container)
 
 		parse_document($('body'));
 
-		$('#questionnaire-form').css('display', 'none');
-		var $triggerConfiglist = $('#trigger-configlist');
-
-		$triggerConfiglist.on('click', function () {
-			var $configlist = $('#configlist');
-			$configlist.closest('.send-stats-data-row').toggleClass('send-stats-data-hidden');
-			$configlist.closest('.send-stats-row').find('.send-stats-data-row:first-child').toggleClass('send-stats-data-only-row');
-			$(this).find('i').toggleClass('fa-angle-down fa-angle-up');
-		});
-
-		$('#configlist').closest('.send-stats-data-row').addClass('send-stats-data-hidden');
+		// Hide configlist and success message in send statistics page
+		phpbb.toggleDisplay('configlist', -1);
+		phpbb.toggleDisplay('questionnaire-thanks', -1);
 	});
 })(jQuery);

phpBB/adm/style/ajax.js

@@ -4,101 +4,6 @@
 
 'use strict';
 
-
-phpbb.prepareSendStats = function () {
-	var $form = $('#acp_help_phpbb');
-	var $dark = $('#darkenwrapper');
-	var $loadingIndicator;
-
-	$form.on('submit', function (event) {
-		var $this = $(this),
-			currentTime = Math.floor(new Date().getTime() / 1000),
-			statsTime = parseInt($this.find('input[name=help_send_statistics_time]').val(), 10);
-
-		event.preventDefault();
-		$this.unbind('submit');
-
-		// Skip ajax request if form is submitted too early or send stats
-		// checkbox is not checked
-		if (!$this.find('input[name=help_send_statistics]').is(':checked') ||
-			statsTime > currentTime) {
-			$form.find('input[type=submit]').click();
-			setTimeout(function () {
-				$form.find('input[type=submit]').click();
-			}, 300);
-			return;
-		}
-
-		/**
-		 * Handler for AJAX errors
-		 */
-		function errorHandler(jqXHR, textStatus, errorThrown) {
-			if (typeof console !== 'undefined' && console.log) {
-				console.log('AJAX error. status: ' + textStatus + ', message: ' + errorThrown);
-			}
-			phpbb.clearLoadingTimeout();
-			var errorText = '';
-
-			if (typeof errorThrown === 'string' && errorThrown.length > 0) {
-				errorText = errorThrown;
-			} else {
-				errorText = $dark.attr('data-ajax-error-text-' + textStatus);
-				if (typeof errorText !== 'string' || !errorText.length) {
-					errorText = $dark.attr('data-ajax-error-text');
-				}
-			}
-			phpbb.alert($dark.attr('data-ajax-error-title'), errorText);
-		}
-
-		/**
-		 * This is a private function used to handle the callbacks, refreshes
-		 * and alert. It calls the callback, refreshes the page if necessary, and
-		 * displays an alert to the user and removes it after an amount of time.
-		 *
-		 * It cannot be called from outside this function, and is purely here to
-		 * avoid repetition of code.
-		 *
-		 * @param {object} res The object sent back by the server.
-		 */
-		function returnHandler(res) {
-			phpbb.clearLoadingTimeout();
-
-			// If a confirmation is not required, display an alert and call the
-			// callbacks.
-			$dark.fadeOut(phpbb.alertTime);
-
-			if ($loadingIndicator) {
-				$loadingIndicator.fadeOut(phpbb.alertTime);
-			}
-
-			var $sendStatisticsSuccess = $('<input />', {
-				type: 'hidden',
-				name: 'send_statistics_response',
-				value: res
-			});
-			$sendStatisticsSuccess.appendTo('p.submit-buttons');
-
-			// Finish actual form submission
-			$form.find('input[type=submit]').click();
-		}
-
-		$loadingIndicator = phpbb.loadingIndicator();
-
-		$.ajax({
-			url: $this.attr('data-ajax-action').replace('&amp;', '&'),
-			type: 'POST',
-			data: 'systemdata=' + encodeURIComponent($this.find('input[name=systemdata]').val()),
-			success: returnHandler,
-			error: errorHandler,
-			cache: false
-		}).always(function() {
-			if ($loadingIndicator && $loadingIndicator.is(':visible')) {
-				$loadingIndicator.fadeOut(phpbb.alertTime);
-			}
-		});
-	});
-};
-
 /**
  * The following callbacks are for reording items. row_down
  * is triggered when an item is moved down, and row_up is triggered when
@@ -157,139 +62,7 @@ phpbb.addAjaxCallback('row_delete', function(res) {
 	}
 });
 
-/**
- * Handler for submitting permissions form in chunks
- * This call will submit permissions forms in chunks of 5 fieldsets.
- */
-function submitPermissions() {
-	var $form = $('form#set-permissions'),
-		fieldsetList = $form.find('fieldset[id^=perm]'),
-		formDataSets = [],
-		dataSetIndex = 0,
-		$submitAllButton = $form.find('input[type=submit][name^=action]')[0],
-		$submitButton = $form.find('input[type=submit][data-clicked=true]')[0];
 
-	// Set proper start values for handling refresh of page
-	var permissionSubmitSize = 0,
-		permissionRequestCount = 0,
-		forumIds = [],
-		permissionSubmitFailed = false;
-
-	if ($submitAllButton !== $submitButton) {
-		fieldsetList = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id);
-	}
-
-	$.each(fieldsetList, function (key, value) {
-		dataSetIndex = Math.floor(key / 5);
-		var $fieldset = $('fieldset#' + value.id);
-		if (key % 5 === 0) {
-			formDataSets[dataSetIndex] = $fieldset.find('select:visible, input:not([data-name])').serialize();
-		} else {
-			formDataSets[dataSetIndex] += '&' + $fieldset.find('select:visible, input:not([data-name])').serialize();
-		}
-
-		// Find proper role value
-		var roleInput = $fieldset.find('input[name^=role][data-name]');
-		if (roleInput.val()) {
-			formDataSets[dataSetIndex] += '&' + roleInput.attr('name') + '=' + roleInput.val();
-		} else {
-			formDataSets[dataSetIndex] += '&' + roleInput.attr('name') + '=' +
-				$fieldset.find('select[name="' + roleInput.attr('name') + '"]').val();
-		}
-	});
-
-	permissionSubmitSize = formDataSets.length;
-
-	// Add each forum ID to forum ID list to preserve selected forums
-	$.each($form.find('input[type=hidden][name^=forum_id]'), function (key, value) {
-		if (value.name.match(/^forum_id\[([0-9]+)\]$/)) {
-			forumIds.push(value.value);
-		}
-	});
-
-	/**
-	 * Handler for submitted permissions form chunk
-	 *
-	 * @param {object} res Object returned by AJAX call
-	 */
-	function handlePermissionReturn(res) {
-		permissionRequestCount++;
-		var $dark = $('#darkenwrapper');
-
-		if (res.S_USER_WARNING) {
-			phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
-			permissionSubmitFailed = true;
-		} else if (!permissionSubmitFailed && res.S_USER_NOTICE) {
-			// Display success message at the end of submitting the form
-			if (permissionRequestCount >= permissionSubmitSize) {
-				var $alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
-				var $alertBoxLink = $alert.find('p.alert_text > a');
-
-				// Create form to submit instead of normal "Back to previous page" link
-				if ($alertBoxLink) {
-					// Remove forum_id[] from URL
-					$alertBoxLink.attr('href', $alertBoxLink.attr('href').replace(/(&forum_id\[\]=[0-9]+)/g, ''));
-					var previousPageForm = '<form action="' + $alertBoxLink.attr('href') + '" method="post">';
-					$.each(forumIds, function (key, value) {
-						previousPageForm += '<input type="text" name="forum_id[]" value="' + value + '" />';
-					});
-					previousPageForm += '</form>';
-
-					$alertBoxLink.on('click', function (e) {
-						var $previousPageForm = $(previousPageForm);
-						$('body').append($previousPageForm);
-						e.preventDefault();
-						$previousPageForm.submit();
-					});
-				}
-
-				// Do not allow closing alert
-				$dark.off('click');
-				$alert.find('.alert_close').hide();
-
-				if (typeof res.REFRESH_DATA !== 'undefined') {
-					setTimeout(function () {
-						// Create forum to submit using POST. This will prevent
-						// exceeding the maximum length of URLs
-						var form = '<form action="' + res.REFRESH_DATA.url.replace(/(&forum_id\[\]=[0-9]+)/g, '') + '" method="post">';
-						$.each(forumIds, function (key, value) {
-							form += '<input type="text" name="forum_id[]" value="' + value + '" />';
-						});
-						form += '</form>';
-						$form = $(form);
-						$('body').append($form);
-
-						// Hide the alert even if we refresh the page, in case the user
-						// presses the back button.
-						$dark.fadeOut(phpbb.alertTime, function () {
-							if (typeof $alert !== 'undefined') {
-								$alert.hide();
-							}
-						});
-
-						// Submit form
-						$form.submit();
-					}, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds
-				}
-			}
-		}
-	}
-
-	// Create AJAX request for each form data set
-	$.each(formDataSets, function (key, formData) {
-		$.ajax({
-			url: $form.action,
-			type: 'POST',
-			data: formData + '&' + $submitButton.name + '=' + encodeURIComponent($submitButton.value) +
-				'&creation_time=' + $form.find('input[type=hidden][name=creation_time]')[0].value +
-				'&form_token=' + $form.find('input[type=hidden][name=form_token]')[0].value +
-				'&' + $form.children('input[type=hidden]').serialize() +
-				'&' + $form.find('input[type=checkbox][name^=inherit]').serialize(),
-			success: handlePermissionReturn,
-			error: handlePermissionReturn
-		});
-	});
-}
 
 $('[data-ajax]').each(function() {
 	var $this = $(this),
@@ -310,22 +83,6 @@ $('[data-ajax]').each(function() {
 */
 $(function() {
 	phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), {minHeight: 75});
-
-	var $setPermissionsForm = $('form#set-permissions');
-	if ($setPermissionsForm.length) {
-		$setPermissionsForm.on('submit', function (e) {
-			submitPermissions();
-			e.preventDefault();
-		});
-		$setPermissionsForm.find('input[type=submit]').click(function() {
-			$('input[type=submit]', $(this).parents($('form#set-permissions'))).removeAttr('data-clicked');
-			$(this).attr('data-clicked', true);
-		});
-	}
-
-	if ($('#acp_help_phpbb')) {
-		phpbb.prepareSendStats();
-	}
 });
 
 

phpBB/adm/style/installer_convert.html

@@ -1,87 +0,0 @@
-<!-- INCLUDE installer_header.html -->
-<!-- IF TITLE --><h1>{TITLE}</h1><!-- ENDIF -->
-<!-- IF S_ERROR_BOX -->
-<div class="errorbox">
-	<h3>{ERROR_TITLE}</h3>
-	<p>{ERROR_MSG}</p>
-</div>
-<!-- ENDIF -->
-<!-- IF .errors -->
-<div id="error-container">
-<!-- BEGIN errors -->
-	<strong>{errors.TITLE}</strong>
-	<!-- IF errors.DESCRIPTION --><p>{errors.DESCRIPTION}</p><!-- ENDIF -->
-<!-- END errors -->
-</div>
-<!-- ENDIF -->
-<!-- IF BODY --><p>{BODY}</p><!-- ENDIF -->
-<!-- IF CONTENT -->{CONTENT}<!-- ENDIF -->
-<!-- IF S_CONV_IN_PROGRESS -->
-<p class="centered-text"><a href="{U_ACTION}" class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->"<!-- IF S_REFRESH --> onclick="return false;"<!-- ENDIF -->>{L_SUBMIT}</a></p>
-<!-- ENDIF -->
-<!-- IF S_CONTINUE -->
-<div id="download-wrapper" class="download-box">
-	<p class="centered-text">
-		<a href="{U_NEW_ACTION}" class="button1">{L_CONVERT_NEW_CONVERSION}</a>
-		<a href="{U_CONTINUE_ACTION}" class="button1">{L_CONTINUE_OLD_CONVERSION}</a>
-	</p>
-</div>
-<!-- ENDIF -->
-<!-- IF S_LIST -->
-<table class="table1">
-	<caption>{L_AVAILABLE_CONVERTORS}</caption>
-	<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-	<thead>
-	<tr>
-		<th>{L_SOFTWARE}</th>
-		<th>{L_VERSION}</th>
-		<th>{L_AUTHOR}</th>
-		<th>{L_CONVERT_OPTIONS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- IF .convertors -->
-	<!-- BEGIN convertors -->
-	<tr>
-		<td>{convertors.SOFTWARE}</td>
-		<td>{convertors.VERSION}</td>
-		<td>{convertors.AUTHOR}</td>
-		<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
-	</tr>
-	<!-- END convertors -->
-	<!-- ELSE -->
-	<tr>
-		<td>{L_NO_CONVERTORS}</td>
-		<td>-</td>
-		<td>-</td>
-		<td>-</td>
-	</tr>
-	<!-- ENDIF -->
-	</tbody>
-</table>
-<!-- ENDIF -->
-<!-- IF .checks -->
-<fieldset>
-
-	<!-- BEGIN checks -->
-	<!-- IF checks.S_LEGEND -->
-	<!-- IF not checks.S_FIRST_ROW -->
-</fieldset>
-
-<fieldset>
-	<!-- ENDIF -->
-	<legend>{checks.LEGEND}</legend>
-	<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
-	<!-- ELSE -->
-
-	<dl>
-		<dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-		<dd>{checks.RESULT}</dd>
-	</dl>
-	<!-- ENDIF -->
-	<!-- END checks -->
-
-</fieldset>
-<!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
-<!-- INCLUDE installer_footer.html -->

phpBB/adm/style/installer_footer.html

@@ -11,18 +11,9 @@
 	</div>
 </div>
 
-<script type="text/javascript">
-<!--
-installLang = {
-	title: '{LA_TIMEOUT_DETECTED_TITLE}',
-	msg: '{LA_TIMEOUT_DETECTED_MESSAGE}'
-};
-//-->
-</script>
-
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF -->
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<!-- 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/installer_header.html

@@ -2,12 +2,11 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1" />
 	<!-- IF META -->{META}<!-- ENDIF -->
 	<title>{PAGE_TITLE}</title>
 
-	<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
+	<link href="{T_TEMPLATE_PATH}admin.css" rel="stylesheet" type="text/css" media="screen" />
 </head>
 
 <body class="{S_CONTENT_DIRECTION} nojs">

phpBB/adm/style/installer_install.html

@@ -9,5 +9,5 @@
 	</fieldset>
 </form>
 <!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
 <!-- INCLUDE installer_footer.html -->

phpBB/adm/style/installer_update.html

@@ -9,5 +9,5 @@
 	</fieldset>
 </form>
 <!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
 <!-- INCLUDE installer_footer.html -->

phpBB/adm/style/installer_update_file_status.html

@@ -4,7 +4,7 @@
 <p>{L_FILES_DELETED_EXPLAIN}</p>
 
 <fieldset id="deleted">
-	<legend><img src="{T_IMAGE_PATH}/icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
 	<!-- BEGIN deleted -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<!-- ENDIF --><strong>{deleted.FILE_PART}</strong></dt>
@@ -20,7 +20,7 @@
 <p>{L_FILES_CONFLICT_EXPLAIN}</p>
 
 <fieldset id="conflict">
-	<legend><img src="{T_IMAGE_PATH}/file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
 	<!-- BEGIN conflict -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<!-- ENDIF --><strong>{conflict.FILE_PART}</strong></dt>
@@ -36,7 +36,7 @@
 <p>{L_FILES_MODIFIED_EXPLAIN}</p>
 
 <fieldset id="modified">
-	<legend><img src="{T_IMAGE_PATH}/file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
 	<!-- BEGIN modified -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF modified.DIR_PART -->{modified.DIR_PART}<!-- ENDIF --><strong>{modified.FILE_PART}</strong></dt>
@@ -52,7 +52,7 @@
 <p>{L_FILES_NEW_EXPLAIN}</p>
 
 <fieldset id="new_files" style="display: none;">
-	<legend><img src="{T_IMAGE_PATH}/file_new.gif" alt="{L_STATUS_NEW}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
 	<!-- BEGIN new -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF new.DIR_PART -->{new.DIR_PART}<!-- ENDIF --><strong>{new.FILE_PART}</strong>
@@ -69,7 +69,7 @@
 <p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
 
 <fieldset id="not_modified" style="display: none;">
-	<legend><img src="{T_IMAGE_PATH}/file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
 	<!-- BEGIN not_modified -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<!-- ENDIF --><strong>{not_modified.FILE_PART}</strong></dt>

phpBB/adm/style/overall_footer.html

@@ -34,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('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</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

@@ -2,12 +2,10 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-<link href="{T_FONT_AWESOME_LINK}" rel="stylesheet">
 <link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
@@ -51,10 +49,10 @@ function marklist(id, name, state)
 	}
 
 	var rb = parent.getElementsByTagName('input');
-
+	
 	for (var r = 0; r < rb.length; r++)
 	{
-		if (rb[r].name.substr(0, name.length) == name && rb[r].disabled !== true)
+		if (rb[r].name.substr(0, name.length) == name)
 		{
 			rb[r].checked = state;
 		}
@@ -105,7 +103,7 @@ function popup(url, width, height, name)
 		<p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> &bull; <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p>
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 	</div>
-
+	
 	<div id="page-body">
 		<div id="tabs">
 			<ul>
@@ -122,7 +120,7 @@ function popup(url, width, height, name)
 						<!-- DEFINE $LI_USED = 0 -->
 						<!-- BEGIN l_block1 -->
 							<!-- IF l_block1.S_SELECTED -->
-
+	
 						<!-- BEGIN l_block2 -->
 							<!-- IF .l_block1.l_block2.l_block3 -->
 							<!-- IF $LI_USED --></ul></div><!-- ENDIF -->
@@ -131,13 +129,13 @@ function popup(url, width, height, name)
 								<ul>
 							<!-- DEFINE $LI_USED = 1 -->
 							<!-- ENDIF -->
-
+	
 							<!-- BEGIN l_block3 -->
 								<li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li>
 								<!-- DEFINE $LI_USED = 1 -->
 							<!-- END l_block3 -->
 						<!-- END l_block2 -->
-
+						
 							<!-- ENDIF -->
 						<!-- END l_block1 -->
 						<!-- IF $LI_USED -->
@@ -145,13 +143,6 @@ function popup(url, width, height, name)
 							</div>
 						<!-- ENDIF -->
 					</div>
-
+	
 					<div id="main">
 						<div class="main">
-							{% if CONTAINER_EXCEPTION !== false %}
-							<div class="errorbox">
-								<p>{{ lang('CONTAINER_EXCEPTION') }}</p><br />
-								<p>{{ lang('EXCEPTION') }}{{ lang('COLON') }} {{ CONTAINER_EXCEPTION.getMessage() }}</p>
-								<pre>{{ CONTAINER_EXCEPTION.getTraceAsString() }}</pre>
-							</div>
-							{% endif %}

phpBB/adm/style/permission_mask.html

@@ -39,19 +39,18 @@
 		</div>
 		<dl class="permissions-simple">
 			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}{L_COLON}</label></dt>
-			{% if p_mask.f_mask.role_options %}
+			{% if role_options %}
 				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%">
 					<div class="dropdown-container dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}">
-						<select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]">{p_mask.f_mask.S_ROLE_OPTIONS}</select>
 						<span title="Roles" class="button icon-button tools-icon dropdown-trigger dropdown-select">{L_NO_ROLE_ASSIGNED}</span>
 						<div class="dropdown hidden">
 							<ul class="dropdown-contents" id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" >
-								{% for role in p_mask.f_mask.role_options %}
+								{% for role in loops.role_options %}
 									<li data-id="{{ role.ID }}" data-target-id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" data-title="{{ role.TITLE }}"{% if role.SELECTED == true %} data-selected="{{ role.SELECTED }}"{% endif %}>{{ role.ROLE_NAME }}</li>
 								{% endfor %}
 							</ul>
 						</div>
-						<input type="hidden" data-name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]"{% if p_mask.f_mask.S_ROLE_ID %}value="{{ p_mask.f_mask.S_ROLE_ID }}"{% endif %} />
+						<input type="hidden" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]"{% if S_ROLE_ID %}value="{{ S_ROLE_ID }}"{% endif %} />
 					</div>
 				</dd>
 			{% else %}

phpBB/adm/style/simple_footer.html

@@ -17,7 +17,7 @@
 </div>
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</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 -->

phpBB/adm/style/simple_header.html

@@ -2,7 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
@@ -66,7 +65,7 @@ function marklist(id, name, state)
 	
 	for (var r = 0; r < rb.length; r++)
 	{
-		if (rb[r].name.substr(0, name.length) == name && rb[r].disabled !== true)
+		if (rb[r].name.substr(0, name.length) == name)
 		{
 			rb[r].checked = state;
 		}

phpBB/adm/style/tooltip.js

@@ -141,43 +141,20 @@ phpbb.positionTooltip = function ($element) {
  */
 phpbb.prepareRolesDropdown = function () {
 	var $options = $('.roles-options li');
-
-	// Display span and hide select
-	$('.roles-options > span').css('display', 'block');
-	$('.roles-options > select').hide();
-	$('.roles-options > input[type=hidden]').each(function () {
-		var $this = $(this);
-
-		if ($this.attr('data-name') && !$this.attr('name')) {
-			$this.attr('name', $this.attr('data-name'));
-		}
-	});
+	var $rolesOptions = $options.closest('.roles-options');
+	var $span = $rolesOptions.children('span');
 
 	// Prepare highlighting of select options and settings update
 	$options.each(function () {
 		var $this = $(this);
-		var $rolesOptions = $this.closest('.roles-options');
-		var $span = $rolesOptions.children('span');
 
 		// Correctly show selected option
 		if (typeof $this.attr('data-selected') !== 'undefined') {
-			$rolesOptions
+			$rolesOptions.closest('.roles-options')
 				.children('span')
 				.text($this.text())
 				.attr('data-default', $this.text())
 				.attr('data-default-val', $this.attr('data-id'));
-
-			// Save default text of drop down if there is no default set yet
-			if (typeof $span.attr('data-default') === 'undefined') {
-				$span.attr('data-default', $span.text());
-			}
-
-			// Prepare resetting drop down on form reset
-			$this.closest('form').on('reset', function () {
-				$span.text($span.attr('data-default'));
-				$rolesOptions.children('input[type=hidden]')
-					.val($span.attr('data-default-val'));
-			});
 		}
 
 		$this.on('mouseover', function () {
@@ -186,7 +163,6 @@ phpbb.prepareRolesDropdown = function () {
 			$this.addClass('roles-highlight');
 		}).on('click', function () {
 			var $this = $(this);
-			var $rolesOptions = $this.closest('.roles-options');
 
 			// Update settings
 			set_role_settings($this.attr('data-id'), $this.attr('data-target-id'));
@@ -202,6 +178,19 @@ phpbb.prepareRolesDropdown = function () {
 			$('body').trigger('click');
 		});
 	});
+
+	// Save default text of drop down if there is no default set yet
+	if (typeof $span.attr('data-default') === 'undefined') {
+		$span.attr('data-default', $span.text());
+	}
+
+	// Prepare resetting drop down on form reset
+	$options.closest('form').on('reset', function () {
+		$span.text($span.attr('data-default'));
+		$rolesOptions.children('input[type=hidden]')
+			.val($span.attr('data-id'));
+	});
+
 };
 
 // Run onload functions for RolesDropdown and tooltips
@@ -211,23 +200,6 @@ $(function() {
 
 	// Prepare dropdown
 	phpbb.prepareRolesDropdown();
-
-	// Reset role drop-down on modifying permissions in advanced tab
-	$('div.permissions-switch > a').on('click', function () {
-		$.each($('input[type=radio][name^="setting["]'), function () {
-			var $this = $(this);
-			$this.on('click', function () {
-				var $rolesOptions = $this.closest('fieldset.permissions').find('.roles-options'),
-					rolesSelect = $rolesOptions.find('select > option')[0];
-
-				// Set selected setting
-				$rolesOptions.children('span')
-					.text(rolesSelect.text);
-				$rolesOptions.children('input[type=hidden]')
-					.val(rolesSelect.value);
-			});
-		});
-	});
 });
 
 })(jQuery); // Avoid conflicts with other libraries

phpBB/assets/cookieconsent/cookieconsent.min.css

@@ -1,6 +0,0 @@
-.cc-window{opacity:1;transition:opacity 1s ease}.cc-window.cc-invisible{opacity:0}.cc-animate.cc-revoke{transition:transform 1s ease}.cc-animate.cc-revoke.cc-top{transform:translateY(-2em)}.cc-animate.cc-revoke.cc-bottom{transform:translateY(2em)}.cc-animate.cc-revoke.cc-active.cc-bottom,.cc-animate.cc-revoke.cc-active.cc-top,.cc-revoke:hover{transform:translateY(0)}.cc-grower{max-height:0;overflow:hidden;transition:max-height 1s}
-.cc-link,.cc-revoke:hover{text-decoration:underline}.cc-revoke,.cc-window{position:fixed;overflow:hidden;box-sizing:border-box;font-family:Helvetica,Calibri,Arial,sans-serif;font-size:16px;line-height:1.5em;display:-ms-flexbox;display:flex;-ms-flex-wrap:nowrap;flex-wrap:nowrap;z-index:9999}.cc-window.cc-static{position:static}.cc-window.cc-floating{padding:2em;max-width:24em;-ms-flex-direction:column;flex-direction:column}.cc-window.cc-banner{padding:1em 1.8em;width:100%;-ms-flex-direction:row;flex-direction:row}.cc-revoke{padding:.5em}.cc-header{font-size:18px;font-weight:700}.cc-btn,.cc-close,.cc-link,.cc-revoke{cursor:pointer}.cc-link{opacity:.8;display:inline-block;padding:.2em}.cc-link:hover{opacity:1}.cc-link:active,.cc-link:visited{color:initial}.cc-btn{display:block;padding:.4em .8em;font-size:.9em;font-weight:700;border-width:2px;border-style:solid;text-align:center;white-space:nowrap}.cc-banner .cc-btn:last-child{min-width:140px}.cc-highlight .cc-btn:first-child{background-color:transparent;border-color:transparent}.cc-highlight .cc-btn:first-child:focus,.cc-highlight .cc-btn:first-child:hover{background-color:transparent;text-decoration:underline}.cc-close{display:block;position:absolute;top:.5em;right:.5em;font-size:1.6em;opacity:.9;line-height:.75}.cc-close:focus,.cc-close:hover{opacity:1}
-.cc-revoke.cc-top{top:0;left:3em;border-bottom-left-radius:.5em;border-bottom-right-radius:.5em}.cc-revoke.cc-bottom{bottom:0;left:3em;border-top-left-radius:.5em;border-top-right-radius:.5em}.cc-revoke.cc-left{left:3em;right:unset}.cc-revoke.cc-right{right:3em;left:unset}.cc-top{top:1em}.cc-left{left:1em}.cc-right{right:1em}.cc-bottom{bottom:1em}.cc-floating>.cc-link{margin-bottom:1em}.cc-floating .cc-message{display:block;margin-bottom:1em}.cc-window.cc-floating .cc-compliance{-ms-flex:1;flex:1}.cc-window.cc-banner{-ms-flex-align:center;align-items:center}.cc-banner.cc-top{left:0;right:0;top:0}.cc-banner.cc-bottom{left:0;right:0;bottom:0}.cc-banner .cc-message{-ms-flex:1;flex:1}.cc-compliance{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:justify;align-content:space-between}.cc-compliance>.cc-btn{-ms-flex:1;flex:1}.cc-btn+.cc-btn{margin-left:.5em}
-@media print{.cc-revoke,.cc-window{display:none}}@media screen and (max-width:900px){.cc-btn{white-space:normal}}@media screen and (max-width:414px) and (orientation:portrait),screen and (max-width:736px) and (orientation:landscape){.cc-window.cc-top{top:0}.cc-window.cc-bottom{bottom:0}.cc-window.cc-banner,.cc-window.cc-left,.cc-window.cc-right{left:0;right:0}.cc-window.cc-banner{-ms-flex-direction:column;flex-direction:column}.cc-window.cc-banner .cc-compliance{-ms-flex:1;flex:1}.cc-window.cc-floating{max-width:none}.cc-window .cc-message{margin-bottom:1em}.cc-window.cc-banner{-ms-flex-align:unset;align-items:unset}}
-.cc-floating.cc-theme-classic{padding:1.2em;border-radius:5px}.cc-floating.cc-type-info.cc-theme-classic .cc-compliance{text-align:center;display:inline;-ms-flex:none;flex:none}.cc-theme-classic .cc-btn{border-radius:5px}.cc-theme-classic .cc-btn:last-child{min-width:140px}.cc-floating.cc-type-info.cc-theme-classic .cc-btn{display:inline-block}
-.cc-theme-edgeless.cc-window{padding:0}.cc-floating.cc-theme-edgeless .cc-message{margin:2em 2em 1.5em}.cc-banner.cc-theme-edgeless .cc-btn{margin:0;padding:.8em 1.8em;height:100%}.cc-banner.cc-theme-edgeless .cc-message{margin-left:1em}.cc-floating.cc-theme-edgeless .cc-btn+.cc-btn{margin-left:0}

phpBB/assets/javascript/core.js

@@ -36,27 +36,20 @@ phpbb.loadingIndicator = function() {
 
 	if (!$loadingIndicator.is(':visible')) {
 		$loadingIndicator.fadeIn(phpbb.alertTime);
-		// Wait 60 seconds and display an error if nothing has been returned by then.
+		// Wait fifteen seconds and display an error if nothing has been returned by then.
 		phpbb.clearLoadingTimeout();
 		phpbbAlertTimer = setTimeout(function() {
-			phpbb.showTimeoutMessage();
-		}, 60000);
+			var $alert = $('#phpbb_alert');
+
+			if ($loadingIndicator.is(':visible')) {
+				phpbb.alert($alert.attr('data-l-err'), $alert.attr('data-l-timeout-processing-req'));
+			}
+		}, 15000);
 	}
 
 	return $loadingIndicator;
 };
 
-/**
- * Show timeout message
- */
-phpbb.showTimeoutMessage = function () {
-	var $alert = $('#phpbb_alert');
-
-	if ($loadingIndicator.is(':visible')) {
-		phpbb.alert($alert.attr('data-l-err'), $alert.attr('data-l-timeout-processing-req'));
-	}
-};
-
 /**
  * Clear loading alert timeout
 */
@@ -1039,7 +1032,7 @@ phpbb.resizeTextArea = function($items, options) {
 
 	function autoResize(item) {
 		function setHeight(height) {
-			height += parseInt($item.css('height'), 10) - $item.innerHeight();
+			height += parseInt($item.css('height'), 10) - $item.height();
 			$item
 				.css({ height: height + 'px', resize: 'none' })
 				.addClass('auto-resized');
@@ -1058,7 +1051,7 @@ phpbb.resizeTextArea = function($items, options) {
 				configuration.maxHeight
 			),
 			$item = $(item),
-			height = parseInt($item.innerHeight(), 10),
+			height = parseInt($item.height(), 10),
 			scrollHeight = (item.scrollHeight) ? item.scrollHeight : 0;
 
 		if (height < 0) {
@@ -1548,13 +1541,6 @@ phpbb.toggleSelectSettings = function(el) {
 		var $this = $(this),
 			$setting = $($this.data('toggle-setting'));
 		$setting.toggle($this.is(':selected'));
-
-		// Disable any input elements that are not visible right now
-		if ($this.is(':selected')) {
-			$($this.data('toggle-setting') + ' input').prop('disabled', false);
-		} else {
-			$($this.data('toggle-setting') + ' input').prop('disabled', true);
-		}
 	});
 };
 

phpBB/assets/javascript/editor.js

@@ -414,12 +414,6 @@ function getCaretPosition(txtarea) {
 		if ($('#attach-panel').length) {
 			phpbb.showDragNDrop(textarea);
 		}
-
-		$('textarea').on('keydown', function (e) {
-			if (e.which === 13 && (e.metaKey || e.ctrlKey)) {
-				$(this).closest('form').submit();
-			}
-		});
 	});
 })(jQuery);
 

phpBB/assets/javascript/installer.js

@@ -12,8 +12,6 @@
 	var progressTimer = null;
 	var currentProgress = 0;
 	var refreshRequested = false;
-	var transmissionOver = false;
-	var statusCount = 0;
 
 	// Template related variables
 	var $contentWrapper = $('.install-body').find('.main');
@@ -179,7 +177,7 @@
 	 * @param progressObject
 	 */
 	function setProgress(progressObject) {
-		var $statusText, $progressBar, $progressText, $progressFiller, $progressFillerText;
+		var $statusText, $progressBar, $progressText, $progressFiller;
 
 		if (progressObject.task_name.length) {
 			if (!progressBarTriggered) {
@@ -191,34 +189,27 @@
 				$progressBar.attr('id', 'progress-bar');
 				$progressText = $('<p />');
 				$progressText.attr('id', 'progress-bar-text');
-				$progressFiller = $('<div />');
+				$progressFiller = $('<span />');
 				$progressFiller.attr('id', 'progress-bar-filler');
-				$progressFillerText = $('<p />');
-				$progressFillerText.attr('id', 'progress-bar-filler-text');
+				$progressFiller.html($progressText);
 
 				$statusText = $('<p />');
 				$statusText.attr('id', 'progress-status-text');
 
-				$progressFiller.append($progressFillerText);
-				$progressBar.append($progressText);
 				$progressBar.append($progressFiller);
 
 				$progressBarWrapper.append($statusText);
 				$progressBarWrapper.append($progressBar);
 
-				$progressFillerText.css('width', $progressBar.width());
-
 				progressBarTriggered = true;
 			} else if (progressObject.hasOwnProperty('restart')) {
 				clearInterval(progressTimer);
 
 				$progressFiller = $('#progress-bar-filler');
-				$progressFillerText = $('#progress-bar-filler-text');
 				$progressText = $('#progress-bar-text');
 				$statusText = $('#progress-status-text');
 
 				$progressText.text('0%');
-				$progressFillerText.text('0%');
 				$progressFiller.css('width', '0%');
 
 				currentProgress = 0;
@@ -245,22 +236,6 @@
 		}
 	}
 
-	// Redirects user
-	function redirect(url, use_ajax) {
-		if (use_ajax) {
-			resetPolling();
-
-			var xhReq = createXhrObject();
-			xhReq.open('GET', url, true);
-			xhReq.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-			xhReq.send();
-
-			startPolling(xhReq);
-		} else {
-			window.location.href = url;
-		}
-	}
-
 	/**
 	 * Parse messages from the response object
 	 *
@@ -327,67 +302,6 @@
 		if (responseObject.hasOwnProperty('refresh')) {
 			refreshRequested = true;
 		}
-
-		if (responseObject.hasOwnProperty('redirect')) {
-			redirect(responseObject.redirect.url, responseObject.redirect.use_ajax);
-		}
-
-		if (responseObject.hasOwnProperty('over')) {
-			if (responseObject.over) {
-				transmissionOver = true;
-			}
-		}
-	}
-
-	/**
-	 * Processes status data
-	 *
-	 * @param status
-	 */
-	function processTimeoutResponse(status) {
-		if (statusCount === 12) { // 1 minute hard cap
-			status = 'fail';
-		}
-
-		if (status === 'continue') {
-			refreshRequested = false;
-			doRefresh();
-		} else if (status === 'running') {
-			statusCount++;
-			$('#loading_indicator').css('display', 'block');
-			setTimeout(queryInstallerStatus, 5000);
-		} else {
-			$('#loading_indicator').css('display', 'none');
-			addMessage('error',
-				[{
-					title: installLang.title,
-					description: installLang.msg
-				}]
-			);
-		}
-	}
-
-	/**
-	 * Queries the installer's status
-	 */
-	function queryInstallerStatus() {
-		var url = $(location).attr('pathname');
-		var lookUp = 'install/app.php';
-		var position = url.indexOf(lookUp);
-
-		if (position === -1) {
-			lookUp = 'install';
-			position = url.indexOf(lookUp);
-
-			if (position === -1) {
-				return false;
-			}
-		}
-
-		url = url.substring(0, position) + lookUp + '/installer/status';
-		$.getJSON(url, function(data) {
-			processTimeoutResponse(data.status);
-		});
 	}
 
 	/**
@@ -416,17 +330,10 @@
 			$('#loading_indicator').css('display', 'none');
 			resetPolling();
 
-			var timeoutDetected = !transmissionOver;
-
 			if (refreshRequested) {
 				refreshRequested = false;
 				doRefresh();
 			}
-
-			if (timeoutDetected) {
-				statusCount = 0;
-				queryInstallerStatus();
-			}
 		}
 	}
 
@@ -435,20 +342,15 @@
 	 *
 	 * @param $progressText
 	 * @param $progressFiller
-	 * @param $progressFillerText
 	 * @param progressLimit
 	 */
-	function incrementFiller($progressText, $progressFiller, $progressFillerText, progressLimit) {
+	function incrementFiller($progressText, $progressFiller, progressLimit) {
 		if (currentProgress >= progressLimit || currentProgress >= 100) {
 			clearInterval(progressTimer);
 			return;
 		}
 
-		var $progressBar = $('#progress-bar');
-
 		currentProgress++;
-		$progressFillerText.css('width', $progressBar.width());
-		$progressFillerText.text(currentProgress + '%');
 		$progressText.text(currentProgress + '%');
 		$progressFiller.css('width', currentProgress + '%');
 	}
@@ -460,14 +362,13 @@
 	 */
 	function incrementProgressBar(progressLimit) {
 		var $progressFiller = $('#progress-bar-filler');
-		var $progressFillerText = $('#progress-bar-filler-text');
 		var $progressText = $('#progress-bar-text');
 		var progressStart = $progressFiller.width() / $progressFiller.offsetParent().width() * 100;
 		currentProgress = Math.floor(progressStart);
 
 		clearInterval(progressTimer);
 		progressTimer = setInterval(function() {
-			incrementFiller($progressText, $progressFiller, $progressFillerText, progressLimit);
+			incrementFiller($progressText, $progressFiller, progressLimit);
 		}, 10);
 	}
 
@@ -486,7 +387,6 @@
 	 */
 	function startPolling(xhReq) {
 		resetPolling();
-		transmissionOver = false;
 		pollTimer = setInterval(function () {
 			pollContent(xhReq);
 		}, 250);

phpBB/bin/phpbbcli.php

@@ -42,7 +42,6 @@ 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);
-require($phpbb_root_path . 'includes/functions_compatibility.' . $phpEx);
 
 $phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
 $phpbb_container = $phpbb_container_builder->with_config($phpbb_config_php_file);
@@ -69,18 +68,15 @@ $phpbb_container = $phpbb_container_builder->get_container();
 $phpbb_container->get('request')->enable_super_globals();
 require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
 
-register_compatibility_globals();
-
-/** @var \phpbb\language\language $language */
-$language = $phpbb_container->get('language');
-$language->add_lang(array('common', 'acp/common', 'cli'));
-
 /* @var $user \phpbb\user */
 $user = $phpbb_container->get('user');
-$user->data['user_id'] = ANONYMOUS;
-$user->ip = '127.0.0.1';
+$user->add_lang('acp/common');
+$user->add_lang('cli');
 
-$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $language);
+/* @var $lang \phpbb\language\language */
+$lang = $phpbb_container->get('language');
+
+$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $lang);
 $application->setDispatcher($phpbb_container->get('dispatcher'));
 $application->register_container_commands($phpbb_container->get('console.command_collection'));
 $application->run($input);

phpBB/common.php

@@ -12,7 +12,7 @@
 */
 
 /**
-* Minimum Requirement: PHP 5.4.0
+* Minimum Requirement: PHP 5.3.9
 */
 
 if (!defined('IN_PHPBB'))
@@ -43,13 +43,7 @@ if (!defined('PHPBB_INSTALLED'))
 	// available as used by the redirect function
 	$server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
 	$server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT');
-	$secure = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 1 : 0;
-
-	if (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https')
-	{
-		$secure = 1;
-		$server_port = 443;
-	}
+	$secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0;
 
 	$script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF');
 	if (!$script_name)
@@ -96,14 +90,8 @@ include($phpbb_root_path . 'includes/functions_compatibility.' . $phpEx);
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
-if (PHPBB_ENVIRONMENT === 'development')
-{
-	\phpbb\debug\debug::enable();
-}
-else
-{
-	set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
-}
+// Set PHP error handler to ours
+set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
 $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
 $phpbb_class_loader_ext->register();
@@ -116,17 +104,10 @@ try
 }
 catch (InvalidArgumentException $e)
 {
-	if (PHPBB_ENVIRONMENT !== 'development')
-	{
-		trigger_error(
-			'The requested environment ' . PHPBB_ENVIRONMENT . ' is not available.',
-			E_USER_ERROR
-		);
-	}
-	else
-	{
-		throw $e;
-	}
+	trigger_error(
+		'The requested environment ' . PHPBB_ENVIRONMENT . ' is not available.',
+		E_USER_ERROR
+	);
 }
 
 $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
@@ -134,8 +115,6 @@ $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
 
 require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
 
-register_compatibility_globals();
-
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));

phpBB/composer.json

@@ -25,51 +25,39 @@
 		"phpbb/phpbb-core": "self.version"
 	},
 	"require": {
-		"php": ">=5.4",
+		"php": ">=5.4,<7.1",
 		"bantu/ini-get-wrapper": "1.0.*",
-		"google/recaptcha": "~1.1",
-		"guzzlehttp/guzzle": "~5.3",
-		"lusitanian/oauth": "^0.8.1",
-		"marc1706/fast-image-size": "^1.1",
-		"paragonie/random_compat": "^1.4",
-		"patchwork/utf8": "^1.1",
-		"s9e/text-formatter": "~0.9.0",
-		"symfony/config": "^2.8",
-		"symfony/console": "^2.8",
-		"symfony/debug": "^2.8",
-		"symfony/dependency-injection": "^2.8",
-		"symfony/event-dispatcher": "^2.8",
-		"symfony/filesystem": "^2.8",
-		"symfony/finder": "^2.8",
-		"symfony/http-foundation": "^2.8",
-		"symfony/http-kernel": "^2.8",
-		"symfony/proxy-manager-bridge": "^2.8",
-		"symfony/routing": "^2.8",
-		"symfony/twig-bridge": "^2.8",
-		"symfony/yaml": "^2.8",
-		"twig/twig": "^1.0"
+	  	"google/recaptcha": "~1.1",
+		"lusitanian/oauth": "0.2.*",
+		"marc1706/fast-image-size": "1.1.*",
+		"patchwork/utf8": "1.1.*",
+		"s9e/text-formatter": "dev-release/php5.3",
+		"symfony/config": "2.8.*",
+		"symfony/console": "2.8.*",
+		"symfony/dependency-injection": "2.8.*",
+		"symfony/event-dispatcher": "2.8.*",
+		"symfony/filesystem": "2.8.*",
+		"symfony/finder": "2.8.*",
+		"symfony/http-kernel": "2.8.*",
+		"symfony/routing": "2.8.*",
+		"symfony/security-core": "2.8.*",
+		"symfony/security-csrf": "2.8.*",
+		"symfony/twig-bridge": "2.8.*",
+		"symfony/yaml": "2.8.*",
+		"twig/twig": "1.*"
 	},
 	"require-dev": {
-		"fabpot/goutte": "~2.0",
-		"facebook/webdriver": "~1.1",
-		"laravel/homestead": "~2.2",
+		"fabpot/goutte": "1.0.*",
 		"phing/phing": "2.4.*",
 		"phpunit/dbunit": "1.3.*",
-		"phpunit/phpunit": "^4.1",
+		"phpunit/phpunit": "4.1.*",
 		"sami/sami": "1.*",
 		"squizlabs/php_codesniffer": "2.*",
-		"symfony/browser-kit": "^2.8",
-		"symfony/css-selector": "^2.8",
-		"symfony/dom-crawler": "^2.8"
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "3.2.x-dev"
-		}
-	},
-	"config": {
-		"platform": {
-			"php": "5.4"
-		}
+		"symfony/browser-kit": "2.8.*",
+		"symfony/css-selector": "2.8.*",
+		"symfony/debug": "2.8.*",
+		"symfony/dom-crawler": "2.8.*",
+		"symfony/http-foundation": "2.8.*",
+		"symfony/process": "2.8.*"
 	}
 }

phpBB/config/default/container/services.yml

@@ -108,7 +108,7 @@ services:
             - '%tables.ext%'
             - '%core.root_path%'
             - '%core.php_ext%'
-            - '@cache'
+            - '@cache.driver'
 
     file_downloader:
         class: phpbb\file_downloader
@@ -161,7 +161,7 @@ services:
 
     version_helper:
         class: phpbb\version_helper
-        shared: false
+        scope: prototype
         arguments:
             - '@cache'
             - '@config'

phpBB/config/default/container/services_attachment.yml

@@ -1,7 +1,7 @@
 services:
     attachment.delete:
         class: phpbb\attachment\delete
-        shared: false
+        scope: prototype
         arguments:
             - '@config'
             - '@dbal.conn'
@@ -12,7 +12,7 @@ services:
 
     attachment.manager:
         class: phpbb\attachment\manager
-        shared: false
+        scope: prototype
         arguments:
             - '@attachment.delete'
             - '@attachment.resync'
@@ -20,13 +20,13 @@ services:
 
     attachment.resync:
         class: phpbb\attachment\resync
-        shared: false
+        scope: prototype
         arguments:
             - '@dbal.conn'
 
     attachment.upload:
         class: phpbb\attachment\upload
-        shared: false
+        scope: prototype
         arguments:
             - '@auth'
             - '@cache'

phpBB/config/default/container/services_auth.yml

@@ -58,12 +58,10 @@ services:
             - '@request'
             - '@user'
             - '%tables.auth_provider_oauth_token_storage%'
-            - '%tables.auth_provider_oauth_states%'
             - '%tables.auth_provider_oauth_account_assoc%'
             - '@auth.provider.oauth.service_collection'
             - '%tables.users%'
             - '@service_container'
-            - '@dispatcher'
             - '%core.root_path%'
             - '%core.php_ext%'
         tags:
@@ -100,11 +98,3 @@ services:
             - '@request'
         tags:
             - { name: auth.provider.oauth.service }
-
-    auth.provider.oauth.service.twitter:
-        class: phpbb\auth\provider\oauth\service\twitter
-        arguments:
-            - '@config'
-            - '@request'
-        tags:
-            - { name: auth.provider.oauth.service }

phpBB/config/default/container/services_captcha.yml

@@ -6,7 +6,7 @@ services:
             - '@captcha.plugins.service_collection'
 
 # ----- Captcha plugins -----
-# Service MUST NOT be shared for all the plugins to work.
+# Scope MUST be prototype for all the plugins to work.
     captcha.plugins.service_collection:
         class: phpbb\di\service_collection
         arguments:
@@ -16,7 +16,7 @@ services:
 
     core.captcha.plugins.gd:
         class: phpbb\captcha\plugins\gd
-        shared: false
+        scope: prototype
         calls:
             - [set_name, [core.captcha.plugins.gd]]
         tags:
@@ -24,7 +24,7 @@ services:
 
     core.captcha.plugins.gd_wave:
         class: phpbb\captcha\plugins\gd_wave
-        shared: false
+        scope: prototype
         calls:
             - [set_name, [core.captcha.plugins.gd_wave]]
         tags:
@@ -32,7 +32,7 @@ services:
 
     core.captcha.plugins.nogd:
         class: phpbb\captcha\plugins\nogd
-        shared: false
+        scope: prototype
         calls:
             - [set_name, [core.captcha.plugins.nogd]]
         tags:
@@ -40,7 +40,7 @@ services:
 
     core.captcha.plugins.qa:
         class: phpbb\captcha\plugins\qa
-        shared: false
+        scope: prototype
         arguments:
             - '%tables.captcha_qa_questions%'
             - '%tables.captcha_qa_answers%'
@@ -52,7 +52,7 @@ services:
 
     core.captcha.plugins.recaptcha:
         class: phpbb\captcha\plugins\recaptcha
-        shared: false
+        scope: prototype
         calls:
             - [set_name, [core.captcha.plugins.recaptcha]]
         tags:

phpBB/config/default/container/services_console.yml

@@ -111,7 +111,15 @@ services:
 
     console.command.db.revert:
         class: phpbb\console\command\db\revert
-        parent: console.command.db.migrate
+        arguments:
+            - '@user'
+            - '@language'
+            - '@migrator'
+            - '@ext.manager'
+            - '@config'
+            - '@cache'
+            - '@filesystem'
+            - '%core.root_path%'
         tags:
             - { name: console.command }
 
@@ -167,27 +175,6 @@ services:
         tags:
             - { name: console.command }
 
-    console.command.fixup.update_hashes:
-        class: phpbb\console\command\fixup\update_hashes
-        arguments:
-            - '@config'
-            - '@user'
-            - '@dbal.conn'
-            - '@passwords.manager'
-            - '@passwords.driver_collection'
-            - '%passwords.algorithms%'
-        tags:
-            - { name: console.command }
-
-    console.command.fixup.fix_left_right_ids:
-        class: phpbb\console\command\fixup\fix_left_right_ids
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@cache.driver'
-        tags:
-            - { name: console.command }
-
     console.command.reparser.list:
         class: phpbb\console\command\reparser\list_all
         arguments:
@@ -232,63 +219,3 @@ services:
             - '@user'
         tags:
             - { name: console.command }
-
-    console.command.update.check:
-        class: phpbb\console\command\update\check
-        arguments:
-            - '@user'
-            - '@config'
-            - '@service_container'
-            - '@language'
-        tags:
-            - { name: console.command }
-
-    console.command.user.activate:
-        class: phpbb\console\command\user\activate
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@config'
-            - '@language'
-            - '@log'
-            - '@notification_manager'
-            - '@user_loader'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-        tags:
-            - { name: console.command }
-
-    console.command.user.add:
-        class: phpbb\console\command\user\add
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@config'
-            - '@language'
-            - '@passwords.manager'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-        tags:
-            - { name: console.command }
-
-    console.command.user.delete:
-        class: phpbb\console\command\user\delete
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@language'
-            - '@log'
-            - '@user_loader'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-        tags:
-            - { name: console.command }
-
-    console.command.user.reclean:
-        class: phpbb\console\command\user\reclean
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@language'
-        tags:
-            - { name: console.command }

phpBB/config/default/container/services_cron.yml

@@ -75,7 +75,6 @@ services:
             - '%core.root_path%'
             - '%core.php_ext%'
             - '@config'
-            - '%core.cache_dir%'
         calls:
             - [set_name, [cron.task.core.queue]]
         tags:
@@ -107,8 +106,6 @@ services:
         arguments:
             - '%core.root_path%'
             - '@config'
-            - '@log'
-            - '@user'
         calls:
             - [set_name, [cron.task.core.tidy_plupload]]
         tags:
@@ -219,17 +216,3 @@ services:
             - [set_reparser, [text_reparser.user_signature]]
         tags:
             - { name: cron.task }
-
-    cron.task.core.update_hashes:
-        class: phpbb\cron\task\core\update_hashes
-        arguments:
-            - '@config'
-            - '@dbal.conn'
-            - '@passwords.update.lock'
-            - '@passwords.manager'
-            - '@passwords.driver_collection'
-            - '%passwords.algorithms%'
-        calls:
-            - [set_name, [cron.task.core.update_hashes]]
-        tags:
-            - { name: cron.task }

phpBB/config/default/container/services_db.yml

@@ -5,7 +5,9 @@ services:
             - '@service_container'
 
     dbal.conn.driver:
-        synthetic: true
+        class: '%dbal.driver.class%'
+        calls:
+            - [sql_connect, ['%dbal.dbhost%', '%dbal.dbuser%', '%dbal.dbpasswd%', '%dbal.dbname%', '%dbal.dbport%', false, '%dbal.new_link%']]
 
 # ----- DB Tools -----
     dbal.tools.factory:
@@ -29,10 +31,10 @@ services:
         factory: ['@dbal.extractor.factory', get]
 
 # ----- DB Extractors for different drivers -----
-# Service MUST NOT be shared for all the handlers to work correctly.
+# Scope MUST be prototype for all the handlers to work correctly.
     dbal.extractor.extractors.mssql_extractor:
         class: phpbb\db\extractor\mssql_extractor
-        shared: false
+        scope: prototype
         arguments:
             - '%core.root_path%'
             - '@request'
@@ -40,7 +42,7 @@ services:
 
     dbal.extractor.extractors.mysql_extractor:
         class: phpbb\db\extractor\mysql_extractor
-        shared: false
+        scope: prototype
         arguments:
             - '%core.root_path%'
             - '@request'
@@ -48,7 +50,7 @@ services:
 
     dbal.extractor.extractors.oracle_extractor:
         class: phpbb\db\extractor\oracle_extractor
-        shared: false
+        scope: prototype
         arguments:
             - '%core.root_path%'
             - '@request'
@@ -56,7 +58,7 @@ services:
 
     dbal.extractor.extractors.postgres_extractor:
         class: phpbb\db\extractor\postgres_extractor
-        shared: false
+        scope: prototype
         arguments:
             - '%core.root_path%'
             - '@request'
@@ -64,7 +66,15 @@ services:
 
     dbal.extractor.extractors.sqlite3_extractor:
         class: phpbb\db\extractor\sqlite3_extractor
-        shared: false
+        scope: prototype
+        arguments:
+            - '%core.root_path%'
+            - '@request'
+            - '@dbal.conn.driver'
+
+    dbal.extractor.extractors.sqlite_extractor:
+        class: phpbb\db\extractor\sqlite_extractor
+        scope: prototype
         arguments:
             - '%core.root_path%'
             - '@request'

phpBB/config/default/container/services_feed.yml

@@ -11,7 +11,6 @@ services:
             - '@feed.helper'
             - '@user'
             - '@auth'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.helper:
@@ -24,7 +23,7 @@ services:
 
     feed.forum:
         class: phpbb\feed\forum
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -33,12 +32,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.forums:
         class: phpbb\feed\forums
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -47,12 +45,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.news:
         class: phpbb\feed\news
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -61,12 +58,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.overall:
         class: phpbb\feed\overall
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -75,12 +71,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.topic:
         class: phpbb\feed\topic
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -89,12 +84,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.topics:
         class: phpbb\feed\topics
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -103,12 +97,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.topics_active:
         class: phpbb\feed\topics_active
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -117,5 +110,4 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'

phpBB/config/default/container/services_files.yml

@@ -6,7 +6,7 @@ services:
 
     files.filespec:
         class: phpbb\files\filespec
-        shared: false
+        scope: prototype
         arguments:
             - '@filesystem'
             - '@language'
@@ -18,7 +18,7 @@ services:
 
     files.upload:
         class: phpbb\files\upload
-        shared: false
+        scope: prototype
         arguments:
             - '@filesystem'
             - '@files.factory'
@@ -28,7 +28,7 @@ services:
 
     files.types.form:
         class: phpbb\files\types\form
-        shared: false
+        scope: prototype
         arguments:
             - '@files.factory'
             - '@language'
@@ -37,8 +37,8 @@ services:
             - '@request'
 
     files.types.local:
-        class: phpbb\files\types\local
-        shared: false
+        class: phpbb\files\types\form
+        scope: prototype
         arguments:
             - '@files.factory'
             - '@language'
@@ -47,9 +47,8 @@ services:
 
     files.types.remote:
         class: phpbb\files\types\remote
-        shared: false
+        scope: prototype
         arguments:
-            - '@config'
             - '@files.factory'
             - '@language'
             - '@php_ini'

phpBB/config/default/container/services_notification.yml

@@ -15,7 +15,7 @@ services:
             - '%tables.user_notifications%'
 
 # ----- Notification's types -----
-# Service MUST NOT be shared for all the plugins to work.
+# Scope MUST be prototype for all the plugins to work.
     notification.type_collection:
         class: phpbb\di\service_collection
         arguments:
@@ -36,7 +36,7 @@ services:
 
     notification.type.admin_activate_user:
         class: phpbb\notification\type\admin_activate_user
-        shared: false
+        scope: prototype
         parent: notification.type.base
         calls:
             - [set_user_loader, ['@user_loader']]
@@ -46,42 +46,42 @@ services:
 
     notification.type.approve_post:
         class: phpbb\notification\type\approve_post
-        shared: false
+        scope: prototype
         parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.approve_topic:
         class: phpbb\notification\type\approve_topic
-        shared: false
+        scope: prototype
         parent: notification.type.topic
         tags:
             - { name: notification.type }
 
     notification.type.bookmark:
         class: phpbb\notification\type\bookmark
-        shared: false
+        scope: prototype
         parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.disapprove_post:
         class: phpbb\notification\type\disapprove_post
-        shared: false
+        scope: prototype
         parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.disapprove_topic:
         class: phpbb\notification\type\disapprove_topic
-        shared: false
+        scope: prototype
         parent: notification.type.topic
         tags:
             - { name: notification.type }
 
     notification.type.group_request:
         class: phpbb\notification\type\group_request
-        shared: false
+        scope: prototype
         parent: notification.type.base
         calls:
             - [set_user_loader, ['@user_loader']]
@@ -90,14 +90,14 @@ services:
 
     notification.type.group_request_approved:
         class: phpbb\notification\type\group_request_approved
-        shared: false
+        scope: prototype
         parent: notification.type.base
         tags:
             - { name: notification.type }
 
     notification.type.pm:
         class: phpbb\notification\type\pm
-        shared: false
+        scope: prototype
         parent: notification.type.base
         calls:
             - [set_user_loader, ['@user_loader']]
@@ -107,7 +107,7 @@ services:
 
     notification.type.post:
         class: phpbb\notification\type\post
-        shared: false
+        scope: prototype
         parent: notification.type.base
         calls:
             - [set_user_loader, ['@user_loader']]
@@ -117,14 +117,14 @@ services:
 
     notification.type.post_in_queue:
         class: phpbb\notification\type\post_in_queue
-        shared: false
+        scope: prototype
         parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.quote:
         class: phpbb\notification\type\quote
-        shared: false
+        scope: prototype
         parent: notification.type.post
         calls:
             - [set_utils, ['@text_formatter.utils']]
@@ -133,35 +133,35 @@ services:
 
     notification.type.report_pm:
         class: phpbb\notification\type\report_pm
-        shared: false
+        scope: prototype
         parent: notification.type.pm
         tags:
             - { name: notification.type }
 
     notification.type.report_pm_closed:
         class: phpbb\notification\type\report_pm_closed
-        shared: false
+        scope: prototype
         parent: notification.type.pm
         tags:
             - { name: notification.type }
 
     notification.type.report_post:
         class: phpbb\notification\type\report_post
-        shared: false
+        scope: prototype
         parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.report_post_closed:
         class: phpbb\notification\type\report_post_closed
-        shared: false
+        scope: prototype
         parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.topic:
         class: phpbb\notification\type\topic
-        shared: false
+        scope: prototype
         parent: notification.type.base
         calls:
             - [set_user_loader, ['@user_loader']]
@@ -171,13 +171,13 @@ services:
 
     notification.type.topic_in_queue:
         class: phpbb\notification\type\topic_in_queue
-        shared: false
+        scope: prototype
         parent: notification.type.topic
         tags:
             - { name: notification.type }
 
 # ----- Notification's methods -----
-# Service MUST NOT be shared for all the plugins to work.
+# Scope MUST be prototype for all the plugins to work.
     notification.method_collection:
         class: phpbb\di\service_collection
         arguments:
@@ -187,7 +187,7 @@ services:
 
     notification.method.board:
         class: phpbb\notification\method\board
-        shared: false
+        scope: prototype # scope MUST be prototype for this to work!
         arguments:
             - '@user_loader'
             - '@dbal.conn'
@@ -201,7 +201,7 @@ services:
 
     notification.method.email:
         class: phpbb\notification\method\email
-        shared: false
+        scope: prototype
         arguments:
             - '@user_loader'
             - '@user'
@@ -213,7 +213,7 @@ services:
 
     notification.method.jabber:
         class: phpbb\notification\method\jabber
-        shared: false
+        scope: prototype
         arguments:
             - '@user_loader'
             - '@user'

phpBB/config/default/container/services_password.yml

@@ -1,6 +1,3 @@
-parameters:
-    passwords.driver.bcrypt_cost: 10
-
 services:
 # ----- Password management -----
     passwords.manager:
@@ -32,7 +29,6 @@ services:
         arguments:
             - '@config'
             - '@passwords.driver_helper'
-            - '%passwords.driver.bcrypt_cost%'
         tags:
             - { name: passwords.driver }
 
@@ -41,7 +37,6 @@ services:
         arguments:
             - '@config'
             - '@passwords.driver_helper'
-            - '%passwords.driver.bcrypt_cost%'
         tags:
             - { name: passwords.driver }
 
@@ -127,10 +122,3 @@ services:
             - '@passwords.driver_helper'
         tags:
             - { name: passwords.driver }
-
-    passwords.update.lock:
-        class: phpbb\lock\db
-        arguments:
-            - update_hashes_lock
-            - '@config'
-            - '@dbal.conn'

phpBB/config/default/container/services_report.yml

@@ -29,10 +29,10 @@ services:
             - '@user'
 
 # ----- Report handlers -----
-# Service MUST NOT be shared for all the handlers to work correctly.
+# Scope MUST be prototype for all the handlers to work correctly.
     phpbb.report.handlers.report_handler_pm:
         class: phpbb\report\report_handler_pm
-        shared: false
+        scope: prototype
         arguments:
             - '@dbal.conn.driver'
             - '@dispatcher'
@@ -43,7 +43,7 @@ services:
 
     phpbb.report.handlers.report_handler_post:
         class: phpbb\report\report_handler_post
-        shared: false
+        scope: prototype
         arguments:
             - '@dbal.conn.driver'
             - '@dispatcher'

phpBB/config/default/container/services_routing.yml

@@ -5,8 +5,9 @@ services:
             - '@service_container'
             - '@routing.chained_resources_locator'
             - '@routing.delegated_loader'
+            - '%core.root_path%'
             - '%core.php_ext%'
-            - '%core.cache_dir%'
+            - '%core.environment%'
 
     router.listener:
         class: Symfony\Component\HttpKernel\EventListener\RouterListener

phpBB/config/default/container/services_text_formatter.yml

@@ -1,5 +1,5 @@
 parameters:
-    text_formatter.cache.dir: '%core.cache_dir%'
+    text_formatter.cache.dir: '%core.root_path%cache/%core.environment%/'
     text_formatter.cache.parser.key: _text_formatter_parser
     text_formatter.cache.renderer.key: _text_formatter_renderer
 
@@ -33,14 +33,10 @@ services:
             - '@cache.driver'
             - '@dispatcher'
             - '@config'
-            - '@text_formatter.s9e.link_helper'
             - '%text_formatter.cache.dir%'
             - '%text_formatter.cache.parser.key%'
             - '%text_formatter.cache.renderer.key%'
 
-    text_formatter.s9e.link_helper:
-        class: phpbb\textformatter\s9e\link_helper
-
     text_formatter.s9e.parser:
         class: phpbb\textformatter\s9e\parser
         arguments:

phpBB/config/default/container/services_text_reparser.yml

@@ -24,8 +24,6 @@ services:
         class: phpbb\textreparser\plugins\contact_admin_info
         arguments:
             - '@config_text'
-        calls:
-            - [set_name, [contact_admin_info]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -34,8 +32,6 @@ services:
         arguments:
             - '@dbal.conn'
             - '%tables.forums%'
-        calls:
-            - [set_name, [forum_description]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -44,8 +40,6 @@ services:
         arguments:
             - '@dbal.conn'
             - '%tables.forums%'
-        calls:
-            - [set_name, [forum_rules]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -54,8 +48,6 @@ services:
         arguments:
             - '@dbal.conn'
             - '%tables.groups%'
-        calls:
-            - [set_name, [group_description]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -64,8 +56,6 @@ services:
         arguments:
             - '@dbal.conn'
             - '%tables.privmsgs%'
-        calls:
-            - [set_name, [pm_text]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -73,8 +63,6 @@ services:
         class: phpbb\textreparser\plugins\poll_option
         arguments:
             - '@dbal.conn'
-        calls:
-            - [set_name, [poll_option]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -83,8 +71,6 @@ services:
         arguments:
             - '@dbal.conn'
             - '%tables.topics%'
-        calls:
-            - [set_name, [poll_title]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -93,8 +79,6 @@ services:
         arguments:
             - '@dbal.conn'
             - '%tables.posts%'
-        calls:
-            - [set_name, [post_text]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -103,7 +87,5 @@ services:
         arguments:
             - '@dbal.conn'
             - '%tables.users%'
-        calls:
-            - [set_name, [user_signature]]
         tags:
             - { name: text_reparser.plugin }

phpBB/config/default/container/services_twig.yml

@@ -1,5 +1,5 @@
 parameters:
-    core.template.cache_path: '%core.cache_dir%twig/'
+    core.template.cache_path: '%core.root_path%cache/%core.environment%/twig/'
 
 services:
     template.twig.environment:
@@ -8,17 +8,14 @@ services:
             - '@config'
             - '@filesystem'
             - '@path_helper'
+            - '@service_container'
             - '%core.template.cache_path%'
             - '@ext.manager'
             - '@template.twig.loader'
-            - '@dispatcher'
             - []
-        calls:
-            - [setLexer, ['@template.twig.lexer']]
 
     template.twig.lexer:
         class: phpbb\template\twig\lexer
-        lazy: true
         arguments:
             - '@template.twig.environment'
 

phpBB/config/default/container/tables.yml

@@ -6,7 +6,6 @@ parameters:
     tables.acl_users: '%core.table_prefix%acl_users'
     tables.attachments: '%core.table_prefix%attachments'
     tables.auth_provider_oauth_token_storage: '%core.table_prefix%oauth_tokens'
-    tables.auth_provider_oauth_states: '%core.table_prefix%oauth_states'
     tables.auth_provider_oauth_account_assoc: '%core.table_prefix%oauth_accounts'
     tables.banlist: '%core.table_prefix%banlist'
     tables.bbcodes: '%core.table_prefix%bbcodes'

phpBB/config/installer/container/services.yml

@@ -12,14 +12,12 @@ services:
     cache.driver:
         class: '%cache.driver.class%'
         arguments:
-            - '%core.cache_dir%'
+            - '%core.root_path%/cache/installer/'
 
     config:
         class: phpbb\config\config
         arguments:
-            -
-                rand_seed: 'installer_seed'
-                rand_seed_last_update: 0
+            - []
 
     controller.resolver:
         class: phpbb\controller\resolver
@@ -81,19 +79,11 @@ services:
             - '@config'
             - '@filesystem'
             - '@path_helper'
+            - '@service_container'
             - '%core.template.cache_path%'
             - null
             - '@template.twig.loader'
-            - null
             - []
-        calls:
-            - [setLexer, ['@template.twig.lexer']]
-
-    user:
-        class: phpbb\user
-        arguments:
-            - '@language'
-            - '%datetime.class%'
 
     console.exception_subscriber:
         class: phpbb\console\exception_subscriber

phpBB/config/installer/container/services_install_console.yml

@@ -21,6 +21,7 @@ services:
         arguments:
             - '@language'
             - '@installer.helper.iohandler_factory'
+            - '@installer.installer.install'
         tags:
             - { name: console.installer.command }
 
@@ -30,32 +31,6 @@ services:
         arguments:
             - '@language'
             - '@installer.helper.iohandler_factory'
-        tags:
-            - { name: console.installer.command }
-
-    console.updater.command.update:
-        class: phpbb\install\console\command\update\update
-        arguments:
-            - '@language'
-            - '@installer.helper.iohandler_factory'
-            - '@installer.installer.update'
-            - '@installer.helper.install_helper'
-        tags:
-            - { name: console.installer.command }
-
-    console.updater.command.config.show:
-        class: phpbb\install\console\command\update\config\show
-        arguments:
-            - '@language'
-            - '@installer.helper.iohandler_factory'
-        tags:
-            - { name: console.installer.command }
-
-
-    console.updater.command.config.validate:
-        class: phpbb\install\console\command\update\config\validate
-        arguments:
-            - '@language'
-            - '@installer.helper.iohandler_factory'
+            - '@installer.installer.install'
         tags:
             - { name: console.installer.command }

phpBB/config/installer/container/services_install_controller.yml

@@ -49,25 +49,3 @@ services:
         class: phpbb\install\controller\archive_download
         arguments:
             - '@installer.helper.config'
-
-    phpbb.installer.controller.convert:
-        class: phpbb\convert\controller\convertor
-        arguments:
-            - '@cache.driver'
-            - '@installer.helper.container_factory'
-            - '@installer.helper.database'
-            - '@phpbb.installer.controller.helper'
-            - '@installer.helper.install_helper'
-            - '@installer.helper.iohandler_factory'
-            - '@language'
-            - '@installer.navigation.provider'
-            - '@request'
-            - '@template'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-
-    phpbb.installer.controller.status:
-        class: phpbb\install\controller\timeout_check
-        arguments:
-            - '@phpbb.installer.controller.helper'
-            - '%core.root_path%'

phpBB/config/installer/container/services_install_data.yml

@@ -23,22 +23,11 @@ services:
     installer.install_data.add_modules:
         class: phpbb\install\module\install_data\task\add_modules
         arguments:
-            - '@installer.helper.config'
             - '@installer.helper.iohandler'
             - '@installer.helper.container_factory'
         tags:
             - { name: install_data_install, order: 30 }
 
-    installer.install_data.create_search_index:
-        class: phpbb\install\module\install_data\task\create_search_index
-        arguments:
-            - '@config'
-            - '@installer.helper.container_factory'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-        tags:
-            - { name: install_data_install, order: 40 }
-
     installer.module.data_install_collection:
         class: phpbb\di\ordered_service_collection
         arguments:

phpBB/config/installer/container/services_install_database.yml

@@ -1,35 +1,15 @@
 services:
-    installer.install_database.create_schema_file:
-        class: phpbb\install\module\install_database\task\create_schema_file
-        arguments:
-            - '@installer.helper.config'
-            - '@installer.helper.database'
-            - '@filesystem'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-        tags:
-            - { name: install_database_install, order: 10 }
-
-    installer.install_database.set_up_database:
-        class: phpbb\install\module\install_database\task\set_up_database
+    installer.install_database.create_schema:
+        class: phpbb\install\module\install_database\task\create_schema
         arguments:
             - '@installer.helper.config'
             - '@installer.helper.database'
             - '@filesystem'
             - '@installer.helper.iohandler'
             - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
-            - { name: install_database_install, order: 20 }
-
-    installer.install_database.add_tables:
-        class: phpbb\install\module\install_database\task\add_tables
-        arguments:
-            - '@installer.helper.config'
-            - '@installer.helper.database'
-            - '@filesystem'
-            - '%core.root_path%'
-        tags:
-            - { name: install_database_install, order: 30 }
+            - { name: install_database_install, order: 10 }
 
     installer.install_database.add_default_data:
         class: phpbb\install\module\install_database\task\add_default_data
@@ -41,7 +21,7 @@ services:
             - '@language'
             - '%core.root_path%'
         tags:
-            - { name: install_database_install, order: 40 }
+            - { name: install_database_install, order: 20 }
 
     installer.install_database.add_config_settings:
         class: phpbb\install\module\install_database\task\add_config_settings
@@ -53,7 +33,7 @@ services:
             - '@language'
             - '%core.root_path%'
         tags:
-            - { name: install_database_install, order: 50 }
+            - { name: install_database_install, order: 30 }
 
     installer.module.install_database_collection:
         class: phpbb\di\ordered_service_collection

phpBB/config/installer/container/services_install_finish.yml

@@ -2,21 +2,10 @@ services:
     installer.install_finish.populate_migrations:
         class: phpbb\install\module\install_finish\task\populate_migrations
         arguments:
-            - '@installer.helper.config'
             - '@installer.helper.container_factory'
         tags:
             - { name: install_finish, order: 10 }
 
-    installer.install_finish.install_extensions:
-        class: phpbb\install\module\install_finish\task\install_extensions
-        arguments:
-            - '@installer.helper.container_factory'
-            - '@installer.helper.config'
-            - '@installer.helper.iohandler'
-            - '%core.root_path%'
-        tags:
-            - { name: install_finish, order: 20 }
-
     installer.install_finish.notify_user:
         class: phpbb\install\module\install_finish\task\notify_user
         arguments:
@@ -26,7 +15,7 @@ services:
             - '%core.root_path%'
             - '%core.php_ext%'
         tags:
-            - { name: install_finish, order: 30 }
+            - { name: install_finish, order: 20 }
 
     installer.module.install_finish_collection:
         class: phpbb\di\ordered_service_collection
@@ -36,7 +25,7 @@ services:
             - { name: service_collection, tag: install_finish, class_name_aware: true }
 
     installer.module.finish_install:
-        class: phpbb\install\module\install_finish\module
+        class: phpbb\install\module\install_filesystem\module
         parent: installer.module_base
         arguments:
             - '@installer.module.install_finish_collection'

phpBB/config/installer/container/services_install_navigation.yml

@@ -13,7 +13,7 @@ services:
 
     installer.navigation.main_navigation:
         class: phpbb\install\helper\navigation\main_navigation
-        shared: false
+        scope: prototype
         tags:
             - { name: installer.navigation }
 
@@ -21,7 +21,7 @@ services:
         class: phpbb\install\helper\navigation\install_navigation
         arguments:
             - '@installer.helper.install_helper'
-        shared: false
+        scope: prototype
         tags:
             - { name: installer.navigation }
 
@@ -29,14 +29,7 @@ services:
         class: phpbb\install\helper\navigation\update_navigation
         arguments:
             - '@installer.helper.install_helper'
-        shared: false
+        scope: prototype
         tags:
             - { name: installer.navigation }
 
-    installer.navigation.convertor_navigation:
-        class: phpbb\install\helper\navigation\convertor_navigation
-        arguments:
-            - '@installer.helper.install_helper'
-        shared: false
-        tags:
-            - { name: installer.navigation }

phpBB/config/installer/container/services_installer.yml

@@ -47,7 +47,6 @@ services:
             - '@request'
             - '@template'
             - '@router'
-            - '%core.root_path%'
 
     installer.helper.iohandler_cli:
         class: phpbb\install\helper\iohandler\cli_iohandler
@@ -90,7 +89,6 @@ services:
             - '@cache.driver'
             - '@installer.helper.config'
             - '@path_helper'
-            - '@installer.helper.container_factory'
 
     installer.install.module_collection:
         class: phpbb\di\ordered_service_collection
@@ -110,10 +108,8 @@ services:
         parent: installer.installer.abstract
         calls:
             - [set_modules, ['@installer.install.module_collection']]
-            - [set_purge_cache_before, [false]]
 
     installer.installer.update:
         parent: installer.installer.abstract
         calls:
             - [set_modules, ['@installer.update.module_collection']]
-            - [set_purge_cache_before, [true]]

phpBB/config/installer/container/services_update_database.yml

@@ -11,17 +11,6 @@ services:
         tags:
             - { name: update_database_task, order: 10 }
 
-    installer.update_database.update_extensions:
-        class: phpbb\install\module\update_database\task\update_extensions
-        arguments:
-            - '@installer.helper.container_factory'
-            - '@installer.helper.config'
-            - '@installer.helper.iohandler'
-            - '@installer.helper.update_helper'
-            - '%core.root_path%'
-        tags:
-            - { name: update_database_task, order: 20 }
-
     installer.module.update_database_collection:
         class: phpbb\di\ordered_service_collection
         arguments:

phpBB/config/installer/container/services_update_requirements.yml

@@ -15,7 +15,6 @@ services:
         arguments:
             - '@installer.helper.container_factory'
             - '@filesystem'
-            - '@installer.helper.config'
             - '@installer.helper.iohandler'
             - '@installer.helper.update_helper'
             - '%core.root_path%'

phpBB/config/installer/routing/installer.yml

@@ -35,33 +35,3 @@ phpbb_installer_update_conflict_download:
     path: /download/conflict
     defaults:
         _controller: phpbb.installer.controller.file_downloader:conflict_archive
-
-phpbb_convert_intro:
-    path: /convert/{start_new}
-    defaults:
-        _controller: phpbb.installer.controller.convert:intro
-        start_new: 0
-
-phpbb_convert_settings:
-    path: /convert/settings/{converter}
-    defaults:
-        _controller: phpbb.installer.controller.convert:settings
-    requirements:
-        converter: "[a-zA-Z0-9_]+"
-
-phpbb_convert_convert:
-    path: /convert/in_progress/{converter}
-    defaults:
-        _controller: phpbb.installer.controller.convert:convert
-    requirements:
-        converter: "[a-zA-Z0-9_]+"
-
-phpbb_convert_finish:
-    path: /convert/finished
-    defaults:
-        _controller: phpbb.installer.controller.convert:finish
-
-phpbb_installer_status:
-    path: /installer/status
-    defaults:
-        _controller: phpbb.installer.controller.status:status

phpBB/cron.php

@@ -57,18 +57,6 @@ if ($cron_lock->acquire())
 	$task = $cron->find_task($cron_type);
 	if ($task)
 	{
-		/**
-		 * This event enables you to catch the task before it runs
-		 *
-		 * @event core.cron_run_before
-		 * @var	\phpbb\cron\task\wrapper	task	Current Cron task
-		 * @since 3.1.8-RC1
-		 */
-		$vars = array(
-			'task',
-		);
-		extract($phpbb_dispatcher->trigger_event('core.cron_run_before', compact($vars)));
-
 		if ($task->is_parametrized())
 		{
 			$task->parse_parameters($request);

phpBB/develop/add_permissions.php

@@ -379,6 +379,8 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 						$sql = 'VALUES ' . implode(', ', preg_replace('#^(.*?)$#', '(\1)', $sql_subary));
 						break;
 
+					case 'mssql':
+					case 'sqlite':
 					case 'sqlite3':
 						$sql = implode(' UNION ALL ', preg_replace('#^(.*?)$#', 'SELECT \1', $sql_subary));
 						break;
@@ -387,7 +389,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 						foreach ($sql_subary as $sql)
 						{
 							$sql = "INSERT INTO $table ($id_field, forum_id, auth_option_id, auth_setting) VALUES ($sql)";
-							$db->sql_query($sql);
+							$result = $db->sql_query($sql);
 							$sql = '';
 						}
 				}
@@ -395,7 +397,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 				if ($sql != '')
 				{
 					$sql = "INSERT INTO $table ($id_field, forum_id, auth_option_id, auth_setting) $sql";
-					$db->sql_query($sql);
+					$result = $db->sql_query($sql);
 				}
 				break;
 
@@ -403,7 +405,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 			case 'delete':
 				foreach ($sql_subary as $sql)
 				{
-					$db->sql_query($sql);
+					$result = $db->sql_query($sql);
 					$sql = '';
 				}
 				break;

phpBB/develop/benchmark.php

@@ -143,7 +143,7 @@ function filldb($newposts)
 		if ((rand(0,30) < 1) || ($forum_topic_count[$forum] == 0))
 		{
 			// create a new topic 1 in 30 times (or when there are none);
-			make_topic($userid, "Testing topic $i", $forum);
+			$topic = make_topic($userid, "Testing topic $i", $forum);
 			$forum_topic_count[$forum]++;
 		} 
 		else 

phpBB/develop/create_schema_files.php

@@ -49,7 +49,7 @@ $classes = $finder->core_path('phpbb/')
 	->directory('/db/migration/data')
 	->get_classes();
 
-$db = new \phpbb\db\driver\sqlite3();
+$db = new \phpbb\db\driver\sqlite();
 $factory = new \phpbb\db\tools\factory();
 $db_tools = $factory->get($db, true);