Merge pull request #4899 from rubencm/ticket/15286

[ticket/15286] Use storage in attachments

.appveyor.yml

@@ -0,0 +1,143 @@
+build: false
+clone_folder: c:\projects\phpbb
+version: '{build}'
+
+services:
+  - iis
+
+environment:
+  matrix:
+  - db: mssql
+    db_version: sql2012sp1
+    php: 7.0
+  - db: mssql
+    db_version: sql2014
+    php: 7.0
+  - db: mssql
+    db_version: sql2016
+    php: 7.1.12
+#  - db: mssql
+#    db_version: sql2017
+#    php: 7.1
+#  - db: mariadb
+#    php: 7.1
+#  - db: mysqli
+#    php: 7.1
+#  - db: sqlite
+#    php: 7.1
+#  - db: postgresql
+#    php: 7.1
+
+hosts:
+  phpbb.test: 127.0.0.1
+
+init:
+  - SET PATH=%systemroot%\system32\inetsrv\;C:\Program Files\OpenSSL;C:\tools\php;c:\php;%PATH%
+  - SET ANSICON=121x90 (121x90)
+  - REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
+
+before_test:
+  - ps: |
+      Set-Service wuauserv -StartupType Manual
+      cinst -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
+      Get-ChildItem -Path "c:\tools\php$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1$2')" -Recurse |
+          Move-Item -destination "c:\tools\php"
+      cd c:\tools\php
+      cat php.ini-development | %{$_ -replace "memory_limit = 128M","memory_limit = 1024M"} | Out-File -Encoding "Default" php.ini
+      Add-Content php.ini "`n date.timezone=UTC"
+      Add-Content php.ini "`n display_errors=On"
+      Add-Content php.ini "`n extension_dir=ext"
+      Add-Content php.ini "`n extension=php_openssl.dll"
+      Add-Content php.ini "`n extension=php_mbstring.dll"
+      Add-Content php.ini "`n extension=php_curl.dll"
+      Add-Content php.ini "`n extension=php_gd2.dll"
+      Add-Content php.ini "`n extension=php_tidy.dll"
+      Add-Content php.ini "`n extension=php_fileinfo.dll"
+      Add-Content php.ini "`n extension=php_pdo_sqlite.dll"
+      Add-Content php.ini "`n extension=php_sqlite3.dll"
+      Add-Content php.ini "`n extension=php_pdo_mysql.dll"
+      Add-Content php.ini "`n extension=php_mysqli.dll"
+      Add-Content php.ini "`n extension=php_pdo_pgsql.dll"
+      Add-Content php.ini "`n extension=php_pgsql.dll"
+
+      # Get MSSQL driver
+      if ($env:db -eq "mssql") {
+        cd c:\tools\php\ext
+        $DLLVersion = "4.1.6.1"
+        curl -o php_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip https://windows.php.net/downloads/pecl/releases/sqlsrv/$($:DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip
+        7z x -y php_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip > $null
+        curl -o php_pdo_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip https://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip
+        7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php -replace '([0-9])[.]([0-9])[.]?([0-9]+)?','$1.$2')-nts-vc14-x64.zip > $null
+        Remove-Item c:\tools\php\* -include .zip
+        cd c:\tools\php
+        Add-Content php.ini "`nextension=php_sqlsrv.dll"
+        Add-Content php.ini "`nextension=php_pdo_sqlsrv.dll"
+        Add-Content php.ini "`n"
+
+        $instanceName = $env:db_version.ToUpper()
+        Start-Service "MSSQL`$$instanceName"
+        Set-Variable -Name "sqlServerPath" -Value "(local)\$($env:db_version.ToUpper())"
+
+        # Create database write test config
+        sqlcmd -S $sqlServerPath -Q "Use [master]; CREATE DATABASE [phpbb_test] COLLATE Latin1_General_CI_AS"
+        $data = "<?php`n`n`$dbms = 'phpbb\\db\\driver\\mssqlnative';`n`$dbhost = '.\\$env:db_version';`n`$dbport = '';`n`$dbname = 'phpbb_test';`n`$dbuser = 'sa';`n`$dbpasswd = 'Password12!';`n`$phpbb_functional_url = 'http://phpbb.test/';"; $data | Out-File -Encoding "Default" "c:\\projects\\phpbb\\tests\\test_config.php"
+      }
+      elseif ($env:db -eq "mysqli") {
+        Start-Service MySQL57
+        $env:MYSQL_PWD="Password12!"
+        $cmd = '"C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -e "create database phpbb_test;" --user=root'
+        iex "& $cmd"
+        $data = "<?php`n`n`$dbms = 'phpbb\\db\\driver\\mysqli';`n`$dbhost = 'localhost';`n`$dbport = '';`n`$dbname = 'phpbb_test';`n`$dbuser = 'root';`n`$dbpasswd = 'Password12!';`n`$phpbb_functional_url = 'http://phpbb.test/';"; $data | Out-File -Encoding "Default" "c:\\projects\\phpbb\\tests\\test_config.php"
+      }
+      elseif ($env:db -eq "postgresql") {
+        Start-Service postgresql-x64-9.5
+        $env:PGUSER="postgres"
+        $env:PGPASSWORD="Password12!"
+        $Env:Path="C:\Program Files\PostgreSQL\9.6\bin\;$($Env:Path)"
+        createdb phpbb_test
+        $data = "<?php`n`n`$dbms = 'phpbb\\db\\driver\\postgres';`n`$dbhost = 'localhost';`n`$dbport = '';`n`$dbname = 'phpbb_test';`n`$dbuser = 'postgres';`n`$dbpasswd = 'Password12!';`n`$phpbb_functional_url = 'http://phpbb.test/';"; $data | Out-File -Encoding "Default" "c:\\projects\\phpbb\\tests\\test_config.php"
+      }
+      elseif ($env:db -eq "mariadb") {
+        appveyor-retry cinst -y --force mariadb
+        $env:MYSQL_PWD=""
+        $cmd = '"C:\Program Files\MariaDB 10.2\bin\mysql" -e "create database phpbb_test;" --user=root'
+        iex "& $cmd"
+        $data = "<?php`n`n`$dbms = 'phpbb\\db\\driver\\mysqli';`n`$dbhost = 'localhost';`n`$dbport = '';`n`$dbname = 'phpbb_test';`n`$dbuser = 'root';`n`$dbpasswd = '';`n`$phpbb_functional_url = 'http://phpbb.test/';"; $data | Out-File -Encoding "Default" "c:\\projects\\phpbb\\tests\\test_config.php"
+      }
+      elseif ($env:db -eq "sqlite") {
+        # install sqlite
+        appveyor-retry cinst -y sqlite
+        sqlite3 c:\projects\test.db "create table aTable(field1 int); drop table aTable;"
+        $data = "<?php`n`n`$dbms = 'phpbb\\db\\driver\\sqlite3';`n`$dbhost = 'c:\\projects\\test.db';`n`$dbport = '';`n`$dbname = '';`n`$dbuser = '';`n`$dbpasswd = '';`n`$phpbb_functional_url = 'http://phpbb.test/';"; $data | Out-File -Encoding "Default" "c:\\projects\\phpbb\\tests\\test_config.php"
+      }
+
+      # Install PhantomJS
+      cinst -y phantomjs
+      Start-Process "phantomjs" "--webdriver=8910" | Out-Null
+  - ps: |
+      cd c:\projects\phpbb\phpBB
+      (Get-Content c:\projects\phpbb\phpBB\web.config).replace("<configuration>", "<configuration>`n`t<system.web>`n`t`t<customErrors mode=`"Off`"/>`n`t</system.web>") | Set-Content c:\projects\phpbb\phpBB\web.config
+      (Get-Content c:\projects\phpbb\phpBB\web.config).replace("`t</system.webServer>", "`t`t<httpErrors errorMode=`"Detailed`" />`n`t</system.webServer>") | Set-Content c:\projects\phpbb\phpBB\web.config
+  - cd c:\projects\phpbb\phpBB
+  - php ..\composer.phar install
+  - choco install -y urlrewrite
+  - ps: New-WebSite -Name 'phpBBTest' -PhysicalPath 'c:\projects\phpbb\phpBB' -Force
+  - ps: Import-Module WebAdministration; Set-ItemProperty 'IIS:\Sites\phpBBTest' -name Bindings -value @{protocol='http';bindingInformation='*:80:phpbb.test'}
+  - echo Change default anonymous user AUTH to ApplicationPool
+  - appcmd set config -section:anonymousAuthentication /username:"" --password
+  - echo Setup FAST-CGI configuration
+  - appcmd set config /section:system.webServer/fastCGI /+[fullPath='C:\tools\php\php-cgi.exe']
+  - echo Setup FACT-CGI handler
+  - appcmd set config /section:system.webServer/handlers /+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='C:\tools\php\php-cgi.exe',resourceType='Either']
+  - iisreset
+  - NET START W3SVC
+  - mkdir "C:\projects\phpbb\phpBB\cache\test"
+  - mkdir "C:\projects\phpbb\phpBB\cache\installer"
+  - icacls "C:\projects\phpbb\phpBB\cache" /grant Users:F /T
+  - icacls "C:\projects\phpbb\phpBB\files" /grant Users:F /T
+  - icacls "C:\projects\phpbb\phpBB\store" /grant Users:F /T
+  - icacls "C:\projects\phpbb\phpBB\images\avatars\upload" /grant Users:F /T
+
+test_script:
+  - cd c:\projects\phpbb
+  - php -e phpBB\vendor\phpunit\phpunit\phpunit --verbose

.devcontainer/Dockerfile

@@ -1,20 +0,0 @@
-# Debian version
-ARG VARIANT="buster"
-FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
-
-# Install PHP
-RUN apt-get -y update
-RUN apt-get -y install php php-xml php-mbstring php-curl php-zip php-xdebug
-
-# Install Composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# Install MySQL
-RUN apt-get -y install mysql-server php-mysql
-
-# Xdebug
-ADD resources/xdebug.ini /etc/php/8.1/apache2/conf.d/xdebug.ini
-
-# Configure Apache
-RUN echo "Listen 8080" >> /etc/apache2/ports.conf && \
-    a2enmod rewrite

.devcontainer/devcontainer.json

@@ -1,37 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.238.1/containers/ubuntu
-{
-	"name": "Ubuntu",
-	"build": {
-		"dockerfile": "Dockerfile",
-		// Update 'VARIANT' to pick an Ubuntu version: jammy / ubuntu-22.04, focal / ubuntu-20.04, bionic /ubuntu-18.04
-		// Use ubuntu-22.04 or ubuntu-18.04 on local arm64/Apple Silicon.
-		"args": { "VARIANT": "ubuntu-22.04" }
-	},
-
-	// Configure tool-specific properties.
-	"customizations": {
-		// Configure properties specific to VS Code.
-		"vscode": {
-			"settings": {
-				// Allow Xdebug to listen to requests from remote (or container)
-				"remote.localPortHost": "allInterfaces"
-			},
-			//"devPort": {},
-			// Specify which VS Code extensions to install (List of IDs)
-			"extensions": ["xdebug.php-debug"]
-			}
-		},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	"forwardPorts": [80, 9003],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	"postStartCommand": "bash .devcontainer/resources/setup.sh",
-
-	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "vscode",
-	"features": {
-		"github-cli": "latest"
-	}
-}

.devcontainer/resources/phpbb-config.yml

@@ -1,38 +0,0 @@
-installer:
-    admin:
-        name: admin
-        password: adminadmin
-        email: admin@example.org
-
-    board:
-        lang: en
-        name: My Board
-        description: My amazing new phpBB board
-
-    database:
-        dbms: mysqli
-        dbhost: 127.0.0.1
-        dbport: 3306
-        dbuser: phpbb
-        dbpasswd: phpbb
-        dbname: phpbb
-        table_prefix: phpbb_
-
-    email:
-        enabled: false
-        smtp_delivery : ~
-        smtp_host: ~
-        smtp_port: ~
-        smtp_auth: ~
-        smtp_user: ~
-        smtp_pass: ~
-
-    server:
-        cookie_secure: false
-        server_protocol: http://
-        force_server_vars: true
-        server_name: localhost
-        server_port: 80
-        script_path: /
-
-    extensions: []

.devcontainer/resources/setup.sh

@@ -1,52 +0,0 @@
-# setup.sh
-# Commands to install and configure phpBB
-
-# Start MySQL
-echo "[Codespaces] Start MySQL"
-sudo service mysql start
-
-# Start Apache
-echo "[Codespaces] Start Apache"
-sudo service apache2 start
-
-# Add SSH key
-echo "[Codespaces] Add SSH key"
-echo "$SSH_KEY" > /home/vscode/.ssh/id_rsa && chmod 600 /home/vscode/.ssh/id_rsa
-
-# Create a MySQL user to use
-echo "[Codespaces] Create MySQL user"
-sudo mysql -u root<<EOFMYSQL
-    CREATE USER 'phpbb'@'localhost' IDENTIFIED BY 'phpbb';
-    GRANT ALL PRIVILEGES ON *.* TO 'phpbb'@'localhost' WITH GRANT OPTION;
-    CREATE DATABASE IF NOT EXISTS phpbb;
-EOFMYSQL
-
-# Download dependencies
-echo "[Codespaces] Install Composer dependencies"
-composer install --no-interaction
-
-# Symlink the webroot so it can be viewed
-echo "[Codespaces] Create Symlink of webroot"
-sudo rm -rf /var/www/html
-sudo ln -s /workspaces/phpbb/phpBB /var/www/html
-
-# Copy phpBB config
-echo "[Codespaces] Copy phpBB configuration"
-cp /workspaces/phpbb/.devcontainer/resources/phpbb-config.yml /workspaces/phpbb/phpBB/install/install-config.yml
-
-# Force the server URL to reflect the Codespace
-# https://docs.github.com/en/codespaces/developing-in-a-codespace/default-environment-variables-for-your-codespace
-if [ "$CODESPACES" = true ] ; then
-    echo "[Codespaces] Set the phpBB server name using default environment variables"
-    codespaces_url="${CODESPACE_NAME}-80.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}"
-    sed -i "s/localhost/$codespaces_url/g" /workspaces/phpbb/phpBB/install/install-config.yml
-fi
-
-# Install phpBB
-echo "[Codespaces] Run phpBB CLI installation"
-cd /workspaces/phpbb/phpBB && composer install --no-interaction
-sudo php /workspaces/phpbb/phpBB/install/phpbbcli.php install /workspaces/phpbb/phpBB/install/install-config.yml
-rm -rf /workspaces/phpbb/phpBB/install
-
-# Finished
-echo "[Codespaces] phpBB installation completed"

.devcontainer/resources/xdebug.ini

@@ -1,10 +0,0 @@
-zend_extension=xdebug.so
-
-[xdebug]
-xdebug.mode=develop,debug
-xdebug.discover_client_host=1
-xdebug.client_port=9003
-xdebug.start_with_request=yes
-xdebug.log='/var/log/xdebug/xdebug.log'
-xdebug.connect_timeout_ms=2000
-xdebug.idekey=VSCODE

.github/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://area51.phpbb.com/docs/dev/master/development/coding_guidelines.html) and [Git Contribution Guidelines](https://area51.phpbb.com/docs/dev/master/development/git.html)
+3. Read our [Coding guidelines](https://wiki.phpbb.com/Coding_guidelines) and [Git Contribution Guidelines](http://wiki.phpbb.com/Git)
 4. Send us a pull request

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,10 @@
 Checklist:
 
-- [ ] Correct branch: master for new features; 3.3.x for fixes
+- [ ] Correct branch: master for new features; 3.2.x for fixes
 - [ ] Tests pass
-- [ ] Code follows coding guidelines: [master](https://area51.phpbb.com/docs/master/coding-guidelines.html) and [3.3.x](https://area51.phpbb.com/docs/dev/3.3.x/development/coding_guidelines.html)
-- [ ] Commit follows commit message [format](https://area51.phpbb.com/docs/dev/3.3.x/development/git.html)
+- [ ] Code follows coding guidelines: [master](https://area51.phpbb.com/docs/dev/master/development/coding_guidelines.html) and [3.2.x](https://area51.phpbb.com/docs/dev/3.2.x/development/coding_guidelines.html)
+- [ ] Commit follows commit message [format](https://area51.phpbb.com/docs/dev/3.2.x/development/git.html)
 
-Tracker ticket:
+Tracker ticket (set the ticket ID to **your ticket ID**):
 
-https://tracker.phpbb.com/browse/PHPBB-12345
+https://tracker.phpbb.com/browse/PHPBB3-12345

.github/check-doctum-parse-errors.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-
-if [ ! -f doctum.phar ]; then
-	# Download the latest (5.x.x) release if the file does not exist
-	# Remove it to update your phar
-	curl -O https://doctum.long-term.support/releases/5/doctum.phar
-	rm -f doctum.phar.sha256
-	curl -O https://doctum.long-term.support/releases/5/doctum.phar.sha256
-	sha256sum --strict --check doctum.phar.sha256
-	rm -f doctum.phar.sha256
-	chmod +x ./doctum.phar
-	# You can fetch the latest (5.x.x) version code here:
-	# https://doctum.long-term.support/releases/5/VERSION
-fi
-# Show the version to inform users of the script
-./doctum.phar version --text
-./doctum.phar parse build/doctum-checkout.conf.php -v

.github/check-executable-files.sh

@@ -1,63 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-
-root="$1"
-path="${root}phpBB/"
-
-# Check the permissions of the files
-
-# The following variables MUST NOT contain any wildcard
-# Directories to skip
-directories_skipped="-path ${path}develop -o -path ${path}vendor"
-
-# Files to skip
-files_skipped="-false"
-
-# Files which have to be executable
-executable_files="-path ${path}bin/* -o -path ${path}install/phpbbcli.php"
-
-incorrect_files=$( 								\
-	find ${path}								\
-		'('										\
-			'('									\
-				${directories_skipped}			\
-			')'									\
-			-a -type d -prune -a -type f		\
-		')' -o 									\
-		'('										\
-			-type f -a							\
-			-not '('							\
-				${files_skipped}				\
-			')' -a								\
-			'('									\
-				'('								\
-					'('							\
-						${executable_files}		\
-					')' -a						\
-					-not -perm /100				\
-				')' -o							\
-				'('								\
-					-not '('					\
-						${executable_files}		\
-					')' -a						\
-					-perm /111					\
-				')'								\
-			')'									\
-		')'										\
-	)
-
-if [ "${incorrect_files}" != '' ]
-then
-	echo "The following files do not have proper permissions:";
-	ls -la ${incorrect_files}
-	exit 1;
-fi

.github/check-image-icc-profiles.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-
-find . -type f -a -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' -a -not -wholename '*vendor/*' | \
-	parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}'

.github/ext-check-executable-files.sh

@@ -1,64 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-
-root="$1"
-extname="$2"
-path="${root}phpBB/ext/${extname}/"
-
-# Check the permissions of the files
-
-# The following variables MUST NOT contain any wildcard
-# Directories to skip
-directories_skipped="-path ${path}develop -o -path ${path}vendor -o -path ${path}.git"
-
-# Files to skip
-files_skipped="-false"
-
-# Files which have to be executable
-executable_files="-path ${path}bin/* -o -path ${path}install/phpbbcli.php"
-
-incorrect_files=$( 								\
-	find ${path}								\
-		'('										\
-			'('									\
-				${directories_skipped}			\
-			')'									\
-			-a -type d -prune -a -type f		\
-		')' -o 									\
-		'('										\
-			-type f -a							\
-			-not '('							\
-				${files_skipped}				\
-			')' -a								\
-			'('									\
-				'('								\
-					'('							\
-						${executable_files}		\
-					')' -a						\
-					-not -perm /100				\
-				')' -o							\
-				'('								\
-					-not '('					\
-						${executable_files}		\
-					')' -a						\
-					-perm /111					\
-				')'								\
-			')'									\
-		')'										\
-	)
-
-if [ "${incorrect_files}" != '' ]
-then
-	echo "The following files do not have proper permissions:";
-	ls -la ${incorrect_files}
-	exit 1;
-fi

.github/ext-sniff.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-set -x
-
-EXTNAME=$1
-NOTESTS=$2
-
-if [ "$NOTESTS" == "1" ]
-then
-	phpBB/vendor/bin/phpcs 											\
-		-s															\
-		--extensions=php											\
-		--standard=build/code_sniffer/ruleset-php-extensions.xml	\
-		--ignore=*/"$EXTNAME"/tests/*,*/"$EXTNAME"/vendor/*			\
-		phpBB/ext/"$EXTNAME"
-fi

.github/ldap/base.ldif

@@ -1,41 +0,0 @@
-dn: dc=example,dc=com
-objectClass: top
-objectClass: dcObject
-objectClass: organization
-o: example
-dc: example
-
-dn: ou=foo,dc=example,dc=com
-objectClass: organizationalUnit
-ou: foo
-
-dn: cn=admin,dc=example,dc=com
-objectClass: simpleSecurityObject
-objectClass: organizationalRole
-cn: admin
-description: LDAP administrator
-userPassword:: e1NTSEF9NytMR2gveUxTMzdsc3RRd1V1dENZSVA0TWdYdm9SdDY=
-
-dn: ou=group,dc=example,dc=com
-objectClass: organizationalUnit
-ou: group
-
-dn: cn=admin,ou=foo,dc=example,dc=com
-objectClass: posixAccount
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-objectClass: person
-loginShell: /bin/bash
-homeDirectory: /home/admin
-uid: admin
-cn: admin
-uidNumber: 10000
-gidNumber: 10000
-sn: admin
-mail: admin@example.com
-userPassword:: e1NTSEF9WHpueGZURHZZc21JSkl6czdMVXBjdCtWYTA1dlMzVlQ=
-
-dn: cn=admin,ou=group,dc=example,dc=com
-objectClass: posixGroup
-gidNumber: 10000
-cn: admin

.github/ldap/slapd.conf

@@ -1,17 +0,0 @@
-# See slapd.conf(5) for details on configuration options.
-include   /etc/ldap/schema/core.schema
-include   /etc/ldap/schema/cosine.schema
-include   /etc/ldap/schema/inetorgperson.schema
-include   /etc/ldap/schema/nis.schema
-
-pidfile         /var/tmp/slapd/slapd.pid
-argsfile        /var/tmp/slapd/slapd.args
-
-modulepath     /usr/lib/openldap
-
-database  ldif
-directory /var/tmp/slapd
-
-suffix    "dc=example,dc=com"
-rootdn    "cn=admin,dc=example,dc=com"
-rootpw    adminadmin

.github/phing-sniff.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-set -x
-
-cd build
-../phpBB/vendor/bin/phing sniff
-cd ..

.github/phpunit-mariadb-github.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
-         bootstrap="../tests/bootstrap.php">
-	<testsuites>
-		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests</directory>
-			<exclude>../tests/functional</exclude>
-			<exclude>../tests/lint_test.php</exclude>
-		</testsuite>
-		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php">../tests/functional</directory>
-		</testsuite>
-	</testsuites>
-
-	<groups>
-		<exclude>
-			<group>slow</group>
-		</exclude>
-	</groups>
-
-	<php>
-		<server name="PHPBB_TEST_DBMS" value="mysqli" />
-		<server name="PHPBB_TEST_DBHOST" value="0.0.0.0" />
-		<server name="PHPBB_TEST_DBPORT" value="3306" />
-		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
-		<server name="PHPBB_TEST_DBUSER" value="root" />
-		<server name="PHPBB_TEST_DBPASSWD" value="" />
-		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-		<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
-	</php>
-</phpunit>

.github/phpunit-mssql-github.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
-         bootstrap="../tests/bootstrap.php">
-	<testsuites>
-		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests</directory>
-			<exclude>../tests/functional</exclude>
-			<exclude>../tests/lint_test.php</exclude>
-		</testsuite>
-		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php">../tests/functional</directory>
-		</testsuite>
-	</testsuites>
-
-	<groups>
-		<exclude>
-			<group>slow</group>
-		</exclude>
-	</groups>
-
-	<php>
-		<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mssqlnative" />
-		<server name="PHPBB_TEST_DBHOST" value="127.0.0.1" />
-		<server name="PHPBB_TEST_DBPORT" value="" />
-		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
-		<server name="PHPBB_TEST_DBUSER" value="sa" />
-		<server name="PHPBB_TEST_DBPASSWD" value="Pssw0rd_12" />
-		<server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
-		<server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost" />
-		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-		<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
-	</php>
-</phpunit>

.github/phpunit-postgres-github.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
-         bootstrap="../tests/bootstrap.php">
-	<testsuites>
-		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests</directory>
-			<exclude>../tests/functional</exclude>
-			<exclude>../tests/lint_test.php</exclude>
-		</testsuite>
-		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php">../tests/functional</directory>
-		</testsuite>
-	</testsuites>
-
-	<groups>
-		<exclude>
-			<group>slow</group>
-		</exclude>
-	</groups>
-
-	<php>
-		<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\postgres"/>
-		<server name="PHPBB_TEST_DBHOST" value="localhost" />
-		<server name="PHPBB_TEST_DBPORT" value="5432" />
-		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
-		<server name="PHPBB_TEST_DBUSER" value="postgres" />
-		<server name="PHPBB_TEST_DBPASSWD" value="postgres" />
-		<server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
-		<server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost" />
-		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-		<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
-	</php>
-</phpunit>

.github/phpunit-psql-windows-github.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
-         bootstrap="../tests/bootstrap.php">
-	<testsuites>
-		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests</directory>
-			<exclude>../tests/functional</exclude>
-			<exclude>../tests/lint_test.php</exclude>
-		</testsuite>
-		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php">../tests/functional</directory>
-		</testsuite>
-	</testsuites>
-
-	<groups>
-		<exclude>
-			<group>slow</group>
-		</exclude>
-	</groups>
-
-	<php>
-		<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\postgres"/>
-		<server name="PHPBB_TEST_DBHOST" value="localhost" />
-		<server name="PHPBB_TEST_DBPORT" value="5432" />
-		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
-		<server name="PHPBB_TEST_DBUSER" value="postgres" />
-		<server name="PHPBB_TEST_DBPASSWD" value="root" />
-		<server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
-		<server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost" />
-		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-		<server name="PHPBB_FUNCTIONAL_URL" value="http://phpbb.test/" />
-	</php>
-</phpunit>

.github/phpunit-sqlite3-github.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
-         bootstrap="../tests/bootstrap.php">
-	<testsuites>
-		<testsuite name="phpBB Test Suite">
-			<directory suffix="_test.php">../tests</directory>
-			<exclude>../tests/functional</exclude>
-			<exclude>../tests/lint_test.php</exclude>
-		</testsuite>
-		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php">../tests/functional</directory>
-		</testsuite>
-	</testsuites>
-
-	<groups>
-		<exclude>
-			<group>slow</group>
-		</exclude>
-	</groups>
-
-	<php>
-		<server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
-		<server name="PHPBB_TEST_MEMCACHED_HOST" value="localhost" />
-		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
-		<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
-	</php>
-</phpunit>

.github/prepare-extension.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-set -x
-
-EXTNAME=$1
-
-# Move the extension in place
-mkdir --parents phpBB/ext/$EXTNAME
-cp -R ../tmp/* phpBB/ext/$EXTNAME
-
-# Move the test files for extensions in place
-cp -R .github/*.xml phpBB/ext/$EXTNAME/.github
-cp -R .github/*.sh phpBB/ext/$EXTNAME/.github

.github/setup-database.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-set -x
-
-DB=$1
-MYISAM=$2
-
-if [ "$DB" == "postgres" ]
-then
-	psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres
-	psql -c 'create database phpbb_tests;' -U postgres
-fi
-
-if [ "$MYISAM" == '1' ]
-then
-	mysql -h 127.0.0.1 -u root -e 'SET GLOBAL storage_engine=MyISAM;'
-fi

.github/setup-exiftool.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-sudo apt-get update
-sudo apt-get install -y parallel libimage-exiftool-perl

.github/setup-ldap.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-set -x
-
-sudo apt-get -y install ldap-utils slapd
-mkdir /var/tmp/slapd
-cp .github/ldap/slapd.conf /var/tmp/slapd/slapd.conf
-slapd -d 256 -d 128 -f /var/tmp/slapd/slapd.conf -h ldap://localhost:3389 &
-sleep 3
-ldapadd -H ldap://localhost:3389 -D "cn=admin,dc=example,dc=com" -w adminadmin -f .github/ldap/base.ldif

.github/setup-phpbb.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-set -x
-
-DB=$1
-PHP_VERSION=$2
-NOTESTS=$3
-
-if [ "$NOTESTS" == '1' ]
-then
-	.github/setup-exiftool.sh
-	.github/setup-unbuffer.sh
-fi
-
-if [ "$NOTESTS" != '1' ]
-then
-	.github/setup-webserver.sh
-fi
-
-cd phpBB
-php ../composer.phar install --dev --no-interaction
-if [[ "$PHP_VERSION" =~ ^nightly$ || "$PHP_VERSION" =~ ^8 ]]
-then
-	php ../composer.phar remove phpunit/dbunit --dev --update-with-dependencies \
-	&& php ../composer.phar require symfony/yaml:~4.4 misantron/dbunit:~5.0 phpunit/phpunit:^9.3 doctrine/instantiator:^1.4 --dev --update-with-all-dependencies --ignore-platform-reqs
-fi
-cd ..

.github/setup-unbuffer.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-sudo apt-get update
-sudo apt-get install -y expect-dev

.github/setup-webserver.sh

@@ -1,81 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -e
-set -x
-
-sudo apt-get update
-sudo apt-get install -y nginx coreutils
-
-sudo service nginx stop
-
-DIR=$(dirname "$0")
-USER=$(whoami)
-PHPBB_ROOT_PATH=$(realpath "$DIR/../phpBB")
-NGINX_SITE_CONF="/etc/nginx/sites-enabled/default"
-NGINX_CONF="/etc/nginx/nginx.conf"
-APP_SOCK=$(realpath "$DIR")/php-app.sock
-NGINX_PHP_CONF="$DIR/nginx-php.conf"
-
-# php-fpm
-PHP_FPM_BIN="/usr/sbin/php-fpm$PHP_VERSION"
-PHP_FPM_CONF="$DIR/php-fpm.conf"
-
-if [ ! -f $PHP_FPM_BIN ] && [ -f "/usr/bin/php-fpm" ]
-then
-	PHP_FPM_BIN="/usr/bin/php-fpm"
-fi
-
-if [ ! -f $PHP_FPM_BIN ]
-then
-	sudo apt-get install php$PHP_VERSION-fpm php$PHP_VERSION-cli \
-						php$PHP_VERSION-curl php$PHP_VERSION-xml php$PHP_VERSION-mbstring \
-						php$PHP_VERSION-zip php$PHP_VERSION-mysql php$PHP_VERSION-sqlite3 \
-						php$PHP_VERSION-intl php$PHP_VERSION-gd php$PHP_VERSION-pgsql
-	sudo service php$PHP_VERSION-fpm start
-	sudo service php$PHP_VERSION-fpm status
-fi
-
-echo "
-	[global]
-
-	[ci]
-	user = $USER
-	group = $USER
-	listen = $APP_SOCK
-	listen.mode = 0666
-	pm = static
-	pm.max_children = 2
-
-	php_admin_value[memory_limit] = 128M
-" > $PHP_FPM_CONF
-
-sudo $PHP_FPM_BIN \
-	--fpm-config "$DIR/php-fpm.conf"
-
-# nginx
-sudo sed -i "s/user www-data;/user $USER;/g" $NGINX_CONF
-sudo cp "$DIR/../phpBB/docs/nginx.sample.conf" "$NGINX_SITE_CONF"
-sudo sed -i \
-	-e "s/example\.com/localhost/g" \
-	-e "s|root /path/to/phpbb;|root $PHPBB_ROOT_PATH;|g" \
-	$NGINX_SITE_CONF
-
-# Generate FastCGI configuration for Nginx
-echo "
-upstream php {
-	server unix:$APP_SOCK;
-}
-" > $NGINX_PHP_CONF
-
-sudo mv "$NGINX_PHP_CONF" /etc/nginx/conf.d/php.conf
-
-sudo nginx -T
-sudo service nginx start

.github/workflows/tests.yml

@@ -1,598 +0,0 @@
-name: Tests
-
-on:
-    push:
-        branches:
-            - 3.3.x
-            - master
-            - 'prep-release-*'
-        tags:
-            - 'release-*'
-    pull_request:
-        branches:
-            - 3.3.x
-            - master
-            - 'prep-release-*'
-
-jobs:
-    # Basic checks, e.g. parse errors, commit messages, etc.
-    basic-checks:
-        runs-on: ubuntu-22.04
-        strategy:
-            matrix:
-                include:
-                    - db: 'none'
-                      php: '7.2'
-                      NOTESTS: 1
-
-        name: PHP ${{ matrix.php }} - ${{ matrix.db }}
-
-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v4
-              with:
-                  fetch-depth: 100
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
-                  coverage: none
-
-            - name: Get Composer Cache Directory
-              id: composer-cache
-              env:
-                  PHP_VERSION: ${{ matrix.php }}
-              run: |
-                  cd phpBB
-                  echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-                  echo "version=${PHP_VERSION%.*}" >> $GITHUB_OUTPUT
-                  cd ..
-
-            - name: Cache Composer dependencies
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }}
-
-            - name: Setup environment for phpBB
-              env:
-                  DB: ${{ matrix.db }}
-                  PHP_VERSION: ${{ matrix.php }}
-                  NOTESTS: '1'
-              run: |
-                  .github/setup-phpbb.sh $DB $PHP_VERSION $NOTESTS
-
-            - name: Phing sniff
-              run: |
-                  .github/phing-sniff.sh
-
-            - name: Check doctum parse errors
-              run: |
-                  .github/check-doctum-parse-errors.sh
-
-            - name: Check image ICC profiles
-              run: |
-                  .github/check-image-icc-profiles.sh
-
-            - name: Check executable files
-              run: |
-                  .github/check-executable-files.sh ./
-
-            - name: Check commit message
-              if: github.event_name == 'pull_request'
-              run: |
-                  git fetch origin $GITHUB_BASE_REF &> /dev/null
-                  git-tools/commit-msg-hook-range.sh $(git rev-parse origin/$GITHUB_BASE_REF)..$GITHUB_SHA
-
-    # Tests for MySQL and MariaDB
-    mysql-tests:
-        runs-on: ubuntu-22.04
-        strategy:
-            matrix:
-                include:
-                    - php: '7.2'
-                      db: "mariadb:10.1"
-                    - php: '7.2'
-                      db: "mariadb:10.2"
-                    - php: '7.2'
-                      db: "mariadb:10.3"
-                    - php: '7.2'
-                      db: "mariadb:10.4"
-                    - php: '7.2'
-                      db: "mariadb:10.5"
-                    - php: '7.2'
-                      db: "mysql:5.6"
-                      db_alias: "MySQL Slow Tests"
-                      SLOWTESTS: 1
-                    - php: '7.2'
-                      db: "mysql:5.6"
-                      db_alias: "MyISAM Tests"
-                      MYISAM: 1
-                    - php: '7.2'
-                      db: "mysql:5.6"
-                    - php: '7.2'
-                      db: "mysql:5.7"
-                    - php: '7.3'
-                      db: "mysql:5.7"
-                    - php: '7.4'
-                      db: "mysql:5.7"
-                    - php: '7.4'
-                      db: "mysql:8.0"
-                    - php: '8.0'
-                      db: "mysql:5.7"
-                    - php: '8.1'
-                      db: "mysql:5.7"
-                    - php: '8.2'
-                      db: "mysql:5.7"
-                    - php: '8.3'
-                      db: "mysql:5.7"
-                    - php: '8.4'
-                      db: "mysql:5.7"
-
-        name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
-
-        services:
-            mysql:
-                image: ${{ matrix.db }}
-                env:
-                    MYSQL_ALLOW_EMPTY_PASSWORD: yes
-                    MYSQL_DATABASE: phpbb_tests
-                ports:
-                    - 3306:3306
-                options: >-
-                    --health-cmd="mysqladmin ping"
-                    --health-interval=10s
-                    --health-timeout=5s
-                    --health-retries=3
-
-            redis:
-                image: redis
-                options: >-
-                    --health-cmd "redis-cli ping"
-                    --health-interval 10s
-                    --health-timeout 5s
-                    --health-retries 5
-                ports:
-                    - 6379:6379
-
-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v4
-
-            - id: database-type
-              env:
-                  MATRIX_DB: ${{ matrix.db }}
-              run: |
-                  db=$(echo "${MATRIX_DB%%:*}")
-                  echo "db=$db" >> $GITHUB_OUTPUT
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
-                  coverage: none
-
-            - name: Get Composer Cache Directory
-              id: composer-cache
-              env:
-                  PHP_VERSION: ${{ matrix.php }}
-              run: |
-                  cd phpBB
-                  echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-                  echo "version=${PHP_VERSION%.*}" >> $GITHUB_OUTPUT
-                  cd ..
-
-            - name: Cache Composer dependencies
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }}
-
-            - name: Setup environment for phpBB
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-                  PHP_VERSION: ${{ matrix.php }}
-                  NOTESTS: '0'
-              run: |
-                  .github/setup-phpbb.sh $DB $PHP_VERSION ${NOTESTS:-0}
-
-            - name: Setup database
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-                  MYISAM: ${{ matrix.MYISAM != 1 && '0' || '1' }}
-              run: |
-                  .github/setup-database.sh $DB $MYISAM
-
-            - name: Setup LDAP
-              if: ${{ matrix.SLOWTESTS == 1 }}
-              run: |
-                  .github/setup-ldap.sh
-
-            - name: Lint tests
-              if: ${{ matrix.SLOWTESTS != 1 && steps.database-type.outputs.db == 'mysql' }}
-              run: phpBB/vendor/bin/phpunit tests/lint_test.php
-
-            - name: Run unit tests
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-              if: ${{ matrix.SLOWTESTS != 1 && matrix.NOTESTS != 1 }}
-              run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --verbose --stop-on-error
-
-            - name: Slow tests
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-              if: ${{ matrix.SLOWTESTS == 1 }}
-              run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --group slow
-
-    # Tests for PostgreSQL
-    postgres-tests:
-        runs-on: ubuntu-22.04
-        strategy:
-            matrix:
-                include:
-                    - php: '7.2'
-                      db: "postgres:9.3"
-                    - php: '7.2'
-                      db: "postgres:9.5"
-                    - php: '7.2'
-                      db: "postgres:9.6"
-                    - php: '7.2'
-                      db: "postgres:10"
-                    - php: '7.2'
-                      db: "postgres:11"
-                    - php: '7.2'
-                      db: "postgres:12"
-                    - php: '7.2'
-                      db: "postgres:13"
-                    - php: '7.3'
-                      db: "postgres:13"
-                    - php: '7.4'
-                      db: "postgres:13"
-                    - php: '8.0'
-                      db: "postgres:12"
-                    - php: '8.0'
-                      db: "postgres:13"
-                    - php: '8.1'
-                      db: "postgres:14"
-                    - php: '8.2'
-                      db: "postgres:14"
-                    - php: '8.3'
-                      db: "postgres:14"
-                    - php: '8.4'
-                      db: "postgres:14"
-
-        name: PHP ${{ matrix.php }} - ${{ matrix.db }}
-
-        services:
-            postgres:
-                image: ${{ matrix.db != 'postgres:9.3' && matrix.db != 'postgres:9.5' && matrix.db != 'postgres:9.6' && matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && 'postgres:10' || matrix.db }}
-                env:
-                    POSTGRES_HOST: localhost
-                    POSTGRES_USER: postgres
-                    POSTGRES_PASSWORD: postgres
-                ports:
-                    - 5432:5432
-                options: >-
-                    -v /var/run/postgresql:/var/run/postgresql
-                    --health-cmd pg_isready
-                    --health-interval 10s
-                    --health-timeout 5s
-                    --health-retries 5
-
-            redis:
-                image: redis
-                options: >-
-                    --health-cmd "redis-cli ping"
-                    --health-interval 10s
-                    --health-timeout 5s
-                    --health-retries 5
-                ports:
-                    - 6379:6379
-
-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v4
-
-            - id: database-type
-              env:
-                  MATRIX_DB: ${{ matrix.db }}
-              run: |
-                  db=$(echo "${MATRIX_DB%%:*}")
-                  echo "db=$db" >> $GITHUB_OUTPUT
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
-                  coverage: none
-
-            - name: Get Composer Cache Directory
-              id: composer-cache
-              env:
-                  PHP_VERSION: ${{ matrix.php }}
-              run: |
-                  cd phpBB
-                  echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-                  echo "version=${PHP_VERSION%.*}" >> $GITHUB_OUTPUT
-                  cd ..
-
-            - name: Cache Composer dependencies
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }}
-
-            - name: Setup environment for phpBB
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-                  PHP_VERSION: ${{ matrix.php }}
-                  NOTESTS: '0'
-              run: |
-                  .github/setup-phpbb.sh $DB $PHP_VERSION ${NOTESTS:-0}
-
-            - name: Setup database
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-                  MYISAM: '0'
-              run: |
-                  .github/setup-database.sh $DB $MYISAM
-
-            - name: Run unit tests
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-              run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --verbose --stop-on-error
-
-    # Other database types, namely sqlite3 and mssql
-    other-tests:
-        runs-on: ubuntu-22.04
-        strategy:
-            matrix:
-                include:
-                    - php: '7.2'
-                      db: "sqlite3"
-                    - php: '7.2'
-                      db: "mcr.microsoft.com/mssql/server:2017-latest"
-                      db_alias: 'MSSQL 2017'
-                    - php: '7.2'
-                      db: "mcr.microsoft.com/mssql/server:2019-latest"
-                      db_alias: 'MSSQL 2019'
-
-        name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
-
-        services:
-            mssql:
-                image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
-                env:
-                    SA_PASSWORD: "Pssw0rd_12"
-                    ACCEPT_EULA: "y"
-                ports:
-                    - 1433:1433
-                options: >-
-                    --health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Pssw0rd_12' -Q \"Use [master]; CREATE DATABASE [phpbb_tests] COLLATE Latin1_General_CI_AS\" || exit 1"
-                    --health-interval 10s
-                    --health-timeout 5s
-                    --health-retries 5
-                    --health-start-period 10s
-
-            redis:
-                image: redis
-                options: >-
-                    --health-cmd "redis-cli ping"
-                    --health-interval 10s
-                    --health-timeout 5s
-                    --health-retries 5
-                ports:
-                    - 6379:6379
-
-
-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v4
-
-            - id: database-type
-              env:
-                  MATRIX_DB: ${{ matrix.db }}
-              run: |
-                  if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ]
-                  then
-                      db='mssql'
-                  else
-                      db=$(echo "${MATRIX_DB%%:*}")
-                  fi
-                  echo "db=$db" >> $GITHUB_OUTPUT
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
-                  coverage: none
-
-            - name: Get Composer Cache Directory
-              id: composer-cache
-              env:
-                  PHP_VERSION: ${{ matrix.php }}
-              run: |
-                  cd phpBB
-                  echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-                  echo "version=${PHP_VERSION%.*}" >> $GITHUB_OUTPUT
-                  cd ..
-
-            - name: Cache Composer dependencies
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }}
-
-            - name: Setup environment for phpBB
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-                  PHP_VERSION: ${{ matrix.php }}
-                  NOTESTS: '0'
-              run: |
-                  .github/setup-phpbb.sh $DB $PHP_VERSION ${NOTESTS:-0}
-
-            - name: Setup database
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-                  MYISAM: '0'
-              run: |
-                  .github/setup-database.sh $DB $MYISAM
-
-            - name: Run unit tests
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-              run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --verbose --stop-on-error
-
-    # Test with IIS & PostgreSQL on Windows
-    windows-tests:
-        runs-on: windows-latest
-        strategy:
-            matrix:
-                include:
-                    - php: '7.4'
-                      db: "postgres"
-                      type: 'unit'
-                    - php: '8.0'
-                      db: "postgres"
-                      type: 'unit'
-                    - php: '8.1'
-                      db: "postgres"
-                      type: 'unit'
-                    - php: '8.2'
-                      db: "postgres"
-                      type: 'unit'
-                    - php: '8.3'
-                      db: "postgres"
-                      type: 'unit'
-                    - php: '8.4'
-                      db: "postgres"
-                      type: 'unit'
-                    - php: '7.4'
-                      db: "postgres"
-                      type: 'functional'
-                    - php: '8.0'
-                      db: "postgres"
-                      type: 'functional'
-                    - php: '8.1'
-                      db: "postgres"
-                      type: 'functional'
-                    - php: '8.2'
-                      db: "postgres"
-                      type: 'functional'
-                    - php: '8.3'
-                      db: "postgres"
-                      type: 'functional'
-                    - php: '8.4'
-                      db: "postgres"
-                      type: 'functional'
-
-        name: Windows - PHP ${{ matrix.php }} - ${{ matrix.db }} - ${{ matrix.type }}
-
-        steps:
-            - name: Prepare git for Windows
-              run: |
-                  git config --system core.autocrlf false
-                  git config --system core.eol lf
-            - name: Checkout repository
-              uses: actions/checkout@v4
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql
-                  ini-values: upload_tmp_dir=${{ runner.temp }}, sys_temp_dir=${{ runner.temp }}
-                  coverage: none
-
-            - name: Get Composer Cache Directory
-              id: composer-cache
-              run: |
-                  cd phpBB
-                  echo "dir=$(composer config cache-files-dir)" >> $env:GITHUB_OUTPUT
-                  $major_version="${{ matrix.php }}".substring(0,1)
-                  echo "version=$major_version" >> $env:GITHUB_OUTPUT
-                  cd ..
-
-            - name: Cache Composer dependencies
-              uses: actions/cache@v4
-              with:
-                  path: ${{ steps.composer-cache.outputs.dir }}
-                  key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }}
-
-            - name: Setup environment for phpBB
-              env:
-                  GITHUB_WORKSPACE: ${{ github.workspace }}
-                  TEMP_DIR: ${{ runner.temp }}
-              run: |
-                  Enable-WindowsOptionalFeature -Online -FeatureName IIS-WebServerRole, IIS-WebServer, IIS-CommonHttpFeatures, IIS-ManagementConsole, IIS-HttpErrors, IIS-HttpRedirect, IIS-WindowsAuthentication, IIS-StaticContent, IIS-DefaultDocument, IIS-HttpCompressionStatic, IIS-DirectoryBrowsing, IIS-WebServerManagementTools, IIS-CGI -All
-                  Set-Service wuauserv -StartupType Manual
-                  (Get-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config).replace("<configuration>", "<configuration>`n`t<system.web>`n`t`t<customErrors mode=`"Off`"/>`n`t</system.web>") | Set-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config
-                  (Get-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config).replace("`t</system.webServer>", "`t`t<httpErrors errorMode=`"Detailed`" />`n`t</system.webServer>") | Set-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config
-                  choco install urlrewrite -y
-                  Import-Module WebAdministration
-                  New-WebSite -Name 'phpBBTest' -PhysicalPath "${env:GITHUB_WORKSPACE}\phpBB" -Force
-                  $session = Get-PSSession -Name WinPSCompatSession
-                  $sb = {Set-ItemProperty 'IIS:\Sites\phpBBTest' -name Bindings -value @{protocol='http';bindingInformation='*:80:phpbb.test'}}
-                  Invoke-Command -Scriptblock $sb -Session $session
-                  $sb = {Set-WebConfigurationProperty -filter /system.WebServer/security/authentication/AnonymousAuthentication -name enabled -value true -location "IIS:\Sites\phpBBTest"}
-                  Invoke-Command -Scriptblock $sb -Session $session
-                  Add-Content -Path $env:windir\System32\drivers\etc\hosts -Value "`r`n127.0.0.1`tphpbb.test" -Force
-                  [System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+";%windir%\system32\inetsrv")
-                  echo Setup FAST-CGI configuration
-                  Add-WebConfiguration -Filter /system.webServer/fastCgi -PSPath IIS:\ -Value @{fullpath="C:\tools\php\php-cgi.exe"}
-                  echo Setup FACT-CGI handler
-                  New-WebHandler -Name "PHP-FastCGI" -Path "*.php" -Modules FastCgiModule -ScriptProcessor "C:\tools\php\php-cgi.exe" -Verb '*' -ResourceType Either
-                  iisreset
-                  NET START W3SVC
-                  mkdir "${env:GITHUB_WORKSPACE}\phpBB\cache\test"
-                  mkdir "${env:GITHUB_WORKSPACE}\phpBB\cache\installer"
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\cache" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\files" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\store" /grant Users:F /T
-                  icacls "${env:GITHUB_WORKSPACE}\phpBB\images\avatars\upload" /grant Users:F /T
-                  $accessRule = New-Object System.Security.AccessControl.FileSystemAccessRule("IIS_IUSRS", "FullControl", "ContainerInherit,ObjectInherit", "None", "Allow")
-                  $acl = Get-ACL "${env:TEMP_DIR}"
-                  $acl.AddAccessRule($accessRule)
-                  Set-ACL -Path "${env:TEMP_DIR}" -ACLObject $acl
-                  cd ${env:GITHUB_WORKSPACE}\phpBB
-                  php ..\composer.phar install
-                  php ..\composer.phar remove phpunit/dbunit --dev --update-with-dependencies
-                  php ..\composer.phar require symfony/yaml:~4.4 misantron/dbunit:~5.0 phpunit/phpunit:^9.3 doctrine/instantiator:^1.4 --dev --update-with-all-dependencies --ignore-platform-reqs
-                  cd ..
-            - name: Setup database
-              run: |
-                  $postgreSqlSvc = Get-Service "postgresql*"
-                  Set-Service $postgreSqlSvc.Name -StartupType manual
-                  $runningStatus = [System.ServiceProcess.ServiceControllerStatus]::Running
-                  $maxStartTimeout = New-TimeSpan -Seconds 30
-                  try {
-                    $postgreSqlSvc.Start()
-                    $postgreSqlSvc.WaitForStatus($runningStatus, $maxStartTimeout)
-                  } catch  {
-                    $_ | select *
-                  }
-                  [System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+";${env:PGBIN}")
-                  $env:PGPASSWORD = 'root'
-                  psql -c 'ALTER SYSTEM SET hot_standby = on;' -U postgres
-                  psql -c 'ALTER SYSTEM SET wal_level = minimal;' -U postgres
-                  psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres
-                  psql -c 'create database phpbb_tests;' -U postgres
-                  Set-MpPreference -ExclusionPath "${env:PGDATA}" # Exclude PGDATA directory from Windows Defender
-                  Set-MpPreference -DisableRealtimeMonitoring $true
-            - name: Run unit tests
-              if: ${{ matrix.type == 'unit' }}
-              run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --exclude-group functional
-            - name: Run unit tests
-              if: ${{ matrix.type == 'functional' }}
-              run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --group functional

.gitignore

@@ -1,54 +1,31 @@
-# Excludes cache
+*~
+/phpunit.xml
 /phpBB/cache/*
 !/phpBB/cache/.htaccess
 !/phpBB/cache/index.html
-
-# Excludes user data
+/phpBB/composer.phar
 /phpBB/config*.php*
 /phpBB/ext/*
 /phpBB/files/*
 /phpBB/images/avatars/gallery/*
 /phpBB/images/avatars/upload/*
 /phpBB/images/ranks/*
-/phpBB/store/*
-
-# Excludes all custom langages
+/phpBB/install/schemas/schema.json
 /phpBB/language/*
 !/phpBB/language/en
-
-# Excludes all custom styles
+/phpBB/store/*
 /phpBB/styles/*
 !/phpBB/styles/prosilver
-/phpBB/styles/prosilver/theme/*/
-!/phpBB/styles/prosilver/theme/en
-!/phpBB/styles/prosilver/theme/images
 !/phpBB/styles/all
-
-# Excludes all custom env
-/phpBB/config/*
-!/phpBB/config/default
-!/phpBB/config/development
-!/phpBB/config/installer
-!/phpBB/config/production
-!/phpBB/config/test
-!/phpBB/config/.htaccess
-
-# Excludes vendors
+node_modules
 /phpBB/vendor
-
-# Excludes test / dev files
-/phpunit.xml
-/phpBB/composer.phar
+/phpBB/vendor-ext/*
+!/phpBB/vendor-ext/.git-keep
+/phpBB/composer-ext.json
+/phpBB/composer-ext.lock
 /tests/phpbb_unit_tests.sqlite*
 /tests/test_config*.php
 /tests/tmp/*
 /tests/vendor
 /vagrant/phpbb-install-config.yml
 .vagrant
-node_modules
-
-# Excludes IDE / editors files
-*~
-.idea
-*.DS_Store*
-/.vscode

.postcss-sorting.json

@@ -0,0 +1,243 @@
+{
+	"order": [
+		"custom-properties",
+		"dollar-variables",
+		{
+			"type": "at-rule",
+			"name": "include"
+		},
+		"declarations",
+		"rules",
+		{
+			"type": "at-rule",
+			"name": "media"
+		}
+	],
+	"properties-order": [
+		{
+			"emptyLineBefore": false,
+			"properties": [
+				"font",
+				"font-family",
+				"font-size",
+				"font-weight",
+				"font-style",
+				"font-variant",
+				"font-size-adjust",
+				"font-stretch",
+				"font-effect",
+				"font-emphasize",
+				"font-emphasize-position",
+				"font-emphasize-style",
+				"font-smooth",
+				"font-smoothing",
+				"line-height",
+				"text-align",
+				"text-align-last",
+				"vertical-align",
+				"white-space",
+				"text-decoration",
+				"text-emphasis",
+				"text-emphasis-color",
+				"text-emphasis-style",
+				"text-emphasis-position",
+				"text-indent",
+				"text-justify",
+				"letter-spacing",
+				"word-spacing",
+				"writing-mode",
+				"text-outline",
+				"text-transform",
+				"text-size-adjust",
+				"text-wrap",
+				"text-overflow",
+				"text-overflow-ellipsis",
+				"text-overflow-mode",
+				"word-wrap",
+				"word-break",
+				"tab-size",
+				"hyphens"
+			]
+		},
+		{
+			"emptyLineBefore": false,
+			"properties": [
+				"background",
+				"background-color",
+				"background-image",
+				"background-repeat",
+				"background-attachment",
+				"background-position",
+				"background-position-x",
+				"background-position-y",
+				"background-clip",
+				"background-origin",
+				"background-size",
+				"interpolation-mode",
+				"filter",
+				"border",
+				"border-width",
+				"border-style",
+				"border-color",
+				"border-top",
+				"border-top-width",
+				"border-top-style",
+				"border-top-color",
+				"border-right",
+				"border-right-width",
+				"border-right-style",
+				"border-right-color",
+				"border-bottom",
+				"border-bottom-width",
+				"border-bottom-style",
+				"border-bottom-color",
+				"border-left",
+				"border-left-width",
+				"border-left-style",
+				"border-left-color",
+				"border-radius",
+				"border-top-left-radius",
+				"border-top-right-radius",
+				"border-bottom-right-radius",
+				"border-bottom-left-radius",
+				"border-image",
+				"border-image-source",
+				"border-image-slice",
+				"border-image-width",
+				"border-image-outset",
+				"border-image-repeat",
+				"outline",
+				"outline-width",
+				"outline-style",
+				"outline-color",
+				"outline-offset",
+				"tap-highlight-color"
+			]
+		},
+		{
+			"emptyLineBefore": false,
+			"properties": [
+				"box-decoration-break",
+				"box-shadow",
+				"text-shadow"
+			]
+		},
+		{
+			"emptyLineBefore": false,
+			"properties": [
+				"color",
+				"opacity"
+			]
+		},
+		{
+			"emptyLineBefore": false,
+			"properties": [
+				"position",
+				"z-index",
+				"top",
+				"right",
+				"bottom",
+				"left"
+			]
+		},
+		{
+			"emptyLineBefore": false,
+			"properties": [
+				"display",
+				"visibility",
+				"float",
+				"clear",
+				"overflow",
+				"overflow-x",
+				"overflow-y",
+				"overflow-scrolling",
+				"clip",
+				"zoom",
+				"flex",
+				"flex-direction",
+				"flex-order",
+				"flex-pack",
+				"flex-align",
+				"flex-basis",
+				"flex-grow",
+				"flex-shrink",
+				"flex-wrap",
+				"justify-content",
+				"align-items",
+				"align-self"
+			]
+		},
+		{
+			"emptyLineBefore": false,
+			"properties": [
+				"box-sizing",
+				"width",
+				"min-width",
+				"max-width",
+				"height",
+				"min-height",
+				"max-height",
+				"margin",
+				"margin-top",
+				"margin-right",
+				"margin-bottom",
+				"margin-left",
+				"padding",
+				"padding-top",
+				"padding-right",
+				"padding-bottom",
+				"padding-left"
+			]
+		},
+		{
+			"emptyLineBefore": false,
+			"properties": [
+				"table-layout",
+				"empty-cells",
+				"caption-side",
+				"border-spacing",
+				"border-collapse",
+				"list-style",
+				"list-style-position",
+				"list-style-type",
+				"list-style-image"
+			]
+		},
+		{
+			"emptyLineBefore": false,
+			"properties": [
+				"content",
+				"quotes",
+				"counter-reset",
+				"counter-increment",
+				"resize",
+				"cursor",
+				"touch-callout",
+				"touch-action",
+				"user-select",
+				"nav-index",
+				"nav-up",
+				"nav-right",
+				"nav-down",
+				"nav-left",
+				"transition",
+				"transition-delay",
+				"transition-timing-function",
+				"transition-duration",
+				"transition-property",
+				"transform",
+				"transform-origin",
+				"animation",
+				"animation-name",
+				"animation-duration",
+				"animation-play-state",
+				"animation-timing-function",
+				"animation-delay",
+				"animation-iteration-count",
+				"animation-direction",
+				"pointer-events"
+			]
+		}
+	],
+	"unspecified-properties-position": "bottomAlphabetical"
+}

.stylelintrc

@@ -0,0 +1,391 @@
+{
+	"plugins": [
+		"stylelint-order"
+	],
+	"ignoreFiles": [
+		"./phpBB/styles/prosilver/theme/normalize.css",
+	],
+	"rules": {
+		"at-rule-name-case": "lower",
+		"at-rule-name-newline-after": "always-multi-line",
+		"at-rule-name-space-after": "always-single-line",
+		"at-rule-no-vendor-prefix": true,
+		"at-rule-semicolon-newline-after": "always",
+
+		"block-closing-brace-newline-after": [
+			"always", {
+				"ignoreAtRules": ["if", "else"]
+			}
+		],
+		"block-closing-brace-newline-before": "always-multi-line",
+		"block-closing-brace-space-before": "always-single-line",
+
+		"block-no-empty": true,
+
+		"block-opening-brace-newline-after": "always-multi-line",
+		"block-opening-brace-space-after": "always-single-line",
+		"block-opening-brace-space-before": "always",
+
+		"color-hex-case": "lower",
+		"color-hex-length": "long",
+		"color-named": "never",
+		"color-no-invalid-hex": true,
+
+		"comment-empty-line-before": [
+			"always", {
+				"except": ["first-nested"],
+				"ignore": ["stylelint-commands"]
+			}
+		],
+		"comment-whitespace-inside": "always",
+
+		"declaration-bang-space-after": "never",
+		"declaration-bang-space-before": "always",
+
+		"declaration-block-no-shorthand-property-overrides": true,
+		"declaration-block-semicolon-newline-after": "always-multi-line",
+		"declaration-block-semicolon-newline-before": "never-multi-line",
+		"declaration-block-semicolon-space-after": "always-single-line",
+		"declaration-block-semicolon-space-before": "never",
+		"declaration-block-trailing-semicolon": "always",
+		"declaration-block-single-line-max-declarations": 1,
+		"declaration-block-no-duplicate-properties": [
+			true, {
+				"ignore": ["consecutive-duplicates-with-different-values"]
+			}
+		],
+
+		"declaration-colon-newline-after": "always-multi-line",
+		"declaration-colon-space-after": "always-single-line",
+		"declaration-colon-space-before": "never",
+
+		"declaration-empty-line-before": "never",
+
+		"declaration-property-unit-blacklist": {
+			"line-height": ["rem", "em", "%"]
+		},
+		"declaration-property-unit-whitelist": {
+			"height": ["px", "%", "vh"],
+			"width": ["px", "%", "vw"],
+			"font-size": ["px", "rem", "%"],
+			"margin-left": ["px", "rem", "%"],
+			"margin-right": ["px", "rem", "%"],
+			"margin-top": ["px", "rem", "%"],
+			"margin-bottom": ["px", "rem", "%"],
+			"padding-left": ["px", "rem"],
+			"padding-right": ["px", "rem"],
+			"padding-top": ["px", "rem"],
+			"padding-bottom": ["px", "rem"],
+			"letter-spacing": ["em"],
+			"word-spacing": ["em"]
+		},
+
+		"font-family-name-quotes": "always-where-recommended",
+		"function-calc-no-unspaced-operator": true,
+
+		"function-comma-newline-after": "never-multi-line",
+		"function-comma-newline-before": "never-multi-line",
+		"function-comma-space-after": "always-single-line",
+		"function-comma-space-before": "never-single-line",
+
+		"function-linear-gradient-no-nonstandard-direction": true,
+		"function-max-empty-lines": 5,
+
+		"function-name-case": "lower",
+		"function-parentheses-newline-inside": "always-multi-line",
+		"function-parentheses-space-inside": "never-single-line",
+		"function-url-quotes": "always",
+		"function-whitespace-after": "always",
+
+		"indentation": "tab",
+
+		"length-zero-no-unit": true,
+
+		"max-empty-lines": 10,
+		"max-line-length": 180,
+		"max-nesting-depth": 4,
+
+		"media-feature-colon-space-after": "always",
+		"media-feature-colon-space-before": "never",
+		"media-feature-name-case": "lower",
+		"media-feature-parentheses-space-inside": "never",
+		"media-feature-range-operator-space-after": "always",
+		"media-feature-range-operator-space-before": "always",
+		"media-query-list-comma-newline-after": "always-multi-line",
+		"media-query-list-comma-newline-before": "never-multi-line",
+		"media-query-list-comma-space-after": "always-single-line",
+		"media-query-list-comma-space-before": "never",
+
+		"no-duplicate-selectors": true,
+		"no-empty-source": true,
+		"no-eol-whitespace": true,
+		"no-extra-semicolons": true,
+		"no-missing-end-of-source-newline": true,
+		"no-unknown-animations": true,
+
+		"number-leading-zero": "always",
+		"number-max-precision": 10,
+		"number-no-trailing-zeros": true,
+
+		"property-case": "lower",
+		"property-no-unknown": true,
+
+		"rule-empty-line-before": ["always-multi-line", {
+			"ignore": ["after-comment"],
+			"except": ["first-nested"]
+		}],
+
+		"selector-attribute-brackets-space-inside": "never",
+		"selector-attribute-operator-space-after": "never",
+		"selector-attribute-operator-space-before": "never",
+		"selector-attribute-quotes": "always",
+
+		"selector-combinator-space-after": "always",
+		"selector-combinator-space-before": "always",
+
+		"selector-list-comma-newline-after": "always",
+		"selector-list-comma-space-before": "never",
+
+		"selector-max-empty-lines": 5,
+		"selector-max-compound-selectors": 5,
+
+		"selector-pseudo-class-case": "lower",
+		"selector-pseudo-class-no-unknown": true,
+		"selector-pseudo-class-parentheses-space-inside": "never",
+
+		"selector-pseudo-element-case": "lower",
+		"selector-pseudo-element-colon-notation": "single",
+		"selector-pseudo-element-no-unknown": true,
+
+		"selector-type-case": "lower",
+		"selector-type-no-unknown": true,
+
+		"selector-descendant-combinator-no-non-space": true,
+		"selector-max-id": 0,
+		"selector-no-qualifying-type": [
+			true, {
+				"ignore": ["attribute"]
+			}
+		],
+
+		"shorthand-property-no-redundant-values": true,
+
+		"string-no-newline": true,
+		"string-quotes": "double",
+
+		"unit-case": "lower",
+		"unit-no-unknown": true,
+
+		"value-list-comma-newline-after": "always-multi-line",
+		"value-list-comma-newline-before": "never-multi-line",
+		"value-list-comma-space-after": "always-single-line",
+		"value-list-comma-space-before": "never",
+		"order/declaration-block-order": [
+			"custom-properties",
+			"dollar-variables",
+			{
+				"type": "at-rule",
+				"name": "include"
+			},
+			"declarations",
+			"rules",
+			{
+				"type": "at-rule",
+				"name": "media"
+			}
+		],
+		"order/declaration-block-properties-specified-order": [
+			[
+				"font",
+				"font-family",
+				"font-size",
+				"font-weight",
+				"font-style",
+				"font-variant",
+				"font-size-adjust",
+				"font-stretch",
+				"font-effect",
+				"font-emphasize",
+				"font-emphasize-position",
+				"font-emphasize-style",
+				"font-smooth",
+				"font-smoothing",
+				"line-height",
+				"text-align",
+				"text-align-last",
+				"vertical-align",
+				"white-space",
+				"text-decoration",
+				"text-emphasis",
+				"text-emphasis-color",
+				"text-emphasis-style",
+				"text-emphasis-position",
+				"text-indent",
+				"text-justify",
+				"letter-spacing",
+				"word-spacing",
+				"writing-mode",
+				"text-outline",
+				"text-transform",
+				"text-size-adjust",
+				"text-wrap",
+				"text-overflow",
+				"text-overflow-ellipsis",
+				"text-overflow-mode",
+				"word-wrap",
+				"word-break",
+				"tab-size",
+				"hyphens",
+
+				"background",
+				"background-color",
+				"background-image",
+				"background-repeat",
+				"background-attachment",
+				"background-position",
+				"background-position-x",
+				"background-position-y",
+				"background-clip",
+				"background-origin",
+				"background-size",
+				"interpolation-mode",
+				"filter",
+
+				"border",
+				"border-width",
+				"border-style",
+				"border-color",
+				"border-top",
+				"border-top-width",
+				"border-top-style",
+				"border-top-color",
+				"border-right",
+				"border-right-width",
+				"border-right-style",
+				"border-right-color",
+				"border-bottom",
+				"border-bottom-width",
+				"border-bottom-style",
+				"border-bottom-color",
+				"border-left",
+				"border-left-width",
+				"border-left-style",
+				"border-left-color",
+				"border-radius",
+				"border-top-left-radius",
+				"border-top-right-radius",
+				"border-bottom-right-radius",
+				"border-bottom-left-radius",
+				"border-image",
+				"border-image-source",
+				"border-image-slice",
+				"border-image-width",
+				"border-image-outset",
+				"border-image-repeat",
+				"outline",
+				"outline-width",
+				"outline-style",
+				"outline-color",
+				"outline-offset",
+				"tap-highlight-color",
+
+				"box-decoration-break",
+				"box-shadow",
+				"text-shadow",
+
+				"color",
+				"opacity",
+
+				"position",
+				"z-index",
+				"top",
+				"right",
+				"bottom",
+				"left",
+
+				"display",
+				"visibility",
+				"float",
+				"clear",
+				"overflow",
+				"overflow-x",
+				"overflow-y",
+				"overflow-scrolling",
+				"clip",
+				"zoom",
+				"flex",
+				"flex-direction",
+				"flex-order",
+				"flex-pack",
+				"flex-align",
+				"flex-basis",
+				"flex-grow",
+				"flex-shrink",
+				"flex-wrap",
+				"justify-content",
+				"align-items",
+				"align-self",
+
+				"box-sizing",
+				"width",
+				"min-width",
+				"max-width",
+				"height",
+				"min-height",
+				"max-height",
+				"margin",
+				"margin-top",
+				"margin-right",
+				"margin-bottom",
+				"margin-left",
+				"padding",
+				"padding-top",
+				"padding-right",
+				"padding-bottom",
+				"padding-left",
+
+				"table-layout",
+				"empty-cells",
+				"caption-side",
+				"border-spacing",
+				"border-collapse",
+				"list-style",
+				"list-style-position",
+				"list-style-type",
+				"list-style-image",
+
+				"content",
+				"quotes",
+				"counter-reset",
+				"counter-increment",
+				"resize",
+				"cursor",
+				"touch-callout",
+				"touch-action",
+				"user-select",
+				"nav-index",
+				"nav-up",
+				"nav-right",
+				"nav-down",
+				"nav-left",
+				"transition",
+				"transition-delay",
+				"transition-timing-function",
+				"transition-duration",
+				"transition-property",
+				"transform",
+				"transform-origin",
+				"animation",
+				"animation-name",
+				"animation-duration",
+				"animation-play-state",
+				"animation-timing-function",
+				"animation-delay",
+				"animation-iteration-count",
+				"animation-direction",
+				"pointer-events"
+			],
+			{ unspecified: "bottomAlphabetical" }
+		]
+	}
+}

.travis.yml

@@ -0,0 +1,57 @@
+language: php
+sudo: required
+dist: precise
+
+matrix:
+  include:
+    - php: 5.6
+      env: DB=none;NOTESTS=1
+    - php: 5.6
+      env: DB=mariadb
+    - php: 5.6
+      env: DB=postgres
+    - php: 5.6
+      env: DB=sqlite3
+    - php: 5.6
+      env: DB=mysqli;SLOWTESTS=1
+    - php: 5.6
+      env: DB=mysqli # MyISAM
+    - php: 5.6
+      env: DB=mysql
+    - php: 7.0
+      env: DB=mysqli
+    - php: 7.1
+      env: DB=mysqli
+    - php: 7.2
+      env: DB=mysqli
+    - php: nightly
+      env: DB=mysqli
+  allow_failures:
+    - php: nightly
+  fast_finish: true
+
+addons:
+  apt:
+    sources:
+      - node
+
+services:
+  - redis-server
+
+install:
+  - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+
+before_script:
+  - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - phantomjs --webdriver=8910 > /dev/null &
+
+script:
+  - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION $NOTESTS ./
+  - travis/check-stylesheet.sh $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 [ '$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 remote set-branches --add origin $TRAVIS_BRANCH && git fetch && git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA; fi"

.vscode/launch.json

@@ -1,18 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Debug phpBB",
-            "type": "php",
-            "request": "launch",
-            "port": 9003,
-            "pathMappings": {
-                "/var/www/html": "${workspaceRoot}/phpBB/"
-            },
-            "log": true
-        }
-    ]
-}

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "php.debug.ideKey": "VSCODE"
-}

LICENSE

@@ -1,281 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-

README.md

@@ -1,50 +1,40 @@
-[<img src="phpBB/styles/all/imgs/svg/phpbb_logo_large_cosmic.svg" alt="phpBB" style="max-width:40%" width="400">](https://www.phpbb.com)
+[![phpBB](https://www.phpbb.com/theme/images/logos/blue/160x52.png)](http://www.phpbb.com)
+
+## ABOUT
 
 phpBB is a free open-source bulletin board written in PHP.
 
-## 🧑🏻‍🤝🏻🧑🏽 Community
+## COMMUNITY
 
-Get your copy of phpBB, find support and lots more on [phpBB.com](https://www.phpbb.com). Discuss the development on [area51](https://area51.phpbb.com/phpBB/index.php).
+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).
 
-## 👨‍💻 Contribute
+## INSTALLING DEPENDENCIES
 
-1. [Create an account on phpBB.com](https://www.phpbb.com/community/ucp.php?mode=register)
-2. [Create a ticket (unless there already is one)](https://tracker.phpbb.com/secure/CreateIssue!default.jspa)
+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
+
+
+## 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://area51.phpbb.com/docs/dev/development/coding_guidelines.html) and [Git Contribution Guidelines](https://area51.phpbb.com/docs/dev/development/git.html)
 4. Send us a pull request
 
-### 🏗️ Setting up a development build of phpBB
+## VAGRANT
 
-To run an installation from the repo (and not from a pre-built package) on a local server, run the following commands:
+Read our [Vagrant documentation](phpBB/docs/vagrant.md) to find out how to use Vagrant to develop and contribute to phpBB.
 
-- Fork phpbb/phpbb to your GitHub account, then create a local clone of it:
-  ```
-  git clone https://github.com/your_github_name/phpbb.git
-  ```
-- Install phpBB's dependencies (from the root of your phpbb repo):
-  ```
-  cd phpBB
-  php ../composer.phar install
-  ```
+## AUTOMATED TESTING
 
-Alternatively, you can read:
+We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](https://bamboo.phpbb.com) or check our travis builds below:
 
-* Our [Vagrant documentation](phpBB/docs/vagrant.md) to find out how to use Vagrant to develop and contribute to phpBB.
-* Our [GitHub Codespaces documentation](phpBB/docs/codespaces.md) to learn about phpBB's cloud-based development environment.
+* [![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=master)](http://travis-ci.org/phpbb/phpbb)[![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/master?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/master) **master** - Latest development version
+* [![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=3.2.x)](http://travis-ci.org/phpbb/phpbb)[![Build status](https://ci.appveyor.com/api/projects/status/8g98ybngd2f3axy1/branch/3.2.x?svg=true)](https://ci.appveyor.com/project/phpBB/phpbb/branch/3.2.x) **3.2.x** - Development of version 3.2.x
+* [![Build Status](https://travis-ci.org/phpbb/phpbb.svg?branch=3.1.x)](http://travis-ci.org/phpbb/phpbb) **3.1.x** - Development of version 3.1.x
 
-## 📓 Documentation
-
-phpBB's [Development Documentation](https://area51.phpbb.com/docs/dev/index.html) contains all the information you'll need to learn about developing for phpBB's core, extensions and automated testing.
-
-## 🔬 Automated Testing
-
-We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](https://bamboo.phpbb.com) or check our GitHub Actions below:
-
-Branch  | Description | GitHub Actions |
-------- | ----------- | -------------- |
-**master** | Latest development version | ![Tests](https://github.com/phpbb/phpbb/workflows/Tests/badge.svg?branch=master) |
-**3.3.x** | Development of version 3.3.x | ![Tests](https://github.com/phpbb/phpbb/workflows/Tests/badge.svg?branch=3.3.x) |
-
-## 📜 License
+## LICENSE
 
 [GNU General Public License v2](http://opensource.org/licenses/gpl-2.0.php)

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.3.13-RC1" />
-	<property name="prevversion" value="3.3.12" />
-	<property name="olderversions" value="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, 3.1.12, 3.2.0, 3.2.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.2.9, 3.2.10, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.3.10, 3.3.11" />
+	<property name="newversion" value="3.3.0-a1-dev" />
+	<property name="prevversion" value="3.2.2" />
+	<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, 3.1.12, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0, 3.2.1" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -81,36 +81,29 @@
 				--ignore=${project.basedir}/phpBB/phpbb/db/migration/data/v30x/*
 				phpBB/phpbb"
 			dir="." returnProperty="retval-php-strict" passthru="true" />
-		<php function="preg_replace" returnProperty="sniffIgnoreList">
-			<param value="/\s+/"/>
-			<param value=""/>
-			<param value="${project.basedir}/phpBB/cache/*,
-				${project.basedir}/phpBB/develop/*,
-				${project.basedir}/phpBB/ext/*,
-				${project.basedir}/phpBB/includes/diff/*.php,
-				${project.basedir}/phpBB/includes/sphinxapi.php,
-					${project.basedir}/phpBB/includes/utf/data/*,
-					${project.basedir}/phpBB/install/data/*,
-					${project.basedir}/phpBB/install/database_update.php,
-					${project.basedir}/phpBB/phpbb/*,
-					${project.basedir}/phpBB/vendor/*,
-					${project.basedir}/phpBB/vendor-ext/*,
-					${project.basedir}/phpBB/config.php,
-					${project.basedir}/phpBB/config_dev.php,
-					${project.basedir}/phpBB/config_test.php"/>
-		</php>
 		<exec command="phpBB/vendor/bin/phpcs
 				-s -p
 				--extensions=php
 				--standard=build/code_sniffer/ruleset-php-legacy-core.xml
-				--ignore=${sniffIgnoreList}
+				--ignore=${project.basedir}/phpBB/cache/*
+				--ignore=${project.basedir}/phpBB/develop/*
+				--ignore=${project.basedir}/phpBB/ext/*
+				--ignore=${project.basedir}/phpBB/includes/diff/*.php
+				--ignore=${project.basedir}/phpBB/includes/sphinxapi.php
+				--ignore=${project.basedir}/phpBB/includes/utf/data/*
+				--ignore=${project.basedir}/phpBB/install/data/*
+				--ignore=${project.basedir}/phpBB/install/database_update.php
+				--ignore=${project.basedir}/phpBB/phpbb/*
+				--ignore=${project.basedir}/phpBB/vendor/*
+				--ignore=${project.basedir}/phpBB/vendor-ext/*
 				phpBB"
 			dir="." returnProperty="retval-php-legacy" passthru="true" />
 		<exec command="phpBB/vendor/bin/phpcs
 				-s -p
 				--extensions=php
 				--standard=build/code_sniffer/ruleset-php-extensions.xml
-				--ignore=${project.basedir}/phpBB/ext/*/tests/*,${project.basedir}/phpBB/ext/*/vendor/*
+				--ignore=${project.basedir}/phpBB/ext/*/tests/*
+				--ignore=${project.basedir}/phpBB/ext/*/vendor/*
 				phpBB/ext"
 			dir="." returnProperty="retval-php-ext" passthru="true" />
 		<if>
@@ -128,13 +121,13 @@
 	<!-- Builds docs for current branch into build/api/output/master -->
 	<target name="docs">
 		<exec dir="."
-			command="./doctum.phar update build/doctum-checkout.conf.php"
+			command="phpBB/vendor/bin/sami.php update build/sami-checkout.conf.php"
 			passthru="true" />
 	</target>
 	<!-- Builds docs for multiple branches/tags into build/api/output/$branch -->
 	<target name="docs-all">
 		<exec dir="."
-			command="./doctum.phar update build/doctum-all.conf.php"
+			command="phpBB/vendor/bin/sami.php update build/sami-all.conf.php"
 			passthru="true" />
 	</target>
 
@@ -181,7 +174,6 @@
 
 		<!-- create an empty config.php file (not for diffs) -->
 		<touch file="build/new_version/phpBB3/config.php" />
-		<copy file="build/new_version/phpBB3/phpbb/.htaccess" tofile="build/new_version/phpBB3/vendor/.htaccess" />
 
 	</target>
 
@@ -363,8 +355,6 @@
 		<chmod mode="0777" file="${dir}/store" />
 		<chmod mode="0777" file="${dir}/files" />
 		<chmod mode="0777" file="${dir}/images/avatars/upload" />
-		<!-- set permissions of executable scripts to 755 -->
-		<chmod mode="0755" file="${dir}/bin/phpbbcli.php" />
 	</target>
 
 	<target name="clean-vendor-dir">

build/build_changelog.php

@@ -1,16 +1,16 @@
 #!/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.
- *
- */
+*
+* 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.
+*
+*/
 
 if ($_SERVER['argc'] != 2)
 {
@@ -18,54 +18,40 @@ if ($_SERVER['argc'] != 2)
 	exit(1);
 }
 
-if ($_SERVER['argv'][1] == '--stdin')
-{
-	$stdIn = file_get_contents('php://stdin');
-	// XML output from tracker can be directly piped to this script using:
-	// cat tracker_output.xml | php build/build_changelog.php --stdin
-	$xml = simplexml_load_string($stdIn);
-}
-else
-{
-	$fixVersion = $_SERVER['argv'][1];
+$fixVersion = $_SERVER['argv'][1];
 
-	$query = 'project IN (PHPBB3, SECURITY)
-		AND resolution = Fixed
-		AND fixVersion = "' . $fixVersion . '"
-		AND status IN ("Unverified Fix", Closed)';
+$query = 'project IN (PHPBB3, SECURITY)
+	AND resolution = Fixed
+	AND fixVersion = "' . $fixVersion . '"
+	AND status IN ("Unverified Fix", Closed)';
 
-	$url = 'https://tracker.phpbb.com/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?jqlQuery=' . urlencode($query) . '&tempMax=1000';
-	$xml = simplexml_load_string(file_get_contents($url));
-}
+$url = 'http://tracker.phpbb.com/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?jqlQuery=' . urlencode($query) . '&tempMax=1000';
+$xml = simplexml_load_string(file_get_contents($url));
 
-$types = [];
 foreach ($xml->xpath('//item') as $item)
 {
 	$key = (string) $item->key;
 
-	$keyUrl = 'https://tracker.phpbb.com/browse/' . $key;
+	$keyUrl = 'http://tracker.phpbb.com/browse/' . $key;
 	$keyLink = '<a href="' . $keyUrl . '">' . $key . '</a>';
 
-	$value = str_replace($key, $keyLink, htmlspecialchars($item->title, ENT_COMPAT));
+	$value = str_replace($key, $keyLink, htmlspecialchars($item->title));
 	$value = str_replace(']', '] -', $value);
 
 	$types[(string) $item->type][$key] = $value;
 }
 
-if (count($types))
+ksort($types);
+foreach ($types as $type => $tickets)
 {
-	ksort($types);
-	foreach ($types as $type => $tickets)
+	echo "<h4>$type</h4>\n";
+	echo "<ul>\n";
+
+	uksort($tickets, 'strnatcasecmp');
+
+	foreach ($tickets as $ticket)
 	{
-		echo "<h4>$type</h4>\n";
-		echo "<ul>\n";
-
-		uksort($tickets, 'strnatcasecmp');
-
-		foreach ($tickets as $ticket)
-		{
-			echo "<li>$ticket</li>\n";
-		}
-		echo "</ul>\n";
+		echo "<li>$ticket</li>\n";
 	}
+	echo "</ul>\n";
 }

build/build_helper.php

@@ -33,7 +33,7 @@ class build_package
 	var $status_begun = false;
 	var $num_dots = 0;
 
-	function __construct($versions, $verbose = false)
+	function build_package($versions, $verbose = false)
 	{
 		$this->versions = $versions;
 		$this->verbose = $verbose;
@@ -43,10 +43,10 @@ class build_package
 		$_before = $this->versions[count($this->versions) - 2];
 
 		$this->locations = array(
-			'new_version'	=> dirname(__DIR__) . '/phpBB/',
-			'old_versions'	=> __DIR__ . '/old_versions/',
-			'root'			=> __DIR__ . '/',
-			'package_dir'	=> __DIR__ . '/new_version/'
+			'new_version'	=> dirname(dirname(__FILE__)) . '/phpBB/',
+			'old_versions'	=> dirname(__FILE__) . '/old_versions/',
+			'root'			=> dirname(__FILE__) . '/',
+			'package_dir'	=> dirname(__FILE__) . '/new_version/'
 		);
 
 		$this->package_infos = array(

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

@@ -11,9 +11,6 @@
 *
 */
 
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
 /**
 * Checks that each PHP source file contains a valid header as defined by the
 * phpBB Coding Guidelines.
@@ -21,7 +18,7 @@ use PHP_CodeSniffer\Sniffs\Sniff;
 * @package code_sniffer
 * @author Manuel Pichler <mapi@phpundercontrol.org>
 */
-class phpbb_Sniffs_Commenting_FileCommentSniff implements Sniff
+class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
 {
 	/**
 	* Returns an array of tokens this test wants to listen for.
@@ -36,13 +33,13 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements Sniff
 	/**
 	* Processes this test, when one of its tokens is encountered.
 	*
-	* @param File $phpcsFile The file being scanned.
+	* @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
 	* @param int				  $stackPtr  The position of the current token
 	*										in the stack passed in $tokens.
 	*
-	* @return void
+	* @return null
 	*/
-	public function process(File $phpcsFile, $stackPtr): void
+	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 	{
 		// We are only interested in the first file comment.
 		if ($stackPtr !== 0)
@@ -65,7 +62,7 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements Sniff
 		// Mark as error if this is not a doc comment
 		else if ($start === false || $tokens[$start]['code'] !== T_DOC_COMMENT_OPEN_TAG)
 		{
-			$phpcsFile->addError('Missing required file doc comment.', $stackPtr, 'MissingComment');
+			$phpcsFile->addError('Missing required file doc comment.', $stackPtr);
 			return;
 		}
 
@@ -85,7 +82,7 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements Sniff
 			if ($tokens[$token]['column'] === 1 && (($tokens[$token]['content'] !== '*' && $tokens[$token]['content'] !== ' ') || ($tokens[$token]['content'] === ' ' && $tokens[$token + 1]['content'] !== '*')))
 			{
 				$message = 'The file doc comment should not be indented.';
-				$phpcsFile->addWarning($message, $token, 'CommentIndented');
+				$phpcsFile->addWarning($message, $token);
 			}
 		}
 
@@ -98,13 +95,13 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements Sniff
 		if (!(($tokens[$start + 2]['content'] !== '*' && $tokens[$start + 4]['content'] !== '*') || ($tokens[$start + 3]['content'] !== '*' && $tokens[$start + 6]['content'] !== '*')))
 		{
 			$message = 'The first file comment line should be empty.';
-			$phpcsFile->addWarning($message, ($start + 1), 'CommentFirstNotEmpty');
+			$phpcsFile->addWarning($message, ($start + 1));
 		}
 
 		if ($tokens[$end - 3]['content'] !== '*' && $tokens[$end - 6]['content'] !== '*')
 		{
 			$message = 'The last file comment line should be empty.';
-			$phpcsFile->addWarning($message, $end - 1, 'CommentLastNotEmpty');
+			$phpcsFile->addWarning($message, $end - 1);
 		}
 
 		//$this->processPackage($phpcsFile, $start, $tags);
@@ -116,59 +113,59 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements Sniff
 	/**
 	* Checks that the tags array contains a valid package tag
 	*
-	* @param File $phpcsFile The context source file instance.
+	* @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
 	* @param integer The stack pointer for the first comment token.
 	* @param array(string=>array) $tags The found file doc comment tags.
 	*
-	* @return void
+	* @return null
 	*/
-	protected function processPackage(File $phpcsFile, $ptr, $tags): void
+	protected function processPackage(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
 	{
 		if (!isset($tags['package']))
 		{
 			$message = 'Missing require @package tag in file doc comment.';
-			$phpcsFile->addError($message, $ptr, 'MissingTagPackage');
+			$phpcsFile->addError($message, $ptr);
 		}
 		else if (preg_match('/^([\w]+)$/', $tags['package'][0]) === 0)
 		{
 			$message = 'Invalid content found for @package tag.';
-			$phpcsFile->addWarning($message, $tags['package'][1], 'InvalidTagPackage');
+			$phpcsFile->addWarning($message, $tags['package'][1]);
 		}
 	}
 
 	/**
 	* Checks that the tags array contains a valid version tag
 	*
-	* @param File $phpcsFile The context source file instance.
+	* @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
 	* @param integer The stack pointer for the first comment token.
 	* @param array(string=>array) $tags The found file doc comment tags.
 	*
-	* @return void
+	* @return null
 	*/
-	protected function processVersion(File $phpcsFile, $ptr, $tags): void
+	protected function processVersion(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
 	{
 		if (!isset($tags['version']))
 		{
 			$message = 'Missing require @version tag in file doc comment.';
-			$phpcsFile->addError($message, $ptr, 'MissingTagVersion');
+			$phpcsFile->addError($message, $ptr);
 		}
 		else if (preg_match('/^\$Id:[^\$]+\$$/', $tags['version'][0]) === 0)
 		{
 			$message = 'Invalid content found for @version tag, use "$Id: $".';
-			$phpcsFile->addError($message, $tags['version'][1], 'InvalidTagVersion');
+			$phpcsFile->addError($message, $tags['version'][1]);
 		}
 	}
 
 	/**
 	* Checks that the tags array contains a valid copyright tag
 	*
-	* @param File $phpcsFile The context source file instance.
+	* @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
 	* @param integer The stack pointer for the first comment token.
 	* @param array(string=>array) $tags The found file doc comment tags.
 	*
-	* @return void
+	* @return null
 	*/
-	protected function processCopyright(File $phpcsFile, $ptr, $tags): void
+	protected function processCopyright(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
 	{
 		$copyright = '(c) phpBB Limited <https://www.phpbb.com>';
 		$tokens = $phpcsFile->getTokens();
@@ -180,7 +177,7 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements Sniff
 				if ($tokens[$tag + 2]['content'] !== $copyright)
 				{
 					$message = 'Invalid content found for the first @copyright tag, use "' . $copyright . '".';
-					$phpcsFile->addError($message, $tags['copyright'][0][1], 'InvalidTagCopyright');
+					$phpcsFile->addError($message, $tags['copyright'][0][1]);
 				}
 
 				return;
@@ -188,19 +185,19 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements Sniff
 		}
 
 		$message = 'Missing require @copyright tag in file doc comment.';
-		$phpcsFile->addError($message, $ptr, 'MissingTagCopyright');
+		$phpcsFile->addError($message, $ptr);
 	}
 
 	/**
 	* Checks that the tags array contains a valid license tag
 	*
-	* @param File $phpcsFile The context source file instance.
+	* @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
 	* @param integer The stack pointer for the first comment token.
 	* @param array(string=>array) $tags The found file doc comment tags.
 	*
-	* @return void
+	* @return null
 	*/
-	protected function processLicense(File $phpcsFile, $ptr, $tags): void
+	protected function processLicense(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
 	{
 		$license = 'GNU General Public License, version 2 (GPL-2.0)';
 		$tokens = $phpcsFile->getTokens();
@@ -213,7 +210,7 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements Sniff
 				if ($found)
 				{
 					$message = 'It must be only one @license tag in file doc comment.';
-					$phpcsFile->addError($message, $ptr, 'MultiTagVersion');
+					$phpcsFile->addError($message, $ptr);
 				}
 
 				$found = true;
@@ -221,7 +218,7 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements Sniff
 				if ($tokens[$tag + 2]['content'] !== $license)
 				{
 					$message = 'Invalid content found for @license tag, use "' . $license . '".';
-					$phpcsFile->addError($message, $tags['license'][0][1], 'InvalidTagLicense');
+					$phpcsFile->addError($message, $tags['license'][0][1]);
 				}
 			}
 		}
@@ -229,7 +226,7 @@ class phpbb_Sniffs_Commenting_FileCommentSniff implements Sniff
 		if (!$found)
 		{
 			$message = 'Missing require @license tag in file doc comment.';
-			$phpcsFile->addError($message, $ptr, 'MissingTagLicense');
+			$phpcsFile->addError($message, $ptr);
 		}
 	}
 }

build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningBraceBsdAllmanSniff.php

@@ -11,14 +11,11 @@
 *
 */
 
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
 /**
  * Checks that the opening brace of a control structures is on the line after.
  * From Generic_Sniffs_Functions_OpeningFunctionBraceBsdAllmanSniff
  */
-class phpbb_Sniffs_ControlStructures_OpeningBraceBsdAllmanSniff implements Sniff
+class phpbb_Sniffs_ControlStructures_OpeningBraceBsdAllmanSniff implements PHP_CodeSniffer_Sniff
 {
 	/**
 	 * Registers the tokens that this sniff wants to listen for.
@@ -39,13 +36,13 @@ class phpbb_Sniffs_ControlStructures_OpeningBraceBsdAllmanSniff implements Sniff
 	/**
 	 * Processes this test, when one of its tokens is encountered.
 	 *
-	 * @param File $phpcsFile The file being scanned.
+	 * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
 	 * @param int                  $stackPtr  The position of the current token in the
 	 *                                        stack passed in $tokens.
 	 *
 	 * @return void
 	 */
-	public function process(File $phpcsFile, $stackPtr)
+	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 	{
 		$tokens = $phpcsFile->getTokens();
 

build/code_sniffer/phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php

@@ -11,14 +11,11 @@
  *
  */
 
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
 /**
  * Checks that there is exactly one space between the keyword and the opening
  * parenthesis of a control structures.
  */
-class phpbb_Sniffs_ControlStructures_OpeningParenthesisSniff implements Sniff
+class phpbb_Sniffs_ControlStructures_OpeningParenthesisSniff implements PHP_CodeSniffer_Sniff
 {
 	/**
 	 * Registers the tokens that this sniff wants to listen for.
@@ -39,13 +36,13 @@ class phpbb_Sniffs_ControlStructures_OpeningParenthesisSniff implements Sniff
 	/**
 	 * Processes this test, when one of its tokens is encountered.
 	 *
-	 * @param File $phpcsFile The file being scanned.
+	 * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
 	 * @param int                  $stackPtr  The position of the current token in the
 	 *                                        stack passed in $tokens.
 	 *
 	 * @return void
 	 */
-	public function process(File $phpcsFile, $stackPtr)
+	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 	{
 		$tokens = $phpcsFile->getTokens();
 

build/code_sniffer/phpbb/Sniffs/ControlStructures/StaticKeywordSniff.php

@@ -1,57 +0,0 @@
-<?php
-/**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
-/**
- * Checks that the visibility qualifiers are placed after the static keyword
- * according to the coding guidelines
- */
-class phpbb_Sniffs_ControlStructures_StaticKeywordSniff implements Sniff
-{
-	/**
-	 * Registers the tokens that this sniff wants to listen for.
-	 */
-	public function register()
-	{
-		return [
-			T_STATIC,
-		];
-	}
-
-	/**
-	 * Processes this test, when one of its tokens is encountered.
-	 *
-	 * @param File $phpcsFile The file being scanned.
-	 * @param int $stackPtr  The position of the current token in the stack passed in $tokens.
-	 *
-	 * @return void
-	 */
-	public function process(File $phpcsFile, $stackPtr)
-	{
-		$tokens = $phpcsFile->getTokens();
-
-		$disallowed_after_tokens = [
-			T_PUBLIC,
-			T_PROTECTED,
-			T_PRIVATE,
-		];
-
-		if (in_array($tokens[$stackPtr + 2]['code'], $disallowed_after_tokens))
-		{
-			$error = 'Access specifier (e.g. public) should not follow static scope attribute. Encountered "' . $tokens[$stackPtr + 2]['content'] . '" after static';
-			$phpcsFile->addWarning($error, $stackPtr, 'InvalidStaticFunctionDeclaration', [], 1);
-		}
-	}
-}

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

@@ -11,42 +11,26 @@
 *
 */
 
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
 /**
 * Checks that each use statement is used.
 */
-class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
+class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
 {
-	const FIND = [
-		T_NS_SEPARATOR,
-		T_STRING,
-		T_WHITESPACE,
-	];
-
 	/**
 	* {@inheritdoc}
 	*/
 	public function register()
 	{
-		return [T_USE];
+		return array(T_USE);
 	}
 
-	protected function check(File $phpcsFile, $found_name, $full_name, $short_name, $stack_pointer)
+	protected function check($phpcsFile, $found_name, $full_name, $short_name, $line)
 	{
-		$found_name_normalized = ltrim($found_name, '\\');
-		$full_name = ltrim($full_name, '\\');
 
-		$is_global = ($full_name === $short_name);
-		$unnecessarily_fully_qualified = ($is_global)
-			? ($found_name_normalized !== $found_name && $found_name_normalized === $short_name)
-			: ($found_name_normalized === $full_name);
-
-		if ($unnecessarily_fully_qualified)
+		if ($found_name === $full_name)
 		{
 			$error = 'Either use statement or full name must be used.';
-			$phpcsFile->addError($error, $stack_pointer, 'FullName');
+			$phpcsFile->addError($error, $line, 'FullName');
 		}
 
 		if ($found_name === $short_name)
@@ -60,7 +44,7 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
 	/**
 	* {@inheritdoc}
 	*/
-	public function process(File $phpcsFile, $stackPtr)
+	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 	{
 		if ($this->should_ignore_use($phpcsFile, $stackPtr) === true)
 		{
@@ -71,50 +55,27 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
 
 		$class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($stackPtr + 1));
 
-		$class_name_end = $phpcsFile->findNext(self::FIND, ($stackPtr + 1), null, true);
+		$find = array(
+			T_NS_SEPARATOR,
+			T_STRING,
+			T_WHITESPACE,
+		);
+
+		$class_name_end = $phpcsFile->findNext($find, ($stackPtr + 1), null, true);
 
 		$aliasing_as_position = $phpcsFile->findNext(T_AS, $class_name_end, null, false, null, true);
 		if ($aliasing_as_position !== false)
 		{
 			$alias_position = $phpcsFile->findNext(T_STRING, $aliasing_as_position, null, false, null, true);
-			$name_short = $tokens[$alias_position]['content'];
-			$name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1));
+			$class_name_short = $tokens[$alias_position]['content'];
+			$class_name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1));
 		}
 		else
 		{
-			$name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start));
-			$name_short = $tokens[$class_name_end - 1]['content'];
+			$class_name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start));
+			$class_name_short = $tokens[$class_name_end - 1]['content'];
 		}
 
-		if ($tokens[$class_name_start]['content'] === 'function'
-			&& $tokens[$class_name_start + 1]['code'] === T_WHITESPACE)
-		{
-			$class_name_start += 2;
-			$name_full = $phpcsFile->getTokensAsString(
-				$class_name_start,
-				($class_name_end - $class_name_start - (int) ($aliasing_as_position !== false))
-			);
-			$ok = $this->findFunctionUsage($phpcsFile, $stackPtr, $tokens, $name_full, $name_short);
-		}
-		else
-		{
-			$ok = $this->findClassUsage($phpcsFile, $stackPtr, $tokens, $name_full, $name_short);
-		}
-
-		if ($name_full[0] === '\\')
-		{
-			$phpcsFile->addError("There must not be a leading '\\' in use statements.", $stackPtr, 'Malformed');
-		}
-
-		if (!$ok)
-		{
-			$error = 'There must not be unused USE statements.';
-			$phpcsFile->addError($error, $stackPtr, 'Unused');
-		}
-	}
-
-	private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name_full, $class_name_short)
-	{
 		$ok = false;
 
 		// Checks in simple statements (new, instanceof and extends)
@@ -131,11 +92,11 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
 					continue;
 				}
 
-				$simple_class_name_end = $phpcsFile->findNext(self::FIND, ($simple_statement + 1), null, true);
+				$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)));
 
-				$ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) || $ok;
+				$ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) ? true : $ok;
 			}
 		}
 
@@ -145,12 +106,12 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
 		{
 			$old_paamayim_nekudotayim = $paamayim_nekudotayim;
 
-			$paamayim_nekudotayim_class_name_start = $phpcsFile->findPrevious(self::FIND, $paamayim_nekudotayim - 1, null, true);
+			$paamayim_nekudotayim_class_name_start = $phpcsFile->findPrevious($find, $paamayim_nekudotayim - 1, null, true);
 			$paamayim_nekudotayim_class_name_end = $paamayim_nekudotayim - 1;
 
 			$paamayim_nekudotayim_class_name = trim($phpcsFile->getTokensAsString($paamayim_nekudotayim_class_name_start + 1, ($paamayim_nekudotayim_class_name_end - $paamayim_nekudotayim_class_name_start)));
 
-			$ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) || $ok;
+			$ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) ? true : $ok;
 		}
 
 		// Checks in implements
@@ -165,11 +126,11 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
 				$old_implemented_class = $implemented_class;
 
 				$implements_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($implemented_class - 1));
-				$implements_class_name_end = $phpcsFile->findNext(self::FIND, ($implemented_class - 1), null, true);
+				$implements_class_name_end = $phpcsFile->findNext($find, ($implemented_class - 1), null, true);
 
 				$implements_class_name = trim($phpcsFile->getTokensAsString($implements_class_name_start, ($implements_class_name_end - $implements_class_name_start)));
 
-				$ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) || $ok;
+				$ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) ? true : $ok;
 			}
 		}
 
@@ -177,7 +138,7 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
 		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) || $ok;
+			$ok = $this->checkDocblock($phpcsFile, $docblock, $tokens, $class_name_full, $class_name_short) ? true : $ok;
 		}
 
 		// Checks in type hinting
@@ -190,7 +151,7 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
 			$params = $phpcsFile->getMethodParameters($function_declaration);
 			foreach ($params as $param)
 			{
-				$ok = $this->check($phpcsFile, $param['type_hint'], $class_name_full, $class_name_short, $function_declaration) || $ok;
+				$ok = $this->check($phpcsFile, $param['type_hint'], $class_name_full, $class_name_short, $function_declaration) ? true : $ok;
 			}
 		}
 
@@ -201,118 +162,30 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
 			$old_catch = $catch;
 
 			$caught_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), $catch + 1);
-			$caught_class_name_end = $phpcsFile->findNext(self::FIND, $caught_class_name_start + 1, null, true);
+			$caught_class_name_end = $phpcsFile->findNext($find, $caught_class_name_start + 1, null, true);
 
 			$caught_class_name = trim($phpcsFile->getTokensAsString($caught_class_name_start, ($caught_class_name_end - $caught_class_name_start)));
 
-			$ok = $this->check($phpcsFile, $caught_class_name, $class_name_full, $class_name_short, $catch) || $ok;
+			$ok = $this->check($phpcsFile, $caught_class_name, $class_name_full, $class_name_short, $catch) ? true : $ok;
 		}
 
-		$old_use = $stackPtr;
-		while (($use = $phpcsFile->findNext(T_USE, ($old_use + 1))) !== false)
+		if (!$ok)
 		{
-			$old_use = $use;
-
-			// Needs to be inside a class and must not be inside a function scope.
-			if (!$phpcsFile->hasCondition($use, [T_CLASS, T_TRAIT]) || $phpcsFile->hasCondition($use, T_FUNCTION))
-			{
-				continue;
-			}
-
-			$next = $phpcsFile->findNext(T_WHITESPACE, ($use + 1), null, true, null, true);
-			if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS)
-			{
-				continue;
-			}
-
-			$class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), $use + 1, null, false, null, true);
-			$class_name_end = $phpcsFile->findNext(self::FIND, $class_name_start + 1, null, true, null, true);
-			$found_name = trim($phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start)));
-
-			$ok = $this->check($phpcsFile, $found_name, $class_name_full, $class_name_short, $use) || $ok;
+			$error = 'There must not be unused USE statements.';
+			$phpcsFile->addError($error, $stackPtr, 'Unused');
 		}
-
-		return $ok;
-	}
-
-	private function findFunctionUsage(File $phpcsFile, $stackPtr, $tokens, $name_full, $name_short)
-	{
-		$ok = false;
-		$position = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $stackPtr + 1);
-		while ($position !== false)
-		{
-			$function_name_end = $position;
-			$found_start = 1 + $phpcsFile->findPrevious(
-				[T_NS_SEPARATOR, T_STRING, T_WHITESPACE],
-				$function_name_end - 1,
-				null,
-				true
-			);
-
-			$position = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $position + 1);
-			if ($found_start === null)
-			{
-				continue;
-			}
-
-			$function_name_start = $found_start;
-
-			// Trim the output.
-			while ($tokens[$function_name_start]['code'] === T_WHITESPACE && $function_name_start < $function_name_end)
-			{
-				++$function_name_start;
-			}
-
-			while ($tokens[$function_name_end]['code'] === T_WHITESPACE && $function_name_end > $function_name_start)
-			{
-				--$function_name_end;
-			}
-
-			$function_name_length = $function_name_end - $function_name_start;
-
-			// Filter out control structures, built in type constructors, etc.
-			if ($function_name_length <= 0)
-			{
-				continue;
-			}
-
-			// This doesn't seem to be valid PHP, where is the opening tag?
-			if ($found_start === 0)
-			{
-				continue;
-			}
-
-			$previous_token = $found_start - 1;
-			$filter = [
-				T_FUNCTION, // Function declaration
-				T_OBJECT_OPERATOR, // Method call
-				T_DOUBLE_COLON, // Static method call
-				T_NEW, // Constructors
-			];
-
-			// Filter out calls to methods and function declarations.
-			if (in_array($tokens[$previous_token]['code'], $filter))
-			{
-				continue;
-			}
-
-			$function_name = $phpcsFile->getTokensAsString($function_name_start, $function_name_length);
-			$ok = $this->check($phpcsFile, $function_name, $name_full, $name_short, $function_name_start) || $ok;
-		}
-
-		return $ok;
 	}
 
 	/**
 	* Check if this use statement is part of the namespace block.
 	*
-	* @param File $phpcsFile The file being scanned.
+	* @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
 	* @param int                  $stackPtr  The position of the current token in
 	*                                        the stack passed in $tokens.
 	*
 	* @return bool
 	*/
-	private function should_ignore_use(File $phpcsFile, $stackPtr)
+	private function should_ignore_use(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 	{
 		$tokens = $phpcsFile->getTokens();
 
@@ -334,7 +207,7 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
 	}
 
 	/**
-	 * @param File $phpcsFile
+	 * @param PHP_CodeSniffer_File $phpcsFile
 	 * @param int $field
 	 * @param array $tokens
 	 * @param string $class_name_full
@@ -343,7 +216,7 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
 	 *
 	 * @return bool
 	 */
-	private function checkDocblock(File $phpcsFile, $comment_end, $tokens, $class_name_full, $class_name_short)
+	private function checkDocblock(PHP_CodeSniffer_File $phpcsFile, $comment_end, $tokens, $class_name_full, $class_name_short)
 	{
 		$ok = false;
 
@@ -371,7 +244,7 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements Sniff
 			$classes = explode('|', str_replace('[]', '', $classes));
 			foreach ($classes as $class)
 			{
-				$ok = $this->check($phpcsFile, $class, $class_name_full, $class_name_short, $tag + 2) || $ok;
+				$ok = $this->check($phpcsFile, $class, $class_name_full, $class_name_short, $tokens[$tag + 2]['line']) ? true : $ok;
 			}
 		}
 

build/code_sniffer/ruleset-php-legacy.xml

@@ -89,7 +89,4 @@
  <!-- There MUST be one space between control structure and opening parenthesis -->
  <rule ref="./phpbb/Sniffs/ControlStructures/OpeningParenthesisSniff.php" />
 
- <!-- Static qualifier MUST be placed before the visibility qualifiers. -->
- <rule ref="./phpbb/Sniffs/ControlStructures/StaticKeywordSniff.php" />
-
 </ruleset>

build/doctum-all.conf.php

@@ -1,21 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-require __DIR__ . '/doctum-checkout.conf.php';
-
-$config['versions'] = Doctum\Version\GitVersionCollection::create(__DIR__ . '/../')
-	->add('3.3.x')
-	->add('master')
-;
-
-return new Doctum\Doctum($iterator, $config);

build/doctum-checkout.conf.php

@@ -1,31 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-$iterator = Symfony\Component\Finder\Finder::create()
-	->files()
-	->name('*.php')
-	->in(__DIR__ . '/../phpBB/')
-	->notPath('#^cache/#')
-	->notPath('#^develop/#')
-	->notPath('#^ext/#')
-	->notPath('#^vendor/#')
-	->notPath('data');
-
-// This variable will be used and changed in doctum-all.conf.php
-$config = [
-	'title'                => 'phpBB API Documentation',
-	'build_dir'            => __DIR__ . '/api/output/%version%',
-	'cache_dir'            => __DIR__ . '/api/cache/%version%',
-];
-
-return new Doctum\Doctum($iterator, $config);

build/generate_package_json.php

@@ -1,127 +0,0 @@
-#!/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.
- *
- */
-
-if (version_compare(PHP_VERSION, '7.0-dev', '<'))
-{
-	die('generate_package_json.php requires at least PHP 7.0.');
-}
-
-define('IN_PHPBB', true);
-include_once('../phpBB/includes/functions.php');
-
-$json_data = new \stdClass();
-$json_data->metadata = new stdClass();
-
-$json_data->metadata->current_version_date = '';
-$json_data->metadata->current_version = '';
-$json_data->metadata->download_path = '';
-$json_data->metadata->show_update_package = true;
-$json_data->metadata->historic = false;
-
-$json_data->package = [];
-
-// Open build.xml
-$build_xml = simplexml_load_file('build.xml');
-$current_version = (string) $build_xml->xpath('/project/property[@name=\'newversion\']/@value')[0]->value;
-$previous_version = (string) $build_xml->xpath('/project/property[@name=\'prevversion\']/@value')[0]->value;
-$older_verions = explode(', ', (string) $build_xml->xpath('/project/property[@name=\'olderversions\']/@value')[0]->value);
-
-// Clean and sort version info
-$older_verions[] = $previous_version;
-$older_verions = array_filter($older_verions, function($version) {
-	preg_match(get_preg_expression('semantic_version'), $version, $matches);
-	return empty($matches['prerelease']) || strpos($matches['prerelease'], 'pl') !== false;
-});
-usort($older_verions, function($version_a, $version_b)
-{
-	return phpbb_version_compare($version_b, $version_a);
-});
-
-// Set metadata
-$json_data->metadata->current_version = $current_version;
-$json_data->metadata->current_version_date = date('Y-m-d');
-$json_data->metadata->download_path = 'https://download.phpbb.com/pub/release/' . preg_replace('#([0-9]+\.[0-9]+)(\..+)#', '$1', $current_version) . '/' . $current_version . '/';
-
-// Add package, patch files, and changed files
-phpbb_add_package_file(
-	$json_data->package,
-	'phpBB ' . $current_version,
-	'phpBB-' . $current_version,
-	'full',
-	''
-);
-phpbb_add_package_file(
-	$json_data->package,
-	'phpBB ' . $current_version . ' Patch Files',
-	'phpBB-' . $current_version . '-patch',
-	'update',
-	'patch'
-);
-phpbb_add_package_file(
-	$json_data->package,
-	'phpBB ' . $current_version . ' Changed Files',
-	'phpBB-' . $current_version . '-files',
-	'update',
-	'files'
-);
-
-// Loop through packages and assign to packages array
-foreach ($older_verions as $version)
-{
-	phpbb_add_package_file(
-		$json_data->package,
-		'phpBB ' . $version . ' to ' . $current_version . ' Update Package',
-		'phpBB-' . $version . '_to_' . $current_version,
-		'update',
-		'advanced_update',
-		$version
-	);
-}
-
-echo(json_encode($json_data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n");
-
-function phpbb_add_package_file(array &$package_list, $name, $file_name, $type, $subtype, $from = '')
-{
-	if (!file_exists(__DIR__ . '/new_version/release_files/' . $file_name . '.zip'))
-	{
-		trigger_error('File does not exist: ' . __DIR__ . '/new_version/release_files/' . $file_name . '.zip');
-		return;
-	}
-
-	$package_file = new stdClass();
-	$package_file->name = $name;
-	$package_file->filename = $file_name;
-	$package_file->type = $type;
-	if (!empty($subtype))
-	{
-		$package_file->subtype = $subtype;
-	}
-	if (!empty($from))
-	{
-		$package_file->from = $from;
-	}
-	$package_file->files = [];
-
-	foreach (['zip', 'tar.bz2'] as $extension)
-	{
-		$file_path = 'new_version/release_files/' . $file_name  . '.' . $extension;
-		$filedata = new stdClass();
-		$filedata->filesize = filesize($file_path);
-		$filedata->checksum = trim(preg_replace('/(^\w+)(.+)/', '$1', file_get_contents($file_path . '.sha256')));
-		$filedata->filetype = $extension;
-		$package_file->files[] = $filedata;
-	}
-
-	$package_list[] = $package_file;
-}

build/sami-all.conf.php

@@ -0,0 +1,32 @@
+<?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.
+*
+*/
+
+require __DIR__ . '/sami-checkout.conf.php';
+
+$config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../')
+	/*
+	This would be nice, but currently causes various problems that need
+	debugging.
+	->addFromTags('release-3.0.*')
+	->add('3.0.x', '3.0-next (olympus)')
+	->addFromTags('release-3.1.*')
+	->add('3.1.x', '3.1-next (ascraeus)')
+	->add('master')
+	*/
+	->add('3.0.x')
+	->add('3.1.x')
+	->add('3.2.x')
+	->add('master')
+;
+
+return new Sami\Sami($iterator, $config);

build/sami-checkout.conf.php

@@ -0,0 +1,44 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+// Prevent 'Class "acm" does not exist.' exception on removeClass().
+class PhpbbArrayStore extends Sami\Store\ArrayStore
+{
+	public function removeClass(Sami\Project $project, $name)
+	{
+		unset($this->classes[$name]);
+	}
+}
+
+$iterator = Symfony\Component\Finder\Finder::create()
+	->files()
+	->name('*.php')
+	->in(__DIR__ . '/../phpBB/')
+	->notPath('#^cache/#')
+	->notPath('#^develop/#')
+	->notPath('#^ext/#')
+	->notPath('#^vendor/#')
+	->notPath('data')
+;
+
+$config = array(
+	'theme'                => 'enhanced',
+	'title'                => 'phpBB API Documentation',
+	'build_dir'            => __DIR__.'/api/output/%version%',
+	'cache_dir'            => __DIR__.'/api/cache/%version%',
+	'default_opened_level' => 2,
+	// Do not use JsonStore. See https://github.com/fabpot/Sami/issues/79
+	'store'                => new PhpbbArrayStore,
+);
+
+return new Sami\Sami($iterator, $config);

build/update_stylesheet_querystrings.php

@@ -1,54 +0,0 @@
-<?php declare(strict_types=1);
-/**
-*
-* 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.
-*
-*/
-
-if (php_sapi_name() !== 'cli')
-{
-	die("This program must be run from the command line.\n");
-}
-
-if (version_compare(PHP_VERSION, '7.1.3', '<'))
-{
-	die('update_stylesheet_querystrings.php requires at least PHP 7.1.3');
-}
-
-// Usage: "$ php build/update_stylesheet_querystrings.php"
-$targets = [dirname(dirname(__FILE__)) . '/phpBB/styles/prosilver/theme/stylesheet.css'];
-
-array_map('patch_glob', $targets);
-
-function patch_glob($glob): void
-{
-	array_map('patch_file', glob($glob));
-}
-
-function patch_file(string $filepath): void
-{
-	$file	= file_get_contents($filepath);
-	$old	= $file;
-	$new	= preg_replace_callback(
-		'(^@import\\s+url\\([\'"](?<basename>\\w++\\.css)\\?\\K(?:hash|v)=[^\'"]++)m',
-		function ($match) use ($filepath)
-		{
-			$path = dirname($filepath) . DIRECTORY_SEPARATOR . $match['basename'];
-			$hash = sprintf('%08x', crc32(file_get_contents($path)));
-
-			return 'hash=' . $hash;
-		},
-		$old
-	);
-
-	if ($new !== $old)
-	{
-		file_put_contents($filepath, $new);
-	}
-}

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

@@ -24,17 +24,7 @@ COMMIT_MSG_HOOK_FATAL=$(git config --bool phpbb.hooks.commit-msg.fatal 2> /dev/n
 git config phpbb.hooks.commit-msg.fatal true
 
 EXIT_STATUS=0
-
-COMMIT_HASHES=$(git rev-list --no-merges "$COMMIT_RANGE")
-
-# If any message have been returned instead of commit hashes list
-# send a non-zero exit status upstream.
-if ! [[ "$COMMIT_HASHES" =~ ^[0-9a-f]{5,40} ]]
-then
-	EXIT_STATUS=1
-fi
-
-for COMMIT_HASH in $COMMIT_HASHES
+for COMMIT_HASH in $(git rev-list --no-merges "$COMMIT_RANGE")
 do
 	echo "Inspecting commit message of commit $COMMIT_HASH"
 

git-tools/hooks/commit-msg

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # A hook to check syntax of a phpBB3 commit message, per:
-# * <https://area51.phpbb.com/docs/dev/master/development/git.html>
+# * <http://wiki.phpbb.com/display/DEV/Git>
 # * <http://area51.phpbb.com/phpBB/viewtopic.php?p=209919#p209919>
 #
 # This is a commit-msg hook.
@@ -147,15 +147,6 @@ then
 	quit $ERR_LENGTH;
 fi
 
-# Check for CR/LF line breaks
-if grep -q $'\r$' "$1"
-then
-	complain "The commit message uses CR/LF line breaks, which are not permitted." >&2
-	complain >&2
-
-	quit $ERR_EOF;
-fi
-
 lines=$(wc -l "$1" | awk '{ print $1; }');
 expecting=header;
 in_description=0;
@@ -224,7 +215,7 @@ do
 			"footer")
 				err=$ERR_FOOTER;
 				# Each ticket is on its own line
-				echo "$line" | grep -Eq "^PHPBB3?-[0-9]+$";
+				echo "$line" | grep -Eq "^PHPBB3-[0-9]+$";
 			;;
 			"eof")
 				err=$ERR_EOF;
@@ -356,7 +347,7 @@ echo "$expecting" | grep -q "eof" || (
 	# Check the branch ticket is mentioned, doesn't make sense otherwise
 	if [ $ticket -gt 0 ]
 	then
-		echo "$tickets" | grep -Eq "\bPHPBB3?-$ticket\b" || (
+		echo "$tickets" | grep -Eq "\bPHPBB3-$ticket\b" || (
 			complain "Ticket ID [$ticket] of branch missing from list of tickets:" >&2;
 			complain "$tickets" | sed 's/ /\n/g;s/^/* /g' >&2;
 			quit $ERR_FOOTER;

git-tools/hooks/prepare-commit-msg

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # A hook to add [$branch] to the beginning of a commit message
 # if certain conditions are met.
@@ -31,25 +31,12 @@ branch="$(echo "$branch" | sed "s/refs\/heads\///g")"
 if [ "$2" = "" ]
 then
 	tail="";
-	ticket_id=$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\3/gm;t;d' <<< "$branch");
-	branch_title=$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\1\2\3/gm;t;d' <<< "$branch");
 
-	# Fall back to branch name if no ticket ID
-	if [ -z "$branch_title" ];
+	# Branch is prefixed with 'ticket/', append ticket ID to message
+	if [ "$branch" != "${branch##ticket/}" ];
 	then
-		branch_title="$branch";
+		tail="$(printf "\n\nPHPBB3-${branch##ticket/}")";
 	fi
 
-	if [ "security/" = "$(sed -E 's/(ticket\/)(security\/)?([0-9]+)(.+$)?/\2/gm;t;d' <<< "$branch")" ];
-	then
-		tail="$(printf '\n\nSECURITY-%s' "$ticket_id")";
-	else
-		# Branch is prefixed with 'ticket/', append ticket ID to message
-		if [ "$branch" != "${branch##ticket/}" ];
-		then
-			tail="$(printf '\n\nPHPBB-%s' "$ticket_id")";
-		fi
-	fi
-
-	echo "[$branch_title] $tail$(cat "$1")" > "$1"
+	echo "[$branch] $tail$(cat "$1")" > "$1"
 fi

gulpfile.js

@@ -0,0 +1,71 @@
+'use strict';
+
+const del = require('del');
+const gulp = require('gulp');
+const autoprefixer = require('gulp-autoprefixer');
+const sass = require('gulp-sass');
+const rename = require('gulp-rename');
+const sourcemaps = require('gulp-sourcemaps');
+const cssnano = require('gulp-cssnano');
+const postcss = require('gulp-postcss');
+const stylefmt = require('gulp-stylefmt');
+const sorting = require('postcss-sorting');
+const atimport = require('postcss-import');
+const torem = require('postcss-pxtorem');
+const sortOrder = require('./.postcss-sorting.json');
+const pkg = require('./package.json');
+
+// Config
+const build = {
+	css: './phpBB/styles/prosilver/theme/',
+};
+
+const AUTOPREFIXER_BROWSERS = [
+	'> 1%',
+	'last 2 versions'
+];
+
+gulp.task('css', () => {
+	const css = gulp
+	.src(build.css + '*.css')
+	.pipe(autoprefixer(AUTOPREFIXER_BROWSERS))
+	.pipe(
+		postcss([
+			sorting(sortOrder)
+		])
+	)
+	.pipe(stylefmt())
+	.pipe(gulp.dest(build.css));
+
+	return css;
+});
+
+gulp.task('clean', () => {
+	del(['dist']);
+});
+
+gulp.task('minify', () => {
+	const css = gulp
+	.src(build.css + '/bidi.css')
+	.pipe(sourcemaps.init())
+	.pipe(
+		postcss([
+			atimport()
+		])
+	)
+	.pipe(cssnano())
+	.pipe(rename({
+		suffix: '.min',
+		extname: '.css'
+	}))
+	.pipe(sourcemaps.write('./'))
+	.pipe(gulp.dest(build.css));
+
+	return css;
+});
+
+gulp.task('watch', () => {
+	gulp.watch('phpBB/styles/prosilver/theme/*.css', ['css']);
+});
+
+gulp.task('default', ['css', 'watch']);

package.json

@@ -0,0 +1,52 @@
+{
+  "name": "phpbb",
+  "version": "3.3.0-dev",
+  "description": "phpBB Forum Software application",
+  "main": " ",
+  "directories": {
+    "doc": "docs"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/phpbb/phpbb.git"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions"
+  ],
+  "keywords": [
+    "phpBB",
+    "phpbb",
+    "forum",
+    "php",
+    "software",
+    "community"
+  ],
+  "author": "",
+  "license": "GPL-2.0",
+  "bugs": {
+    "url": "https://tracker.phpbb.com"
+  },
+  "homepage": "https://www.phpbb.com",
+  "devDependencies": {
+    "stylelint": "8.0.0",
+    "stylelint-order": "0.3.0"
+  },
+  "dependencies": {
+    "del": "^3.0.0",
+    "gulp": "^3.9.1",
+    "gulp-autoprefixer": "^4.0.0",
+    "gulp-cssnano": "^2.1.2",
+    "gulp-postcss": "^7.0.0",
+    "gulp-rename": "^1.2.2",
+    "gulp-sass": "^3.1.0",
+    "gulp-sourcemaps": "^2.6.1",
+    "gulp-stylefmt": "^1.1.0",
+    "postcss-import": "^11.0.0",
+    "postcss-pxtorem": "^4.0.1",
+    "postcss-sorting": "^3.0.2"
+  }
+}

phpBB/.htaccess

@@ -36,13 +36,6 @@ RewriteRule ^(.*)$ app.php [QSA,L]
 #Options +FollowSymLinks
 </IfModule>
 
-# Apache content negotation tries to interpret non-existent paths as files if
-# MultiViews is enabled. This will however cause issues with paths containg
-# dots, e.g. for the cron tasks
-<IfModule mod_negotiation.c>
-	Options -MultiViews
-</IfModule>
-
 # With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
 # module mod_authz_host to a new module called mod_access_compat (which may be
 # disabled) and a new "Require" syntax has been introduced to mod_authz_host.

phpBB/adm/index.php

@@ -49,6 +49,7 @@ if (!$auth->acl_get('a_'))
 define('IN_ADMIN', true);
 
 // Some oft used variables
+$safe_mode		= (@ini_get('safe_mode') == '1' || strtolower(@ini_get('safe_mode')) === 'on') ? true : false;
 $file_uploads	= (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_uploads')) === 'on') ? true : false;
 $module_id		= $request->variable('i', '');
 $mode			= $request->variable('mode', '');
@@ -61,8 +62,8 @@ $template->set_custom_style(array(
 	),
 ), $phpbb_admin_path . 'style');
 
-$template->assign_var('T_ASSETS_PATH', $phpbb_path_helper->update_web_root_path($phpbb_root_path . 'assets'));
-$template->assign_var('T_TEMPLATE_PATH', $phpbb_path_helper->update_web_root_path($phpbb_root_path . 'style'));
+$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
+$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
 
 // Instantiate new module
 $module = new p_master();

phpBB/adm/style/acp_attachments.html

@@ -29,7 +29,7 @@
 
 	<!-- BEGIN upload -->
 		:: {upload.FILE_INFO}<br />
-		<!-- IF upload.S_DENIED --><span class="error">{upload.L_DENIED}</span><!-- ELSEIF upload.ERROR_MSG --><span class="error">{upload.ERROR_MSG}</span><!-- ELSE --><span class="success">{L_SUCCESSFULLY_UPLOADED}</span><!-- ENDIF -->
+		<!-- IF upload.S_DENIED --><span class="error">{upload.DENIED}</span><!-- ELSEIF upload.ERROR_MSG --><span class="error">{upload.ERROR_MSG}</span><!-- ELSE --><span class="success">{L_SUCCESSFULLY_UPLOADED}</span><!-- ENDIF -->
 		<br /><br />
 	<!-- END upload -->
 
@@ -37,6 +37,12 @@
 
 <!-- IF S_ATTACHMENT_SETTINGS -->
 
+	<!-- IF not S_THUMBNAIL_SUPPORT -->
+		<div class="errorbox">
+			<p>{L_NO_THUMBNAIL_SUPPORT}</p>
+		</div>
+	<!-- ENDIF -->
+
 	<form id="attachsettings" method="post" action="{U_ACTION}">
 	<!-- BEGIN options -->
 		<!-- IF options.S_LEGEND -->
@@ -50,21 +56,16 @@
 			<dl>
 				<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 				<dd>{options.CONTENT}</dd>
-				{% if (options.KEY == 'allow_attachments' and S_EMPTY_POST_GROUPS) or (options.KEY == 'allow_pm_attach' and S_EMPTY_PM_GROUPS) %}
-					<dd><span class="error">{{ lang(options.KEY == 'allow_attachments' ? 'NO_EXT_GROUP_ALLOWED_POST' : 'NO_EXT_GROUP_ALLOWED_PM', U_EXTENSION_GROUPS) }}</span></dd>
-				{% endif %}
 			</dl>
 
 		<!-- ENDIF -->
 	<!-- END options -->
 	</fieldset>
 
-	<fieldset>
-		<legend>{{ lang('ACP_SUBMIT_CHANGES') }}</legend>
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		</p>
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	</fieldset>
 
 	<!-- IF not S_SECURE_DOWNLOADS -->
@@ -115,7 +116,7 @@
 <!-- ELSEIF S_EXTENSION_GROUPS -->
 
 	<!-- IF S_EDIT_GROUP -->
-		<script>
+		<script type="text/javascript" defer="defer">
 		// <![CDATA[
 			function update_image(newimage)
 			{
@@ -209,13 +210,10 @@
 			<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
 		</dl>
 
-		</fieldset>
-		<fieldset>
-			<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-				<p class="submit-buttons">
-					<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-					<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-				</p>
+		<p class="submit-buttons">
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		</p>
 		{S_FORM_TOKEN}
 		</fieldset>
 
@@ -316,14 +314,10 @@
 	</tbody>
 	</table>
 
-	</fieldset>
-	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		</p>
-
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
 	</form>
@@ -394,13 +388,10 @@
 	<!-- ENDIF -->
 
 	<!-- IF .orphan -->
-	</fieldset>
-	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-			<p class="submit-buttons">
-				<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-				<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-			</p>
+		<p class="submit-buttons">
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		</p>
 	<!-- ENDIF -->
 
 	{S_FORM_TOKEN}
@@ -436,25 +427,17 @@
 	</tr>
 	</thead>
 	<tbody>
-	{% for attachments in attachments %}
+	<!-- BEGIN attachments -->
 		<tr>
 			<td>
-				{{ lang('EXTENSION_GROUP') ~ lang('COLON') }} <strong>{{ attachments.EXT_GROUP_NAME }}</strong>
-				{% if attachments.S_IN_MESSAGE %}
-					<br>{{ attachments.L_DOWNLOAD_COUNT }}
-					<br>{{ lang('IN') }} {{ lang('PRIVATE_MESSAGE') }}
-				{% else %}
-					<br><a href="{{ attachments.U_FILE }}"><strong>{{ attachments.REAL_FILENAME }}</strong></a>
-					{% if attachments.COMMENT %}<br>{{ attachments.COMMENT }}{% endif %}
-					<br>{{ attachments.L_DOWNLOAD_COUNT }}
-					<br>{{ lang('TOPIC') ~ lang('COLON') }} <a href="{{ attachments.U_VIEW_TOPIC }}">{{ attachments.TOPIC_TITLE }}</a>
-				{% endif %}
+				<!-- IF attachments.S_IN_MESSAGE -->{L_EXTENSION_GROUP}{L_COLON} <strong><!-- IF attachments.EXT_GROUP_NAME -->{attachments.EXT_GROUP_NAME}<!-- ELSE -->{L_NO_EXT_GROUP}<!-- ENDIF --></strong><br />{attachments.L_DOWNLOAD_COUNT}<br />{L_IN} {L_PRIVATE_MESSAGE}
+				<!-- ELSE --><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br />{L_TOPIC}{L_COLON} <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF -->
 			</td>
-			<td>{{ attachments.FILETIME }}<br>{{ lang('POST_BY_AUTHOR') }} {{ attachments.ATTACHMENT_POSTER }}</td>
-			<td class="centered-text">{{ attachments.FILESIZE }}</td>
-			<td class="centered-text"><input type="checkbox" class="radio" name="delete[{{ attachments.ATTACH_ID }}]" /></td>
+			<td>{attachments.FILETIME}<br />{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER}</td>
+			<td class="centered-text">{attachments.FILESIZE}</td>
+			<td class="centered-text"><input type="checkbox" class="radio" name="delete[{attachments.ATTACH_ID}]" /></td>
 		</tr>
-	{% endfor %}
+	<!-- END attachments -->
 	</tbody>
 	</table>
 <!-- ELSE -->

phpBB/adm/style/acp_avatar_options_upload.html

@@ -1,6 +1,6 @@
 <dl>
 	<dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
-	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" accept="{{ AVATAR_ALLOWED_EXTENSIONS }}" /></dd>
+	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" /></dd>
 </dl>
 
 <!-- IF S_UPLOAD_AVATAR_URL -->

phpBB/adm/style/acp_ban.html

@@ -8,7 +8,7 @@
 
 <p>{L_EXPLAIN}</p>
 
-<script>
+<script type="text/javascript">
 // <![CDATA[
 
 	var ban_length = new Array();
@@ -73,14 +73,12 @@
 	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>
 	<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>
 </dl>
-</fieldset>
-<fieldset>
-	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
+
+<p class="submit-buttons">
+	<input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />&nbsp;
+	<input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" />
+</p>
+{S_FORM_TOKEN}
 </fieldset>
 </form>
 

phpBB/adm/style/acp_bbcodes.html

@@ -31,11 +31,11 @@
 	</fieldset>
 
 	<fieldset>
-		<legend>{{ lang('BBCODE_HELPLINE') }}</legend>
-		<p>{{ lang('BBCODE_HELPLINE_EXPLAIN') }}</p>
+		<legend>{L_BBCODE_HELPLINE}</legend>
+		<p>{L_BBCODE_HELPLINE_EXPLAIN}</p>
 	<dl>
-		<dt><label for="bbcode_helpline">{{ lang('BBCODE_HELPLINE_TEXT') }}</label></dt>
-		<dd><textarea id="bbcode_helpline" name="bbcode_helpline" cols="60" rows="4">{{ BBCODE_HELPLINE }}</textarea></dd>
+		<dt><label for="bbcode_helpline">{L_BBCODE_HELPLINE_TEXT}</label></dt>
+		<dd><input type="text" id="bbcode_helpline" name="bbcode_helpline" size="60" maxlength="255" value="{BBCODE_HELPLINE}" /></dd>
 	</dl>
 	</fieldset>
 

phpBB/adm/style/acp_contact.html

@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<script>
+<script type="text/javascript">
 // <![CDATA[
 
 	var form_name = 'acp_contact';
@@ -44,7 +44,7 @@
 		<!-- INCLUDE acp_posting_buttons.html -->
 
 		<dl class="responsive-columns">
-			<dt style="width: 90px;" id="color_palette_placeholder" data-color-palette="v" data-height="12" data-width="15" data-bbcode="true">
+			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
 			</dt>
 
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;">
@@ -66,12 +66,9 @@
 		</dl>
 	</fieldset>
 
-	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		</p>
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
 		{S_FORM_TOKEN}
 	</fieldset>
 </form>

phpBB/adm/style/acp_database.html

@@ -20,6 +20,7 @@
 	<p class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" />&nbsp;
 		<input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}" />&nbsp;
+		<input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" />
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
@@ -35,7 +36,7 @@
 
 	<p>{L_ACP_BACKUP_EXPLAIN}</p>
 
-	<script>
+	<script type="text/javascript">
 	// <![CDATA[
 
 		function selector(bool)
@@ -58,6 +59,7 @@
 	<dl>
 		<dt><label for="type">{L_BACKUP_TYPE}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP}</label>
+			<label><input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY}</label>
 			<label><input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</label></dd>
 	</dl>
 	<dl>
@@ -66,6 +68,13 @@
 		<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}</label>
 		<!-- END methods --></dd>
 	</dl>
+	<dl>
+		<dt><label for="where">{L_ACTION}{L_COLON}</label></dt>
+		<dd>
+			<label><input id="where" type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>
+			<label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label>
+		</dd>
+	</dl>
 	<dl>
 		<dt><label for="table">{L_TABLE_SELECT}{L_COLON}</label></dt>
 		<dd><select id="table" name="table[]" size="10" multiple="multiple">
@@ -75,15 +84,12 @@
 		</select></dd>
 		<dd><a href="#" onclick="selector(true); return false;">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false); return false;">{L_DESELECT_ALL}</a></dd>
 	</dl>
-	</fieldset>
 
-	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		</p>
-		{S_FORM_TOKEN}
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
 	</fieldset>
 	</form>
 

phpBB/adm/style/acp_ext_catalog.html

@@ -0,0 +1,130 @@
+{% include('overall_header.html') %}
+
+<a id="maincontent"></a>
+
+<h1>{{ lang( 'EXTENSIONS_CATALOG') }}</h1>
+
+<p>{{ lang( 'EXTENSIONS_CATALOG_EXPLAIN') }}</p>
+
+<fieldset class="quick quick-left">
+	<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/{{ PHPBB_MAJOR }}" target="_blank">{{ lang('BROWSE_EXTENSIONS_DATABASE') }}</a> &bull; <a href="javascript:phpbb.toggleDisplay('catalog_settings');">{{ lang('SETTINGS') }}</a></span>
+</fieldset>
+
+{% if pagination is defined %}
+	<div class="pagination top-pagination">
+		{% include('pagination.html') %}
+	</div>
+{% endif %}
+
+<form id="catalog_settings" method="post" action="{{ U_ACTION }}" style="display:none">
+	<fieldset style="clear: both;">
+		<legend>{{ lang('EXTENSIONS_CATALOG_SETTINGS') }}</legend>
+		<dl>
+			<dt><label for="enable_on_install">{{ lang('ENABLE_ON_INSTALL') }}{{ lang('COLON') }}</label></dt>
+			<dd>
+				<label><input type="radio" id="enable_on_install" name="enable_on_install" class="radio" value="1"{% if settings.enable_on_install %} checked="checked" {% endif %} /> {{ lang('YES') }}</label>
+				<label><input type="radio" name="enable_on_install" class="radio" value="0"{% if not settings.enable_on_install %} checked="checked" {% endif %} /> {{ lang('NO') }}</label>
+			</dd>
+		</dl>
+		<dl>
+			<dt><label for="purge_on_remove">{{ lang('PURGE_ON_REMOVE') }}{{ lang('COLON') }}</label></dt>
+			<dd>
+				<label><input type="radio" id="purge_on_remove" name="purge_on_remove" class="radio" value="1"{% if settings.purge_on_remove %} checked="checked" {% endif %} /> {{ lang('YES') }}</label>
+				<label><input type="radio" name="purge_on_remove" class="radio" value="0"{% if not settings.purge_on_remove %} checked="checked" {% endif %} /> {{ lang('NO') }}</label>
+			</dd>
+		</dl>
+		<dl>
+			<dt>
+				<label for="repositories">{{ lang('COMPOSER_REPOSITORIES') }}{{ lang('COLON') }}</label><br />
+				<span class="explain">
+					{{ lang('COMPOSER_REPOSITORIES_EXPLAIN') }}
+				</span>
+			</dt>
+			<dd>
+				<textarea id="repositories" name="repositories" rows="5" cols="30">{{ settings.repositories|join('\n') }}</textarea>
+			</dd>
+		</dl>
+		<dl>
+			<dt>
+				<label for="enable_packagist">{{ lang('ENABLE_PACKAGIST') }}{{ lang('COLON') }}</label><br />
+				<span class="explain">
+					<strong class="error">{{ lang('WARNING') }}{{ lang('COLON') }}</strong> {{ lang('ENABLE_PACKAGIST_EXPLAIN') }}
+				</span>
+			</dt>
+			<dd>
+				<label><input type="radio" id="enable_packagist" name="enable_packagist" class="radio" value="1"{% if settings.enable_packagist %} checked="checked" {% endif %} /> {{ lang('YES') }}</label>
+				<label><input type="radio" name="enable_packagist" class="radio" value="0"{% if not settings.enable_packagist %} checked="checked" {% endif %} /> {{ lang('NO') }}</label>
+			</dd>
+		</dl>
+		<dl>
+			<dt>
+				<label for="minimum_stability">{{ lang('COMPOSER_MINIMUM_STABILITY') }}{{ lang('COLON') }}</label><br />
+				<span class="explain">
+					<strong class="error">{{ lang('WARNING') }}{{ lang('COLON') }}</strong> {{ lang('COMPOSER_MINIMUM_STABILITY_EXPLAIN') }}
+				</span>
+			</dt>
+			<dd>
+				<select id="minimum_stability" name="minimum_stability">
+					{% for stability in settings.stabilities %}
+						<option value="{{ stability }}"{% if stability === settings.minimum_stability %} selected='selected'{% endif %}>{{ lang('STABILITY_' ~ stability|upper) }}</option>
+					{% endfor %}
+				</select>
+			</dd>
+		</dl>
+
+		<p class="submit-buttons">
+			<input class="button1" type="submit" name="update" value="{{ lang('SUBMIT') }}" />&nbsp;
+			<input class="button2" type="reset" name="reset" value="{{ lang('RESET') }}" />
+			<input type="hidden" name="action" value="set_catalog_settings" />
+			{{ S_FORM_TOKEN }}
+		</p>
+	</fieldset>
+</form>
+
+{% if extensions is empty %}
+<tr>
+	<td colspan="4"><div class="errorbox notice">{{ lang('NO_EXTENSION_AVAILABLE') }}</div></td>
+</tr>
+{% else %}
+<table class="table1">
+	<col class="row1" ><col class="row1" ><col class="row1" ><col class="row2" >
+<thead>
+	<tr>
+		<th style="width: 25%;">{{ lang("EXTENSION_NAME") }}</th>
+		<th style="text-align: center; width: 10%;">{{ lang("VERSION") }}</th>
+		<th>{{ lang("DESCRIPTION") }}</th>
+		<th style="text-align: center; width: 15%;">{{ lang("EXTENSION_ACTIONS") }}</th>
+	</tr>
+</thead>
+<tbody>
+{% for extension in extensions %}
+	<tr>
+		<td>
+			<strong>{{ extension.display_name }}</strong><br />
+			{{ extension.name }}
+		</td>
+		<td style="text-align: center">{{ extension.version }}</td>
+		<td>{{ extension.description }} &bull; <a href="{{ extension.url }}">{{ lang('HOMEPAGE') }}</a></td>
+		<td style="text-align: center">
+			{% if extension.name in managed_extensions %}
+				<span style="color: #228822;">{{ lang('INSTALLED') }}</span>
+			{% elseif extension.name in installed_extensions -%}
+				<span style="color: #BC2A4D;">{{ lang('INSTALLED_MANUALLY') }}</span>
+				(<a href="{{ U_ACTION }}&amp;action=manage&amp;extension={{ extension.composer_name|url_encode }}">{{ lang('MANAGE') }}</a>)
+			{% elseif not enabled -%}
+				<a href="{{ U_ACTION }}&amp;action=install&amp;extension={{ extension.composer_name|url_encode }}">{{ lang('INSTALL') }}</a>
+			{%- endif -%}
+		</td>
+	</tr>
+{% endfor %}
+</tbody>
+</table>
+{% endif %}
+
+{% if pagination is defined %}
+	<div class="pagination bottom-pagination">
+		{% include('pagination.html') %}
+	</div>
+{% endif %}
+
+{% include('overall_footer.html') %}

phpBB/adm/style/acp_ext_delete_data.html

@@ -1,40 +1,40 @@
-{% INCLUDE 'overall_header.html' %}
+<!-- INCLUDE overall_header.html -->
 
 	<a id="maincontent"></a>
 
-	<h1>{{ lang('EXTENSIONS_ADMIN') }}</h1>
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
-	<p>{{ lang('EXTENSIONS_EXPLAIN') }}</p>
-	<p>{{ lang('EXTENSION_DELETE_DATA_EXPLAIN') }}</p>
+	<p>{L_EXTENSIONS_EXPLAIN}</p>
+	<p>{L_EXTENSION_DELETE_DATA_EXPLAIN}</p>
 
-	{% if MIGRATOR_ERROR %}
-		<div class="errorbox">
-			<p><strong>{{ lang('MIGRATION_EXCEPTION_ERROR') }}</strong></p>
-			<p>{{ MIGRATOR_ERROR }}</p>
-			<p><a href="{{ U_RETURN }}">{{ lang('RETURN_TO_EXTENSION_LIST') }}</a></p>
-		</div>
-	{% elseif S_PRE_STEP %}
-		<div class="errorbox">
-			<p>{{ CONFIRM_MESSAGE }}</p>
-		</div>
+	<!-- IF MIGRATOR_ERROR -->
+	<div class="errorbox">
+		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
+		<p>{MIGRATOR_ERROR}</p>
+		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
+	</div>
+	<!-- ELSEIF PRE -->
+	<div class="errorbox">
+		<p>{L_CONFIRM_MESSAGE}</p>
+	</div>
 
-		<form id="acp_extensions" method="post" action="{{ U_PURGE }}">
-			<fieldset class="submit-buttons">
-				<legend>{{ lang('EXTENSION_DELETE_DATA') }}</legend>
-				<input class="button1" type="submit" name="delete_data" value="{{ lang('EXTENSION_DELETE_DATA') }}">
-				<input class="button2" type="submit" name="cancel" value="{{ lang('CANCEL') }}">
-			</fieldset>
-		</form>
-	{% elseif S_NEXT_STEP %}
+	<form id="acp_extensions" method="post" action="{U_PURGE}">
+	<fieldset class="submit-buttons">
+		<legend>{L_EXTENSION_DELETE_DATA}</legend>
+		<input class="button1" type="submit" name="delete_data" value="{L_EXTENSION_DELETE_DATA}" />
+		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+	</fieldset>
+	</form>
+	<!-- ELSEIF S_NEXT_STEP -->
 		<div class="errorbox">
-			<p>{{ lang('EXTENSION_DELETE_DATA_IN_PROGRESS') }}</p>
+			<p>{L_EXTENSION_DELETE_DATA_IN_PROGRESS}</p>
 		</div>
-	{% else %}
+	<!-- ELSE -->
 		<div class="successbox">
-			<p>{{ lang('EXTENSION_DELETE_DATA_SUCCESS') }}</p>
-			<br>
-			<p><a href="{{ U_RETURN }}">{{ lang('RETURN_TO_EXTENSION_LIST') }}</a></p>
+			<p>{L_EXTENSION_DELETE_DATA_SUCCESS}</p>
+			<br />
+			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 		</div>
-	{% endif %}
+	<!-- ENDIF -->
 
-{% INCLUDE 'overall_footer.html' %}
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_ext_disable.html

@@ -1,34 +1,34 @@
-{% INCLUDE 'overall_header.html' %}
+<!-- INCLUDE overall_header.html -->
 
 	<a id="maincontent"></a>
 
-	<h1>{{ lang('EXTENSIONS_ADMIN') }}</h1>
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
-	<p>{{ lang('EXTENSIONS_EXPLAIN') }}</p>
-	<p>{{ lang('EXTENSION_DISABLE_EXPLAIN') }}</p>
+	<p>{L_EXTENSIONS_EXPLAIN}</p>
+	<p>{L_EXTENSION_DISABLE_EXPLAIN}</p>
 
-	{% if S_PRE_STEP %}
-		<fieldset>
-			<h2>{{ lang('CONFIRM') }}</h2>
-			<p>{{ CONFIRM_MESSAGE }}</p>
-		</fieldset>
+	<!-- IF PRE -->
+	<fieldset>
+		<h2>{L_CONFIRM}</h2>
+		<p>{L_CONFIRM_MESSAGE}</p>
+	</fieldset>
 
-		<form id="acp_extensions" method="post" action="{{ U_DISABLE }}">
-			<fieldset class="submit-buttons">
-				<input class="button1" type="submit" name="disable" value="{{ lang('EXTENSION_DISABLE') }}">
-				<input class="button2" type="submit" name="cancel" value="{{ lang('CANCEL') }}">
-			</fieldset>
-		</form>
-	{% elseif S_NEXT_STEP %}
+	<form id="acp_extensions" method="post" action="{U_DISABLE}">
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" name="disable" value="{L_EXTENSION_DISABLE}" />
+		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+	</fieldset>
+	</form>
+	<!-- ELSEIF S_NEXT_STEP -->
 		<div class="successbox notice">
-			<p>{{ lang('EXTENSION_DISABLE_IN_PROGRESS') }}</p>
+			<p>{L_EXTENSION_DISABLE_IN_PROGRESS}</p>
 		</div>
-	{% else %}
+	<!-- ELSE -->
 		<div class="successbox">
-			<p>{{ lang('EXTENSION_DISABLE_SUCCESS') }}</p>
-			<br>
-			<p><a href="{{ U_RETURN }}">{{ lang('RETURN_TO_EXTENSION_LIST') }}</a></p>
+			<p>{L_EXTENSION_DISABLE_SUCCESS}</p>
+			<br />
+			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 		</div>
-	{% endif %}
+	<!-- ENDIF -->
 
-{% INCLUDE 'overall_footer.html' %}
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_ext_enable.html

@@ -1,40 +1,40 @@
-{% INCLUDE 'overall_header.html' %}
+<!-- INCLUDE overall_header.html -->
 
 	<a id="maincontent"></a>
 
-	<h1>{{ lang('EXTENSIONS_ADMIN') }}</h1>
+	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
-	<p>{{ lang('EXTENSIONS_EXPLAIN') }}</p>
-	<p>{{ lang('EXTENSION_ENABLE_EXPLAIN') }}</p>
+	<p>{L_EXTENSIONS_EXPLAIN}</p>
+	<p>{L_EXTENSION_ENABLE_EXPLAIN}</p>
 
-	{% if MIGRATOR_ERROR %}
-		<div class="errorbox">
-			<p><strong>{{ lang('MIGRATION_EXCEPTION_ERROR') }}</strong></p>
-			<p>{{ MIGRATOR_ERROR }}</p>
-			<p><a href="{{ U_RETURN }}">{{ lang('RETURN_TO_EXTENSION_LIST') }}</a></p>
-		</div>
-	{% elseif S_PRE_STEP %}
-		<fieldset>
-			<h2>{{ lang('CONFIRM') }}</h2>
-			<p>{{ CONFIRM_MESSAGE }}</p>
-		</fieldset>
+	<!-- IF MIGRATOR_ERROR -->
+	<div class="errorbox">
+		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
+		<p>{MIGRATOR_ERROR}</p>
+		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
+	</div>
+	<!-- ELSEIF PRE -->
+	<fieldset>
+		<h2>{L_CONFIRM}</h2>
+		<p>{L_CONFIRM_MESSAGE}</p>
+	</fieldset>
 
-		<form id="acp_extensions" method="post" action="{{ U_ENABLE }}">
-			<fieldset class="submit-buttons">
-				<input class="button1" type="submit" name="enable" value="{{ lang('EXTENSION_ENABLE') }}">
-				<input class="button2" type="submit" name="cancel" value="{{ lang('CANCEL') }}">
-			</fieldset>
-		</form>
-	{% elseif S_NEXT_STEP %}
+	<form id="acp_extensions" method="post" action="{U_ENABLE}">
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" name="enable" value="{L_EXTENSION_ENABLE}" />
+		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+	</fieldset>
+	</form>
+	<!-- ELSEIF S_NEXT_STEP -->
 		<div class="successbox notice">
-			<p>{{ lang('EXTENSION_ENABLE_IN_PROGRESS') }}</p>
+			<p>{L_EXTENSION_ENABLE_IN_PROGRESS}</p>
 		</div>
-	{% else %}
+	<!-- ELSE -->
 		<div class="successbox">
-			<p>{{ lang('EXTENSION_ENABLE_SUCCESS') }}</p>
-			<br>
-			<p><a href="{{ U_RETURN }}">{{ lang('RETURN_TO_EXTENSION_LIST') }}</a></p>
+			<p>{L_EXTENSION_ENABLE_SUCCESS}</p>
+			<br />
+			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 		</div>
-	{% endif %}
+	<!-- ENDIF -->
 
-{% INCLUDE 'overall_footer.html' %}
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_ext_list.html

@@ -7,7 +7,7 @@
 	<p>{L_EXTENSIONS_EXPLAIN}</p>
 
 	<fieldset class="quick">
-		<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.3" target="_blank">{L_BROWSE_EXTENSIONS_DATABASE}</a> &bull; <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
+		<span class="small"><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
 	</fieldset>
 
 	<form id="version_check_settings" method="post" action="{U_ACTION}" style="display:none">
@@ -60,7 +60,7 @@
 			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
 			<td style="text-align: center;">
 				<!-- BEGIN actions -->
-					<a href="{enabled.actions.U_ACTION}"<!-- IF enabled.actions.L_ACTION_EXPLAIN --> title="{enabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{enabled.actions.L_ACTION}</a>
+					<a href="{enabled.actions.U_ACTION}"<!-- IF enabled.actions.L_ACTION_EXPLAIN --> title="{enabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF --><!-- IF enabled.actions.COLOR -->  style="color: {enabled.actions.COLOR};"<!-- ENDIF -->>{enabled.actions.L_ACTION}</a>
 					<!-- IF not enabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
 				<!-- END actions -->
 			</td>
@@ -88,7 +88,7 @@
 			</td>
 			<td style="text-align: center;">
 				<!-- BEGIN actions -->
-					<a href="{disabled.actions.U_ACTION}"<!-- IF disabled.actions.L_ACTION_EXPLAIN --> title="{disabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{disabled.actions.L_ACTION}</a>
+					<a href="{disabled.actions.U_ACTION}"<!-- IF disabled.actions.L_ACTION_EXPLAIN --> title="{disabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF --><!-- IF disabled.actions.COLOR -->  style="color: {disabled.actions.COLOR};"<!-- ENDIF -->>{disabled.actions.L_ACTION}</a>
 					<!-- IF not disabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
 				<!-- END actions -->
 			</td>

phpBB/adm/style/acp_forums.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT_FORUM -->
 
-	<script>
+	<script type="text/javascript">
 	// <![CDATA[
 		/**
 		* Handle displaying/hiding several options based on the forum type
@@ -210,11 +210,6 @@
 			<dd><label><input type="radio" class="radio" name="display_subforum_list" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_subforum_list" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
-		<dl>
-			<dt><label for="display_subforum_limit">{L_LIMIT_SUBFORUMS}{L_COLON}</label><br /><span>{L_LIMIT_SUBFORUMS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_subforum_limit" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIMIT --> id="display_subforum_limit" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_subforum_limit" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIMIT --> id="display_subforum_limit" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
 		<dl>
 			<dt><label for="display_on_index">{L_LIST_INDEX}{L_COLON}</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
@@ -410,7 +405,7 @@
 
 <!-- ELSEIF S_CONTINUE_SYNC -->
 
-	<script>
+	<script type="text/javascript">
 	// <![CDATA[
 		var close_waitscreen = 0;
 		// no scrollbars...
@@ -426,7 +421,7 @@
 
 <!-- ELSE -->
 
-	<script>
+	<script type="text/javascript">
 	// <![CDATA[
 		/**
 		* Popup search progress bar
@@ -452,7 +447,7 @@
 	<!-- ENDIF -->
 
 	<!-- IF S_RESYNCED -->
-		<script>
+		<script type="text/javascript">
 		// <![CDATA[
 			var close_waitscreen = 1;
 		// ]]>

phpBB/adm/style/acp_groups.html

@@ -36,12 +36,10 @@
 		<dl>
 			<dt><label for="group_type">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
 			<dd>
-				{% EVENT acp_group_types_prepend %}
 				<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>
 				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>
 				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label>
 				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}</label>
-				{% EVENT acp_group_types_append %}
 			</dd>
 		</dl>
 	<!-- ELSE -->
@@ -100,7 +98,7 @@
 			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />
 			<!-- IF GROUP_COLOUR -->&nbsp;<span style="background-color: #{GROUP_COLOUR}">&nbsp; &nbsp;</span><!-- ENDIF -->&nbsp;&nbsp;<span>
 			[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]</span>
-			<div id="color_palette_placeholder" style="display: none;" data-color-palette="h" data-height="12" data-width="15" data-target="#group_colour"></div>
+			<div id="color_palette_placeholder" style="display: none;" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div>
 		</dd>
 	</dl>
 	<dl>
@@ -225,7 +223,6 @@
 
 	<fieldset>
 		<legend>{L_ADD_USERS}</legend>
-	{% EVENT acp_groups_add_user_options_before %}
 	<dl>
 		<dt><label for="leader">{L_USER_GROUP_LEADER}{L_COLON}</label></dt>
 		<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>
@@ -236,13 +233,11 @@
 		<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>
 			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
-	{% EVENT acp_groups_add_user_usernames_before %}
 	<dl>
 		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
 		<dd><!-- EVENT acp_groups_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_groups_find_username_append --></dd>
 	</dl>
-	{% EVENT acp_groups_add_user_options_after %}
 
 	<p class="quick">
 		<input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" />

phpBB/adm/style/acp_groups_position.html

@@ -15,15 +15,13 @@
 				<label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
-	</fieldset>
-	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-		<p class="submit-buttons">
-			<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" name="reset" value="{L_RESET}" />
-			<input type="hidden" name="action" value="set_config_legend" />
-			{S_FORM_TOKEN}
-		</p>
+
+	<p class="submit-buttons">
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" name="reset" value="{L_RESET}" />
+		<input type="hidden" name="action" value="set_config_legend" />
+		{S_FORM_TOKEN}
+	</p>
 	</fieldset>
 	</form>
 

phpBB/adm/style/acp_help_phpbb.html

@@ -38,13 +38,10 @@
 			<dd>{L_SEND_STATISTICS_LONG}</dd>
 		</dl>
 	</div>
-	<script>
-		var statsData = {{ S_STATS_DATA }};
-	</script>
 	<!-- EVENT acp_help_phpbb_stats_after -->
 	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
 		<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>
@@ -54,13 +51,8 @@
 </form>
 <form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
 	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
 		<p class="submit-buttons">
-			{% for providers in providers %}
-				{% for values in providers.values %}
-					<input type="hidden" name="{{ providers.NAME }}[{{ values.KEY }}]" value="{{ values.VALUE }}" />
-				{% endfor %}
-			{% endfor %}
+			<input type="hidden" name="systemdata" value="{RAW_DATA}" />
 			<input class="button1" type="submit" id="submit_stats" name="submit" value="{L_SEND_STATISTICS}" />
 		</p>
 	</fieldset>

phpBB/adm/style/acp_icons.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT -->
 
-	<script>
+	<script type="text/javascript" defer="defer">
 	// <![CDATA[
 	<!-- IF S_ADD_CODE -->
 
@@ -105,7 +105,7 @@
 	<!-- BEGIN items -->
 		<tr>
 
-		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="{items.TEXT_ALT}" title="{items.TEXT_ALT}" style="max-width: 160px;"><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
+		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="{items.TEXT_ALT}" title="{items.TEXT_ALT}" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
 		<td style="vertical-align: top;">[{items.IMG}]</td>
 		<!-- IF S_SMILIES -->
 			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>

phpBB/adm/style/acp_inactive.html

@@ -45,7 +45,7 @@
 	</tr>
 <!-- BEGINELSE -->
 	<tr>
-		<td colspan="7" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
+		<td colspan="6" style="text-align: center;">{L_NO_INACTIVE_USERS}</td>
 	</tr>
 <!-- END inactive -->
 </tbody>

phpBB/adm/style/acp_jabber.html

@@ -70,12 +70,9 @@
 
 </fieldset>
 
-<fieldset>
-	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
+<fieldset class="submit-buttons">
+	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>

phpBB/adm/style/acp_language.html

@@ -69,7 +69,7 @@
 	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p>
 
 	<fieldset class="quick">
-		<span class="small"><a href="https://www.phpbb.com/go/customise/language-packs/3.3" target="_blank">{L_BROWSE_LANGUAGE_PACKS_DATABASE}</a></span>
+		<span class="small"><a href="https://www.phpbb.com/go/customise/language-packs/3.2" target="_blank">{L_BROWSE_LANGUAGE_PACKS_DATABASE}</a></span>
 	</fieldset>
 
 	<table class="table1 zebra-table">

phpBB/adm/style/acp_main.html

@@ -14,31 +14,27 @@
 
 	<p>{L_ADMIN_INTRO}</p>
 
-	{% if S_UPDATE_INCOMPLETE %}
+	<!-- IF S_UPDATE_INCOMPLETE -->
 		<div class="errorbox">
-			<p>{{ lang('UPDATE_INCOMPLETE') }} <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
+			<p>{L_UPDATE_INCOMPLETE} <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
 		</div>
-	{% elseif S_VERSIONCHECK_FAIL %}
+	<!-- ELSEIF S_VERSIONCHECK_FAIL -->
 		<div class="errorbox notice">
-			<p>{{ lang('VERSIONCHECK_FAIL') }}</p>
-			<p>{{ VERSIONCHECK_FAIL_REASON }}</p>
-			<p><a href="{{ U_VERSIONCHECK_FORCE }}">{{ lang('VERSIONCHECK_FORCE_UPDATE') }}</a> &middot; <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
+			<p>{L_VERSIONCHECK_FAIL}</p>
+			<p>{VERSIONCHECK_FAIL_REASON}</p>
+			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
 		</div>
-	{% elseif not S_VERSION_UP_TO_DATE %}
+	<!-- ELSEIF not S_VERSION_UP_TO_DATE -->
 		<div class="errorbox">
-			<p>{{ lang('VERSION_NOT_UP_TO_DATE_TITLE') }}</p>
-			<p><a href="{{ U_VERSIONCHECK_FORCE }}">{{ lang('VERSIONCHECK_FORCE_UPDATE') }}</a> &middot; <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
+			<p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p>
+			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
 		</div>
-	{% elseif S_VERSION_UP_TO_DATE && S_VERSIONCHECK_FORCE %}
-		<div class="successbox">
-			<p>{{ lang('VERSION_UP_TO_DATE_ACP') }}</p>
-		</div>
-	{% endif %}
-	{% if S_VERSION_UPGRADEABLE %}
+	<!-- ENDIF -->
+	<!-- IF S_VERSION_UPGRADEABLE -->
 		<div class="errorbox notice">
-			<p>{{ UPGRADE_INSTRUCTIONS }}</p>
+			<p>{UPGRADE_INSTRUCTIONS}</p>
 		</div>
-	{% endif %}
+	<!-- ENDIF -->
 
 	<!-- IF S_SEARCH_INDEX_MISSING -->
 		<div class="errorbox">
@@ -82,13 +78,6 @@
 				<p>{L_ERROR_MBSTRING_HTTP_OUTPUT_EXPLAIN}</p>
 			</div>
 		<!-- ENDIF -->
-
-		{% if S_DEFAULT_CHARSET_FAIL %}
-			<div class="errorbox">
-				<h3>{{ lang('ERROR_DEFAULT_CHARSET') }}</h3>
-				<p>{{ lang('ERROR_DEFAULT_CHARSET_EXPLAIN') }}</p>
-			</div>
-		{% endif %}
 	<!-- ENDIF -->
 
 	<!-- IF S_WRITABLE_CONFIG -->
@@ -105,115 +94,89 @@
 
 	<!-- EVENT acp_main_notice_after -->
 
-		<div class="lside">
-			<table class="table2 zebra-table no-header" data-no-responsive-header="true">
-				<thead>
-					<tr>
-						<th>{{ lang('STATISTIC') }}</th>
-						<th>{{ lang('VALUE') }}</th>
-					</tr>
-				</thead>
-
-				<tbody>
-					<tr>
-						<td class="tabled">{{ lang('BOARD_STARTED') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ START_DATE }}</strong></td>
-					</tr>
-					<tr>
-						<td class="tabled">{{ lang('AVATAR_DIR_SIZE') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ AVATAR_DIR_SIZE }}</strong></td>
-					</tr>
-					<tr>
-						<td class="tabled">{{ lang('DATABASE_SIZE') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ DBSIZE }}</strong></td>
-					</tr>
-					<tr>
-						<td class="tabled">{{ lang('UPLOAD_DIR_SIZE') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ UPLOAD_DIR_SIZE }}</strong></td>
-					</tr>
-					<tr>
-						<td class="tabled">{{ lang('DATABASE_SERVER_INFO') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ DATABASE_INFO }}</strong></td>
-					</tr>
-					<tr>
-						<td class="tabled">{{ lang('GZIP_COMPRESSION') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ GZIP_COMPRESSION }}</strong></td>
-					</tr>
-					<tr>
-						<td class="tabled">{{ lang('PHP_VERSION') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ PHP_VERSION_INFO }}</strong></td>
-					</tr>
-					<tr>
-						<td class="tabled">{{ lang('NUMBER_ORPHAN') ~ lang('COLON') }}</td>
-						<td class="tabled">
-						{% if TOTAL_ORPHAN > 0 %}
-							<a href="{{ U_ATTACH_ORPHAN }}" title="{{ lang('MORE_INFORMATION') }}"><strong>{{ TOTAL_ORPHAN }}</strong></a>
-						{% else %}
-							<strong>{{ TOTAL_ORPHAN }}</strong>
-						{% endif %}
-						</td>
-					</tr>
-					{% if S_VERSIONCHECK %}
-					<tr>
-						<td class="tabled">{{ lang('BOARD_VERSION') ~ lang('COLON') }}</td>
-						<td class="tabled">
-							<strong><a href="{{ U_VERSIONCHECK }}" {% if S_VERSION_UP_TO_DATE %}style="color: #228822;" {% elseif not S_VERSIONCHECK_FAIL %}style="color: #BC2A4D;" {% endif %}title="{{ lang('MORE_INFORMATION') }}">{{ BOARD_VERSION }}</a></strong> [&nbsp;<a href="{{ U_VERSIONCHECK_FORCE }}">{{ lang('VERSIONCHECK_FORCE_UPDATE') }}</a>&nbsp;]
-						</td>
-					</tr>
-					{% endif %}
-				</tbody>
-			</table>
-
-			<table class="table2 zebra-table no-header" data-no-responsive-header="true">
-				<thead>
-					<tr>
-						<th>{{ lang('STATISTIC') }}</th>
-						<th>{{ lang('VALUE') }}</th>
-					</tr>
-				</thead>
-
-				<tbody>
-					<tr>
-						<td class="tabled">{{ lang('NUMBER_POSTS') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ TOTAL_POSTS }}</strong></td>
-					</tr>
-					<tr>
-						<td class="tabled">{{ lang('POSTS_PER_DAY') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ POSTS_PER_DAY }}</strong></td>
-					</tr>
-					<tr>
-						<td class="tabled">{{ lang('NUMBER_TOPICS') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ TOTAL_TOPICS }}</strong></td>
-					</tr>
-					<tr>
-						<td class="tabled">{{ lang('TOPICS_PER_DAY') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ TOPICS_PER_DAY }}</strong></td>
-					</tr>
-					<tr>
-						<td class="tabled">{{ lang('NUMBER_USERS') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ TOTAL_USERS }}</strong></td>
-					</tr>
-					<tr>
-						<td class="tabled">{{ lang('USERS_PER_DAY') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ USERS_PER_DAY }}</strong></td>
-					</tr>
-					<tr>
-						<td class="tabled">{{ lang('NUMBER_FILES') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ TOTAL_FILES }}</strong></td>
-					</tr>
-					<tr>
-						<td class="tabled">{{ lang('FILES_PER_DAY') ~ lang('COLON') }}</td>
-						<td class="tabled"><strong>{{ FILES_PER_DAY }}</strong></td>
-					</tr>
-					{% if S_VERSIONCHECK %}
-					<tr>
-						<td class="tabled">&nbsp;</td>
-						<td class="tabled">&nbsp;</td>
-					</tr>
-					{% endif %}
-				</tbody>
-			</table>
-		</div>
+	<table class="table1 two-columns no-header" data-no-responsive-header="true">
+		<caption>{L_FORUM_STATS}</caption>
+		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
+	<thead>
+	<tr>
+		<th>{L_STATISTIC}</th>
+		<th>{L_VALUE}</th>
+		<th>{L_STATISTIC}</th>
+		<th>{L_VALUE}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<tr>
+		<td>{L_NUMBER_POSTS}{L_COLON} </td>
+		<td><strong>{TOTAL_POSTS}</strong></td>
+		<td>{L_POSTS_PER_DAY}{L_COLON} </td>
+		<td><strong>{POSTS_PER_DAY}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_TOPICS}{L_COLON} </td>
+		<td><strong>{TOTAL_TOPICS}</strong></td>
+		<td>{L_TOPICS_PER_DAY}{L_COLON} </td>
+		<td><strong>{TOPICS_PER_DAY}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_USERS}{L_COLON} </td>
+		<td><strong>{TOTAL_USERS}</strong></td>
+		<td>{L_USERS_PER_DAY}{L_COLON} </td>
+		<td><strong>{USERS_PER_DAY}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_NUMBER_FILES}{L_COLON} </td>
+		<td><strong>{TOTAL_FILES}</strong></td>
+		<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>
+		<td>{L_AVATAR_DIR_SIZE}{L_COLON} </td>
+		<td><strong>{AVATAR_DIR_SIZE}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_DATABASE_SIZE}{L_COLON} </td>
+		<td><strong>{DBSIZE}</strong></td>
+		<td>{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
+		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
+	</tr>
+	<tr>
+		<td>{L_DATABASE_SERVER_INFO}{L_COLON} </td>
+		<td><strong>{DATABASE_INFO}</strong></td>
+		<td>{L_GZIP_COMPRESSION}{L_COLON} </td>
+		<td><strong>{GZIP_COMPRESSION}</strong></td>
+	</tr>
+	<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>
+		<!-- IF TOTAL_ORPHAN > 0 -->
+			<a href="{U_ATTACH_ORPHAN}" title="{L_MORE_INFORMATION}"><strong>{TOTAL_ORPHAN}</strong></a>
+		<!-- ELSE -->
+			<strong>{TOTAL_ORPHAN}</strong>
+		<!-- ENDIF -->
+		</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>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	</tr>
+	<!-- ENDIF -->
+	</tbody>
+	</table>
 
 	<!-- IF S_ACTION_OPTIONS -->
 		<fieldset>

phpBB/adm/style/acp_modules.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT_MODULE -->
 
-	<script>
+	<script type="text/javascript">
 	// <![CDATA[
 		function display_options(value)
 		{

phpBB/adm/style/acp_permission_roles.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT -->
 
-	<script>
+	<script type="text/javascript">
 	// <![CDATA[
 		var active_pmask = '0';
 		var active_fmask = '0';
@@ -20,7 +20,7 @@
 	// ]]>
 	</script>
 
-	<script src="style/permissions.js"></script>
+	<script type="text/javascript" src="style/permissions.js"></script>
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 

phpBB/adm/style/acp_permissions.html

@@ -340,12 +340,9 @@
 	<br class="responsive-hide" /><br class="responsive-hide" />
 
 	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" />&nbsp;
-			<input class="button2" type="button"  id="reset" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" />
-			{S_FORM_TOKEN}
-		</p>
+		<input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" />
+		<input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" />
+		{S_FORM_TOKEN}
 	</fieldset>
 
 	<br class="responsive-hide" /><br class="responsive-hide" />

phpBB/adm/style/acp_posting_buttons.html

@@ -1,10 +1,31 @@
-<script>
+<script type="text/javascript">
 // <![CDATA[
 
 	// Define the bbCode tags
 	var bbcode = new Array();
 	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
 
+	// Helpline messages
+	var help_line = {
+		b: '{LA_BBCODE_B_HELP}',
+		i: '{LA_BBCODE_I_HELP}',
+		u: '{LA_BBCODE_U_HELP}',
+		q: '{LA_BBCODE_Q_HELP}',
+		c: '{LA_BBCODE_C_HELP}',
+		l: '{LA_BBCODE_L_HELP}',
+		o: '{LA_BBCODE_O_HELP}',
+		p: '{LA_BBCODE_P_HELP}',
+		w: '{LA_BBCODE_W_HELP}',
+		a: '{LA_BBCODE_A_HELP}',
+		s: '{LA_BBCODE_S_HELP}',
+		f: '{LA_BBCODE_F_HELP}',
+		y: '{LA_BBCODE_Y_HELP}',
+		d: '{LA_BBCODE_D_HELP}'
+		<!-- BEGIN custom_tags -->
+			,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'
+		<!-- END custom_tags -->
+	}
+
 // ]]>
 </script>
 
@@ -44,7 +65,7 @@
 	</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 }}" />
+	<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
 	<!-- END custom_tags -->
 </div>
 <!-- EVENT acp_posting_buttons_after -->

phpBB/adm/style/acp_profile.html

@@ -21,11 +21,8 @@
 
 	<!-- IF S_STEP_ONE -->
 
-		{% EVENT acp_profile_options_before %}
-
 		<fieldset>
 			<legend>{L_TITLE}</legend>
-		{% EVENT acp_profile_basic_options_before %}
 		<dl>
 			<dt><label>{L_FIELD_TYPE}{L_COLON}</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
 			<dd><strong>{FIELD_TYPE}</strong></dd>
@@ -46,11 +43,8 @@
 			<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
-		{% EVENT acp_profile_basic_options_after %}
 		</fieldset>
 
-		{% EVENT acp_profile_visibility_options_before %}
-
 		<fieldset>
 			<legend>{L_VISIBILITY_OPTION}</legend>
 		<dl>
@@ -93,11 +87,8 @@
 			<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>
-		{% EVENT acp_profile_contact_after %}
 		</fieldset>
 
-		{% EVENT acp_profile_visibility_options_after %}
-
 		<!-- IF S_EDIT_MODE -->
 			<fieldset class="quick">
 				<input class="button1" type="submit" name="save" value="{L_SAVE}" />
@@ -247,7 +238,7 @@
 	<form id="profile_fields" method="post" action="{U_ACTION}">
 
 	<fieldset class="quick">
-		<select name="field_type">{S_TYPE_OPTIONS}</select>
+		<input class="text small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select>
 		<input class="button1" type="submit" name="submit" value="{L_CREATE_NEW_FIELD}" />
 		<input type="hidden" name="create" value="1" />
 		{S_FORM_TOKEN}

phpBB/adm/style/acp_prune_users.html

@@ -7,7 +7,7 @@
 <p>{L_ACP_PRUNE_USERS_EXPLAIN}</p>
 
 <form id="acp_prune" method="post" action="{U_ACTION}">
-
+	
 <fieldset>
 	<legend>{L_CRITERIA}</legend>
 <dl>
@@ -66,19 +66,15 @@
 	<dd><label><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}</label>
 		<label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</label></dd>
 </dl>
+
+<p class="submit-buttons">
+	<input type="hidden" name="prune" value="1" />
+
+	<input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" />&nbsp;
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	{S_FORM_TOKEN}
+</p>
 </fieldset>
-
-<fieldset>
-	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-	<p class="submit-buttons">
-		<input type="hidden" name="prune" value="1" />
-
-		<input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</p>
-</fieldset>
-
 </form>
 
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_ranks.html

@@ -6,7 +6,7 @@
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
-	<script>
+	<script type="text/javascript">
 	// <![CDATA[
 		function update_image(newimage)
 		{
@@ -85,7 +85,7 @@
 	<!-- BEGIN ranks -->
 	<tr>
 		<!-- EVENT acp_ranks_list_column_before -->
-		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" style="max-width: 160px;"><!-- ELSE -->&nbsp; - &nbsp;<!-- ENDIF --></td>
+		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE -->&nbsp; - &nbsp;<!-- ENDIF --></td>
 		<td style="text-align: center;">{ranks.RANK_TITLE}</td>
 		<td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK -->&nbsp; - &nbsp;<!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td>
 		<!-- EVENT acp_ranks_list_column_after -->

phpBB/adm/style/acp_search.html

@@ -36,13 +36,6 @@
 		<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>
 	</dl>
-	<dl>
-		<dt>
-			<label for="default_search_return_chars">{{ lang('DEFAULT_SEARCH_RETURN_CHARS') ~ lang('COLON') }}</label>
-			<br><span>{{ lang('DEFAULT_SEARCH_RETURN_CHARS_EXPLAIN') }}</span>
-		</dt>
-		<dd><input id="default_search_return_chars" name="config[default_search_return_chars]" type="number" value="{{ DEFAULT_SEARCH_RETURN_CHARS }}" min="0" max="9999"></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>
@@ -66,47 +59,40 @@
 
 	<!-- END backend -->
 
-	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		</p>
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
 
 <!-- ELSEIF S_INDEX -->
 
+	<script type="text/javascript">
+	// <![CDATA[
+		/**
+		* Popup search progress bar
+		*/
+		function popup_progress_bar(progress_type)
+		{
+			close_waitscreen = 0;
+			// no scrollbars
+			popup('{UA_PROGRESS_BAR}&amp;type=' + progress_type, 400, 240, '_index');
+		}
+	// ]]>
+	</script>
+
 	<h1>{L_ACP_SEARCH_INDEX}</h1>
 
 	<!-- IF S_CONTINUE_INDEXING -->
-		<p>
-			{% if S_CONTINUE_INDEXING == 'create' %}
-				{{ lang('CONTINUE_INDEXING_EXPLAIN') }}
-			{% else %}
-				{{ lang('CONTINUE_DELETING_INDEX_EXPLAIN') }}
-			{% endif %}
-		</p>
+		<p>{L_CONTINUE_EXPLAIN}</p>
 
 		<form id="acp_search_continue" method="post" action="{U_CONTINUE_INDEXING}">
-			<fieldset>
-				<legend>{{ lang('CONTINUE_INDEXING') }}</legend>
-				{% if CONTINUE_PROGRESS %}
-					<div class="centered-text">
-						<br>
-						<progress
-							value="{{ CONTINUE_PROGRESS.VALUE }}"
-							max="{{ CONTINUE_PROGRESS.TOTAL }}"
-							style="height: 2em; width: 20em;"></progress><br>
-						{{ CONTINUE_PROGRESS.PERCENTAGE|number_format(2) ~ ' %' }}<br>
-						{{ lang('SEARCH_INDEX_PROGRESS', CONTINUE_PROGRESS.VALUE, CONTINUE_PROGRESS.REMAINING, CONTINUE_PROGRESS.TOTAL) }}
-					</div>
-				{% endif %}
-				<p class="submit-buttons">
-					<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-					<input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" />
-				</p>
+			<fieldset class="submit-buttons">
+				<legend>{L_SUBMIT}</legend>
+				<input class="button1" type="submit" id="continue" name="continue" value="{L_CONTINUE}" onclick="popup_progress_bar('{S_CONTINUE_INDEXING}');" />&nbsp;
+				<input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" />
 				{S_FORM_TOKEN}
 			</fieldset>
 		</form>
@@ -154,10 +140,10 @@
 			<p class="quick">
 			<!-- IF backend.S_INDEXED -->
 				<input type="hidden" name="action" value="delete" />
-				<input class="button2" type="submit" name="submit" value="{{ lang('DELETE_INDEX') }}" />
+				<input class="button2" type="submit" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />
 			<!-- ELSE -->
 				<input type="hidden" name="action" value="create" />
-				<input class="button2" type="submit" name="submit" value="{{ lang('CREATE_INDEX') }}" />
+				<input class="button2" type="submit" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />
 			<!-- ENDIF -->
 			</p>
 			{S_FORM_TOKEN}
@@ -168,24 +154,6 @@
 
 	<!-- ENDIF -->
 
-<!-- ELSEIF S_INDEX_PROGRESS -->
-	<div class="successbox">
-		<h3>{{ INDEXING_TITLE }}</h3>
-		<p>
-			{{ INDEXING_EXPLAIN }}
-			{% if INDEXING_PROGRESS %}<br>{{ INDEXING_PROGRESS }}{% endif %}
-			{% if INDEXING_RATE %}<br>{{ INDEXING_RATE }}{% endif %}
-			{% if INDEXING_PROGRESS_BAR %}
-				<br>
-				<progress
-					value="{{ INDEXING_PROGRESS_BAR.VALUE }}"
-					max="{{ INDEXING_PROGRESS_BAR.TOTAL }}"
-					style="height: 2em; width: 20em;"></progress><br>
-				{{ INDEXING_PROGRESS_BAR.PERCENTAGE|number_format(2) ~ ' %' }}<br>
-				{{ lang('SEARCH_INDEX_PROGRESS', INDEXING_PROGRESS_BAR.VALUE, INDEXING_PROGRESS_BAR.REMAINING, INDEXING_PROGRESS_BAR.TOTAL) }}
-			{% endif %}
-		</p>
-	</div>
 <!-- ENDIF -->
 
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_storage.html

@@ -0,0 +1,76 @@
+{% include 'overall_header.html' %}
+
+<a id="maincontent"></a>
+
+<h1>{{ lang('STORAGE_TITLE') }}</h1>
+
+<p>{{ lang('STORAGE_TITLE_EXPLAIN') }}</p>
+
+<form id="acp_storage" method="post" action="{{ U_ACTION }}">
+
+	{% for storage in STORAGES %}
+		<fieldset>
+			<legend>{{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }}</legend>
+			<dl>
+				<dt><label for="{{ storage.get_name }}">{{ lang('STORAGE_SELECT') }}{{ lang('COLON') }}</label><br /><span>{{ lang('STORAGE_SELECT_DESC') }}</span></dt>
+				<dd>
+					<select id="{{ storage.get_name }}" name="{{ storage.get_name }}[provider]" data-togglable-settings="true">
+						{% for provider in PROVIDERS if provider.is_available %}
+							<option value="{{ get_class(provider) }}"{{ attribute(config, 'storage\\' ~ storage.get_name ~ '\\provider') ==  get_class(provider) ? ' selected' : '' }} data-toggle-setting="#{{ storage.get_name }}_{{ provider.get_name }}_settings">
+								{{ lang('STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_NAME') }}
+							</option>
+						{% endfor %}
+					</select>
+				</dd>
+			</dl>
+		</fieldset>
+
+		{% for provider in PROVIDERS if provider.is_available %}
+			<fieldset id="{{ storage.get_name }}_{{ provider.get_name }}_settings">
+				<legend>{{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} - {{ lang('STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_NAME') }}</legend>
+				{% for name, options in provider.get_options %}
+					{% set title = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper %}
+					{% set description = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper ~ '_EXPLAIN' %}
+					{% set input_id = storage.get_name ~ '_' ~ provider.get_name ~ '_' ~ name %}
+					{% set input_type = options['type'] %}
+					{% set input_name = storage.get_name ~ '[' ~ name ~ ']' %}
+					{% set input_value = attribute(config, 'storage\\' ~ storage.get_name ~ '\\config\\' ~ name) %}
+					<dl>
+						<dt>
+							<label for="{{ input_id }}}">{{ lang(title) }}{{ lang('COLON') }}</label>
+							{% if lang_defined(description) %}
+								<br /><span>{{ lang(description) }}</span>
+							{% endif %}
+						</dt>
+						<dd>
+							{% if input_type in ['text', 'password', 'email'] %}
+								<input id="{{ input_id }}" type="{{ input_type }}" name="{{ input_name }}" value="{{ input_value }}" maxlength="{{ options['maxlength'] ?: 255 }}" />
+							{% elseif input_type == 'textarea' %}
+								<textarea id="{{ input_id }}" name="{{ input_name }}">{{ input_value }}</textarea>
+							{% elseif input_type == 'radio' %}
+								{% for option_name, option_value in options['options'] %}
+									<input type="radio" name="{{ input_name }}" value="{{ option_value }}" class="radio"{% if loop.first %} id="{{ input_id }}"{% endif %}{{ (option_value == input_value) ? ' checked="checked"' }}> {{ lang(option_name) }}
+								{% endfor %}
+							{% elseif input_type == 'select' %}
+								<select name="{{ input_name }}" id="{{ input_id }}">
+									{% for option_name, option_value in options['options'] %}
+										<option value="{{ option_value }}"{{ (option_value == input_value) ? ' selected' }}>{{ lang(option_name) }}</option>
+									{% endfor %}
+								</select>
+							{% endif %}
+						</dd>
+					</dl>
+				{% endfor %}
+			</fieldset>
+		{% endfor %}
+	{% endfor %}
+
+	<fieldset class="submit-buttons">
+		<legend>{{ lang('SUBMIT') }}</legend>
+		<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
+		{{ S_FORM_TOKEN }}
+	</fieldset>
+</form>
+
+{% include 'overall_footer.html' %}

phpBB/adm/style/acp_styles.html

@@ -33,7 +33,7 @@
 <!-- IF L_EXPLAIN --><p>{L_EXPLAIN}</p><!-- ENDIF -->
 
 <fieldset class="quick">
-	<span class="small"><a href="https://www.phpbb.com/go/customise/styles/3.3" target="_blank">{L_BROWSE_STYLES_DATABASE}</a></span>
+	<span class="small"><a href="https://www.phpbb.com/go/customise/styles/3.2" target="_blank">{L_BROWSE_STYLES_DATABASE}</a></span>
 </fieldset>
 
 <form id="acp_styles" method="post" action="{U_ACTION}">
@@ -96,10 +96,9 @@
 	<thead>
 	<tr>
 		<th>{L_STYLE_NAME}</th>
-		<th style="width: 10%; white-space: nowrap; text-align: center;">{{ lang('STYLE_VERSION') }}</th>
-		<th style="width: 10%; white-space: nowrap; text-align: center;">{L_STYLE_PHPBB_VERSION}</th>
-		<!-- IF not STYLES_LIST_HIDE_COUNT --><th style="width: 10%; white-space: nowrap; text-align: center;">{L_STYLE_USED_BY}</th><!-- ENDIF -->
-		<th style="width: 25%; white-space: nowrap; text-align: center;">{L_ACTIONS}</th>
+		<th width="10%" style="white-space: nowrap; text-align: center;">{L_STYLE_PHPBB_VERSION}</th>
+		<!-- IF not STYLES_LIST_HIDE_COUNT --><th width="10%" style="white-space: nowrap; text-align: center;">{L_STYLE_USED_BY}</th><!-- ENDIF -->
+		<th width="25%" style="white-space: nowrap; text-align: center;">{L_ACTIONS}</th>
 		{STYLES_LIST_EXTRA}
 		<th>&nbsp;</th>
 	</tr>
@@ -131,7 +130,6 @@
 				<span class="style-path"><br />{L_STYLE_PATH}{L_COLON} {styles_list.STYLE_PATH_FULL}</span>
 			<!-- ENDIF -->
 		</td>
-		<td class="{$ROW_CLASS} users">{{ styles_list.STYLE_VERSION }}</td>
 		<td class="{$ROW_CLASS} users">{styles_list.STYLE_PHPBB_VERSION}</td>
 		<!-- IF not STYLES_LIST_HIDE_COUNT -->
 			<td class="{$ROW_CLASS} users">{styles_list.USERS}</td>
@@ -146,11 +144,9 @@
 			<!-- END actions -->
 		</td>
 		{styles_list.EXTRA}
-		<td class="{$ROW_CLASS} mark" style="width: 20px;">
+		<td class="{$ROW_CLASS} mark" width="20">
 			<!-- IF styles_list.STYLE_ID -->
-				{% if styles_list.STYLE_NAME !== 'prosilver' %}
-					<input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}" />
-				{% endif %}
+				<input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}" />
 			<!-- ELSE -->
 				<!-- IF styles_list.COMMENT != '' -->
 					&nbsp;

phpBB/adm/style/acp_users.html

@@ -137,13 +137,9 @@
 				<td><a href="{group.U_EDIT_GROUP}">{group.GROUP_NAME}</a></td>
 				<td><!-- IF group.S_IS_MEMBER --><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --><!-- ELSEIF not group.S_IS_MEMBER and group.U_APPROVE --><a href="{group.U_APPROVE}">{L_GROUP_APPROVE}</a><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
 				<td><!-- IF group.S_IS_MEMBER and not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
-				<td>{% if group.U_DELETE %}<a href="{{ group.U_DELETE }}">{{ lang('GROUP_DELETE') }}</a>{% endif %}</td>
+				<td><a href="{group.U_DELETE}">{L_GROUP_DELETE}</a></td>
 			</tr>
 		<!-- ENDIF -->
-	<!-- BEGINELSE -->
-		<tr>
-			<td class="row3 centered-text" colspan="4">{{ lang('NO_GROUP') }}</td>
-		</tr>
 	<!-- END group -->
 	</tbody>
 	</table>

phpBB/adm/style/acp_users_overview.html

@@ -79,7 +79,7 @@
 
 <!-- IF not S_USER_FOUNDER or S_FOUNDER -->
 
-	<script>
+	<script type="text/javascript">
 	// <![CDATA[
 
 		function display_reason(option)

phpBB/adm/style/acp_users_prefs.html

@@ -1,4 +1,4 @@
-<script>
+<script type="text/javascript">
 // <![CDATA[
 	var default_dateformat = '{A_DEFAULT_DATEFORMAT}';
 // ]]>
@@ -33,7 +33,7 @@
 		<dt><label for="notifymethod">{L_NOTIFY_METHOD}{L_COLON}</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>
 		<dd><label><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>
 			<label><input type="radio" class="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>
-			<label><input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label></dd>
+			<label><input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label></dd>
 	</dl>
 	<dl> 
 		<dt><label for="notifypm">{L_NOTIFY_ON_PM}{L_COLON}</label></dt>

phpBB/adm/style/acp_users_signature.html

@@ -1,4 +1,4 @@
-<script>
+<script type="text/javascript">
 // <![CDATA[
 
 	var form_name = 'user_signature';
@@ -26,7 +26,7 @@
 		<!-- INCLUDE acp_posting_buttons.html -->
 
 		<dl class="responsive-columns">
-			<dt style="width: 90px;" id="color_palette_placeholder" data-color-palette="v" data-height="12" data-width="15" data-bbcode="true">
+			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
 			</dt>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">

phpBB/adm/style/acp_users_warnings.html

@@ -14,7 +14,7 @@
 	<!-- BEGIN warn -->
 		<tr>
 			<td>{warn.USERNAME}</td>
-			<td style="text-align: center; white-space: nowrap;">{warn.DATE}</td>
+			<td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td>
 			<td>{warn.ACTION}</td>
 			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}" /></td>
 		</tr>

phpBB/adm/style/admin.js

@@ -169,7 +169,7 @@ function parse_document(container)
 			ul = $this.children(),
 			tabs = ul.children().not('[data-skip-responsive]'),
 			links = tabs.children('a'),
-			item = ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner"></div></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
+			item = ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
 			menu = item.find('.dropdown-contents'),
 			maxHeight = 0,
 			lastWidth = false,
@@ -254,10 +254,5 @@ function parse_document(container)
 		});
 
 		$('#configlist').closest('.send-stats-data-row').addClass('send-stats-data-hidden');
-
-		// Do not underline actions icons on hover (could not be done via CSS)
-		$('.actions a:has(i.acp-icon)').mouseover(function () {
-			$(this).css("text-decoration", "none");
-		});
 	});
 })(jQuery);

phpBB/adm/style/ajax.js

@@ -1,4 +1,4 @@
-/* global phpbb, statsData */
+/* global phpbb */
 
 (function($) {  // Avoid conflicts with other libraries
 
@@ -74,7 +74,7 @@ phpbb.prepareSendStats = function () {
 			var $sendStatisticsSuccess = $('<input />', {
 				type: 'hidden',
 				name: 'send_statistics_response',
-				value: JSON.stringify(res)
+				value: res
 			});
 			$sendStatisticsSuccess.appendTo('p.submit-buttons');
 
@@ -87,7 +87,7 @@ phpbb.prepareSendStats = function () {
 		$.ajax({
 			url: $this.attr('data-ajax-action').replace('&amp;', '&'),
 			type: 'POST',
-			data: statsData,
+			data: 'systemdata=' + encodeURIComponent($this.find('input[name=systemdata]').val()),
 			success: returnHandler,
 			error: errorHandler,
 			cache: false
@@ -173,9 +173,7 @@ function submitPermissions() {
 	var permissionSubmitSize = 0,
 		permissionRequestCount = 0,
 		forumIds = [],
-		permissionSubmitFailed = false,
-		clearIndicator = true,
-		$loadingIndicator;
+		permissionSubmitFailed = false;
 
 	if ($submitAllButton !== $submitButton) {
 		fieldsetList = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id);
@@ -209,8 +207,6 @@ function submitPermissions() {
 		}
 	});
 
-	$loadingIndicator = phpbb.loadingIndicator();
-
 	/**
 	 * Handler for submitted permissions form chunk
 	 *
@@ -226,8 +222,6 @@ function submitPermissions() {
 		} else if (!permissionSubmitFailed && res.S_USER_NOTICE) {
 			// Display success message at the end of submitting the form
 			if (permissionRequestCount >= permissionSubmitSize) {
-				clearIndicator = true;
-
 				var $alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
 				var $alertBoxLink = $alert.find('p.alert_text > a');
 
@@ -277,17 +271,6 @@ function submitPermissions() {
 						$form.submit();
 					}, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds
 				}
-			} else {
-				// Still more forms to submit, so do not clear indicator
-				clearIndicator = false;
-			}
-		}
-
-		if (clearIndicator) {
-			phpbb.clearLoadingTimeout();
-
-			if ($loadingIndicator) {
-				$loadingIndicator.fadeOut(phpbb.alertTime);
 			}
 		}
 	}