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

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,9 @@
 Checklist:
 
-- [ ] Correct branch: master for new features; 3.2.x, 3.1.x for fixes
+- [ ] Correct branch: master for new features; 3.2.x for fixes
 - [ ] Tests pass
-- [ ] Code follows coding guidelines: [master / 3.2.x](https://area51.phpbb.com/docs/master/coding-guidelines.html), [3.1.x](https://area51.phpbb.com/docs/31x/coding-guidelines.html)
-- [ ] Commit follows commit message [format](https://wiki.phpbb.com/Git#Commit_Messages)
+- [ ] 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 (set the ticket ID to **your ticket ID**):
 

.gitignore

@@ -17,7 +17,12 @@
 /phpBB/styles/*
 !/phpBB/styles/prosilver
 !/phpBB/styles/all
+node_modules
 /phpBB/vendor
+/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/*

.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

@@ -1,38 +1,40 @@
 language: php
+sudo: required
+dist: precise
 
 matrix:
   include:
-    - php: 5.4
-      env: DB=none;NOTESTS=1
-    - php: 5.4
-      env: DB=mysqli # MyISAM
-    - php: 5.4
-      env: DB=mysql
-    - php: 5.4
-      env: DB=mariadb
-    - php: 5.4
-      env: DB=postgres
-    - php: 5.4
-      env: DB=sqlite3
-    - php: 5.4
-      env: DB=mysqli;SLOWTESTS=1
-    - php: 5.5
-      env: DB=mysqli
     - php: 5.6
-      env: DB=mysqli
+      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: nightly
+    - php: 7.2
       env: DB=mysqli
-    - php: hhvm
+    - php: nightly
       env: DB=mysqli
   allow_failures:
-    - php: hhvm
     - php: nightly
   fast_finish: true
 
+addons:
+  apt:
+    sources:
+      - node
+
 services:
   - redis-server
 
@@ -48,7 +50,8 @@ script:
   - 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-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; 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"

README.md

@@ -20,7 +20,7 @@ To be able to run an installation from the repo (and not from a pre-built packag
 
 1. [Create an account on phpBB.com](http://www.phpbb.com/community/ucp.php?mode=register)
 2. [Create a ticket (unless there already is one)](http://tracker.phpbb.com/secure/CreateIssue!default.jspa)
-3. Read our [Coding guidelines](https://wiki.phpbb.com/Coding_guidelines) and [Git Contribution Guidelines](http://wiki.phpbb.com/Git)
+3. Read our [Coding guidelines](https://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
 
 ## VAGRANT
@@ -29,11 +29,11 @@ Read our [Vagrant documentation](phpBB/docs/vagrant.md) to find out how to use V
 
 ## AUTOMATED TESTING
 
-We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](http://bamboo.phpbb.com) or check our travis builds below:
+We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](https://bamboo.phpbb.com) or check our travis builds below:
 
-* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=master)](http://travis-ci.org/phpbb/phpbb) **master** - Latest development version
-* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=3.2.x)](http://travis-ci.org/phpbb/phpbb) **3.2.x** - Development of version 3.2.x
-* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=3.1.x)](http://travis-ci.org/phpbb/phpbb) **3.1.x** - Development of version 3.1.x
+* [![Build Status](https://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
 
 ## LICENSE
 

build/build.xml

@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.2.1" />
-	<property name="prevversion" value="3.2.0" />
-	<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 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.1-RC1" />
+	<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}" />
@@ -95,6 +95,7 @@
 				--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

build/build_helper.php

@@ -39,8 +39,8 @@ class build_package
 		$this->verbose = $verbose;
 
 		// Get last two entries
-		$_latest = $this->versions[sizeof($this->versions) - 1];
-		$_before = $this->versions[sizeof($this->versions) - 2];
+		$_latest = $this->versions[count($this->versions) - 1];
+		$_before = $this->versions[count($this->versions) - 2];
 
 		$this->locations = array(
 			'new_version'	=> dirname(dirname(__FILE__)) . '/phpBB/',

build/package.php

@@ -33,7 +33,7 @@ echo "Now all three package types (patch, files, release) are built as well as t
 
 // Go trough all versions making a diff if we even have old versions
 // For phpBB 3.0.x we might choose a different update method, rendering the things below useless...
-if (sizeof($package->old_packages))
+if (count($package->old_packages))
 {
 	chdir($package->locations['old_versions']);
 
@@ -76,7 +76,7 @@ if (sizeof($package->old_packages))
 			// Create Directories along the way?
 			$file = explode('/', $file);
 			// Remove filename portion
-			$file[sizeof($file)-1] = '';
+			$file[count($file)-1] = '';
 
 			chdir($dest_filename_dir);
 			foreach ($file as $entry)
@@ -169,7 +169,7 @@ if (sizeof($package->old_packages))
 			// Create Directories along the way?
 			$file = explode('/', $file);
 			// Remove filename portion
-			$file[sizeof($file)-1] = '';
+			$file[count($file)-1] = '';
 
 			chdir($dest_filename_dir . '/install/update/old');
 			foreach ($file as $entry)
@@ -214,7 +214,7 @@ if (sizeof($package->old_packages))
 			// Create Directories along the way?
 			$file = explode('/', $file);
 			// Remove filename portion
-			$file[sizeof($file)-1] = '';
+			$file[count($file)-1] = '';
 
 			chdir($dest_filename_dir . '/install/update/new');
 			foreach ($file as $entry)
@@ -321,7 +321,7 @@ $update_info = array(
 	\'version\'	=> array(\'from\' => \'' . str_replace('_to_', '', $package->old_packages[$_package_name]) . '\', \'to\' => \'' . $package->get('new_version_number') . '\'),
 ';
 
-		if (sizeof($file_contents['all']))
+		if (count($file_contents['all']))
 		{
 			$index_contents .= "\t'files'		=> array(\n\t\t'" . implode("',\n\t\t'", $file_contents['all']) . "',\n\t),\n";
 		}
@@ -330,7 +330,7 @@ $update_info = array(
 			$index_contents .= "\t'files'		=> array(),\n";
 		}
 
-		if (sizeof($file_contents['binary']))
+		if (count($file_contents['binary']))
 		{
 			$index_contents .= "\t'binary'		=> array(\n\t\t'" . implode("',\n\t\t'", $file_contents['binary']) . "',\n\t),\n";
 		}
@@ -339,7 +339,7 @@ $update_info = array(
 			$index_contents .= "\t'binary'		=> array(),\n";
 		}
 
-		if (sizeof($file_contents['deleted']))
+		if (count($file_contents['deleted']))
 		{
 			$index_contents .= "\t'deleted'		=> array(\n\t\t'" . implode("',\n\t\t'", $file_contents['deleted']) . "',\n\t),\n";
 		}
@@ -380,7 +380,7 @@ $compress_programs = array(
 	'zip'		=> 'zip -r'
 );
 
-if (sizeof($package->old_packages))
+if (count($package->old_packages))
 {
 	// Build Patch Files
 	chdir($package->get('patch_directory'));

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/adm/style/acp_attachments.html

@@ -329,42 +329,71 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<table class="table1 zebra-table fixed-width-table">
-	<thead>
-	<tr>
-		<th>{L_FILENAME}</th>
-		<th style="width: 15%;">{L_FILEDATE}</th>
-		<th style="width: 15%;">{L_FILESIZE}</th>
-		<th style="width: 15%;">{L_ATTACH_POST_ID}</th>
-		<th style="width: 15%;">{L_ATTACH_TO_POST}</th>
-		<th style="width: 15%;">{L_DELETE}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN orphan -->
+	<div class="pagination top-pagination">
+	<!-- IF .pagination or TOTAL_FILES -->
+		{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} &bull; {L_TOTAL_SIZE}{L_COLON} {TOTAL_SIZE}
+		<!-- IF .pagination -->
+			&bull; <!-- INCLUDE pagination.html -->
+		<!-- ELSE -->
+			&bull; {PAGE_NUMBER}
+		<!-- ENDIF -->
+	<!-- ENDIF -->
+	</div>
+
+	<!-- IF .orphan -->
+		<table class="table1 zebra-table fixed-width-table">
+		<thead>
 		<tr>
-			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
-			<td>{orphan.FILETIME}</td>
-			<td>{orphan.FILESIZE}</td>
-			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" min="0" max="9999999999" name="post_id[{orphan.ATTACH_ID}]" value="{orphan.POST_ID}" style="width: 75%;" /></td>
-			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
-			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
+			<th>{L_FILENAME}</th>
+			<th style="width: 15%;">{L_FILEDATE}</th>
+			<th style="width: 15%;">{L_FILESIZE}</th>
+			<th style="width: 15%;">{L_ATTACH_POST_ID}</th>
+			<th style="width: 15%;">{L_ATTACH_TO_POST}</th>
+			<th style="width: 15%;">{L_DELETE}</th>
 		</tr>
-	<!-- END orphan -->
-	<tr class="row4">
-		<td colspan="4">&nbsp;</td>
-		<td class="small"><a href="#" onclick="marklist('orphan', 'add', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('orphan', 'add', false); return false;">{L_UNMARK_ALL}</a></td>
-		<td class="small"><a href="#" onclick="marklist('orphan', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('orphan', 'delete', false); return false;">{L_UNMARK_ALL}</a></td>
-	</tr>
-	</tbody>
-	</table>
+		</thead>
+		<tbody>
+		<!-- BEGIN orphan -->
+			<tr>
+				<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
+				<td>{orphan.FILETIME}</td>
+				<td>{orphan.FILESIZE}</td>
+				<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" min="0" max="9999999999" name="post_id[{orphan.ATTACH_ID}]" value="{orphan.POST_ID}" style="width: 75%;" /></td>
+				<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
+				<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
+			</tr>
+		<!-- END orphan -->
+		<tr class="row4">
+			<td colspan="4">&nbsp;</td>
+			<td class="small"><a href="#" onclick="marklist('orphan', 'add', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('orphan', 'add', false); return false;">{L_UNMARK_ALL}</a></td>
+			<td class="small"><a href="#" onclick="marklist('orphan', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('orphan', 'delete', false); return false;">{L_UNMARK_ALL}</a></td>
+		</tr>
+		</tbody>
+		</table>
+	<!-- ELSE -->
+		<div class="errorbox">
+			<p>{L_NO_ATTACHMENTS}</p>
+		</div>
+	<!-- ENDIF -->
 
-	<br />
+	<!-- IF TOTAL_FILES -->
+	<div class="pagination">
+		{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} &bull; {L_TOTAL_SIZE}{L_COLON} {TOTAL_SIZE}
+		<!-- IF .pagination -->
+			&bull; <!-- INCLUDE pagination.html -->
+		<!-- ELSE -->
+			&bull; {PAGE_NUMBER}
+		<!-- ENDIF -->
+	</div>
+	<!-- ENDIF -->
+
+	<!-- IF .orphan -->
+		<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 -->
 
-	<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>
@@ -440,7 +469,7 @@
 		<input class="button2" type="submit" name="submit" value="{L_DELETE_MARKED}" /><br />
 		<p class="small">
 			<a href="#" onclick="marklist('attachments', 'delete', true); return false;">{L_MARK_ALL}</a> &bull;
-			<a href="#" onclick="marklist('attachments', 'delete', false); return false;">{L_UNMARK_ALL}</a>		
+			<a href="#" onclick="marklist('attachments', 'delete', false); return false;">{L_UNMARK_ALL}</a>
 		</p>
 	</fieldset>
 <!-- ENDIF -->

phpBB/adm/style/acp_board.html

@@ -18,10 +18,11 @@
 <!-- BEGIN options -->
 	<!-- IF options.S_LEGEND -->
 		<!-- IF not options.S_FIRST_ROW -->
-			</fieldset>
+		</fieldset>
 		<!-- ENDIF -->
+
 		<fieldset>
-			<legend>{options.LEGEND}</legend>
+		<legend>{options.LEGEND}</legend>
 	<!-- ELSE -->
 
 		<dl>

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_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.1" 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">
@@ -51,7 +51,8 @@
 			<td><strong title="{enabled.NAME}">{enabled.META_DISPLAY_NAME}</strong><!-- EVENT acp_ext_list_enabled_name_after --></td>
 			<td style="text-align: center;">
 				<!-- IF enabled.S_VERSIONCHECK -->
-				<strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.META_VERSION}</strong>
+				<strong class="<!-- IF enabled.S_UP_TO_DATE -->current-ext<!-- ELSE -->outdated-ext<!-- ENDIF -->">{enabled.META_VERSION}</strong>
+				<!-- IF not enabled.S_UP_TO_DATE --><i class="fa fa-exclamation-circle outdated-ext" aria-hidden="true"></i><!-- ENDIF -->
 				<!-- ELSE -->
 				{enabled.META_VERSION}
 				<!-- ENDIF -->
@@ -59,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>
@@ -76,7 +77,8 @@
 			<td><strong title="{disabled.NAME}">{disabled.META_DISPLAY_NAME}</strong><!-- EVENT acp_ext_list_disabled_name_after --></td>
 			<td style="text-align: center;">
 				<!-- IF disabled.S_VERSIONCHECK -->
-				<strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.META_VERSION}</strong>
+				<strong class="<!-- IF disabled.S_UP_TO_DATE -->current-ext<!-- ELSE -->outdated-ext<!-- ENDIF -->">{disabled.META_VERSION}</strong>
+				<!-- IF not disabled.S_UP_TO_DATE --><i class="fa fa-exclamation-circle outdated-ext" aria-hidden="true"></i><!-- ENDIF -->
 				<!-- ELSE -->
 				{disabled.META_VERSION}
 				<!-- ENDIF -->
@@ -86,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_groups.html

@@ -316,7 +316,7 @@
 	<tbody>
 		<!-- ELSE -->
 		<tr>
-			<td><strong>{groups.GROUP_NAME}</strong></td>
+			<td><strong<!-- IF groups.GROUP_COLOR --> style="color: #{groups.GROUP_COLOR}"<!-- ENDIF -->>{groups.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
 			<td style="text-align: center;">{groups.PENDING_MEMBERS}</td>
 			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>

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.1" 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

@@ -153,8 +153,14 @@
 		<td><strong>{PHP_VERSION_INFO}</strong></td>
 	<!-- IF S_TOTAL_ORPHAN -->
 		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
-		<td><strong>{TOTAL_ORPHAN}</strong></td>
-	<!-- ELSE -->
+		<td>
+		<!-- 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 -->

phpBB/adm/style/acp_prune_forums.html

@@ -94,7 +94,9 @@
 		<dd><label><input type="radio" class="radio" name="prune_sticky" value="1" /> {L_YES}</label>
 			<label><input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
-	
+
+	<!-- EVENT acp_prune_forums_settings_append -->
+
 	<p class="quick">
 		{S_HIDDEN_FIELDS}
 		{S_FORM_TOKEN}

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.1" 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,6 +96,7 @@
 	<thead>
 	<tr>
 		<th>{L_STYLE_NAME}</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}
@@ -129,6 +130,7 @@
 				<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_PHPBB_VERSION}</td>
 		<!-- IF not STYLES_LIST_HIDE_COUNT -->
 			<td class="{$ROW_CLASS} users">{styles_list.USERS}</td>
 		<!-- ENDIF -->

phpBB/adm/style/acp_users.html

@@ -231,6 +231,10 @@
 
 	<!-- INCLUDE permission_mask.html -->
 
+<!-- ELSE -->
+
+	<!-- EVENT acp_users_mode_add -->
+
 <!-- ENDIF -->
 
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/detailed_message_body.html

@@ -0,0 +1,14 @@
+<!-- INCLUDE overall_header.html -->
+
+<div {% if S_USER_NOTICE %}class="successbox"{% else %}class="errorbox"{% endif %}>
+	<h3>{{ MESSAGE_TITLE }}</h3>
+	<p>{{ MESSAGE_TEXT }}</p>
+</div>
+
+<div>
+	<fieldset class="console-output">
+		<pre>{{ MESSAGE_DETAIL }}</pre>
+	</fieldset>
+</div>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/installer_form.html

@@ -1,3 +1,4 @@
+<!-- IF FORM_TITLE --><h1>{FORM_TITLE}</h1><!-- ENDIF -->
 <form id="<!-- IF FORM_ID -->{FORM_ID}<!-- ELSE -->install_install<!-- ENDIF -->" method="POST" action="{U_ACTION}">
 <!-- IF .options -->
 <!-- IF S_NOT_ONLY_BUTTON_FORM -->
@@ -8,9 +9,9 @@
 		<!-- IF options.S_LEGEND -->
 			<!-- IF not options.S_FIRST_ROW -->
 			</fieldset>
-
-			<fieldset>
 			<!-- ENDIF -->
+			<fieldset>
+
 		<legend>{options.LEGEND}</legend>
 		<!-- ELSE -->
 		<dl>
@@ -49,7 +50,7 @@
 <fieldset class="submit-buttons">
 	<legend>{L_SUBMIT}</legend>
 	<!-- BEGIN submit_buttons -->
-	<input class="button1" type="submit" name="{submit_buttons.KEY}" value="{submit_buttons.TITLE}" />
+	<input class="<!-- IF not submit_buttons.IS_SECONDARY -->button1<!-- ELSE -->button2<!-- ENDIF --><!-- IF submit_buttons.DISABLED --> disabled<!-- ENDIF -->" type="submit" name="{submit_buttons.KEY}" value="{submit_buttons.TITLE}"<!-- IF submit_buttons.DISABLED --> disabled="disabled"<!-- ENDIF --> />
 	<!-- END submit_buttons -->
 </fieldset>
 <!-- ENDIF -->

phpBB/adm/style/overall_footer.html

@@ -20,7 +20,14 @@
 		<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
 			<div id="darken">&nbsp;</div>
 		</div>
-		<div id="loading_indicator"></div>
+		<div id="loading_indicator" class="loading_indicator">
+			<div class="loader">
+				<svg class="spinner" width="48px" height="48px" viewBox="0 0 66 66" xmlns="http://www.w3.org/2000/svg" aria-labelledby="loader-title" role="img">
+					<title id="loader-title">{L_LOADING}</title>
+					<circle class="spinner-path" fill="none" stroke-width="6" stroke-linecap="round" cx="33" cy="33" r="30"></circle>
+				</svg>
+			</div>
+		</div>
 
 		<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
 			<a href="#" class="alert_close"></a>

phpBB/adm/style/permission_mask.html

@@ -41,7 +41,7 @@
 			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}{L_COLON}</label></dt>
 			{% if p_mask.f_mask.role_options %}
 				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%">
-					<div class="dropdown-container dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}">
+					<div class="dropdown-container dropdown-{S_CONTENT_FLOW_END} dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}">
 						<select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]">{p_mask.f_mask.S_ROLE_OPTIONS}</select>
 						<span title="Roles" class="button icon-button tools-icon dropdown-trigger dropdown-select">{L_NO_ROLE_ASSIGNED}</span>
 						<div class="dropdown hidden">

phpBB/adm/style/tooltip.js

@@ -130,10 +130,17 @@ phpbb.positionTooltip = function ($element) {
 	$element = $element.parent();
 	offset = $element.offset();
 
-	$('#_tooltip_container').css({
-		top: offset.top + 30,
-		left: offset.left - 205
-	});
+	if ($('body').hasClass('rtl')) {
+		$('#_tooltip_container').css({
+			top: offset.top + 30,
+			left: offset.left + 255
+		});
+	} else {
+		$('#_tooltip_container').css({
+			top: offset.top + 30,
+			left: offset.left - 205
+		});
+	}
 };
 
 /**

phpBB/assets/javascript/core.js

@@ -27,11 +27,7 @@ phpbb.isTouch = (window && typeof window.ontouchstart !== 'undefined');
  */
 phpbb.loadingIndicator = function() {
 	if (!$loadingIndicator) {
-		$loadingIndicator = $('<div />', { 
-			id: 'loading_indicator', 
-			class: 'loading_indicator', 
-		});
-		$loadingIndicator.appendTo('#page-footer');
+		$loadingIndicator = $('#loading_indicator');
 	}
 
 	if (!$loadingIndicator.is(':visible')) {
@@ -179,7 +175,7 @@ phpbb.alert.close = function($alert, fadedark) {
 phpbb.confirm = function(msg, callback, fadedark) {
 	var $confirmDiv = $('#phpbb_confirm');
 	$confirmDiv.find('.alert_text').html(msg);
-	fadedark = fadedark || true;
+	fadedark = typeof fadedark !== 'undefined' ? fadedark : true;
 
 	$(document).on('keydown.phpbb.alert', function(e) {
 		if (e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) {
@@ -194,9 +190,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
 	$confirmDiv.find('input[type="button"]').one('click.phpbb.confirmbox', function(e) {
 		var confirmed = this.name === 'confirm';
 
-		if (confirmed) {
-			callback(true);
-		}
+		callback(confirmed);
 		$confirmDiv.find('input[type="button"]').off('click.phpbb.confirmbox');
 		phpbb.alert.close($confirmDiv, fadedark || !confirmed);
 
@@ -1333,6 +1327,8 @@ phpbb.toggleDropdown = function() {
 			$this.css({
 				marginLeft: 0,
 				left: 0,
+				marginRight: 0,
+				right: 0,
 				maxWidth: (windowWidth - 4) + 'px'
 			});
 
@@ -1656,7 +1652,7 @@ $(function() {
 
 	phpbb.registerPageDropdowns();
 
-	$('#color_palette_placeholder').each(function() {
+	$('[data-orientation]').each(function() {
 		phpbb.registerPalette($(this));
 	});
 

phpBB/assets/javascript/editor.js

@@ -417,7 +417,7 @@ function getCaretPosition(txtarea) {
 
 		$('textarea').on('keydown', function (e) {
 			if (e.which === 13 && (e.metaKey || e.ctrlKey)) {
-				$(this).closest('form').submit();
+				$(this).closest('form').find(':submit').click();
 			}
 		});
 	});

phpBB/bin/phpbbcli.php

@@ -71,8 +71,14 @@ require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
 
 register_compatibility_globals();
 
+if (@is_file($phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php'))
+{
+	require_once($phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php');
+}
+
 /** @var \phpbb\language\language $language */
 $language = $phpbb_container->get('language');
+$language->set_default_language($phpbb_container->get('config')['default_lang']);
 $language->add_lang(array('common', 'acp/common', 'cli'));
 
 /* @var $user \phpbb\user */

phpBB/common.php

@@ -65,8 +65,7 @@ if (!defined('PHPBB_INSTALLED'))
 
 	// Eliminate . and .. from the path
 	require($phpbb_root_path . 'phpbb/filesystem.' . $phpEx);
-	$phpbb_filesystem = new phpbb\filesystem\filesystem();
-	$script_path = $phpbb_filesystem->clean_path($script_path);
+	$script_path = \phpbb\filesystem\helper::clean_path($script_path);
 
 	$url = (($secure) ? 'https://' : 'http://') . $server_name;
 
@@ -136,6 +135,11 @@ require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
 
 register_compatibility_globals();
 
+if (@is_file($phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php'))
+{
+	require_once($phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php');
+}
+
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));

phpBB/composer.json

@@ -4,7 +4,7 @@
 	"type": "project",
 	"keywords": ["phpbb", "forum"],
 	"homepage": "https://www.phpbb.com",
-	"license": "GPL-2.0",
+	"license": "GPL-2.0-only",
 	"authors": [
 		{
 			"name": "phpBB Limited",
@@ -25,51 +25,52 @@
 		"phpbb/phpbb-core": "self.version"
 	},
 	"require": {
-		"php": ">=5.4",
+		"php": ">=5.6",
 		"bantu/ini-get-wrapper": "1.0.*",
+		"composer/composer": "^1.6",
+		"composer/installers": "^1.4",
 		"google/recaptcha": "~1.1",
-		"guzzlehttp/guzzle": "~5.3",
+		"guzzlehttp/guzzle": "~6.3",
 		"lusitanian/oauth": "^0.8.1",
 		"marc1706/fast-image-size": "^1.1",
 		"paragonie/random_compat": "^1.4",
 		"patchwork/utf8": "^1.1",
-		"s9e/text-formatter": "~0.10.0",
-		"symfony/config": "^2.8",
-		"symfony/console": "^2.8",
-		"symfony/debug": "^2.8",
-		"symfony/dependency-injection": "^2.8",
-		"symfony/event-dispatcher": "^2.8",
-		"symfony/filesystem": "^2.8",
-		"symfony/finder": "^2.8",
-		"symfony/http-foundation": "^2.8",
-		"symfony/http-kernel": "^2.8",
-		"symfony/proxy-manager-bridge": "^2.8",
-		"symfony/routing": "^2.8",
-		"symfony/twig-bridge": "^2.8",
-		"symfony/yaml": "^2.8",
+		"s9e/text-formatter": "~0.13.0",
+		"symfony/config": "~3.1",
+		"symfony/console": "~3.1",
+		"symfony/debug": "~3.1",
+		"symfony/dependency-injection": "~3.1",
+		"symfony/event-dispatcher": "~3.1",
+		"symfony/filesystem": "~3.1",
+		"symfony/finder": "~3.1",
+		"symfony/http-foundation": "~3.1",
+		"symfony/http-kernel": "~3.1",
+		"symfony/proxy-manager-bridge": "~3.1",
+		"symfony/routing": "~3.1",
+		"symfony/twig-bridge": "~3.1",
+		"symfony/yaml": "~3.1",
 		"twig/twig": "^1.0"
 	},
 	"require-dev": {
-		"fabpot/goutte": "~2.0",
+		"fabpot/goutte": "~3.1",
 		"facebook/webdriver": "~1.1",
-		"laravel/homestead": "~2.2",
+		"laravel/homestead": "~4.0",
 		"phing/phing": "2.4.*",
-		"phpunit/dbunit": "1.3.*",
-		"phpunit/phpunit": "^4.1",
-		"sami/sami": "1.*",
+		"phpunit/dbunit": "~2.0",
+		"phpunit/phpunit": "^5.7",
 		"squizlabs/php_codesniffer": "2.*",
-		"symfony/browser-kit": "^2.8",
-		"symfony/css-selector": "^2.8",
-		"symfony/dom-crawler": "^2.8"
+		"symfony/browser-kit": "~3.1",
+		"symfony/css-selector": "~3.1",
+		"symfony/dom-crawler": "~3.1"
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.2.x-dev"
+			"dev-master": "3.3.x-dev"
 		}
 	},
 	"config": {
 		"platform": {
-			"php": "5.4"
+			"php": "5.6"
 		}
 	}
 }

phpBB/config/default/container/parameters.yml

@@ -14,6 +14,7 @@ parameters:
 
     # List of default password driver types
     passwords.algorithms:
+        - passwords.driver.argon2i
         - passwords.driver.bcrypt_2y
         - passwords.driver.bcrypt
         - passwords.driver.salted_md5

phpBB/config/default/container/services.yml

@@ -8,6 +8,7 @@ imports:
     - { resource: services_cron.yml }
     - { resource: services_db.yml }
     - { resource: services_event.yml }
+    - { resource: services_extensions.yml }
     - { resource: services_feed.yml }
     - { resource: services_files.yml }
     - { resource: services_filesystem.yml }
@@ -24,6 +25,7 @@ imports:
     - { resource: services_profilefield.yml }
     - { resource: services_report.yml }
     - { resource: services_routing.yml }
+    - { resource: services_storage.yml }
     - { resource: services_text_formatter.yml }
     - { resource: services_text_reparser.yml }
     - { resource: services_twig.yml }
@@ -98,25 +100,12 @@ services:
             - '%core.root_path%'
             - '@template'
 
-    ext.manager:
-        class: phpbb\extension\manager
-        arguments:
-            - '@service_container'
-            - '@dbal.conn'
-            - '@config'
-            - '@filesystem'
-            - '%tables.ext%'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-            - '@cache'
-
     file_downloader:
         class: phpbb\file_downloader
 
     file_locator:
         class: phpbb\routing\file_locator
         arguments:
-            - '@filesystem'
             - '%core.root_path%'
 
     group_helper:
@@ -140,7 +129,6 @@ services:
         class: phpbb\path_helper
         arguments:
             - '@symfony_request'
-            - '@filesystem'
             - '@request'
             - '%core.root_path%'
             - '%core.php_ext%'

phpBB/config/default/container/services_attachment.yml

@@ -6,9 +6,8 @@ services:
             - '@config'
             - '@dbal.conn'
             - '@dispatcher'
-            - '@filesystem'
             - '@attachment.resync'
-            - '%core.root_path%'
+            - '@storage.attachment'
 
     attachment.manager:
         class: phpbb\attachment\manager
@@ -36,5 +35,5 @@ services:
             - '@mimetype.guesser'
             - '@dispatcher'
             - '@plupload'
+            - '@storage.attachment'
             - '@user'
-            - '%core.root_path%'

phpBB/config/default/container/services_avatar.yml

@@ -61,11 +61,11 @@ services:
             - '@config'
             - '%core.root_path%'
             - '%core.php_ext%'
-            - '@filesystem'
+            - '@storage.avatar'
             - '@path_helper'
             - '@dispatcher'
             - '@files.factory'
-            - '@cache.driver'
+            - '@php_ini'
         calls:
             - [set_name, [avatar.driver.upload]]
         tags:

phpBB/config/default/container/services_console.yml

@@ -3,7 +3,6 @@ services:
         class: phpbb\console\exception_subscriber
         arguments:
             - '@language'
-            - '%debug.exceptions%'
         tags:
             - { name: kernel.event_subscriber }
 
@@ -141,6 +140,33 @@ services:
         tags:
             - { name: console.command }
 
+    console.command.extension.install:
+        class: phpbb\console\command\extension\install
+        arguments:
+            - '@user'
+            - '@ext.composer.manager'
+            - '@language'
+        tags:
+            - { name: console.command }
+
+    console.command.extension.list_available:
+        class: phpbb\console\command\extension\list_available
+        arguments:
+            - '@user'
+            - '@ext.composer.manager'
+            - '@language'
+        tags:
+            - { name: console.command }
+
+    console.command.extension.manage:
+        class: phpbb\console\command\extension\manage
+        arguments:
+            - '@user'
+            - '@ext.composer.manager'
+            - '@language'
+        tags:
+            - { name: console.command }
+
     console.command.extension.purge:
         class: phpbb\console\command\extension\purge
         arguments:
@@ -150,6 +176,15 @@ services:
         tags:
             - { name: console.command }
 
+    console.command.extension.remove:
+        class: phpbb\console\command\extension\remove
+        arguments:
+            - '@user'
+            - '@ext.composer.manager'
+            - '@language'
+        tags:
+            - { name: console.command }
+
     console.command.extension.show:
         class: phpbb\console\command\extension\show
         arguments:
@@ -159,6 +194,15 @@ services:
         tags:
             - { name: console.command }
 
+    console.command.extension.update:
+        class: phpbb\console\command\extension\update
+        arguments:
+            - '@user'
+            - '@ext.composer.manager'
+            - '@language'
+        tags:
+            - { name: console.command }
+
     console.command.fixup.recalculate_email_hash:
         class: phpbb\console\command\fixup\recalculate_email_hash
         arguments:

phpBB/config/default/container/services_content.yml

@@ -68,5 +68,3 @@ services:
 
     viewonline_helper:
         class: phpbb\viewonline_helper
-        arguments:
-            - '@filesystem'

phpBB/config/default/container/services_cron.yml

@@ -3,6 +3,7 @@ services:
         class: phpbb\cron\manager
         arguments:
             - '@cron.task_collection'
+            - '@routing.helper'
             - '%core.root_path%'
             - '%core.php_ext%'
 
@@ -13,6 +14,18 @@ services:
             - '@config'
             - '@dbal.conn'
 
+    cron.controller:
+        class: phpbb\cron\controller\cron
+
+    cron.event_listener:
+        class: phpbb\cron\event\cron_runner_listener
+        arguments:
+            - '@cron.lock_db'
+            - '@cron.manager'
+            - '@request'
+        tags:
+            - { name: kernel.event_subscriber }
+
 # ----- Cron tasks -----
     cron.task_collection:
         class: phpbb\di\service_collection

phpBB/config/default/container/services_event.yml

@@ -9,6 +9,7 @@ services:
         arguments:
             - '@template'
             - '@language'
+            - '%debug.exceptions%'
         tags:
             - { name: kernel.event_subscriber }
 

phpBB/config/default/container/services_extensions.yml

@@ -0,0 +1,47 @@
+services:
+    ext.manager:
+        class: phpbb\extension\manager
+        arguments:
+            - '@service_container'
+            - '@dbal.conn'
+            - '@config'
+            - '%tables.ext%'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@cache'
+
+    ext.composer.installer:
+        class: phpbb\composer\installer
+        arguments:
+            - '%core.root_path%'
+            - '@filesystem'
+            - '@request'
+            - '@config'
+
+    ext.composer.manager:
+        class: phpbb\composer\extension_manager
+        arguments:
+            - '@ext.composer.installer'
+            - '@cache.driver'
+            - '@ext.manager'
+            - '@filesystem'
+            - phpbb-extension
+            - EXTENSIONS_
+            - '%core.root_path%'
+            - '@config'
+
+    style.composer.manager:
+        class: phpbb\composer\manager
+        arguments:
+            - '@ext.composer.installer'
+            - '@cache.driver'
+            - phpbb-style
+            - STYLES_
+
+    lang.composer.manager:
+        class: phpbb\composer\manager
+        arguments:
+            - '@ext.composer.installer'
+            - '@cache.driver'
+            - phpbb-language
+            - LANGUAGES_

phpBB/config/default/container/services_feed.yml

@@ -18,9 +18,10 @@ services:
         class: phpbb\feed\helper
         arguments:
             - '@config'
+            - '@service_container'
+            - '@path_helper'
+            - '@text_formatter.renderer'
             - '@user'
-            - '%core.root_path%'
-            - '%core.php_ext%'
 
     feed.forum:
         class: phpbb\feed\forum
@@ -78,6 +79,10 @@ services:
             - '@dispatcher'
             - '%core.php_ext%'
 
+    feed.quote_helper:
+        class: phpbb\feed\quote_helper
+        parent: text_formatter.s9e.quote_helper
+
     feed.topic:
         class: phpbb\feed\topic
         shared: false

phpBB/config/default/container/services_files.yml

@@ -16,6 +16,16 @@ services:
             - '@mimetype.guesser'
             - '@plupload'
 
+    files.filespec_storage:
+        class: phpbb\files\filespec_storage
+        shared: false
+        arguments:
+            - '@language'
+            - '@php_ini'
+            - '@upload_imagesize'
+            - '@mimetype.guesser'
+            - '@plupload'
+
     files.upload:
         class: phpbb\files\upload
         shared: false
@@ -36,6 +46,16 @@ services:
             - '@plupload'
             - '@request'
 
+    files.types.form_storage:
+        class: phpbb\files\types\form_storage
+        shared: false
+        arguments:
+            - '@files.factory'
+            - '@language'
+            - '@php_ini'
+            - '@plupload'
+            - '@request'
+
     files.types.local:
         class: phpbb\files\types\local
         shared: false
@@ -55,3 +75,14 @@ services:
             - '@php_ini'
             - '@request'
             - '%core.root_path%'
+
+    files.types.remote_storage:
+        class: phpbb\files\types\remote_storage
+        shared: false
+        arguments:
+            - '@config'
+            - '@files.factory'
+            - '@language'
+            - '@php_ini'
+            - '@request'
+            - '%core.root_path%'

phpBB/config/default/container/services_password.yml

@@ -1,4 +1,7 @@
 parameters:
+    passwords.driver.argon2_memory_cost: 1024
+    passwords.driver.argon2_threads: 2
+    passwords.driver.argon2_time_cost: 2
     passwords.driver.bcrypt_cost: 10
 
 services:
@@ -27,6 +30,17 @@ services:
         tags:
             - { name: service_collection, tag: passwords.driver }
 
+    passwords.driver.argon2i:
+        class: phpbb\passwords\driver\argon2i
+        arguments:
+            - '@config'
+            - '@passwords.driver_helper'
+            - '%passwords.driver.argon2_memory_cost%'
+            - '%passwords.driver.argon2_threads%'
+            - '%passwords.driver.argon2_time_cost%'
+        tags:
+            - { name: passwords.driver }
+
     passwords.driver.bcrypt:
         class: phpbb\passwords\driver\bcrypt
         arguments:

phpBB/config/default/container/services_routing.yml

@@ -12,8 +12,6 @@ services:
         class: Symfony\Component\HttpKernel\EventListener\RouterListener
         arguments:
             - '@router'
-            - null
-            - null
             - '@request_stack'
         tags:
             - { name: kernel.event_subscriber }
@@ -25,7 +23,6 @@ services:
             - '@router'
             - '@symfony_request'
             - '@request'
-            - '@filesystem'
             - '%core.root_path%'
             - '%core.php_ext%'
 

phpBB/config/default/container/services_storage.yml

@@ -0,0 +1,67 @@
+services:
+
+# Storages
+    storage.attachment:
+        class: phpbb\storage\storage
+        arguments:
+            - '@storage.adapter.factory'
+            - 'attachment'
+        tags:
+            - { name: storage }
+
+    storage.avatar:
+        class: phpbb\storage\storage
+        arguments:
+            - '@storage.adapter.factory'
+            - 'avatar'
+        tags:
+            - { name: storage }
+
+# Factory
+    storage.adapter.factory:
+        class: phpbb\storage\adapter_factory
+        arguments:
+            - '@config'
+            - '@storage.adapter_collection'
+            - '@storage.provider_collection'
+
+# Collections
+    storage.storage_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - '@service_container'
+        tags:
+            - { name: service_collection, tag: storage }
+
+    storage.adapter_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - '@service_container'
+        tags:
+            - { name: service_collection, tag: storage.adapter, class_name_aware: true }
+
+    storage.provider_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - '@service_container'
+        tags:
+            - { name: service_collection, tag: storage.provider, class_name_aware: true }
+
+# Adapters
+    storage.adapter.local:
+        class: phpbb\storage\adapter\local
+        shared: false
+        arguments:
+            - '@filesystem'
+            - '@upload_imagesize'
+            - '@mimetype.guesser'
+            - '%core.root_path%'
+        tags:
+            - { name: storage.adapter }
+
+# Providers
+    storage.provider.local:
+        class: phpbb\storage\provider\local
+        arguments:
+        tags:
+            - { name: storage.provider }

phpBB/config/default/container/services_text_formatter.yml

@@ -26,6 +26,11 @@ services:
     text_formatter.utils:
         alias: text_formatter.s9e.utils
 
+    text_formatter.s9e.bbcode_merger:
+        class: phpbb\textformatter\s9e\bbcode_merger
+        arguments:
+            - '@text_formatter.s9e.factory'
+
     text_formatter.s9e.factory:
         class: phpbb\textformatter\s9e\factory
         arguments:
@@ -34,6 +39,7 @@ services:
             - '@dispatcher'
             - '@config'
             - '@text_formatter.s9e.link_helper'
+            - '@log'
             - '%text_formatter.cache.dir%'
             - '%text_formatter.cache.parser.key%'
             - '%text_formatter.cache.renderer.key%'

phpBB/config/default/container/services_twig.yml

@@ -15,6 +15,7 @@ services:
             - []
         calls:
             - [setLexer, ['@template.twig.lexer']]
+            - [addGlobal, ['config', '@config']]
 
     template.twig.lexer:
         class: phpbb\template\twig\lexer
@@ -24,8 +25,6 @@ services:
 
     template.twig.loader:
         class: phpbb\template\twig\loader
-        arguments:
-            - '@filesystem'
 
     template.twig.extensions.collection:
         class: phpbb\di\service_collection

phpBB/config/default/routing/cron.yml

@@ -0,0 +1,3 @@
+phpbb_cron_run:
+    path: /{cron_type}
+    defaults: { _controller: cron.controller:handle }

phpBB/config/default/routing/routing.yml

@@ -8,6 +8,10 @@
 # instantiate the 'foo_service' service and call the 'method' method.
 #
 
+phpbb_cron_routing:
+    resource: cron.yml
+    prefix: /cron
+
 phpbb_feed_routing:
     resource: feed.yml
     prefix: /feed

phpBB/config/development/config.yml

@@ -11,3 +11,7 @@ core:
         debug: true
         auto_reload: true
         enable_debug_extension: true
+
+    extensions:
+        composer_debug: true
+        composer_verbose: true

phpBB/config/installer/container/services.yml

@@ -31,7 +31,6 @@ services:
     file_locator:
         class: phpbb\routing\file_locator
         arguments:
-            - '@filesystem'
             - '%core.root_path%'
 
     kernel_exception_subscriber:
@@ -50,7 +49,6 @@ services:
         class: phpbb\path_helper
         arguments:
             - '@symfony_request'
-            - '@filesystem'
             - '@request'
             - '%core.root_path%'
             - '%core.php_ext%'

phpBB/cron.php

@@ -11,10 +11,11 @@
 *
 */
 
+use Symfony\Component\HttpFoundation\RedirectResponse;
+
 /**
 */
 define('IN_PHPBB', true);
-define('IN_CRON', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.' . $phpEx);
@@ -23,62 +24,14 @@ include($phpbb_root_path . 'common.' . $phpEx);
 $user->session_begin(false);
 $auth->acl($user->data);
 
-function output_image()
-{
-	// Output transparent gif
-	header('Cache-Control: no-cache');
-	header('Content-type: image/gif');
-	header('Content-length: 43');
-
-	echo base64_decode('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==');
-
-	// Flush here to prevent browser from showing the page as loading while
-	// running cron.
-	flush();
-}
-
-// Thanks to various fatal errors and lack of try/finally, it is quite easy to leave
-// the cron lock locked, especially when working on cron-related code.
-//
-// Attempt to alleviate the problem by doing setup outside of the lock as much as possible.
-
 $cron_type = $request->variable('cron_type', '');
 
-// Comment this line out for debugging so the page does not return an image.
-output_image();
+$get_params_array = $request->get_super_global(\phpbb\request\request_interface::GET);
 
-/* @var $cron_lock \phpbb\lock\db */
-$cron_lock = $phpbb_container->get('cron.lock_db');
-if ($cron_lock->acquire())
-{
-	/* @var $cron \phpbb\cron\manager */
-	$cron = $phpbb_container->get('cron.manager');
-
-	$task = $cron->find_task($cron_type);
-	if ($task)
-	{
-		/**
-		 * This event enables you to catch the task before it runs
-		 *
-		 * @event core.cron_run_before
-		 * @var	\phpbb\cron\task\wrapper	task	Current Cron task
-		 * @since 3.1.8-RC1
-		 */
-		$vars = array(
-			'task',
-		);
-		extract($phpbb_dispatcher->trigger_event('core.cron_run_before', compact($vars)));
-
-		if ($task->is_parametrized())
-		{
-			$task->parse_parameters($request);
-		}
-		if ($task->is_ready())
-		{
-			$task->run();
-		}
-	}
-	$cron_lock->release();
-}
-
-garbage_collection();
+/** @var \phpbb\controller\helper $controller_helper */
+$controller_helper = $phpbb_container->get('controller.helper');
+$response = new RedirectResponse(
+	$controller_helper->route('phpbb_cron_run', $get_params_array),
+	301
+);
+$response->send();

phpBB/develop/add_permissions.php

@@ -185,7 +185,7 @@ while ($row = $db->sql_fetchrow($result))
 }
 $db->sql_freeresult($result);
 
-if (sizeof($remove_auth_options))
+if (count($remove_auth_options))
 {
 	$db->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id IN (' . implode(', ', $remove_auth_options) . ')');
 	$db->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id IN (' . implode(', ', $remove_auth_options) . ')');
@@ -199,7 +199,7 @@ $prefixes = array('f_', 'a_', 'm_', 'u_');
 foreach ($prefixes as $prefix)
 {
 	$var = $prefix . 'permissions';
-	if (sizeof(${$var}))
+	if (count(${$var}))
 	{
 		foreach (${$var} as $auth_option => $l_ary)
 		{

phpBB/develop/adjust_avatars.php

@@ -19,7 +19,7 @@ $auth->acl($user->data);
 $user->setup();
 
 $echos = 0;
- 
+
 if (!isset($config['avatar_salt']))
 {
 	$cache->purge();
@@ -30,6 +30,11 @@ if (!isset($config['avatar_salt']))
 	die('database not up to date');
 }
 
+if (!isset($config['storage\\avatar\\config\\path']) || $config['storage\\avatar\\config\\path'] !== 'phpbb\\storage\\provider\\local')
+{
+	die('use local provider');
+}
+
 // let's start with the users using a group_avatar.
 $sql = 'SELECT group_id, group_avatar
 	FROM ' . GROUPS_TABLE . '
@@ -46,16 +51,16 @@ while ($row = $db->sql_fetchrow($result))
 {
 	$new_avatar_name = adjust_avatar($row['group_avatar'], 'g' . $row['group_id']);
 	$group_avatars[] = $new_avatar_name;
-	
+
 	// failure is probably due to the avatar name already being adjusted
 	if ($new_avatar_name !== false)
 	{
 		$sql = 'UPDATE ' . USERS_TABLE . "
 			SET user_avatar = '" . $db->sql_escape($new_avatar_name) . "'
-			WHERE user_avatar = '" . $db->sql_escape($row['group_avatar']) . "' 
+			WHERE user_avatar = '" . $db->sql_escape($row['group_avatar']) . "'
 			AND user_avatar_type = " . AVATAR_UPLOAD;
 		$db->sql_query($sql);
-		
+
 		$sql = 'UPDATE ' . GROUPS_TABLE . "
 			SET group_avatar = '" . $db->sql_escape($new_avatar_name) . "'
 			WHERE group_id = {$row['group_id']}";
@@ -80,8 +85,8 @@ while ($row = $db->sql_fetchrow($result))
 $db->sql_freeresult($result);
 
 $sql = 'SELECT user_id, username, user_avatar, user_avatar_type
-	FROM ' . USERS_TABLE . ' 
-	WHERE user_avatar_type = ' . AVATAR_UPLOAD . ' 
+	FROM ' . USERS_TABLE . '
+	WHERE user_avatar_type = ' . AVATAR_UPLOAD . '
 	AND ' . $db->sql_in_set('user_avatar', $group_avatars, true, true);
 $result = $db->sql_query($sql);
 
@@ -108,7 +113,7 @@ while ($row = $db->sql_fetchrow($result))
 		$db->sql_query($sql);
 		echo '<br /> Failed updating user ' . $row['user_id'] . "\n";
 	}
-	
+
 	if ($echos > 200)
 	{
 		echo '<br />' . "\n";
@@ -131,8 +136,8 @@ $db->sql_close();
 function adjust_avatar($old_name, $midfix)
 {
 	global $config, $phpbb_root_path;
-	
-	$avatar_path = $phpbb_root_path . $config['avatar_path'];
+
+	$avatar_path = $phpbb_root_path . $config['storage\\avatar\\config\\path'];
 	$extension = strtolower(substr(strrchr($old_name, '.'), 1));
 	$new_name = $config['avatar_salt'] . '_' . $midfix . '.' . $extension;
 

phpBB/develop/check_flash_bbcodes.php

@@ -51,7 +51,7 @@ function check_table_flash_bbcodes($table_name, $id_field, $content_field, $uid_
 
 	$ids = get_table_flash_bbcode_pkids($table_name, $id_field, $content_field, $uid_field, $bitfield_field);
 
-	$size = sizeof($ids);
+	$size = count($ids);
 	if ($size)
 	{
 		echo "Found $size potentially dangerous flash bbcodes.\n";

phpBB/develop/create_schema_files.php

@@ -44,7 +44,7 @@ require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
 $phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx);
 $phpbb_class_loader->register();
 
-$finder = new \phpbb\finder(new \phpbb\filesystem\filesystem(), $phpbb_root_path);
+$finder = new \phpbb\finder($phpbb_root_path);
 $classes = $finder->core_path('phpbb/')
 	->directory('/db/migration/data')
 	->get_classes();

phpBB/develop/create_variable_overview.php

@@ -489,12 +489,12 @@ foreach ($lang_references as $lang_var => $filenames)
 
 	$html_data .= '<b>' . $lang_var . '</b><ul>';
 
-	if (sizeof($filenames) != 1)
+	if (count($filenames) != 1)
 	{
 		fwrite($common_fp, (($entry['common']) ? ",\n" : '') . "\t'$var' => '" . $lang[$var] . "'");
 		$entry['common'] = true;
 	}
-	else if (sizeof($filenames) == 1)
+	else if (count($filenames) == 1)
 	{
 		// Merge logical - hardcoded
 		$fname = (preg_match('#^(' . implode('|', $merge) . ')#', $filenames[0], $match)) ? $match[0] . '.php' : str_replace($ext, 'php', $filenames[0]);

phpBB/develop/mysql_upgrader.php

@@ -62,7 +62,7 @@ echo "USE $dbname;$newline$newline";
 
 @set_time_limit(0);
 
-$finder = new \phpbb\finder(new \phpbb\filesystem\filesystem(), $phpbb_root_path);
+$finder = new \phpbb\finder($phpbb_root_path);
 $classes = $finder->core_path('phpbb/')
 	->directory('/db/migration/data')
 	->get_classes();

phpBB/develop/regex_idn.php

@@ -120,7 +120,7 @@ do
 	$pct_encoded = "%[\dA-F]{2}";
 	$unreserved = "$add_chars\pL0-9\-._~";
 	$sub_delims = ($inline) ? '!$&\'(*+,;=' : '!$&\'()*+,;=';
-	$scheme = ($inline) ? '[a-z][a-z\d+]*': '[a-z][a-z\d+\-.]*' ; // avoid automatic parsing of "word" in "last word.http://..."
+	$scheme = ($inline) ? '[a-z][a-z\d+]*(?<!javascript)': '[a-z][a-z\d+\-.]*(?<!javascript)' ; // avoid automatic parsing of "word" in "last word.http://..."
 	$pchar = "(?:[^$remove_chars]*[$unreserved$sub_delims:@|]+|$pct_encoded)"; // rfc: no "|"
 
 	$reg_name = "(?:[^$remove_chars]*[$unreserved$sub_delims:@|]+|$pct_encoded)+"; // rfc: * instead of + and no "|" and no "@" and no ":" (included instead of userinfo)

phpBB/develop/search_fill.php

@@ -89,7 +89,7 @@ for(;$postcounter <= $max_post_id; $postcounter += $batchsize)
 	$rowset = $db->sql_fetchrowset($result);
 	$db->sql_freeresult($result);
 
-	$post_rows = sizeof($rowset);
+	$post_rows = count($rowset);
 	
 	if( $post_rows )
 	{

phpBB/docs/CHANGELOG.html

@@ -50,6 +50,8 @@
 <ol>
 	<li><a href="#changelog">Changelog</a>
 	<ul>
+		<li><a href="#v322">Changes since 3.2.2</a></li>
+		<li><a href="#v321">Changes since 3.2.1</a></li>
 		<li><a href="#v320">Changes since 3.2.0</a></li>
 		<li><a href="#v320rc1">Changes since 3.2.0-RC1</a></li>
 		<li><a href="#v320b2">Changes since 3.2.0-b2</a></li>
@@ -57,6 +59,7 @@
 		<li><a href="#v320a2">Changes since 3.2.0-a2</a></li>
 		<li><a href="#v320a1">Changes since 3.2.0-a1</a></li>
 		<li><a href="#v31x">Changes since 3.1.x</a></li>
+		<li><a href="#v3111">Changes since 3.1.11</a></li>
 		<li><a href="#v3110">Changes since 3.1.10</a></li>
 		<li><a href="#v319">Changes since 3.1.9</a></li>
 		<li><a href="#v318">Changes since 3.1.8</a></li>
@@ -126,6 +129,201 @@
 		<div class="inner">
 
 		<div class="content">
+			<a name="v322"></a><h3>Changes since 3.2.2</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14936">PHPBB3-14936</a>] - Missing language variable INST_ERR_DB</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15491">PHPBB3-15491</a>] - Outdated linkes in installer support page</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15492">PHPBB3-15492</a>] - Permissions role combobox does not work in RTL</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15500">PHPBB3-15500</a>] - Docs outdated for new PHP 5.4.7 requirement</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15502">PHPBB3-15502</a>] - Errors in migrations in 3.2.2 release</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15506">PHPBB3-15506</a>] - Previewing new post empties attachment list of all but first attachment</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15512">PHPBB3-15512</a>] - Avoid reparsing non-existent polls</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15513">PHPBB3-15513</a>] - Signature edit in acp gives error</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15520">PHPBB3-15520</a>] - DbDriver-&gt;sql_build_query cant cope with sub-selects</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15522">PHPBB3-15522</a>] - Allow multiple color palettes per page</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15523">PHPBB3-15523</a>] - AdBlocker may cause JS error when using CookieConsent</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15525">PHPBB3-15525</a>] - composer.json License is Invalid/Deprecated</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15526">PHPBB3-15526</a>] - Cast bbcode ID to integer</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15527">PHPBB3-15527</a>] - Cannot interpret the BBCode definition</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15532">PHPBB3-15532</a>] - Update pull request template</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15533">PHPBB3-15533</a>] - Typo in viewtopic_topic_tools.html</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15558">PHPBB3-15558</a>] - phpbb\report\report_handler_post.php</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15559">PHPBB3-15559</a>] - phpbb\report\report_handler_pm.php:56</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15595">PHPBB3-15595</a>] - Migration Module Exists Tool Broken</li>
+			</ul>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12579">PHPBB3-12579</a>] - Add BUTTON_ language strings for post &amp; PM buttons</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15495">PHPBB3-15495</a>] - Use transactions for queries in move_forum</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15499">PHPBB3-15499</a>] - Drop HHVM support</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15510">PHPBB3-15510</a>] - Link Orphan attachments in ACP&gt;General to Orphaned attachments page </li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15514">PHPBB3-15514</a>] - Improve accessibility by adding vital info from explanation to a title</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15518">PHPBB3-15518</a>] - Do not attempt to accurately determine whether posters can read private messages in viewtopic</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15528">PHPBB3-15528</a>] - Display the version of the installed styles in acp</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15529">PHPBB3-15529</a>] - Color groups in ACP</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15531">PHPBB3-15531</a>] - Log malformed BBCodes</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15534">PHPBB3-15534</a>] - Outdated ACP extensions database link for phpBB 3.2</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15535">PHPBB3-15535</a>] - Add S_FIRST_POST to postrow on viewtopic</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15537">PHPBB3-15537</a>] - Add events core.search_(native|mysql|postgres|sphinx)_index_before</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15547">PHPBB3-15547</a>] - Add file object to event core.avatar_driver_upload_move_file_before</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15561">PHPBB3-15561</a>] - Add core events for adding columns to MySQL and Postgres search backends</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15568">PHPBB3-15568</a>] - Update depencies to latest versions</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15569">PHPBB3-15569</a>] - Adjust update instructions to suggest file replacement method</li>
+			</ul>
+			<h4>New Feature</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15398">PHPBB3-15398</a>] - Add event to oauth login after ID check</li>
+			</ul>
+			<h4>Security Issue</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15570">PHPBB3-15570</a>] - Extension version check is restricted to TLS 1.0</li>
+			</ul>
+			<h4>Task</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15466">PHPBB3-15466</a>] - Move Nils in CREDITS.txt</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15516">PHPBB3-15516</a>] - Add instructions on running UI tests</li>
+			</ul>
+
+			<a name="v321"></a><h3>Changes since 3.2.1</h3>
+			<h4>Security Issue</h4>
+			<ul>
+				<li>[SECURITY-211] - URLs with javascript scheme should not be made clickable</li>
+			</ul>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7845">PHPBB3-7845</a>] - Error on posting local image when script path is empty</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13214">PHPBB3-13214</a>] - Contact us page textarea looks narrow in responsive mode</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14629">PHPBB3-14629</a>] - acp global quick reply will not enable quick reply correctly</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14857">PHPBB3-14857</a>] - ordinal suffix in dateformat is not handled in translations</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15041">PHPBB3-15041</a>] - Cannot delete Orphaned Attachments when large number of attachments</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15060">PHPBB3-15060</a>] - Online user list fails on notifications</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15089">PHPBB3-15089</a>] - Enable/Disable settings backwards for Cookie Secure</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15133">PHPBB3-15133</a>] - Fast image size library sometimes returns no size or invalid sizes</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15149">PHPBB3-15149</a>] - Unexpected Ctrl+Enter behavior on reply</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15171">PHPBB3-15171</a>] - Confusing bitfield values</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15172">PHPBB3-15172</a>] - $request-&gt;server('server_port') is returning wrong port</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15174">PHPBB3-15174</a>] - Unable to purge cache (ext &amp; acp)</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15195">PHPBB3-15195</a>] - Code direction in print view is not defined as &quot;ltr&quot;</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15201">PHPBB3-15201</a>] - Removing style sets user_style to 0</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15224">PHPBB3-15224</a>] - Advanced search in &quot;message text only&quot; crashes with SQL error when using Mysql fulltext search index</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15245">PHPBB3-15245</a>] - Relative URLs in atom feeds broken when accessing via app.php</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15262">PHPBB3-15262</a>] - WebFontConfig google families script issue in 3.2.1</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15266">PHPBB3-15266</a>] - Content visibility events do not allow what they describe</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15273">PHPBB3-15273</a>] - 'COOKIE_PATH_EXPLAIN' does not make sense</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15285">PHPBB3-15285</a>] - Travis tests are failing due to trusty changes</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15292">PHPBB3-15292</a>] - Retina imageset is blurry when displayed in Chrome browser</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15297">PHPBB3-15297</a>] - Current date in board index is broken into lines in RTL</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15298">PHPBB3-15298</a>] - Errors being suppressed in cli</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15303">PHPBB3-15303</a>] - Typo in memcached driver</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15306">PHPBB3-15306</a>] - Error and missing information in core.acp_users_profile_validate event</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15309">PHPBB3-15309</a>] - Improved fix for pagination layout in tables</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15314">PHPBB3-15314</a>] - Wrong class constructor definition for convertor component</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15319">PHPBB3-15319</a>] - Database update v310\style_update_p2 fails to drop sequences</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15320">PHPBB3-15320</a>] - Redis cache does not save keys with expiration date 0 (no expiration)</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15322">PHPBB3-15322</a>] - Wrong return Return-Path in emails</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15331">PHPBB3-15331</a>] - Gravatars cannot be overridden</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15332">PHPBB3-15332</a>] - Dark background is always removed after confirm popup</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15333">PHPBB3-15333</a>] - Callback isn't called when confirm dialog is canceled</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15339">PHPBB3-15339</a>] - Missing acp_send_statistics -&gt; Upgrading to 3.2.0 fails for phpBB 3.0.5</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15346">PHPBB3-15346</a>] - The installer tries to enable all extensions even if they are not enableable</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15347">PHPBB3-15347</a>] - Password updater in cron generates invalid postgres SQL</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15349">PHPBB3-15349</a>] - Cli doesn't check if an extension is enableable before enable it</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15350">PHPBB3-15350</a>] - Links to Plural rules are outdated</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15351">PHPBB3-15351</a>] - Confirm box function does not work with symlink on server config</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15353">PHPBB3-15353</a>] - Invalid HTML in ACP board settings</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15355">PHPBB3-15355</a>] - Empty version field in versioncheck when using the latest version</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15356">PHPBB3-15356</a>] - Avatar remote upload doesn't work</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15361">PHPBB3-15361</a>] - Topic / Forum Icons Look Withered (on Safari)</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15362">PHPBB3-15362</a>] - Excessive value for {NOTIFICATION_TYPES_COLS}</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15365">PHPBB3-15365</a>] - Fix invalidating OPcache</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15367">PHPBB3-15367</a>] - Sphinx search backend doesn't escape special characters</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15368">PHPBB3-15368</a>] - Schema upgrade fails in 3.2.1 when using SQL Server</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15379">PHPBB3-15379</a>] - Reparser cron will always run</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15381">PHPBB3-15381</a>] - L_CONTACT_US_ENABLE_EXPLAIN should specify that &quot;Enable board-wide emails&quot; is also needed for it to work</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15390">PHPBB3-15390</a>] - Admin permissions role tooltip popup has vertical bar running through it.</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15396">PHPBB3-15396</a>] - revert_schema() steps not executed in correct order</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15401">PHPBB3-15401</a>] - Use separate constant for memcached driver config</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15419">PHPBB3-15419</a>] - Sphinx does not search UTF keywords in delta index</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15423">PHPBB3-15423</a>] - Wrong title for topic's &quot;Unappproved posts&quot; icon</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15432">PHPBB3-15432</a>] - Don't remove dark background if fadedark is false</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15433">PHPBB3-15433</a>] - phpbbcli can enable non-existent extension</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15445">PHPBB3-15445</a>] -  Git Contribution Guidelines in README.md is outdated</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15464">PHPBB3-15464</a>] - Can't reparse [IMG] - in uppercase</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15475">PHPBB3-15475</a>] - Restore Travis PR commit message validation</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15478">PHPBB3-15478</a>] - core.js $loadingIndicator JavaScript errors</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15489">PHPBB3-15489</a>] - Wrong footer text on forum of type &quot;category&quot;</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15496">PHPBB3-15496</a>] - SQL Error in PostgreSQL Fulltext search when results displayed as topics</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15497">PHPBB3-15497</a>] - Declaration of admin_activate_user::create_insert_array not compatible with base</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15498">PHPBB3-15498</a>] - confirm_box() adds duplicate strings to URLs in extensions</li>
+			</ul>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7488">PHPBB3-7488</a>] - View Only - Categories: No Message</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9819">PHPBB3-9819</a>] - Move functions definitions out of mcp.php and includes/mcp/mcp_*.php</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12291">PHPBB3-12291</a>] - Allow extensions to use custom topic icons</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12939">PHPBB3-12939</a>] - Drop support for IE &lt;11 on January 2016</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14677">PHPBB3-14677</a>] - Extension update check is not very colorblind / colourblind friendly.</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14820">PHPBB3-14820</a>] - Style Version Missing</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14919">PHPBB3-14919</a>] - Inconsistent use of globals vs class elements in acp_extensions</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14927">PHPBB3-14927</a>] - event core.user_add_modify_data</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14944">PHPBB3-14944</a>] - Add possibility to search for template loop indexes by key</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14950">PHPBB3-14950</a>] - Add possibility to delete a template block with alter_block_array</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14979">PHPBB3-14979</a>] - Remove underline from unread icon</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14994">PHPBB3-14994</a>] - Refactor template-&gt;assign_block_var to be consistent with alter_block_array</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14995">PHPBB3-14995</a>] - Add ACP template events acp_ext_list_*_name_after</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15111">PHPBB3-15111</a>] - Fix the typo in ucp_pm_view_messsage</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15134">PHPBB3-15134</a>] - Avatar upload driver should use filesystem service</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15247">PHPBB3-15247</a>] - Add driver for APCu v5.x cache</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15267">PHPBB3-15267</a>] - Hide birthday block if the user cannot view profile</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15291">PHPBB3-15291</a>] - Allow short array notation in event declarations</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15293">PHPBB3-15293</a>] - Prevent skipping file changes in automatic updater</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15307">PHPBB3-15307</a>] - Allow extensions to add custom modes to acp_users module</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15328">PHPBB3-15328</a>] - Disable email/jabber checkbox if notification method isn't supported</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15340">PHPBB3-15340</a>] - Update to plupload 2.3.1, stable for one year</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15352">PHPBB3-15352</a>] - Add text to clarify forum descriptions won't display on categories</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15374">PHPBB3-15374</a>] - Add core event to modify page title in viewforum.php</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15384">PHPBB3-15384</a>] - Add linebreaks to SMTP configuration option explanations</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15385">PHPBB3-15385</a>] - nginx sample config: www redirection, security regex</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15387">PHPBB3-15387</a>] - prosilver: vertical bars on forum rows on index page not full height</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15389">PHPBB3-15389</a>] - Simplify migration between event names</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15391">PHPBB3-15391</a>] - Remove not needed image rendering from topic/forum images</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15394">PHPBB3-15394</a>] - Add $user_cache and $post_edit_list to core.viewtopic_modify_post_row</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15408">PHPBB3-15408</a>] - Reject duplicate BBCodes in ACP</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15409">PHPBB3-15409</a>] - Add u_action to core.acp_users_overview_run_quicktool</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15442">PHPBB3-15442</a>] - Allow unsafe HTML in bbcode.html</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15444">PHPBB3-15444</a>] - Merge duplicate BBCodes via a migration</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15446">PHPBB3-15446</a>] - Add event core.acp_profile_action</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15447">PHPBB3-15447</a>] - Add event core.acp_profile_modify_profile_row</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15451">PHPBB3-15451</a>] - [EVENT] - mcp_topic_postrow_attachments_before/after</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15452">PHPBB3-15452</a>] - [EVENT] - mcp_topic_postrow_post_before</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15453">PHPBB3-15453</a>] - Add event in acp_language after delete language</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15454">PHPBB3-15454</a>] - event - mcp_queue_approve_details_template</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15470">PHPBB3-15470</a>] - attachment boxes need there own font-size</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15471">PHPBB3-15471</a>] - Add core events to ACP when pruning a forum</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15476">PHPBB3-15476</a>] - Add core event before search rows are edited</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15485">PHPBB3-15485</a>] - Add template event to forumlist_body &gt; forum images</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15486">PHPBB3-15486</a>] - Add core event to the function user_add() to modify notifications data</li>
+			</ul>
+			<h4>New Feature</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13344">PHPBB3-13344</a>] - Add new events for logging</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15122">PHPBB3-15122</a>] - Support using memcached instead of memcache</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15372">PHPBB3-15372</a>] - Add a &quot;Can view topics&quot; permission</li>
+			</ul>
+			<h4>Sub-task</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13150">PHPBB3-13150</a>] - [Event] - core.phpbb_log_get_topic_auth_sql_after</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15468">PHPBB3-15468</a>] - Add a service to merge duplicate BBCodes</li>
+			</ul>
+			<h4>Task</h4>
+			<ul>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15179">PHPBB3-15179</a>] - Update 3.2.x dependencies and fix Twig &gt; 1.25 compatibility</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15304">PHPBB3-15304</a>] - Update s9e/text-formatter dependency</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15455">PHPBB3-15455</a>] - Margin discrepancy due to &lt;!-- INCLUDE jumpbox.html --&gt;</li>
+				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15457">PHPBB3-15457</a>] - Update s9e/text-formatter dependency</li>
+			</ul>
+
 			<a name="v320"></a><h3>Changes since 3.2.0</h3>
 			<h4>Bug</h4>
 			<ul>
@@ -718,6 +916,53 @@
 				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14265">PHPBB3-14265</a>] - Make all tables available in the container</li>
 			</ul>
 
+	<a name="v3111"></a><h3>Changes since 3.1.11</h3>
+
+	<h4>Security Issue</h4>
+	<ul>
+		<li>[SECURITY-211] - URLs with javascript scheme should not be made clickable</li>
+	</ul>
+	<h4>Bug</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9533">PHPBB3-9533</a>] - phpbb_own_realpath() doesn't always replicate realpath() behaviour</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12835">PHPBB3-12835</a>] - Jump-box dropdown menu doesn't expand with according to line length in IE8</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13360">PHPBB3-13360</a>] - rename_too_long_indexes migration never deleted the old unique index</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13464">PHPBB3-13464</a>] - problem with drop down options and Arabic letters in chrome</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13574">PHPBB3-13574</a>] - Last post not showing in &quot;Active topics&quot; when Prosilver goes responsive</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15174">PHPBB3-15174</a>] - Unable to purge cache (ext &amp; acp)</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15285">PHPBB3-15285</a>] - Travis tests are failing due to trusty changes</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15303">PHPBB3-15303</a>] - Typo in memcached driver</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15347">PHPBB3-15347</a>] - Password updater in cron generates invalid postgres SQL</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15367">PHPBB3-15367</a>] - Sphinx search backend doesn't escape special characters</li>
+	</ul>
+	<h4>Improvement</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10122">PHPBB3-10122</a>] - [list=] - should support &quot;none&quot;, along with CSS2 types</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11063">PHPBB3-11063</a>] - Change version check to SSL</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14820">PHPBB3-14820</a>] - Style Version Missing</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14919">PHPBB3-14919</a>] - Inconsistent use of globals vs class elements in acp_extensions</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14927">PHPBB3-14927</a>] - event core.user_add_modify_data</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14944">PHPBB3-14944</a>] - Add possibility to search for template loop indexes by key</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14995">PHPBB3-14995</a>] - Add ACP template events acp_ext_list_*_name_after</li>
+	</ul>
+	<h4>New Feature</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13344">PHPBB3-13344</a>] - Add new events for logging</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15122">PHPBB3-15122</a>] - Support using memcached instead of memcache</li>
+	</ul>
+	<h4>Sub-task</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11182">PHPBB3-11182</a>] - Ensure that template files use L_COLON instead of colons.</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11676">PHPBB3-11676</a>] - generate_text_for_storage on includes/acp/acp_users.php</li>
+	</ul>
+	<h4>Task</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10758">PHPBB3-10758</a>] - Improve Functional Test Code Coverage</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10791">PHPBB3-10791</a>] - Add a section for extensions to readme.html</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10792">PHPBB3-10792</a>] - Add a section for 3.0 to 3.1 upgrades to install.html</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13874">PHPBB3-13874</a>] - Add master to sami API docs</li>
+	</ul>
+
 	<a name="v3110"></a><h3>Changes since 3.1.10</h3>
 
 	<h4>Bug</h4>

phpBB/docs/CREDITS.txt

@@ -20,15 +20,15 @@
 
 phpBB Project Manager:   Marshalrusty (Yuriy Rusko)
 
-phpBB Product Manager:   naderman (Nils Adermann)
-
 phpBB Lead Developer:    Marc (Marc Alexander)
 
 phpBB Developers:        bantu (Andreas Fischer)
                          CHItA (Máté Bartus)
+                         Derky (Derk Ruitenbeek)
                          Elsensee (Oliver Schramm)
+                         Hanakin (Michael Miday)
+                         MichaelC (Michael Cullum)
                          Nicofuma (Tristan Darricau)
-                         prototech (Cesar Gallegos)
 
 For a list of phpBB Team members, please see:
 http://www.phpbb.com/about/team/
@@ -41,7 +41,10 @@ https://github.com/phpbb/phpbb/graphs/contributors
 phpBB Project Manager:   theFinn (James Atkinson)      [Founder - 04/2007]
                          SHS` (Jonathan Stanley)
 
-phpBB Lead Developer:    Acyd Burn (Meik Sievertsen)   [09/2005 - 01/2010]
+phpBB Product Manager:   naderman (Nils Adermann)      [02/2016 - 02/2017]
+
+phpBB Lead Developer:    naderman (Nils Adermann)      [01/2010 - 02/2016]
+                         Acyd Burn (Meik Sievertsen)   [09/2005 - 01/2010]
                          psoTFX (Paul S. Owen)         [2001 - 09/2005]
 
 phpBB Developers:        A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
@@ -61,6 +64,7 @@ phpBB Developers:        A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
                          kellanved (Henry Sudhof)      [04/2007 - 03/2011]
                          nickvergessen (Joas Schilling)[04/2010 - 12/2015]
                          Oleg (Oleg Pudeyev)           [01/2011 - 05/2013]
+                         prototech (Cesar Gallegos)    [01/2014 - 12/2016]
                          rxu (Ruslan Uzdenov)          [04/2010 - 12/2012]
                          TerraFrost (Jim Wigginton)    [04/2009 - 01/2011]
                          ToonArmy (Chris Smith)        [06/2008 - 11/2011]
@@ -79,10 +83,10 @@ prosilver by subBlue Design, Tom Beddard, (c) 2004 phpBB Limited
 
 phpBB contains code from the following applications:
 
-LGPL licenced:
+LGPL licensed:
 Smarty (c) 2001, 2002 by ispi of Lincoln, Inc, http://smarty.php.net/
 
-GPL licenced:
+GPL licensed:
 phpMyAdmin (c) 2001, 2003 phpMyAdmin Devel team, http://www.phpmyadmin.net/
 Jabber Class (c) 2006 Flyspray.org, http://www.flyspray.org/
 Chora (c) 2000-2006, The Horde Project. http://horde.org/chora/
@@ -96,6 +100,6 @@ Pear (c) 2001-2004 PHP Group, http://pear.php.net
 
 Text_Diff-0.2.1 http://pear.php.net/package/Text_Diff
 
-MIT licenced:
+MIT licensed:
 Symfony2 (c) 2004-2011 Fabien Potencier, https://symfony.com/
 Cookie Consent (c) 2015 Silktide Ltd, https://cookieconsent.insites.com

phpBB/docs/INSTALL.html

@@ -147,7 +147,7 @@
 			<li>Oracle</li>
 		</ul>
 		</li>
-		<li><strong>PHP 5.4.0+</strong> with support for the database you intend to use.</li>
+		<li><strong>PHP 5.4.7+</strong> with support for the database you intend to use.</li>
 		<li>The following PHP modules are required:
 		<ul>
 			<li>json</li>
@@ -269,11 +269,11 @@
 
 <a name="update_full"></a><h3>4.i. Full package</h3>
 
-	<p>The full package is normally meant for new installations only, but if you want to replace all source files, this package comes in handy.</p>
+	<p>Updating using the full package is the recommended update method for boards without modifications to core phpBB files.</p>
 
-	<p>First, you should make a copy of your existing <code>config.php</code> file; keep it in a safe place! Next, delete all the existing phpBB files, you may want to leave your <code>files/</code>, <code>images/</code> and <code>ext/</code> directories in place, otherwise you will lose your file attachments, uploaded images and get error due to missing extension files. You can leave alternative styles in place too. With this complete, you can upload the new phpBB files (see <a href="#install">New installation</a> for details if necessary). Once complete, copy back your saved <code>config.php</code>, replacing the new one. Another method is to just <strong>replace</strong> the existing files with the files from the full package - though make sure you do <strong>not</strong> overwrite your config.php file.</p>
+	<p>First, you should make a copy of your existing <code>config.php</code> file; keep it in a safe place! Next, delete all the existing phpBB files, you should leave your <code>files/</code>, <code>images/</code> and <code>ext/</code> directories in place, otherwise you will lose your file attachments, uploaded images and get errors due to missing extension files. You can leave alternative styles in place too. With this complete, you can upload the new phpBB files (see <a href="#install">New installation</a> for details if necessary). Once complete, copy back your saved <code>config.php</code>, replacing the new one. Another method is to just <strong>replace</strong> the existing files with the files from the full package - though make sure you do <strong>not</strong> overwrite your config.php file.</p>
 
-	<p>You should now got to <code>/install/app.php/update</code> which will display a warning: <strong>No valid update directory was found, please make sure you uploaded the relevant files</strong>. Beneath that warning you will see a radion button <em>Update database only</em>, just click <strong>Submit</strong>. Depending on your previous version this will make a number of database changes. You may receive <em>FAILURES</em> during this procedure. They should not be a cause for concern unless you see an actual <em>ERROR</em>, in which case the script will stop (in this case you should seek help via our forums or bug tracker). If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
+	<p>You should now got to <code>/install/app.php/update</code> which will display a warning: <strong>No valid update directory was found, please make sure you uploaded the relevant files</strong>. Beneath that warning you will see a radio button <em>Update database only</em>, just click <strong>Submit</strong>. Depending on your previous version this will make a number of database changes. You may receive <em>FAILURES</em> during this procedure. They should not be a cause for concern unless you see an actual <em>ERROR</em>, in which case the script will stop (in this case you should seek help via our forums or bug tracker). If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
 
 	<p>Once <code>/install/app.php/update</code> has completed, it displays the success message: <strong>The database update was successful</strong>. You may proceed to the Administration Control Panel and then remove the install directory as advised.</p>
 
@@ -301,7 +301,7 @@
 
 <a name="update_auto"></a><h3>4.iv. Automatic update package</h3>
 
-	<p>This update method is the recommended method for updating. This package detects changed files automatically and merges in changes if needed.</p>
+	<p>This update method is only recommended for installations with modifications to core phpBB files. This package detects changed files automatically and merges in changes if needed.</p>
 
 	<p>The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is <strong>3.2.0</strong>, you need the <code>phpBB-3.2.0_to_3.2.1.zip/tar.bz2</code> file.</p>
 

phpBB/docs/README.html

@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.2.x Readme" />
+<meta name="description" content="phpBB 3.3.x Readme" />
 <title>phpBB &bull; Readme</title>
 
 <link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
@@ -21,7 +21,7 @@
 
 			<div id="doc-description">
 				<a href="../index.php" id="logo"><img src="assets/images/site_logo.gif" alt="" /></a>
-				<h1>phpBB 3.2.x Readme</h1>
+				<h1>phpBB 3.3.x Readme</h1>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
 			</div>
 
@@ -323,11 +323,11 @@
 
 		<div class="content">
 
-	<p>phpBB 3.2.x takes advantage of new features added in PHP 5.4. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 5.4.0 and the maximum supported version is the latest stable version of PHP.</p>
+	<p>phpBB 3.2.x takes advantage of new features added in PHP 5.5.9. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 5.5.9 and the maximum supported version is the latest stable version of PHP.</p>
 
 	<p>Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.</p>
 
-	<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MariaDB 5.x, PostgreSQL 8.x, Oracle 8 and SQLite 3. Versions of PHP used range from 5.4.x above 5.6.x to 7.0.x without problem.</p>
+	<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MariaDB 5.x, PostgreSQL 8.x, Oracle 8 and SQLite 3. Versions of PHP used range from 5.4.7 above 5.6.x to 7.1.x and 7.2.x without problem.</p>
 
 <a name="phpsec"></a><h3>7.i. Notice on PHP security issues</h3>
 

phpBB/docs/coding-guidelines.html

@@ -264,7 +264,6 @@ PHPBB_QA                   (Set board to QA-Mode, which means the updater also c
 	<li>{T_SUPER_TEMPLATE_PATH} - styles/xxx/template</li>
 	<li>{T_IMAGES_PATH} - images/</li>
 	<li>{T_SMILIES_PATH} - $config['smilies_path']/</li>
-	<li>{T_AVATAR_PATH} - $config['avatar_path']/</li>
 	<li>{T_AVATAR_GALLERY_PATH} - $config['avatar_gallery_path']/</li>
 	<li>{T_ICONS_PATH} - $config['icons_path']/</li>
 	<li>{T_RANKS_PATH} - $config['ranks_path']/</li>
@@ -627,7 +626,7 @@ $min = ($i &lt; $j) ? $i : $j;</pre>
 		<pre>if (isset($forum) &amp;&amp; $forum == 5)</pre>
 	</div>
 
-	<p>The <code>empty()</code> function is useful if you want to check if a variable is not set or being empty (an empty string, 0 as an integer or string, NULL, false, an empty array or a variable declared, but without a value in a class). Therefore empty should be used in favor of <code>isset($array) &amp;&amp; sizeof($array) &gt; 0</code> - this can be written in a shorter way as <code>!empty($array)</code>.</p>
+	<p>The <code>empty()</code> function is useful if you want to check if a variable is not set or being empty (an empty string, 0 as an integer or string, NULL, false, an empty array or a variable declared, but without a value in a class). Therefore empty should be used in favor of <code>isset($array) &amp;&amp; count($array) &gt; 0</code> - this can be written in a shorter way as <code>!empty($array)</code>.</p>
 
 	<h4>Switch statements:</h4>
 	<p>Switch/case code blocks can get a bit long sometimes. To have some level of notice and being in-line with the opening/closing brace requirement (where they are on the same line for better readability), this also applies to switch/case code blocks and the breaks. An example:</p>
@@ -994,9 +993,9 @@ $sql = $db-&gt;sql_build_query('SELECT', $sql_array);</pre>
 	<h4>Operations in loop definition: </h4>
 	<p>Always try to optimize your loops if operations are going on at the comparing part, since this part is executed every time the loop is parsed through. For assignments a descriptive name should be chosen. Example:</p>
 
-	<p class="bad">// On every iteration the sizeof function is called</p>
+	<p class="bad">// On every iteration the count function is called</p>
 	<div class="codebox"><pre>
-for ($i = 0; $i &lt; sizeof($post_data); $i++)
+for ($i = 0; $i &lt; count($post_data); $i++)
 {
 	do_something();
 }</pre>
@@ -1004,7 +1003,7 @@ for ($i = 0; $i &lt; sizeof($post_data); $i++)
 
 	<p class="good">// You are able to assign the (not changing) result within the loop itself</p>
 	<div class="codebox"><pre>
-for ($i = 0, $size = sizeof($post_data); $i &lt; $size; $i++)
+for ($i = 0, $size = count($post_data); $i &lt; $size; $i++)
 {
 	do_something();
 }</pre>
@@ -1211,7 +1210,7 @@ parent = prosilver</pre>
 &lt;td class=&quot;gensmall&quot;&gt;TEST&lt;/td&gt;
 </pre></div>
 
-<p>Try to match text class types with existing useage, e.g. don't use the nav class where viewtopic uses gensmall for example.</p>
+<p>Try to match text class types with existing usage, e.g. don't use the nav class where viewtopic uses gensmall for example.</p>
 
 <p>Row colours/classes are now defined by the template, use an <code>IF S_ROW_COUNT</code> switch, see viewtopic or viewforum for an example.</p>
 
@@ -1223,7 +1222,7 @@ parent = prosilver</pre>
 
 <p>The separate catXXXX and thXXX classes are gone. When defining a header cell just use <code>&lt;th&gt;</code> rather than <code>&lt;th class="thHead"&gt;</code> etc. Similarly for cat, don't use <code>&lt;td class="catLeft"&gt;</code> use <code>&lt;td class="cat"&gt;</code> etc.</p>
 
-<p>Try to retain consistency of basic layout and class useage, i.e. _EXPLAIN text should generally be placed below the title it explains, e.g. <code>{L_POST_USERNAME}&lt;br /&gt;&lt;span class="gensmall"&gt;{L_POST_USERNAME_EXPLAIN}&lt;/span&gt;</code> is the typical way of handling this ... there may be exceptions and this isn't a hard and fast rule.</p>
+<p>Try to retain consistency of basic layout and class usage, i.e. _EXPLAIN text should generally be placed below the title it explains, e.g. <code>{L_POST_USERNAME}&lt;br /&gt;&lt;span class="gensmall"&gt;{L_POST_USERNAME_EXPLAIN}&lt;/span&gt;</code> is the typical way of handling this ... there may be exceptions and this isn't a hard and fast rule.</p>
 
 <p>Try to keep template conditional and other statements tabbed in line with the block to which they refer.</p>
 
@@ -1767,7 +1766,7 @@ This may span multiple lines.
 <p>The <a href="http://en.wikipedia.org/wiki/Universal_Character_Set">Universal Character Set (UCS)</a> described in ISO/IEC 10646 consists of a large amount of characters. Each of them has a unique name and a code point which is an integer number. <a href="http://en.wikipedia.org/wiki/Unicode">Unicode</a> - which is an industry standard - complements the Universal Character Set with further information about the characters' properties and alternative character encodings. More information on Unicode can be found on the <a href="http://www.unicode.org/">Unicode Consortium's website</a>. One of the Unicode encodings is the <a href="http://en.wikipedia.org/wiki/UTF-8">8-bit Unicode Transformation Format (UTF-8)</a>. It encodes characters with up to four bytes aiming for maximum compatibility with the <a href="http://en.wikipedia.org/wiki/ASCII">American Standard Code for Information Interchange</a> which is a 7-bit encoding of a relatively small subset of the UCS.</p>
 
 <h4>phpBB's use of Unicode</h4>
-<p>Unfortunately PHP does not faciliate the use of Unicode prior to version 6. Most functions simply treat strings as sequences of bytes assuming that each character takes up exactly one byte. This behaviour still allows for storing UTF-8 encoded text in PHP strings but many operations on strings have unexpected results. To circumvent this problem we have created some alternative functions to PHP's native string operations which use code points instead of bytes. These functions can be found in <code>/includes/utf/utf_tools.php</code>. They are also covered in the <a href="http://area51.phpbb.com/docs/code/">phpBB3 Sourcecode Documentation</a>. A lot of native PHP functions still work with UTF-8 as long as you stick to certain restrictions. For example <code>explode</code> still works as long as the first and the last character of the delimiter string are ASCII characters.</p>
+<p>Unfortunately PHP does not facilitate the use of Unicode prior to version 6. Most functions simply treat strings as sequences of bytes assuming that each character takes up exactly one byte. This behaviour still allows for storing UTF-8 encoded text in PHP strings but many operations on strings have unexpected results. To circumvent this problem we have created some alternative functions to PHP's native string operations which use code points instead of bytes. These functions can be found in <code>/includes/utf/utf_tools.php</code>. They are also covered in the <a href="http://area51.phpbb.com/docs/code/">phpBB3 Sourcecode Documentation</a>. A lot of native PHP functions still work with UTF-8 as long as you stick to certain restrictions. For example <code>explode</code> still works as long as the first and the last character of the delimiter string are ASCII characters.</p>
 
 <p>phpBB only uses the ASCII and the UTF-8 character encodings. Still all Strings are UTF-8 encoded because ASCII is a subset of UTF-8. The only exceptions to this rule are code sections which deal with external systems which use other encodings and character sets. Such external data should be converted to UTF-8 using the <code>utf8_recode()</code> function supplied with phpBB. It supports a variety of other character sets and encodings, a full list can be found below.</p>
 
@@ -1848,7 +1847,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
 
 	<p>The <abbr title="Internet Engineering Task Force">IETF</abbr> recently published <a href="http://tools.ietf.org/html/rfc4646">RFC 4646</a> for tags used to identify languages, which in combination with <a href="http://tools.ietf.org/html/rfc4647">RFC 4647</a> obseletes the older <a href="http://tools.ietf.org/html/rfc3066">RFC 3006</a> and older-still <a href="http://tools.ietf.org/html/rfc1766">RFC 1766</a>. <a href="http://tools.ietf.org/html/rfc4646">RFC 4646</a> uses <a href="http://www.loc.gov/standards/iso639-2/php/English_list.php">ISO 639-1/ISO 639-2</a>, <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a>, <a href="http://www.unicode.org/iso15924/iso15924-codes.html">ISO 15924</a> and <a href="http://unstats.un.org/unsd/methods/m49/m49.htm">UN M.49</a> to define a language tag. Each complete tag is composed of subtags which are not case sensitive and can also be empty.</p>
 
-	<p>Ordering of the subtags in the case that they are all non-empty is: <code>language</code>-<code>script</code>-<code>region</code>-<code>variant</code>-<code>extension</code>-<code>privateuse</code>. Should any subtag be empty, its corresponding hyphen would also be ommited. Thus, the language tag for English will be <code>en</code> <strong>and not</strong> <code>en-----</code>.</p>
+	<p>Ordering of the subtags in the case that they are all non-empty is: <code>language</code>-<code>script</code>-<code>region</code>-<code>variant</code>-<code>extension</code>-<code>privateuse</code>. Should any subtag be empty, its corresponding hyphen would also be omitted. Thus, the language tag for English will be <code>en</code> <strong>and not</strong> <code>en-----</code>.</p>
 
 	<p>Most language tags consist of a two- or three-letter language subtag (from <a href="http://www.loc.gov/standards/iso639-2/php/English_list.php">ISO 639-1/ISO 639-2</a>). Sometimes, this is followed by a two-letter or three-digit region subtag (from <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a> or <a href="http://unstats.un.org/unsd/methods/m49/m49.htm">UN M.49</a>). Some examples are:</p>
 
@@ -1902,7 +1901,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
 
 	<p>The ultimate aim of a language tag is to convey the needed <strong>useful distingushing information</strong>, whilst keeping it as <strong>short as possible</strong>. So for example, use <code>en</code>, <code>fr</code> and <code>ja</code> as opposed to <code>en-GB</code>, <code>fr-FR</code> and <code>ja-JP</code>, since we know English, French and Japanese are the native language of Great Britain, France and Japan respectively.</p>
 
-	<p>Next is the <a href="http://www.unicode.org/iso15924/iso15924-codes.html">ISO 15924</a> language script code and when one should or shouldn't use it. For example, whilst <code>en-Latn</code> is syntaxically correct for describing English written with Latin script, real world English writing is <strong>more-or-less exclusively in the Latin script</strong>. For such languages like English that are written in a single script, the <a href="http://www.iana.org/assignments/language-subtag-registry"><abbr title="Internet Assigned Numbers Authority">IANA</abbr> Language Subtag Registry</a> has a "Suppress-Script" field meaning the script code <strong>should be ommitted</strong> unless a specific language tag requires a specific script code. Some languages are <strong>written in more than one script</strong> and in such cases, the script code <strong>is encouraged</strong> since an end-user may be able to read their language in one script, but not the other. Some examples are:</p>
+	<p>Next is the <a href="http://www.unicode.org/iso15924/iso15924-codes.html">ISO 15924</a> language script code and when one should or shouldn't use it. For example, whilst <code>en-Latn</code> is syntaxically correct for describing English written with Latin script, real world English writing is <strong>more-or-less exclusively in the Latin script</strong>. For such languages like English that are written in a single script, the <a href="http://www.iana.org/assignments/language-subtag-registry"><abbr title="Internet Assigned Numbers Authority">IANA</abbr> Language Subtag Registry</a> has a "Suppress-Script" field meaning the script code <strong>should be omitted</strong> unless a specific language tag requires a specific script code. Some languages are <strong>written in more than one script</strong> and in such cases, the script code <strong>is encouraged</strong> since an end-user may be able to read their language in one script, but not the other. Some examples are:</p>
 
 	<table>
 	<caption>Examples of using a language subtag in combination with a script subtag</caption>
@@ -1967,7 +1966,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
 	</tbody>
 	</table>
 
-	<p>Usage of the three-digit <a href="http://unstats.un.org/unsd/methods/m49/m49.htm">UN M.49</a> code over the two-letter <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a> code should hapen if a macro-geographical entity is required and/or the <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a> is ambiguous.</p>
+	<p>Usage of the three-digit <a href="http://unstats.un.org/unsd/methods/m49/m49.htm">UN M.49</a> code over the two-letter <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a> code should happen if a macro-geographical entity is required and/or the <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1 alpha-2</a> is ambiguous.</p>
 
 	<p>Examples of English using marco-geographical regions:</p>
 
@@ -2387,7 +2386,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
 		You have <code>[1/21/31] slon</code>, <code>[2/3/4] slona</code>, <code>[0/5/6] slonova</code> and <code>[7/8/9/11] ...</code> and some more difficult rules.
 	</p>
 
-	<p>The <a href="https://wiki.phpbb.com/Plural_Rules">plural system</a> takes care of this and can be used as follows:</p>
+	<p>The <a href="https://area51.phpbb.com/docs/dev/32x/language/plurals.html">plural system</a> takes care of this and can be used as follows:</p>
 
 	<p>The PHP code will basically look like this:</p>
 

phpBB/docs/events.md

@@ -164,13 +164,13 @@ acp_group_options_before
 ===
 * Location: adm/style/acp_groups.html
 * Since: 3.1.0-b4
-* Purpose: Add addtional options to group settings (before GROUP_FOUNDER_MANAGE)
+* Purpose: Add additional options to group settings (before GROUP_FOUNDER_MANAGE)
 
 acp_group_options_after
 ===
 * Location: adm/style/acp_groups.html
 * Since: 3.1.0-b4
-* Purpose: Add addtional options to group settings (after GROUP_RECEIVE_PM)
+* Purpose: Add additional options to group settings (after GROUP_RECEIVE_PM)
 
 acp_groups_find_username_append
 ===
@@ -433,6 +433,13 @@ acp_prune_forums_prepend
 * Since: 3.1.7-RC1
 * Purpose: Add content before the forum select form label
 
+acp_prune_forums_settings_append
+===
+* Locations:
+    + adm/style/acp_prune_forums.html
+* Since: 3.2.2-RC1
+* Purpose: Add content after the prune settings
+
 acp_prune_users_find_username_append
 ===
 * Locations:
@@ -498,6 +505,13 @@ acp_styles_list_before
 * Since: 3.1.7-RC1
 * Purpose: Add content before list of styles
 
+acp_users_mode_add
+===
+* Locations:
+    + adm/style/acp_users.html
+* Since: 3.2.2-RC1
+* Purpose: Add extra modes to the ACP user page
+
 acp_users_profile_before
 ===
 * Locations:
@@ -666,6 +680,34 @@ forumlist_body_category_header_row_prepend
 * Since: 3.1.5-RC1
 * Purpose: Add content before the header row of the category on the forum list.
 
+forumlist_body_forum_image_after
+===
+* Locations:
+    + styles/prosilver/template/forumlist_body.html
+* Since: 3.2.2-RC1
+* Purpose: Add content after the forum image on the forum list.
+
+forumlist_body_forum_image_append
+===
+* Locations:
+    + styles/prosilver/template/forumlist_body.html
+* Since: 3.2.2-RC1
+* Purpose: Add content at the start of the forum image on the forum list.
+
+forumlist_body_forum_image_before
+===
+* Locations:
+    + styles/prosilver/template/forumlist_body.html
+* Since: 3.2.2-RC1
+* Purpose: Add content before the forum image on the forum list.
+
+forumlist_body_forum_image_prepend
+===
+* Locations:
+    + styles/prosilver/template/forumlist_body.html
+* Since: 3.2.2-RC1
+* Purpose: Add content at the end of the forum image on the forum list.
+
 forumlist_body_forum_row_after
 ===
 * Locations:
@@ -946,6 +988,27 @@ mcp_topic_options_before
 * Since: 3.1.6-RC1
 * Purpose: Add some options (field, checkbox, ...) before the subject field when split a subject
 
+mcp_topic_postrow_attachments_after
+===
+* Locations:
+    + styles/prosilver/template/mcp_topic.html
+* Since: 3.2.2-RC1
+* Purpose: Show additional content after attachments in mcp topic review
+
+mcp_topic_postrow_attachments_before
+===
+* Locations:
+    + styles/prosilver/template/mcp_topic.html
+* Since: 3.2.2-RC1
+* Purpose: Show additional content before attachments in mcp topic review
+
+mcp_topic_postrow_post_before
+===
+* Locations:
+    + styles/prosilver/template/mcp_topic.html
+* Since: 3.2.2-RC1
+* Purpose: Show additional content after postrow begins in mcp topic review
+
 mcp_topic_postrow_post_details_after
 ===
 * Locations:
@@ -1483,6 +1546,20 @@ overall_header_stylesheets_after
 * Purpose: Add asset calls after stylesheets within the `</head>` tag.
 Note that INCLUDECSS will not work with this event.
 
+posting_attach_body_attach_row_controls_append
+===
+* Locations:
+    + styles/prosilver/template/posting_attach_body.html
+* Since: 3.2.2-RC1
+* Purpose: Add content after attachment control elements 
+
+posting_attach_body_attach_row_controls_prepend
+===
+* Locations:
+    + styles/prosilver/template/posting_attach_body.html
+* Since: 3.2.2-RC1
+* Purpose: Add content before attachment control elements 
+
 posting_editor_add_panel_tab
 ===
 * Locations:
@@ -2671,6 +2748,13 @@ viewtopic_topic_title_after
 * Since: 3.1.7-RC1
 * Purpose: Add content directly after the topic title link on the View topic screen (outside of the h2 HTML tag)
 
+viewtopic_topic_title_before
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+* Since: 3.2.2-RC1
+* Purpose: Add content directly before the topic title link on the View topic screen (outside of the h2 HTML tag)
+
 viewtopic_topic_title_append
 ===
 * Locations:

phpBB/docs/lighttpd.sample.conf

@@ -3,17 +3,8 @@
 # from your system's lighttpd.conf.
 # Tested with lighttpd 1.4.35
 
-# If you want to use the X-Sendfile feature,
-# uncomment the 'allow-x-send-file' for the fastcgi
-# server below and add the following to your config.php
-#
-#  define('PHPBB_ENABLE_X_SENDFILE', true);
-#
-# See http://blog.lighttpd.net/articles/2006/07/02/x-sendfile
-# for the details on X-Sendfile.
-
 # Load moules
-server.modules += ( 
+server.modules += (
 	"mod_access",
 	"mod_fastcgi",
 	"mod_rewrite",
@@ -32,11 +23,11 @@ $HTTP["host"] == "www.myforums.com" {
 	server.name				= "www.myforums.com"
 	server.document-root	= "/path/to/phpbb"
 	server.dir-listing		= "disable"
-	
+
 	index-file.names		= ( "index.php", "index.htm", "index.html" )
 	accesslog.filename		= "/var/log/lighttpd/access-www.myforums.com.log"
-	
-	# Deny access to internal phpbb files.	
+
+	# Deny access to internal phpbb files.
 	$HTTP["url"] =~ "^/(config\.php|common\.php|cache|files|images/avatars/upload|includes|phpbb|store|vendor)" {
 		url.access-deny = ( "" )
 	}
@@ -45,12 +36,12 @@ $HTTP["host"] == "www.myforums.com" {
 	$HTTP["url"] =~ "/\.svn|/\.git" {
 		url.access-deny = ( "" )
 	}
-	
+
 	# Deny access to apache configuration files.
 	$HTTP["url"] =~ "/\.htaccess|/\.htpasswd|/\.htgroups" {
 		url.access-deny = ( "" )
 	}
-	
+
 	# The following 3 lines will rewrite URLs passed through the front controller
 	# to not require app.php in the actual URL. In other words, a controller is
 	# by default accessed at /app.php/my/controller, but can also be accessed at
@@ -58,14 +49,14 @@ $HTTP["host"] == "www.myforums.com" {
 	url.rewrite-if-not-file = (
 	   "^/(.*)$" => "/app.php/$1"
 	)
-	
-	fastcgi.server = ( ".php" => 
+
+	fastcgi.server = ( ".php" =>
 		((
 			"bin-path" => "/usr/bin/php-cgi",
 			"socket" => "/tmp/php.socket",
 			"max-procs" => 4,
 			"idle-timeout" => 30,
-			"bin-environment" => ( 
+			"bin-environment" => (
 				"PHP_FCGI_CHILDREN" => "10",
 				"PHP_FCGI_MAX_REQUESTS" => "10000"
 			),

phpBB/docs/nginx.sample.conf

@@ -3,14 +3,6 @@
 # from your system's nginx.conf.
 # Tested with nginx 0.8.35.
 
-# If you want to use the X-Accel-Redirect feature,
-# add the following to your config.php.
-#
-#  define('PHPBB_ENABLE_X_ACCEL_REDIRECT', true);
-#
-# See http://wiki.nginx.org/XSendfile for the details
-# on X-Accel-Redirect.
-
 http {
     # Compression - requires gzip and gzip static modules.
     gzip on;
@@ -18,11 +10,11 @@ http {
     gzip_vary on;
     gzip_http_version 1.1;
     gzip_min_length 700;
-    
+
     # Compression levels over 6 do not give an appreciable improvement
     # in compression ratio, but take more resources.
     gzip_comp_level 6;
-    
+
     # IE 6 and lower do not support gzip with Vary correctly.
     gzip_disable "msie6";
     # Before nginx 0.7.63:
@@ -49,9 +41,7 @@ http {
         server_name myforums.com;
 
         # A trick from http://wiki.nginx.org/Pitfalls#Taxing_Rewrites:
-        rewrite ^ http://www.myforums.com$request_uri permanent;
-        # Equivalent to:
-        #rewrite ^(.*)$ http://www.myforums.com$1 permanent;
+        return 301 http://www.myforums.com$request_uri;
     }
 
     # The actual board domain.
@@ -72,7 +62,7 @@ http {
         }
 
         # Deny access to internal phpbb files.
-        location ~ /(config\.php|common\.php|cache|files|images/avatars/upload|includes|phpbb|store|vendor) {
+        location ~ /(config\.php|common\.php|cache|files|images/avatars/upload|includes|(?<!ext/)phpbb|store|vendor) {
             deny all;
             # deny was ignored before 0.8.40 for connections over IPv6.
             # Use internal directive to prohibit access on older versions.

phpBB/download/file.php

@@ -99,6 +99,11 @@ if (isset($_GET['avatar']))
 	/* @var $phpbb_avatar_manager \phpbb\avatar\manager */
 	$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 
+	if (@is_file($phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php'))
+	{
+		require_once($phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php');
+	}
+
 	$filename = $request->variable('avatar', '');
 	$avatar_group = false;
 	$exit = false;
@@ -159,6 +164,8 @@ $user->session_begin(false);
 $auth->acl($user->data);
 $user->setup('viewtopic');
 
+$phpbb_content_visibility = $phpbb_container->get('content.visibility');
+
 if (!$config['allow_attachments'] && !$config['allow_pm_attach'])
 {
 	send_status_line(404, 'Not Found');
@@ -225,7 +232,7 @@ else
 			$post_row = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);
 
-			if (!$post_row || ($post_row['post_visibility'] != ITEM_APPROVED && !$auth->acl_get('m_approve', $post_row['forum_id'])))
+			if (!$post_row || !$phpbb_content_visibility->is_visible('post', $post_row['forum_id'], $post_row))
 			{
 				// Attachment of a soft deleted post and the user is not allowed to see the post
 				send_status_line(404, 'Not Found');
@@ -247,7 +254,6 @@ else
 		}
 	}
 
-	$download_mode = (int) $extensions[$attachment['extension']]['download_mode'];
 	$display_cat = $extensions[$attachment['extension']]['display_cat'];
 
 	if (($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) && !$user->optionget('viewimg'))
@@ -260,6 +266,8 @@ else
 		$display_cat = ATTACHMENT_CATEGORY_NONE;
 	}
 
+	$redirect = '';
+
 	/**
 	* Event to modify data before sending file to browser
 	*
@@ -267,21 +275,22 @@ else
 	* @var	int		attach_id			The attachment ID
 	* @var	array	attachment			Array with attachment data
 	* @var	int		display_cat			Attachment category
-	* @var	int		download_mode		File extension specific download mode
 	* @var	array	extensions			Array with file extensions data
 	* @var	string	mode				Download mode
 	* @var	bool	thumbnail			Flag indicating if the file is a thumbnail
+	* @var	string	redirect			Do a redirection instead of reading the file
 	* @since 3.1.6-RC1
 	* @changed 3.1.7-RC1	Fixing wrong name of a variable (replacing "extension" by "extensions")
+	* @changed 3.3.0-a1		Add redirect variable
 	*/
 	$vars = array(
 		'attach_id',
 		'attachment',
 		'display_cat',
-		'download_mode',
 		'extensions',
 		'mode',
 		'thumbnail',
+		'redirect',
 	);
 	extract($phpbb_dispatcher->trigger_event('core.download_file_send_to_browser_before', compact($vars)));
 
@@ -302,23 +311,15 @@ else
 	}
 	else
 	{
-		// Determine the 'presenting'-method
-		if ($download_mode == PHYSICAL_LINK)
+		if (!empty($redirect))
 		{
-			// This presenting method should no longer be used
-			if (!@is_dir($phpbb_root_path . $config['upload_path']))
-			{
-				send_status_line(500, 'Internal Server Error');
-				trigger_error($user->lang['PHYSICAL_DOWNLOAD_NOT_POSSIBLE']);
-			}
-
-			redirect($phpbb_root_path . $config['upload_path'] . '/' . $attachment['physical_filename']);
-			file_gc();
+			redirect($redirect, false, true);
 		}
 		else
 		{
-			send_file_to_browser($attachment, $config['upload_path'], $display_cat);
-			file_gc();
+			send_file_to_browser($attachment, $display_cat);
 		}
+
+		file_gc();
 	}
 }

phpBB/includes/acp/acp_attachments.php

@@ -147,7 +147,6 @@ class acp_attachments
 
 						'allow_attachments'		=> array('lang' => 'ALLOW_ATTACHMENTS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
 						'allow_pm_attach'		=> array('lang' => 'ALLOW_PM_ATTACHMENTS',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'upload_path'			=> array('lang' => 'UPLOAD_DIR',			'validate' => 'wpath',	'type' => 'text:25:100', 'explain' => true),
 						'display_order'			=> array('lang' => 'DISPLAY_ORDER',			'validate' => 'bool',	'type' => 'custom', 'method' => 'display_order', 'explain' => true),
 						'attachment_quota'		=> array('lang' => 'ATTACH_QUOTA',			'validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
 						'max_filesize'			=> array('lang' => 'ATTACH_MAX_FILESIZE',	'validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
@@ -190,7 +189,7 @@ class acp_attachments
 				validate_config_vars($display_vars['vars'], $cfg_array, $error);
 
 				// Do not write values if there is an error
-				if (sizeof($error))
+				if (count($error))
 				{
 					$submit = false;
 				}
@@ -223,10 +222,7 @@ class acp_attachments
 				{
 					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_CONFIG_ATTACH');
 
-					// Check Settings
-					$this->test_upload($error, $this->new_config['upload_path'], false);
-
-					if (!sizeof($error))
+					if (!count($error))
 					{
 						trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
 					}
@@ -256,14 +252,14 @@ class acp_attachments
 				$supported_types = get_supported_image_types();
 
 				// Check Thumbnail Support
-				if (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !sizeof($supported_types['format'])))
+				if (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !count($supported_types['format'])))
 				{
 					$this->new_config['img_create_thumbnail'] = 0;
 				}
 
 				$template->assign_vars(array(
 					'U_SEARCH_IMAGICK'		=> $this->u_action . '&action=imgmagick',
-					'S_THUMBNAIL_SUPPORT'	=> (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !sizeof($supported_types['format']))) ? false : true)
+					'S_THUMBNAIL_SUPPORT'	=> (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !count($supported_types['format']))) ? false : true)
 				);
 
 				// Secure Download Options - Same procedure as with banning
@@ -290,7 +286,7 @@ class acp_attachments
 				$template->assign_vars(array(
 					'S_SECURE_DOWNLOADS'	=> $this->new_config['secure_downloads'],
 					'S_DEFINED_IPS'			=> ($defined_ips != '') ? true : false,
-					'S_WARNING'				=> (sizeof($error)) ? true : false,
+					'S_WARNING'				=> (count($error)) ? true : false,
 
 					'WARNING_MSG'			=> implode('<br />', $error),
 					'DEFINED_IPS'			=> $defined_ips,
@@ -363,7 +359,7 @@ class acp_attachments
 						// Generate correct Change List
 						$extensions = array();
 
-						for ($i = 0, $size = sizeof($extension_change_list); $i < $size; $i++)
+						for ($i = 0, $size = count($extension_change_list); $i < $size; $i++)
 						{
 							$extensions[$extension_change_list[$i]]['group_id'] = $group_select_list[$i];
 						}
@@ -390,7 +386,7 @@ class acp_attachments
 						// Delete Extension?
 						$extension_id_list = $request->variable('extension_id_list', array(0));
 
-						if (sizeof($extension_id_list))
+						if (count($extension_id_list))
 						{
 							$sql = 'SELECT extension
 								FROM ' . EXTENSIONS_TABLE . '
@@ -420,7 +416,7 @@ class acp_attachments
 
 					if ($add_extension && $add)
 					{
-						if (!sizeof($error))
+						if (!count($error))
 						{
 							$sql = 'SELECT extension_id
 								FROM ' . EXTENSIONS_TABLE . "
@@ -433,7 +429,7 @@ class acp_attachments
 							}
 							$db->sql_freeresult($result);
 
-							if (!sizeof($error))
+							if (!count($error))
 							{
 								$sql_ary = array(
 									'group_id'	=>	$add_extension_group,
@@ -447,7 +443,7 @@ class acp_attachments
 						}
 					}
 
-					if (!sizeof($error))
+					if (!count($error))
 					{
 						$notify[] = $user->lang['EXTENSIONS_UPDATED'];
 					}
@@ -558,7 +554,7 @@ class acp_attachments
 						$db->sql_freeresult($result);
 					}
 
-					if (!sizeof($error))
+					if (!count($error))
 					{
 						// Ok, build the update/insert array
 						$upload_icon	= $request->variable('upload_icon', 'no_image');
@@ -575,7 +571,7 @@ class acp_attachments
 							$max_filesize = 0;
 						}
 
-						if (!sizeof($allowed_forums))
+						if (!count($allowed_forums))
 						{
 							$forum_select = false;
 						}
@@ -590,11 +586,6 @@ class acp_attachments
 							'allow_in_pm'	=> ($allow_in_pm) ? 1 : 0,
 						);
 
-						if ($action == 'add')
-						{
-							$group_ary['download_mode'] = INLINE_LINK;
-						}
-
 						$sql = ($action == 'add') ? 'INSERT INTO ' . EXTENSION_GROUPS_TABLE . ' ' : 'UPDATE ' . EXTENSION_GROUPS_TABLE . ' SET ';
 						$sql .= $db->sql_build_array((($action == 'add') ? 'INSERT' : 'UPDATE'), $group_ary);
 						$sql .= ($action == 'edit') ? " WHERE group_id = $group_id" : '';
@@ -612,7 +603,7 @@ class acp_attachments
 
 					$extension_list = $request->variable('extensions', array(0));
 
-					if ($action == 'edit' && sizeof($extension_list))
+					if ($action == 'edit' && count($extension_list))
 					{
 						$sql = 'UPDATE ' . EXTENSIONS_TABLE . "
 							SET group_id = 0
@@ -620,7 +611,7 @@ class acp_attachments
 						$db->sql_query($sql);
 					}
 
-					if (sizeof($extension_list))
+					if (count($extension_list))
 					{
 						$sql = 'UPDATE ' . EXTENSIONS_TABLE . "
 							SET group_id = $group_id
@@ -630,7 +621,7 @@ class acp_attachments
 
 					$cache->destroy('_extensions');
 
-					if (!sizeof($error))
+					if (!count($error))
 					{
 						$notify[] = $user->lang['SUCCESS_EXTENSION_GROUP_' . strtoupper($action)];
 					}
@@ -806,7 +797,7 @@ class acp_attachments
 							'S_FILENAME_LIST'			=> $filename_list,
 							'S_EDIT_GROUP'				=> true,
 							'S_NO_IMAGE'				=> $no_image_select,
-							'S_FORUM_IDS'				=> (sizeof($forum_ids)) ? true : false,
+							'S_FORUM_IDS'				=> (count($forum_ids)) ? true : false,
 
 							'U_EXTENSIONS'		=> append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&amp;mode=extensions"),
 							'U_BACK'			=> $this->u_action,
@@ -922,13 +913,16 @@ class acp_attachments
 
 			case 'orphan':
 
+				/* @var $pagination \phpbb\pagination */
+				$pagination = $this->phpbb_container->get('pagination');
+
 				if ($submit)
 				{
 					$delete_files = (isset($_POST['delete'])) ? array_keys($request->variable('delete', array('' => 0))) : array();
 					$add_files = (isset($_POST['add'])) ? array_keys($request->variable('add', array('' => 0))) : array();
 					$post_ids = $request->variable('post_id', array('' => 0));
 
-					if (sizeof($delete_files))
+					if (count($delete_files))
 					{
 						$sql = 'SELECT *
 							FROM ' . ATTACHMENTS_TABLE . '
@@ -951,7 +945,7 @@ class acp_attachments
 						$db->sql_freeresult($result);
 					}
 
-					if (sizeof($delete_files))
+					if (count($delete_files))
 					{
 						$sql = 'DELETE FROM ' . ATTACHMENTS_TABLE . '
 							WHERE ' . $db->sql_in_set('attach_id', array_keys($delete_files));
@@ -971,7 +965,7 @@ class acp_attachments
 					}
 					unset($add_files);
 
-					if (sizeof($upload_list))
+					if (count($upload_list))
 					{
 						$template->assign_var('S_UPLOADING_FILES', true);
 
@@ -1064,13 +1058,29 @@ class acp_attachments
 					'S_ORPHAN'		=> true)
 				);
 
+				$attachments_per_page = (int) $config['topics_per_page'];
+
+				// Get total number or orphans older than 3 hours
+				$sql = 'SELECT COUNT(attach_id) as num_files, SUM(filesize) as total_size
+					FROM ' . ATTACHMENTS_TABLE . '
+					WHERE is_orphan = 1
+						AND filetime < ' . (time() - 3*60*60);
+				$result = $this->db->sql_query($sql);
+				$row = $this->db->sql_fetchrow($result);
+				$num_files = (int) $row['num_files'];
+				$total_size = (int) $row['total_size'];
+				$this->db->sql_freeresult($result);
+
+				$start = $request->variable('start', 0);
+				$start = $pagination->validate_start($start, $attachments_per_page, $num_files);
+
 				// Just get the files with is_orphan set and older than 3 hours
 				$sql = 'SELECT *
 					FROM ' . ATTACHMENTS_TABLE . '
 					WHERE is_orphan = 1
 						AND filetime < ' . (time() - 3*60*60) . '
 					ORDER BY filetime DESC';
-				$result = $db->sql_query($sql);
+				$result = $db->sql_query_limit($sql, $attachments_per_page, $start);
 
 				while ($row = $db->sql_fetchrow($result))
 				{
@@ -1086,6 +1096,20 @@ class acp_attachments
 				}
 				$db->sql_freeresult($result);
 
+				$pagination->generate_template_pagination(
+					$this->u_action,
+					'pagination',
+					'start',
+					$num_files,
+					$attachments_per_page,
+					$start
+				);
+
+				$template->assign_vars(array(
+					'TOTAL_FILES'		=> $num_files,
+					'TOTAL_SIZE'		=> get_formatted_filesize($total_size),
+				));
+
 			break;
 
 			case 'manage':
@@ -1094,7 +1118,7 @@ class acp_attachments
 				{
 					$delete_files = (isset($_POST['delete'])) ? array_keys($request->variable('delete', array('' => 0))) : array();
 
-					if (sizeof($delete_files))
+					if (count($delete_files))
 					{
 						// Select those attachments we want to delete...
 						$sql = 'SELECT real_filename
@@ -1110,7 +1134,7 @@ class acp_attachments
 
 						if ($num_deleted = $this->attachment_manager->delete('attach', $delete_files))
 						{
-							if (sizeof($delete_files) != $num_deleted)
+							if (count($delete_files) != $num_deleted)
 							{
 								$error[] = $user->lang['FILES_GONE'];
 							}
@@ -1231,7 +1255,7 @@ class acp_attachments
 				// Grab extensions
 				$extensions = $cache->obtain_attach_extensions(true);
 
-				for ($i = 0, $end = sizeof($attachments_list); $i < $end; ++$i)
+				for ($i = 0, $end = count($attachments_list); $i < $end; ++$i)
 				{
 					$row = $attachments_list[$i];
 
@@ -1266,7 +1290,7 @@ class acp_attachments
 			break;
 		}
 
-		if (sizeof($error))
+		if (count($error))
 		{
 			$template->assign_vars(array(
 				'S_WARNING'		=> true,
@@ -1274,7 +1298,7 @@ class acp_attachments
 			);
 		}
 
-		if (sizeof($notify))
+		if (count($notify))
 		{
 			$template->assign_vars(array(
 				'S_NOTIFY'		=> true,
@@ -1443,7 +1467,7 @@ class acp_attachments
 		$row['group_name'] = $user->lang['NOT_ASSIGNED'];
 		$group_name[] = $row;
 
-		for ($i = 0, $groups_size = sizeof($group_name); $i < $groups_size; $i++)
+		for ($i = 0, $groups_size = count($group_name); $i < $groups_size; $i++)
 		{
 			if ($default_group === false)
 			{
@@ -1503,50 +1527,6 @@ class acp_attachments
 		return $imagick;
 	}
 
-	/**
-	* Test Settings
-	*/
-	function test_upload(&$error, $upload_dir, $create_directory = false)
-	{
-		global $user, $phpbb_root_path;
-
-		// Does the target directory exist, is it a directory and writable.
-		if ($create_directory)
-		{
-			if (!file_exists($phpbb_root_path . $upload_dir))
-			{
-				@mkdir($phpbb_root_path . $upload_dir, 0777);
-
-				try
-				{
-					$this->filesystem->phpbb_chmod($phpbb_root_path . $upload_dir, CHMOD_READ | CHMOD_WRITE);
-				}
-				catch (\phpbb\filesystem\exception\filesystem_exception $e)
-				{
-					// Do nothing
-				}
-			}
-		}
-
-		if (!file_exists($phpbb_root_path . $upload_dir))
-		{
-			$error[] = sprintf($user->lang['NO_UPLOAD_DIR'], $upload_dir);
-			return;
-		}
-
-		if (!is_dir($phpbb_root_path . $upload_dir))
-		{
-			$error[] = sprintf($user->lang['UPLOAD_NOT_DIR'], $upload_dir);
-			return;
-		}
-
-		if (!$this->filesystem->is_writable($phpbb_root_path . $upload_dir))
-		{
-			$error[] = sprintf($user->lang['NO_WRITE_UPLOAD'], $upload_dir);
-			return;
-		}
-	}
-
 	/**
 	* Perform operations on sites for external linking
 	*/
@@ -1676,7 +1656,7 @@ class acp_attachments
 			}
 			$db->sql_freeresult($result);
 
-			if (sizeof($iplist))
+			if (count($iplist))
 			{
 				foreach ($iplist as $ip_entry)
 				{
@@ -1686,7 +1666,7 @@ class acp_attachments
 				}
 			}
 
-			if (sizeof($hostlist))
+			if (count($hostlist))
 			{
 				foreach ($hostlist as $host_entry)
 				{
@@ -1709,7 +1689,7 @@ class acp_attachments
 		{
 			$unip_sql = $request->variable('unip', array(0));
 
-			if (sizeof($unip_sql))
+			if (count($unip_sql))
 			{
 				$l_unip_list = '';
 

phpBB/includes/acp/acp_bbcodes.php

@@ -253,7 +253,7 @@ class acp_bbcodes
 
 						if ($row)
 						{
-							$bbcode_id = $row['max_bbcode_id'] + 1;
+							$bbcode_id = (int) $row['max_bbcode_id'] + 1;
 
 							// Make sure it is greater than the core bbcode ids...
 							if ($bbcode_id <= NUM_CORE_BBCODES)
@@ -494,7 +494,7 @@ class acp_bbcodes
 				// Pad backreference numbers from tokens
 				if (preg_match_all('/(?<!\\\\)\$([0-9]+)/', $replace, $repad))
 				{
-					$repad = $pad + sizeof(array_unique($repad[0]));
+					$repad = $pad + count(array_unique($repad[0]));
 					$replace = preg_replace_callback('/(?<!\\\\)\$([0-9]+)/', function ($match) use ($pad) {
 						return '${' . ($match[1] + $pad) . '}';
 					}, $replace);
@@ -553,10 +553,10 @@ class acp_bbcodes
 		}
 
 		// Lowercase tags
-		$bbcode_tag = preg_replace('/.*?\[([a-z0-9_-]+=?).*/i', '$1', $bbcode_match);
-		$bbcode_search = preg_replace('/.*?\[([a-z0-9_-]+)=?.*/i', '$1', $bbcode_match);
+		$bbcode_tag = preg_replace('/.*?\[([a-z0-9_-]+).*/i', '$1', $bbcode_match);
+		$bbcode_search = preg_replace('/.*?\[([a-z0-9_-]+).*/i', '$1', $bbcode_match);
 
-		if (!preg_match('/^[a-zA-Z0-9_-]+=?$/', $bbcode_tag))
+		if (!preg_match('/^[a-zA-Z0-9_-]+$/', $bbcode_tag))
 		{
 			global $user;
 			trigger_error($user->lang['BBCODE_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);

phpBB/includes/acp/acp_board.php

@@ -356,6 +356,7 @@ class acp_board
 						'load_user_activity_limit'		=> array('lang' => 'LOAD_USER_ACTIVITY_LIMIT',		'validate' => 'int:0:99999999',	'type' => 'number:0:99999999', 'explain' => true),
 						'load_tplcompile'		=> array('lang' => 'RECOMPILE_STYLES',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'allow_cdn'				=> array('lang' => 'ALLOW_CDN',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'enable_accurate_pm_button'	=> array('lang' => 'YES_ACCURATE_PM_BUTTON',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'allow_live_searches'	=> array('lang' => 'ALLOW_LIVE_SEARCHES',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 
 						'legend3'				=> 'CUSTOM_PROFILE_FIELDS',
@@ -444,11 +445,11 @@ class acp_board
 						'legend1'				=> 'GENERAL_SETTINGS',
 						'email_enable'			=> array('lang' => 'ENABLE_EMAIL',			'validate' => 'bool',	'type' => 'radio:enabled_disabled', 'explain' => true),
 						'board_email_form'		=> array('lang' => 'BOARD_EMAIL_FORM',		'validate' => 'bool',	'type' => 'radio:enabled_disabled', 'explain' => true),
-						'email_function_name'	=> array('lang' => 'EMAIL_FUNCTION_NAME',	'validate' => 'string',	'type' => 'text:20:50', 'explain' => true),
 						'email_package_size'	=> array('lang' => 'EMAIL_PACKAGE_SIZE',	'validate' => 'int:0',	'type' => 'number:0:99999', 'explain' => true),
 						'board_contact'			=> array('lang' => 'CONTACT_EMAIL',			'validate' => 'email',	'type' => 'email:25:100', 'explain' => true),
 						'board_contact_name'	=> array('lang' => 'CONTACT_EMAIL_NAME',	'validate' => 'string',	'type' => 'text:25:50', 'explain' => true),
 						'board_email'			=> array('lang' => 'ADMIN_EMAIL',			'validate' => 'email',	'type' => 'email:25:100', 'explain' => true),
+						'email_force_sender'	=> array('lang' => 'EMAIL_FORCE_SENDER',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'board_email_sig'		=> array('lang' => 'EMAIL_SIG',				'validate' => 'string',	'type' => 'textarea:5:30', 'explain' => true),
 						'board_hide_emails'		=> array('lang' => 'BOARD_HIDE_EMAILS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'send_test_email'		=> array('lang' => 'SEND_TEST_EMAIL',		'validate' => 'bool',	'type' => 'custom', 'method' => 'send_test_email', 'explain' => true),
@@ -503,7 +504,7 @@ class acp_board
 			$error[] = $user->lang['FORM_INVALID'];
 		}
 		// Do not write values if there is an error
-		if (sizeof($error))
+		if (count($error))
 		{
 			$submit = false;
 		}
@@ -532,13 +533,6 @@ class acp_board
 
 			$this->new_config[$config_name] = $config_value = $cfg_array[$config_name];
 
-			if ($config_name == 'email_function_name')
-			{
-				$this->new_config['email_function_name'] = trim(str_replace(array('(', ')'), array('', ''), $this->new_config['email_function_name']));
-				$this->new_config['email_function_name'] = (empty($this->new_config['email_function_name']) || !function_exists($this->new_config['email_function_name'])) ? 'mail' : $this->new_config['email_function_name'];
-				$config_value = $this->new_config['email_function_name'];
-			}
-
 			if ($submit)
 			{
 				if (strpos($data['type'], 'password') === 0 && $config_value === '********')
@@ -552,7 +546,7 @@ class acp_board
 
 				if ($config_name == 'allow_quick_reply' && isset($_POST['allow_quick_reply_enable']))
 				{
-					enable_bitfield_column_flag(FORUMS_TABLE, 'forum_flags', log(FORUM_FLAG_QUICK_REPLY, 2));
+					enable_bitfield_column_flag(FORUMS_TABLE, 'forum_flags', round(log(FORUM_FLAG_QUICK_REPLY, 2)));
 				}
 			}
 		}
@@ -690,7 +684,7 @@ class acp_board
 			'L_TITLE'			=> $user->lang[$display_vars['title']],
 			'L_TITLE_EXPLAIN'	=> $user->lang[$display_vars['title'] . '_EXPLAIN'],
 
-			'S_ERROR'			=> (sizeof($error)) ? true : false,
+			'S_ERROR'			=> (count($error)) ? true : false,
 			'ERROR_MSG'			=> implode('<br />', $error),
 
 			'U_ACTION'			=> $this->u_action)
@@ -1110,7 +1104,7 @@ class acp_board
 		$db->sql_query($sql);
 
 		// Already emptied for all...
-		if (sizeof($values))
+		if (count($values))
 		{
 			// Set for selected forums
 			$sql = 'UPDATE ' . FORUMS_TABLE . '

phpBB/includes/acp/acp_bots.php

@@ -55,7 +55,7 @@ class acp_bots
 		switch ($action)
 		{
 			case 'activate':
-				if ($bot_id || sizeof($mark))
+				if ($bot_id || count($mark))
 				{
 					$sql_id = ($bot_id) ? " = $bot_id" : ' IN (' . implode(', ', $mark) . ')';
 
@@ -69,7 +69,7 @@ class acp_bots
 			break;
 
 			case 'deactivate':
-				if ($bot_id || sizeof($mark))
+				if ($bot_id || count($mark))
 				{
 					$sql_id = ($bot_id) ? " = $bot_id" : ' IN (' . implode(', ', $mark) . ')';
 
@@ -83,7 +83,7 @@ class acp_bots
 			break;
 
 			case 'delete':
-				if ($bot_id || sizeof($mark))
+				if ($bot_id || count($mark))
 				{
 					if (confirm_box(true))
 					{
@@ -109,7 +109,7 @@ class acp_bots
 							WHERE bot_id $sql_id";
 						$db->sql_query($sql);
 
-						if (sizeof($user_id_ary))
+						if (count($user_id_ary))
 						{
 							$_tables = array(USERS_TABLE, USER_GROUP_TABLE);
 							foreach ($_tables as $table)
@@ -207,7 +207,7 @@ class acp_bots
 						$error[] = $user->lang['BOT_NAME_TAKEN'];
 					}
 
-					if (!sizeof($error))
+					if (!count($error))
 					{
 						// New bot? Create a new user and group entry
 						if ($action == 'add')
@@ -338,7 +338,7 @@ class acp_bots
 					'L_TITLE'		=> $user->lang['BOT_' . $l_title],
 					'U_ACTION'		=> $this->u_action . "&id=$bot_id&action=$action",
 					'U_BACK'		=> $this->u_action,
-					'ERROR_MSG'		=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR_MSG'		=> (count($error)) ? implode('<br />', $error) : '',
 
 					'BOT_NAME'		=> $bot_row['bot_name'],
 					'BOT_IP'		=> $bot_row['bot_ip'],
@@ -348,7 +348,7 @@ class acp_bots
 					'S_ACTIVE_OPTIONS'	=> $s_active_options,
 					'S_STYLE_OPTIONS'	=> $style_select,
 					'S_LANG_OPTIONS'	=> $lang_select,
-					'S_ERROR'			=> (sizeof($error)) ? true : false,
+					'S_ERROR'			=> (count($error)) ? true : false,
 					)
 				);
 

phpBB/includes/acp/acp_database.php

@@ -59,7 +59,7 @@ class acp_database
 						$format	= $request->variable('method', '');
 						$where	= $request->variable('where', '');
 
-						if (!sizeof($table))
+						if (!count($table))
 						{
 							trigger_error($user->lang['TABLE_SELECT_ERROR'] . adm_back_link($this->u_action), E_USER_WARNING);
 						}
@@ -495,7 +495,7 @@ function sanitize_data_mssql($text)
 		{
 			$val[] = "'" . $value . "'";
 		}
-		if (sizeof($matches[0]))
+		if (count($matches[0]))
 		{
 			$val[] = 'char(' . ord(array_shift($matches[0])) . ')';
 		}
@@ -519,7 +519,7 @@ function sanitize_data_oracle($text)
 		{
 			$val[] = "'" . $value . "'";
 		}
-		if (sizeof($matches[0]))
+		if (count($matches[0]))
 		{
 			$val[] = 'chr(' . ord(array_shift($matches[0])) . ')';
 		}
@@ -541,7 +541,7 @@ function sanitize_data_generic($text)
 		{
 			$val[] = "'" . $value . "'";
 		}
-		if (sizeof($matches[0]))
+		if (count($matches[0]))
 		{
 			$val[] = "'" . array_shift($matches[0]) . "'";
 		}
@@ -583,7 +583,7 @@ function fgetd_seekless(&$fp, $delim, $read, $seek, $eof, $buffer = 8192)
 	static $array = array();
 	static $record = '';
 
-	if (!sizeof($array))
+	if (!count($array))
 	{
 		while (!$eof($fp))
 		{
@@ -605,7 +605,7 @@ function fgetd_seekless(&$fp, $delim, $read, $seek, $eof, $buffer = 8192)
 		}
 	}
 
-	if (sizeof($array))
+	if (count($array))
 	{
 		return array_shift($array);
 	}

phpBB/includes/acp/acp_email.php

@@ -68,7 +68,7 @@ class acp_email
 				$error[] = $user->lang['NO_EMAIL_MESSAGE'];
 			}
 
-			if (!sizeof($error))
+			if (!count($error))
 			{
 				if (!empty($usernames))
 				{
@@ -168,7 +168,7 @@ class acp_email
 						{
 							$i = 0;
 
-							if (sizeof($email_list))
+							if (count($email_list))
 							{
 								$j++;
 							}
@@ -235,16 +235,16 @@ class acp_email
 				);
 				extract($phpbb_dispatcher->trigger_event('core.acp_email_send_before', compact($vars)));
 
-				for ($i = 0, $size = sizeof($email_list); $i < $size; $i++)
+				for ($i = 0, $size = count($email_list); $i < $size; $i++)
 				{
 					$used_lang = $email_list[$i][0]['lang'];
 					$used_method = $email_list[$i][0]['method'];
 
-					for ($j = 0, $list_size = sizeof($email_list[$i]); $j < $list_size; $j++)
+					for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++)
 					{
 						$email_row = $email_list[$i][$j];
 
-						$messenger->{((sizeof($email_list[$i]) == 1) ? 'to' : 'bcc')}($email_row['email'], $email_row['name']);
+						$messenger->{((count($email_list[$i]) == 1) ? 'to' : 'bcc')}($email_row['email'], $email_row['name']);
 						$messenger->im($email_row['jabber'], $email_row['name']);
 					}
 
@@ -322,8 +322,8 @@ class acp_email
 		$s_priority_options .= '<option value="' . MAIL_HIGH_PRIORITY . '">' . $user->lang['MAIL_HIGH_PRIORITY'] . '</option>';
 
 		$template_data = array(
-			'S_WARNING'				=> (sizeof($error)) ? true : false,
-			'WARNING_MSG'			=> (sizeof($error)) ? implode('<br />', $error) : '',
+			'S_WARNING'				=> (count($error)) ? true : false,
+			'WARNING_MSG'			=> (count($error)) ? implode('<br />', $error) : '',
 			'U_ACTION'				=> $this->u_action,
 			'S_GROUP_OPTIONS'		=> $select_list,
 			'USERNAMES'				=> implode("\n", $usernames),

phpBB/includes/acp/acp_extensions.php

@@ -24,23 +24,35 @@ if (!defined('IN_PHPBB'))
 
 class acp_extensions
 {
-	var $u_action;
-	var $tpl_name;
-	var $page_title;
+	public $u_action;
 
+	private $db;
+
+	/** @var  phpbb\config\config */
 	private $config;
+
+	/** @var \phpbb\template\twig\twig */
 	private $template;
 	private $user;
 	private $log;
+
+	/** @var \phpbb\request\request */
 	private $request;
 	private $phpbb_dispatcher;
-	private $ext_manager;
 
-	function main()
+	/** @var \phpbb\extension\manager */
+	private $ext_manager;
+	private $u_catalog_action;
+
+	/** @var string */
+	private $phpbb_root_path;
+
+	function main($id, $mode)
 	{
 		// Start the page
-		global $config, $user, $template, $request, $phpbb_extension_manager, $phpbb_root_path, $phpbb_log, $phpbb_dispatcher;
+		global $config, $user, $template, $request, $phpbb_extension_manager, $db, $phpbb_log, $phpbb_dispatcher, $phpbb_root_path;
 
+		$this->db       = $db;
 		$this->config = $config;
 		$this->template = $template;
 		$this->user = $user;
@@ -48,8 +60,24 @@ class acp_extensions
 		$this->log = $phpbb_log;
 		$this->phpbb_dispatcher = $phpbb_dispatcher;
 		$this->ext_manager = $phpbb_extension_manager;
+		$this->phpbb_root_path = $phpbb_root_path;
 
-		$this->user->add_lang(array('install', 'acp/extensions', 'migrator'));
+		$this->user->add_lang(['install', 'acp/extensions', 'migrator']);
+
+		switch ($mode)
+		{
+			case 'catalog':
+				$this->catalog_mode($id, $mode);
+			break;
+			default:
+				$this->main_mode($id, $mode);
+			break;
+		}
+	}
+
+	public function main_mode($id, $mode)
+	{
+		global $phpbb_extension_manager, $phpbb_container, $phpbb_admin_path, $phpEx;
 
 		$this->page_title = 'ACP_EXTENSIONS';
 
@@ -110,6 +138,8 @@ class acp_extensions
 			}
 		}
 
+		$this->u_catalog_action = append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&mode=catalog");
+
 		// What are we doing?
 		switch ($action)
 		{
@@ -133,7 +163,7 @@ class acp_extensions
 					$this->config->set('extension_force_unstable', false);
 					trigger_error($this->user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
 				}
-				break;
+			break;
 
 			case 'list':
 			default:
@@ -143,15 +173,27 @@ class acp_extensions
 					trigger_error($this->user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
 				}
 
-				$this->list_enabled_exts();
-				$this->list_disabled_exts();
-				$this->list_available_exts();
+				/** @var \phpbb\composer\manager $composer_manager */
+				$composer_manager = $phpbb_container->get('ext.composer.manager');
+
+				$managed_packages = [];
+				if ($composer_manager->check_requirements())
+				{
+					$managed_packages = $composer_manager->get_managed_packages();
+				}
+
+				$this->list_enabled_exts($phpbb_extension_manager, $managed_packages);
+				$this->list_disabled_exts($phpbb_extension_manager, $managed_packages);
+				$this->list_available_exts($phpbb_extension_manager, $managed_packages);
 
 				$this->template->assign_vars(array(
 					'U_VERSIONCHECK_FORCE' 	=> $this->u_action . '&action=list&versioncheck_force=1',
 					'FORCE_UNSTABLE'		=> $this->config['extension_force_unstable'],
 					'U_ACTION' 				=> $this->u_action,
+					'MANAGED_EXTENSIONS'	=> $managed_packages,
+					'U_CATALOG_ACTION' 		=> $this->u_catalog_action,
 				));
+				$this->request->disable_super_globals();
 
 				$this->tpl_name = 'acp_ext_list';
 			break;
@@ -223,7 +265,7 @@ class acp_extensions
 							'name' 		=> 'adm',
 							'ext_path' 	=> 'adm/style/',
 						),
-					), array($phpbb_root_path . 'adm/style'));
+					), array($this->phpbb_root_path . 'adm/style'));
 
 					$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_EXT_ENABLE', time(), array($ext_name));
 				}
@@ -391,11 +433,340 @@ class acp_extensions
 	}
 
 	/**
-	* Lists all the enabled extensions and dumps to the template
-	*
-	* @return null
-	*/
-	public function list_enabled_exts()
+	 * Handles the catalog mode of the extensions list
+	 *
+	 * @param string $id
+	 * @param string $mode
+	 */
+	public function catalog_mode($id, $mode)
+	{
+		global $phpbb_container;
+
+		$action = $this->request->variable('action', 'list');
+
+		/** @var \phpbb\language\language $language */
+		$language = $phpbb_container->get('language');
+
+		/** @var \phpbb\composer\manager $composer_manager */
+		$composer_manager = $phpbb_container->get('ext.composer.manager');
+
+		/** @var \phpbb\extension\manager $extensions_manager */
+		$extensions_manager = $phpbb_container->get('ext.manager');
+
+		if (!$composer_manager->check_requirements())
+		{
+			$this->page_title = 'ACP_EXTENSIONS_CATALOG';
+			$this->tpl_name = 'message_body';
+
+			$this->template->assign_vars([
+				'MESSAGE_TITLE'	=> $language->lang('EXTENSIONS_CATALOG_NOT_AVAILABLE'),
+				'MESSAGE_TEXT'	=> $language->lang('EXTENSIONS_COMPOSER_NOT_WRITABLE'),
+			]);
+
+			return;
+		}
+
+		switch ($action)
+		{
+			case 'install':
+				$this->page_title = 'ACP_EXTENSIONS_INSTALL';
+
+				$extension = $this->request->variable('extension', '');
+
+				if (empty($extension))
+				{
+					redirect($this->u_action);
+				}
+
+				$formatter = new \phpbb\composer\io\html_output_formatter([
+					'warning' => new \Symfony\Component\Console\Formatter\OutputFormatterStyle('black', 'yellow')
+				]);
+
+				$composer_io = new \phpbb\composer\io\web_io($language, '', $phpbb_container->getParameter('extensions.composer.output'), $formatter);
+
+				try
+				{
+					$composer_manager->install((array) $extension, $composer_io);
+				}
+				catch (\phpbb\exception\runtime_exception $e)
+				{
+					$this->display_composer_exception($language, $e, $composer_io);
+					return;
+				}
+				$this->tpl_name = 'detailed_message_body';
+
+				$this->template->assign_vars(array(
+						'MESSAGE_TITLE'			=> $language->lang('ACP_EXTENSIONS_INSTALL'),
+						'MESSAGE_TEXT'			=> $language->lang('EXTENSIONS_INSTALLED') . adm_back_link($this->u_action),
+						'MESSAGE_DETAIL'		=> $composer_io->getOutput(),
+						'MESSAGE_DETAIL_LEGEND'	=> $language->lang('COMPOSER_OUTPUT'),
+						'S_USER_NOTICE'			=> true,
+					)
+				);
+
+			break;
+			case 'remove':
+				$this->page_title = 'ACP_EXTENSIONS_REMOVE';
+
+				$extension = $this->request->variable('extension', '');
+
+				if (empty($extension))
+				{
+					redirect($this->u_action);
+				}
+
+				$formatter = new \phpbb\composer\io\html_output_formatter([
+					'warning' => new \Symfony\Component\Console\Formatter\OutputFormatterStyle('black', 'yellow')
+				]);
+
+				$composer_io = new \phpbb\composer\io\web_io($language, '', $phpbb_container->getParameter('extensions.composer.output'), $formatter);
+
+				try
+				{
+					$composer_manager->remove((array) $extension, $composer_io);
+				}
+				catch (\phpbb\exception\runtime_exception $e)
+				{
+					$this->display_composer_exception($language, $e, $composer_io);
+					return;
+				}
+				$this->tpl_name = 'detailed_message_body';
+
+				$this->template->assign_vars(array(
+						'MESSAGE_TITLE'			=> $language->lang('ACP_EXTENSIONS_REMOVE'),
+						'MESSAGE_TEXT'			=> $language->lang('EXTENSIONS_REMOVED') . adm_back_link($this->u_action),
+						'MESSAGE_DETAIL'		=> $composer_io->getOutput(),
+						'MESSAGE_DETAIL_LEGEND'	=> $language->lang('COMPOSER_OUTPUT'),
+						'S_USER_NOTICE'			=> true,
+					)
+				);
+
+			break;
+			case 'update':
+				$this->page_title = 'ACP_EXTENSIONS_UPDATE';
+
+				$extension = $this->request->variable('extension', '');
+
+				if (empty($extension))
+				{
+					redirect($this->u_action);
+				}
+
+				$formatter = new \phpbb\composer\io\html_output_formatter([
+					'warning' => new \Symfony\Component\Console\Formatter\OutputFormatterStyle('black', 'yellow')
+				]);
+
+				$composer_io = new \phpbb\composer\io\web_io($language, '', $phpbb_container->getParameter('extensions.composer.output'), $formatter);
+
+				try
+				{
+					$composer_manager->update((array) $extension, $composer_io);
+				}
+				catch (\phpbb\exception\runtime_exception $e)
+				{
+					$this->display_composer_exception($language, $e, $composer_io);
+					return;
+				}
+				$this->tpl_name = 'detailed_message_body';
+
+				$this->template->assign_vars(array(
+						'MESSAGE_TITLE'			=> $language->lang('ACP_EXTENSIONS_UPDATE'),
+						'MESSAGE_TEXT'			=> $language->lang('EXTENSIONS_UPDATED') . adm_back_link($this->u_action),
+						'MESSAGE_DETAIL'		=> $composer_io->getOutput(),
+						'MESSAGE_DETAIL_LEGEND'	=> $language->lang('COMPOSER_OUTPUT'),
+						'S_USER_NOTICE'			=> true,
+					)
+				);
+
+			break;
+			case 'manage':
+				$this->page_title = 'ACP_EXTENSIONS_MANAGE';
+
+				$extension = $this->request->variable('extension', '');
+
+				if (empty($extension))
+				{
+					redirect($this->u_action);
+				}
+
+				$formatter = new \phpbb\composer\io\html_output_formatter([
+					'warning' => new \Symfony\Component\Console\Formatter\OutputFormatterStyle('black', 'yellow')
+				]);
+
+				$composer_io = new \phpbb\composer\io\web_io($language, '', $phpbb_container->getParameter('extensions.composer.output'), $formatter);
+
+				try
+				{
+					$composer_manager->start_managing($extension, $composer_io);
+				}
+				catch (\phpbb\exception\runtime_exception $e)
+				{
+					$this->display_composer_exception($language, $e, $composer_io);
+					return;
+				}
+				$this->tpl_name = 'detailed_message_body';
+
+				$this->template->assign_vars(array(
+						'MESSAGE_TITLE'			=> $language->lang('ACP_EXTENSIONS_MANAGE'),
+						'MESSAGE_TEXT'			=> $language->lang('EXTENSION_MANAGED_SUCCESS', $extension) . adm_back_link($this->u_action),
+						'MESSAGE_DETAIL'		=> $composer_io->getOutput(),
+						'MESSAGE_DETAIL_LEGEND'	=> $language->lang('COMPOSER_OUTPUT'),
+						'S_USER_NOTICE'			=> true,
+					)
+				);
+
+			break;
+			case 'list':
+			default:
+				if (!$this->config['exts_composer_packagist'] && $this->request->is_set('enable_packagist') && confirm_box(true))
+				{
+					$this->config->set('exts_composer_packagist', true);
+					$composer_manager->reset_cache();
+
+					trigger_error($language->lang('CONFIG_UPDATED') . adm_back_link($this->u_action));
+				}
+
+				$submit = $this->request->is_set('update');
+				if ($submit)
+				{
+					if (!check_form_key('catalog_settings'))
+					{
+						trigger_error($language->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					$enable_packagist = $this->request->variable('enable_packagist', false);
+					$enable_on_install = $this->request->variable('enable_on_install', false);
+					$purge_on_remove = $this->request->variable('purge_on_remove', false);
+					$minimum_stability = $this->request->variable('minimum_stability', 'stable');
+					$repositories = array_unique(
+						array_filter(
+							array_map(
+								'trim',
+								explode("\n", $this->request->variable('repositories', ''))
+							)
+						)
+					);
+
+					$previous_minimum_stability = $this->config['exts_composer_minimum_stability'];
+					$previous_repositories = $this->config['exts_composer_repositories'];
+					$previous_enable_packagist = $this->config['exts_composer_packagist'];
+
+					$this->config->set('exts_composer_enable_on_install', $enable_on_install);
+					$this->config->set('exts_composer_purge_on_remove', $purge_on_remove);
+					$this->config->set('exts_composer_minimum_stability', $minimum_stability);
+					$this->config->set('exts_composer_repositories', json_encode($repositories, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+
+					if ($minimum_stability != $previous_minimum_stability
+						|| $repositories != $previous_repositories
+						|| $enable_packagist != $previous_enable_packagist)
+					{
+						$composer_manager->reset_cache();
+					}
+
+					if (!$this->config['exts_composer_packagist'] && $enable_packagist)
+					{
+						$s_hidden_fields = build_hidden_fields(array(
+							'enable_packagist'	=> $enable_packagist
+						));
+
+						confirm_box(false, $language->lang('ENABLE_PACKAGIST_CONFIRM'), $s_hidden_fields);
+					}
+					else
+					{
+						$this->config->set('exts_composer_packagist', $enable_packagist);
+						trigger_error($language->lang('CONFIG_UPDATED') . adm_back_link($this->u_action));
+					}
+				}
+
+				/** @var \phpbb\composer\extension_manager $manager */
+				$manager = $phpbb_container->get('ext.composer.manager');
+
+				/** @var \phpbb\pagination $pagination */
+				$pagination = $phpbb_container->get('pagination');
+
+				$start = $this->request->variable('start', 0);
+				$base_url = $this->u_action;
+
+				$available_extensions = $manager->get_available_packages();
+				$managed_packages = $manager->get_managed_packages();
+
+				$extensions = array_slice($available_extensions, $start, 20);
+
+				$pagination->generate_template_pagination($base_url, 'pagination', 'start', count($available_extensions), 20, $start);
+
+				$this->page_title = 'ACP_EXTENSIONS_CATALOG';
+				$this->tpl_name = 'acp_ext_catalog';
+
+				$this->template->assign_vars([
+					'extensions'			=> $extensions,
+					'managed_extensions'	=> array_keys($managed_packages),
+					'installed_extensions'	=> array_keys($extensions_manager->all_available()),
+					'U_ACTION'				=> $this->u_action,
+					'settings' => [
+						'enable_packagist'	=> $this->config['exts_composer_packagist'],
+						'enable_on_install'	=> $this->config['exts_composer_enable_on_install'],
+						'purge_on_remove'	=> $this->config['exts_composer_purge_on_remove'],
+						'minimum_stability'	=> $this->config['exts_composer_minimum_stability'],
+						'stabilities'		=> array_keys(\Composer\Package\BasePackage::$stabilities),
+						'repositories'		=> json_decode($this->config['exts_composer_repositories'], true),
+					],
+				]);
+
+				add_form_key('catalog_settings');
+
+			break;
+		}
+	}
+
+	/**
+	 * Display an exception raised by the composer manager
+	 *
+	 * @param \phpbb\language\language           $language
+	 * @param \phpbb\exception\runtime_exception $e
+	 * @param \phpbb\composer\io\web_io          $composer_io
+	 */
+	private function display_composer_exception(\phpbb\language\language $language, \phpbb\exception\runtime_exception $e, \phpbb\composer\io\web_io $composer_io)
+	{
+		$this->tpl_name = 'detailed_message_body';
+
+		if ($e->getPrevious())
+		{
+			$message_title = $language->lang_array($e->getMessage(), $e->get_parameters());
+
+			if ($e->getPrevious() instanceof \phpbb\exception\exception_interface)
+			{
+				$message_text  = $language->lang_array($e->getPrevious()->getMessage(), $e->getPrevious()->get_parameters()) . adm_back_link($this->u_action);
+			}
+			else
+			{
+				$message_text = $e->getPrevious()->getMessage() . adm_back_link($this->u_action);
+			}
+		}
+		else
+		{
+			$message_title = $language->lang('INFORMATION');
+			$message_text  = $language->lang_array($e->getMessage(), $e->get_parameters()) . adm_back_link($this->u_action);
+		}
+
+		$this->template->assign_vars(array(
+				'MESSAGE_TITLE'			=> $message_title,
+				'MESSAGE_TEXT'			=> $message_text,
+				'MESSAGE_DETAIL'		=> $composer_io->getOutput(),
+				'MESSAGE_DETAIL_LEGEND'	=> $language->lang('COMPOSER_OUTPUT'),
+				'S_USER_ERROR'			=> true,
+			)
+		);
+	}
+
+	/**
+	 * Lists all the enabled extensions and dumps to the template
+	 *
+	 * @param \phpbb\extension\manager  $phpbb_extension_manager     An instance of the extension manager
+	 * @param array                     $managed_packages            List of managed packages
+	 *
+	 * @return null
+	 */
+	public function list_enabled_exts(\phpbb\extension\manager $phpbb_extension_manager, array $managed_packages)
 	{
 		$enabled_extension_meta_data = array();
 
@@ -409,6 +780,7 @@ class acp_extensions
 				$enabled_extension_meta_data[$name] = array(
 					'META_DISPLAY_NAME' => $md_manager->get_metadata('display-name'),
 					'META_VERSION' => $meta['version'],
+					'META_NAME' => $md_manager->get_metadata('name'),
 				);
 
 				if (isset($meta['extra']['version-check']))
@@ -458,15 +830,29 @@ class acp_extensions
 			$this->output_actions('enabled', array(
 				'DISABLE'		=> $this->u_action . '&action=disable_pre&ext_name=' . urlencode($name),
 			));
+
+			if (isset($managed_packages[$block_vars['META_NAME']]))
+			{
+				$this->output_actions('enabled', [
+					'UPDATE' => $this->u_catalog_action . '&action=update&extension=' . urlencode($block_vars['META_NAME']),
+					'REMOVE' => [
+						'url' => $this->u_catalog_action . '&action=remove&extension=' . urlencode($block_vars['META_NAME']),
+						'color' => '#BC2A4D;',
+					]
+				]);
+			}
 		}
 	}
 
 	/**
-	* Lists all the disabled extensions and dumps to the template
-	*
-	* @return null
-	*/
-	public function list_disabled_exts()
+	 * Lists all the disabled extensions and dumps to the template
+	 *
+	 * @param \phpbb\extension\manager  $phpbb_extension_manager     An instance of the extension manager
+	 * @param array                     $managed_packages            List of managed packages
+	 *
+	 * @return null
+	 */
+	public function list_disabled_exts(\phpbb\extension\manager $phpbb_extension_manager, array $managed_packages)
 	{
 		$disabled_extension_meta_data = array();
 
@@ -480,6 +866,7 @@ class acp_extensions
 				$disabled_extension_meta_data[$name] = array(
 					'META_DISPLAY_NAME' => $md_manager->get_metadata('display-name'),
 					'META_VERSION' => $meta['version'],
+					'META_NAME' => $md_manager->get_metadata('name'),
 				);
 
 				if (isset($meta['extra']['version-check']))
@@ -527,15 +914,29 @@ class acp_extensions
 				'ENABLE'		=> $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name),
 				'DELETE_DATA'	=> $this->u_action . '&action=delete_data_pre&ext_name=' . urlencode($name),
 			));
+
+			if (isset($managed_packages[$block_vars['META_NAME']]))
+			{
+				$this->output_actions('disabled', [
+					'UPDATE' => $this->u_catalog_action . '&action=update&extension=' . urlencode($block_vars['META_NAME']),
+					'REMOVE' => [
+						'url' => $this->u_catalog_action . '&action=remove&extension=' . urlencode($block_vars['META_NAME']),
+						'color' => '#BC2A4D;',
+					]
+				]);
+			}
 		}
 	}
 
 	/**
-	* Lists all the available extensions and dumps to the template
-	*
-	* @return null
-	*/
-	public function list_available_exts()
+	 * Lists all the available extensions and dumps to the template
+	 *
+	 * @param \phpbb\extension\manager  $phpbb_extension_manager     An instance of the extension manager
+	 * @param array                     $managed_packages            List of managed packages
+	 *
+	 * @return null
+	 */
+	public function list_available_exts(\phpbb\extension\manager $phpbb_extension_manager, array $managed_packages)
 	{
 		$uninstalled = array_diff_key($this->ext_manager->all_available(), $this->ext_manager->all_configured());
 
@@ -551,6 +952,7 @@ class acp_extensions
 				$available_extension_meta_data[$name] = array(
 					'META_DISPLAY_NAME' => $md_manager->get_metadata('display-name'),
 					'META_VERSION' => $meta['version'],
+					'META_NAME' => $md_manager->get_metadata('name'),
 				);
 
 				if (isset($meta['extra']['version-check']))
@@ -604,13 +1006,26 @@ class acp_extensions
 	*/
 	private function output_actions($block, $actions)
 	{
-		foreach ($actions as $lang => $url)
+		foreach ($actions as $lang => $options)
 		{
-			$this->template->assign_block_vars($block . '.actions', array(
+			$url = $options;
+			if (is_array($options))
+			{
+				$url = $options['url'];
+			}
+
+			$vars = array(
 				'L_ACTION'			=> $this->user->lang('EXTENSION_' . $lang),
 				'L_ACTION_EXPLAIN'	=> (isset($this->user->lang['EXTENSION_' . $lang . '_EXPLAIN'])) ? $this->user->lang('EXTENSION_' . $lang . '_EXPLAIN') : '',
 				'U_ACTION'			=> $url,
-			));
+			);
+
+			if (isset($options['color']))
+			{
+				$vars['COLOR'] = $options['color'];
+			}
+
+			$this->template->assign_block_vars($block . '.actions', $vars);
 		}
 	}
 

phpBB/includes/acp/acp_forums.php

@@ -90,7 +90,7 @@ class acp_forums
 
 					$errors = $this->delete_forum($forum_id, $action_posts, $action_subforums, $posts_to_id, $subforums_to_id);
 
-					if (sizeof($errors))
+					if (count($errors))
 					{
 						break;
 					}
@@ -198,7 +198,7 @@ class acp_forums
 
 					$errors = $this->update_forum_data($forum_data);
 
-					if (!sizeof($errors))
+					if (!count($errors))
 					{
 						$forum_perm_from = $request->variable('forum_perm_from', 0);
 						$cache->destroy('sql', FORUMS_TABLE);
@@ -622,7 +622,7 @@ class acp_forums
 
 				$template_data = array(
 					'S_EDIT_FORUM'		=> true,
-					'S_ERROR'			=> (sizeof($errors)) ? true : false,
+					'S_ERROR'			=> (count($errors)) ? true : false,
 					'S_PARENT_ID'		=> $this->parent_id,
 					'S_FORUM_PARENT_ID'	=> $forum_data['parent_id'],
 					'S_ADD_ACTION'		=> ($action == 'add') ? true : false,
@@ -632,7 +632,7 @@ class acp_forums
 
 					'L_COPY_PERMISSIONS_EXPLAIN'	=> $user->lang['COPY_PERMISSIONS_' . strtoupper($action) . '_EXPLAIN'],
 					'L_TITLE'						=> $user->lang[$this->page_title],
-					'ERROR_MSG'						=> (sizeof($errors)) ? implode('<br />', $errors) : '',
+					'ERROR_MSG'						=> (count($errors)) ? implode('<br />', $errors) : '',
 
 					'FORUM_NAME'				=> $forum_data['forum_name'],
 					'FORUM_DATA_LINK'			=> $forum_data['forum_link'],
@@ -772,8 +772,8 @@ class acp_forums
 					'S_FORUM_LINK'			=> ($forum_data['forum_type'] == FORUM_LINK) ? true : false,
 					'S_HAS_SUBFORUMS'		=> ($forum_data['right_id'] - $forum_data['left_id'] > 1) ? true : false,
 					'S_FORUMS_LIST'			=> $forums_list,
-					'S_ERROR'				=> (sizeof($errors)) ? true : false,
-					'ERROR_MSG'				=> (sizeof($errors)) ? implode('<br />', $errors) : '')
+					'S_ERROR'				=> (count($errors)) ? true : false,
+					'ERROR_MSG'				=> (count($errors)) ? implode('<br />', $errors) : '')
 				);
 
 				return;
@@ -924,7 +924,7 @@ class acp_forums
 		unset($rowset);
 
 		$template->assign_vars(array(
-			'ERROR_MSG'		=> (sizeof($errors)) ? implode('<br />', $errors) : '',
+			'ERROR_MSG'		=> (count($errors)) ? implode('<br />', $errors) : '',
 			'NAVIGATION'	=> $navigation,
 			'FORUM_BOX'		=> $forum_box,
 			'U_SEL_ACTION'	=> $this->u_action,
@@ -1053,7 +1053,7 @@ class acp_forums
 		// What are we going to do tonight Brain? The same thing we do everynight,
 		// try to take over the world ... or decide whether to continue update
 		// and if so, whether it's a new forum/cat/link or an existing one
-		if (sizeof($errors))
+		if (count($errors))
 		{
 			return $errors;
 		}
@@ -1217,12 +1217,12 @@ class acp_forums
 							$errors = array_merge($errors, $this->delete_forum_content($_row['forum_id']));
 						}
 
-						if (sizeof($errors))
+						if (count($errors))
 						{
 							return $errors;
 						}
 
-						if (sizeof($forum_ids))
+						if (count($forum_ids))
 						{
 							$sql = 'DELETE FROM ' . FORUMS_TABLE . '
 								WHERE ' . $db->sql_in_set('forum_id', $forum_ids);
@@ -1252,7 +1252,7 @@ class acp_forums
 								$allowed_forums = array_diff($allowed_forums, $forum_ids);
 
 								$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . "
-									SET allowed_forums = '" . ((sizeof($allowed_forums)) ? serialize($allowed_forums) : '') . "'
+									SET allowed_forums = '" . ((count($allowed_forums)) ? serialize($allowed_forums) : '') . "'
 									WHERE group_id = {$_row['group_id']}";
 								$db->sql_query($sql);
 							}
@@ -1321,7 +1321,7 @@ class acp_forums
 				$forum_data_sql['forum_last_poster_colour'] = '';
 			}
 
-			if (sizeof($errors))
+			if (count($errors))
 			{
 				return $errors;
 			}
@@ -1338,7 +1338,7 @@ class acp_forums
 				}
 			}
 
-			if (sizeof($errors))
+			if (count($errors))
 			{
 				return $errors;
 			}
@@ -1431,12 +1431,14 @@ class acp_forums
 			return $errors;
 		}
 
+		$db->sql_transaction('begin');
+
 		$moved_forums = get_forum_branch($from_id, 'children', 'descending');
 		$from_data = $moved_forums[0];
-		$diff = sizeof($moved_forums) * 2;
+		$diff = count($moved_forums) * 2;
 
 		$moved_ids = array();
-		for ($i = 0, $size = sizeof($moved_forums); $i < $size; ++$i)
+		for ($i = 0, $size = count($moved_forums); $i < $size; ++$i)
 		{
 			$moved_ids[] = $moved_forums[$i]['forum_id'];
 		}
@@ -1502,6 +1504,8 @@ class acp_forums
 			WHERE " . $db->sql_in_set('forum_id', $moved_ids);
 		$db->sql_query($sql);
 
+		$db->sql_transaction('commit');
+
 		return $errors;
 	}
 
@@ -1612,7 +1616,7 @@ class acp_forums
 			}
 		}
 
-		if (sizeof($errors))
+		if (count($errors))
 		{
 			return $errors;
 		}
@@ -1628,12 +1632,12 @@ class acp_forums
 				$errors = array_merge($errors, $this->delete_forum_content($row['forum_id']));
 			}
 
-			if (sizeof($errors))
+			if (count($errors))
 			{
 				return $errors;
 			}
 
-			$diff = sizeof($forum_ids) * 2;
+			$diff = count($forum_ids) * 2;
 
 			$sql = 'DELETE FROM ' . FORUMS_TABLE . '
 				WHERE ' . $db->sql_in_set('forum_id', $forum_ids);
@@ -1706,7 +1710,7 @@ class acp_forums
 				}
 			}
 
-			if (sizeof($errors))
+			if (count($errors))
 			{
 				return $errors;
 			}
@@ -1754,7 +1758,7 @@ class acp_forums
 			$allowed_forums = array_diff($allowed_forums, $forum_ids);
 
 			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . "
-				SET allowed_forums = '" . ((sizeof($allowed_forums)) ? serialize($allowed_forums) : '') . "'
+				SET allowed_forums = '" . ((count($allowed_forums)) ? serialize($allowed_forums) : '') . "'
 				WHERE group_id = {$row['group_id']}";
 			$db->sql_query($sql);
 		}
@@ -1927,9 +1931,9 @@ class acp_forums
 						}
 						$db->sql_freeresult($result);
 
-						if (sizeof($ids))
+						if (count($ids))
 						{
-							$start += sizeof($ids);
+							$start += count($ids);
 
 							foreach ($tables as $table)
 							{
@@ -1937,7 +1941,7 @@ class acp_forums
 							}
 						}
 					}
-					while (sizeof($ids) == $batch_size);
+					while (count($ids) == $batch_size);
 				}
 				unset($ids);
 
@@ -1978,7 +1982,7 @@ class acp_forums
 		}
 
 		// Adjust users post counts
-		if (sizeof($post_counts))
+		if (count($post_counts))
 		{
 			foreach ($post_counts as $poster_id => $substract)
 			{
@@ -2062,7 +2066,7 @@ class acp_forums
 		}
 		$db->sql_freeresult($result);
 
-		if (!sizeof($target))
+		if (!count($target))
 		{
 			// The forum is already on top or bottom
 			return false;

phpBB/includes/acp/acp_groups.php

@@ -187,7 +187,7 @@ class acp_groups
 
 							group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
 
-							$start = (sizeof($mark_ary) < 200) ? 0 : $start + 200;
+							$start = (count($mark_ary) < 200) ? 0 : $start + 200;
 						}
 						else
 						{
@@ -486,7 +486,7 @@ class acp_groups
 						$error = array_merge($error, $validation_error);
 					}
 
-					if (!sizeof($error))
+					if (!count($error))
 					{
 						// Only set the rank, colour, etc. if it's changed or if we're adding a new
 						// group. This prevents existing group members being updated if no changes
@@ -614,7 +614,7 @@ class acp_groups
 						}
 					}
 
-					if (sizeof($error))
+					if (count($error))
 					{
 						$error = array_map(array(&$user, 'lang'), $error);
 						$group_rank = $submit_ary['rank'];
@@ -732,12 +732,12 @@ class acp_groups
 					'S_ADD_GROUP'		=> ($action == 'add') ? true : false,
 					'S_GROUP_PERM'		=> ($action == 'add' && $auth->acl_get('a_authgroups') && $auth->acl_gets('a_aauth', 'a_fauth', 'a_mauth', 'a_uauth')) ? true : false,
 					'S_INCLUDE_SWATCH'	=> true,
-					'S_ERROR'			=> (sizeof($error)) ? true : false,
+					'S_ERROR'			=> (count($error)) ? true : false,
 					'S_SPECIAL_GROUP'	=> ($group_type == GROUP_SPECIAL) ? true : false,
 					'S_USER_FOUNDER'	=> ($user->data['user_type'] == USER_FOUNDER) ? true : false,
 					'S_AVATARS_ENABLED'		=> ($config['allow_avatar'] && $avatars_enabled),
 
-					'ERROR_MSG'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR_MSG'				=> (count($error)) ? implode('<br />', $error) : '',
 					'GROUP_NAME'			=> $group_helper->get_name($group_name),
 					'GROUP_INTERNAL_NAME'	=> $group_name,
 					'GROUP_DESC'			=> $group_desc_data['text'],
@@ -926,7 +926,7 @@ class acp_groups
 		);
 
 		// Get us all the groups
-		$sql = 'SELECT g.group_id, g.group_name, g.group_type
+		$sql = 'SELECT g.group_id, g.group_name, g.group_type, g.group_colour
 			FROM ' . GROUPS_TABLE . ' g
 			ORDER BY g.group_type ASC, g.group_name';
 		$result = $db->sql_query($sql);
@@ -985,6 +985,7 @@ class acp_groups
 					'S_GROUP_SPECIAL'	=> ($row['group_type'] == GROUP_SPECIAL) ? true : false,
 
 					'GROUP_NAME'	=> $group_name,
+					'GROUP_COLOR'	=> $row['group_colour'],
 					'TOTAL_MEMBERS'	=> $row['total_members'],
 					'PENDING_MEMBERS' => $row['pending_members']
 				));

phpBB/includes/acp/acp_help_phpbb.php

@@ -48,7 +48,7 @@ class acp_help_phpbb
 			$error[] = $user->lang['FORM_INVALID'];
 		}
 		// Do not write values if there is an error
-		if (sizeof($error))
+		if (count($error))
 		{
 			$submit = false;
 		}

phpBB/includes/acp/acp_icons.php

@@ -166,7 +166,7 @@ class acp_icons
 					}
 					$db->sql_freeresult($result);
 
-					if (sizeof($smilies))
+					if (count($smilies))
 					{
 						foreach ($smilies as $row)
 						{
@@ -301,7 +301,7 @@ class acp_icons
 				}
 
 				// Ok, another row for adding an addition code for a pre-existing image...
-				if ($action == 'add' && $mode == 'smilies' && sizeof($smilies))
+				if ($action == 'add' && $mode == 'smilies' && count($smilies))
 				{
 					$template->assign_vars(array(
 						'S_ADD_CODE'		=> true,
@@ -378,7 +378,7 @@ class acp_icons
 				{
 					$smiley_count = $this->item_count($table);
 
-					$addable_smileys_count = sizeof($images);
+					$addable_smileys_count = count($images);
 					foreach ($images as $image)
 					{
 						if (!isset($image_add[$image]))
@@ -546,8 +546,8 @@ class acp_icons
 					{
 						if (preg_match_all("#'(.*?)', ?#", $pak_entry, $data))
 						{
-							if ((sizeof($data[1]) != 4 && $mode == 'icons') ||
-								((sizeof($data[1]) != 6 || (empty($data[1][4]) || empty($data[1][5]))) && $mode == 'smilies' ))
+							if ((count($data[1]) != 4 && $mode == 'icons') ||
+								((count($data[1]) != 6 || (empty($data[1][4]) || empty($data[1][5]))) && $mode == 'smilies' ))
 							{
 								trigger_error($user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING);
 							}
@@ -605,7 +605,7 @@ class acp_icons
 					if ($mode == 'smilies')
 					{
 						$smiley_count = $this->item_count($table);
-						if ($smiley_count + sizeof($pak_ary) > SMILEY_LIMIT)
+						if ($smiley_count + count($pak_ary) > SMILEY_LIMIT)
 						{
 							trigger_error($user->lang('TOO_MANY_SMILIES', SMILEY_LIMIT) . adm_back_link($this->u_action), E_USER_WARNING);
 						}
@@ -616,8 +616,8 @@ class acp_icons
 						$data = array();
 						if (preg_match_all("#'(.*?)', ?#", $pak_entry, $data))
 						{
-							if ((sizeof($data[1]) != 4 && $mode == 'icons') ||
-								(sizeof($data[1]) != 6 && $mode == 'smilies'))
+							if ((count($data[1]) != 4 && $mode == 'icons') ||
+								(count($data[1]) != 6 && $mode == 'smilies'))
 							{
 								trigger_error($user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING);
 							}

phpBB/includes/acp/acp_inactive.php

@@ -70,7 +70,7 @@ class acp_inactive
 		$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
 		gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
 
-		if ($submit && sizeof($mark))
+		if ($submit && count($mark))
 		{
 			if ($action !== 'delete' && !check_form_key($form_key))
 			{

phpBB/includes/acp/acp_language.php

@@ -32,7 +32,7 @@ class acp_language
 	function main($id, $mode)
 	{
 		global $config, $db, $user, $template, $phpbb_log, $phpbb_container;
-		global $phpbb_root_path, $phpEx, $request;
+		global $phpbb_root_path, $phpEx, $request, $phpbb_dispatcher;
 
 		if (!function_exists('validate_language_iso_name'))
 		{
@@ -229,7 +229,20 @@ class acp_language
 
 					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_LANGUAGE_PACK_DELETED', false, array($row['lang_english_name']));
 
-					trigger_error(sprintf($user->lang['LANGUAGE_PACK_DELETED'], $row['lang_english_name']) . adm_back_link($this->u_action));
+					$delete_message = sprintf($user->lang['LANGUAGE_PACK_DELETED'], $row['lang_english_name']);
+					$lang_iso = $row['lang_iso'];
+					/**
+					 * Run code after language deleted
+					 *
+					 * @event core.acp_language_after_delete
+					 * @var	string 	lang_iso     	Language ISO code
+					 * @var	string  delete_message  Delete message appear to user
+					 * @since 3.2.2-RC1
+					 */
+					$vars = array('lang_iso', 'delete_message');
+					extract($phpbb_dispatcher->trigger_event('core.acp_language_after_delete', compact($vars)));
+
+					trigger_error($delete_message . adm_back_link($this->u_action));
 				}
 				else
 				{
@@ -402,7 +415,7 @@ class acp_language
 
 		unset($installed);
 
-		if (sizeof($new_ary))
+		if (count($new_ary))
 		{
 			foreach ($new_ary as $iso => $lang_ary)
 			{

phpBB/includes/acp/acp_logs.php

@@ -57,7 +57,7 @@ class acp_logs
 			{
 				$conditions = array();
 
-				if ($deletemark && sizeof($marked))
+				if ($deletemark && count($marked))
 				{
 					$conditions['log_id'] = array('IN' => $marked);
 				}
@@ -167,7 +167,7 @@ class acp_logs
 				'IP'				=> $row['ip'],
 				'DATE'				=> $user->format_date($row['time']),
 				'ACTION'			=> $row['action'],
-				'DATA'				=> (sizeof($data)) ? implode(' | ', $data) : '',
+				'DATA'				=> (count($data)) ? implode(' | ', $data) : '',
 				'ID'				=> $row['id'],
 				)
 			);

phpBB/includes/acp/acp_main.php

@@ -337,7 +337,7 @@ class acp_main
 							}
 							unset($posted);
 
-							if (sizeof($sql_ary))
+							if (count($sql_ary))
 							{
 								$db->sql_multi_insert(TOPICS_POSTED_TABLE, $sql_ary);
 							}
@@ -502,26 +502,8 @@ class acp_main
 
 		$upload_dir_size = get_formatted_filesize($config['upload_dir_size']);
 
-		$avatar_dir_size = 0;
-
-		if ($avatar_dir = @opendir($phpbb_root_path . $config['avatar_path']))
-		{
-			while (($file = readdir($avatar_dir)) !== false)
-			{
-				if ($file[0] != '.' && $file != 'CVS' && strpos($file, 'index.') === false)
-				{
-					$avatar_dir_size += filesize($phpbb_root_path . $config['avatar_path'] . '/' . $file);
-				}
-			}
-			closedir($avatar_dir);
-
-			$avatar_dir_size = get_formatted_filesize($avatar_dir_size);
-		}
-		else
-		{
-			// Couldn't open Avatar dir.
-			$avatar_dir_size = $user->lang['NOT_AVAILABLE'];
-		}
+		// Couldn't open Avatar dir.
+		$avatar_dir_size = $user->lang['NOT_AVAILABLE'];
 
 		if ($posts_per_day > $total_posts)
 		{
@@ -585,6 +567,7 @@ class acp_main
 			'U_INACTIVE_USERS'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=inactive&mode=list'),
 			'U_VERSIONCHECK'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=update&mode=version_check'),
 			'U_VERSIONCHECK_FORCE'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'versioncheck_force=1'),
+			'U_ATTACH_ORPHAN'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=acp_attachments&mode=orphan'),
 
 			'S_VERSIONCHECK'	=> ($auth->acl_get('a_board')) ? true : false,
 			'S_ACTION_OPTIONS'	=> ($auth->acl_get('a_board')) ? true : false,

phpBB/includes/acp/acp_modules.php

@@ -249,7 +249,7 @@ class acp_modules
 							trigger_error($msg . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING);
 						}
 
-						if (!sizeof($errors))
+						if (!count($errors))
 						{
 							$module_manager->remove_cache_file($this->module_class);
 
@@ -364,7 +364,7 @@ class acp_modules
 						trigger_error($msg . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING);
 					}
 
-					if (!sizeof($errors))
+					if (!count($errors))
 					{
 						$module_manager->remove_cache_file($this->module_class);
 
@@ -430,7 +430,7 @@ class acp_modules
 					array_change_key_case($module_data, CASE_UPPER))
 				);
 
-				if (sizeof($errors))
+				if (count($errors))
 				{
 					$template->assign_vars(array(
 						'S_ERROR'	=> true,
@@ -444,7 +444,7 @@ class acp_modules
 		}
 
 		// Default management page
-		if (sizeof($errors))
+		if (count($errors))
 		{
 			if ($request->is_ajax())
 			{

phpBB/includes/acp/acp_permission_roles.php

@@ -348,7 +348,7 @@ class acp_permission_roles
 				{
 					$hold_ary = $this->auth_admin->get_role_mask($role_id);
 
-					if (sizeof($hold_ary))
+					if (count($hold_ary))
 					{
 						$role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name'];
 
@@ -496,7 +496,7 @@ class acp_permission_roles
 
 		$content_array = $content_array[0];
 
-		$template->assign_var('S_NUM_PERM_COLS', sizeof($categories));
+		$template->assign_var('S_NUM_PERM_COLS', count($categories));
 
 		// Assign to template
 		foreach ($content_array as $cat => $cat_array)

phpBB/includes/acp/acp_permissions.php

@@ -131,11 +131,11 @@ class acp_permissions
 		}
 		unset($usernames);
 
-		if (sizeof($username) && !sizeof($user_id))
+		if (count($username) && !count($user_id))
 		{
 			user_get_id_name($user_id, $username);
 
-			if (!sizeof($user_id))
+			if (!count($user_id))
 			{
 				trigger_error($user->lang['SELECTED_USER_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
 			}
@@ -260,17 +260,17 @@ class acp_permissions
 						{
 							$items = $this->retrieve_defined_user_groups($permission_scope, $forum_id, $permission_type);
 
-							if ($all_users && sizeof($items['user_ids']))
+							if ($all_users && count($items['user_ids']))
 							{
 								$user_id = $items['user_ids'];
 							}
-							else if ($all_groups && sizeof($items['group_ids']))
+							else if ($all_groups && count($items['group_ids']))
 							{
 								$group_id = $items['group_ids'];
 							}
 						}
 
-						if (sizeof($user_id) || sizeof($group_id))
+						if (count($user_id) || count($group_id))
 						{
 							$this->remove_permissions($mode, $permission_type, $auth_admin, $user_id, $group_id, $forum_id);
 						}
@@ -349,7 +349,7 @@ class acp_permissions
 			{
 				case 'forum_dropdown':
 
-					if (sizeof($forum_id))
+					if (count($forum_id))
 					{
 						$this->check_existence('forum', $forum_id);
 						continue 2;
@@ -364,7 +364,7 @@ class acp_permissions
 
 				case 'forums':
 
-					if (sizeof($forum_id))
+					if (count($forum_id))
 					{
 						$this->check_existence('forum', $forum_id);
 						continue 2;
@@ -394,7 +394,7 @@ class acp_permissions
 
 				case 'user':
 
-					if (sizeof($user_id))
+					if (count($user_id))
 					{
 						$this->check_existence('user', $user_id);
 						continue 2;
@@ -409,7 +409,7 @@ class acp_permissions
 
 				case 'group':
 
-					if (sizeof($group_id))
+					if (count($group_id))
 					{
 						$this->check_existence('group', $group_id);
 						continue 2;
@@ -428,14 +428,14 @@ class acp_permissions
 					$all_users = (isset($_POST['all_users'])) ? true : false;
 					$all_groups = (isset($_POST['all_groups'])) ? true : false;
 
-					if ((sizeof($user_id) && !$all_users) || (sizeof($group_id) && !$all_groups))
+					if ((count($user_id) && !$all_users) || (count($group_id) && !$all_groups))
 					{
-						if (sizeof($user_id))
+						if (count($user_id))
 						{
 							$this->check_existence('user', $user_id);
 						}
 
-						if (sizeof($group_id))
+						if (count($group_id))
 						{
 							$this->check_existence('group', $group_id);
 						}
@@ -446,13 +446,13 @@ class acp_permissions
 					// Now we check the users... because the "all"-selection is different here (all defined users/groups)
 					$items = $this->retrieve_defined_user_groups($permission_scope, $forum_id, $permission_type);
 
-					if ($all_users && sizeof($items['user_ids']))
+					if ($all_users && count($items['user_ids']))
 					{
 						$user_id = $items['user_ids'];
 						continue 2;
 					}
 
-					if ($all_groups && sizeof($items['group_ids']))
+					if ($all_groups && count($items['group_ids']))
 					{
 						$group_id = $items['group_ids'];
 						continue 2;
@@ -487,14 +487,14 @@ class acp_permissions
 				'ANONYMOUS_USER_ID'		=> ANONYMOUS,
 
 				'S_SELECT_VICTIM'		=> true,
-				'S_ALLOW_ALL_SELECT'	=> (sizeof($forum_id) > 5) ? false : true,
+				'S_ALLOW_ALL_SELECT'	=> (count($forum_id) > 5) ? false : true,
 				'S_CAN_SELECT_USER'		=> ($auth->acl_get('a_authusers')) ? true : false,
 				'S_CAN_SELECT_GROUP'	=> ($auth->acl_get('a_authgroups')) ? true : false,
 				'S_HIDDEN_FIELDS'		=> $s_hidden_fields)
 			);
 
 			// Let the forum names being displayed
-			if (sizeof($forum_id))
+			if (count($forum_id))
 			{
 				$sql = 'SELECT forum_name
 					FROM ' . FORUMS_TABLE . '
@@ -510,7 +510,7 @@ class acp_permissions
 				$db->sql_freeresult($result);
 
 				$template->assign_vars(array(
-					'S_FORUM_NAMES'		=> (sizeof($forum_names)) ? true : false,
+					'S_FORUM_NAMES'		=> (count($forum_names)) ? true : false,
 					'FORUM_NAMES'		=> implode($user->lang['COMMA_SEPARATOR'], $forum_names))
 				);
 			}
@@ -527,13 +527,13 @@ class acp_permissions
 		));
 
 		// Do not allow forum_ids being set and no other setting defined (will bog down the server too much)
-		if (sizeof($forum_id) && !sizeof($user_id) && !sizeof($group_id))
+		if (count($forum_id) && !count($user_id) && !count($group_id))
 		{
 			trigger_error($user->lang['ONLY_FORUM_DEFINED'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
 		$template->assign_vars(array(
-			'S_PERMISSION_DROPDOWN'		=> (sizeof($this->permission_dropdown) > 1) ? $this->build_permission_dropdown($this->permission_dropdown, $permission_type, $permission_scope) : false,
+			'S_PERMISSION_DROPDOWN'		=> (count($this->permission_dropdown) > 1) ? $this->build_permission_dropdown($this->permission_dropdown, $permission_type, $permission_scope) : false,
 			'L_PERMISSION_TYPE'			=> $this->permissions->get_type_lang($permission_type),
 
 			'U_ACTION'					=> $this->u_action,
@@ -546,8 +546,8 @@ class acp_permissions
 				'S_SETTING_PERMISSIONS'		=> true)
 			);
 
-			$hold_ary = $auth_admin->get_mask('set', (sizeof($user_id)) ? $user_id : false, (sizeof($group_id)) ? $group_id : false, (sizeof($forum_id)) ? $forum_id : false, $permission_type, $permission_scope, ACL_NO);
-			$auth_admin->display_mask('set', $permission_type, $hold_ary, ((sizeof($user_id)) ? 'user' : 'group'), (($permission_scope == 'local') ? true : false));
+			$hold_ary = $auth_admin->get_mask('set', (count($user_id)) ? $user_id : false, (count($group_id)) ? $group_id : false, (count($forum_id)) ? $forum_id : false, $permission_type, $permission_scope, ACL_NO);
+			$auth_admin->display_mask('set', $permission_type, $hold_ary, ((count($user_id)) ? 'user' : 'group'), (($permission_scope == 'local') ? true : false));
 		}
 		else
 		{
@@ -555,8 +555,8 @@ class acp_permissions
 				'S_VIEWING_PERMISSIONS'		=> true)
 			);
 
-			$hold_ary = $auth_admin->get_mask('view', (sizeof($user_id)) ? $user_id : false, (sizeof($group_id)) ? $group_id : false, (sizeof($forum_id)) ? $forum_id : false, $permission_type, $permission_scope, ACL_NEVER);
-			$auth_admin->display_mask('view', $permission_type, $hold_ary, ((sizeof($user_id)) ? 'user' : 'group'), (($permission_scope == 'local') ? true : false));
+			$hold_ary = $auth_admin->get_mask('view', (count($user_id)) ? $user_id : false, (count($group_id)) ? $group_id : false, (count($forum_id)) ? $forum_id : false, $permission_type, $permission_scope, ACL_NEVER);
+			$auth_admin->display_mask('view', $permission_type, $hold_ary, ((count($user_id)) ? 'user' : 'group'), (($permission_scope == 'local') ? true : false));
 		}
 	}
 
@@ -652,7 +652,7 @@ class acp_permissions
 			break;
 		}
 
-		if (sizeof($ids))
+		if (count($ids))
 		{
 			$sql = "SELECT $sql_id
 				FROM $table
@@ -667,7 +667,7 @@ class acp_permissions
 			$db->sql_freeresult($result);
 		}
 
-		if (!sizeof($ids))
+		if (!count($ids))
 		{
 			trigger_error($user->lang['SELECTED_' . strtoupper($mode) . '_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
@@ -684,7 +684,7 @@ class acp_permissions
 		$psubmit = $request->variable('psubmit', array(0 => array(0 => 0)));
 
 		// User or group to be set?
-		$ug_type = (sizeof($user_id)) ? 'user' : 'group';
+		$ug_type = (count($user_id)) ? 'user' : 'group';
 
 		// Check the permission setting again
 		if (!$auth->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !$auth->acl_get('a_auth' . $ug_type . 's'))
@@ -715,7 +715,7 @@ class acp_permissions
 		$ug_id = array($ug_id);
 		$forum_id = array($forum_id);
 
-		if (sizeof($inherit))
+		if (count($inherit))
 		{
 			foreach ($inherit as $_ug_id => $forum_id_ary)
 			{
@@ -771,7 +771,7 @@ class acp_permissions
 		global $request;
 
 		// User or group to be set?
-		$ug_type = (sizeof($user_id)) ? 'user' : 'group';
+		$ug_type = (count($user_id)) ? 'user' : 'group';
 
 		// Check the permission setting again
 		if (!$auth->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !$auth->acl_get('a_auth' . $ug_type . 's'))
@@ -870,7 +870,7 @@ class acp_permissions
 			}
 		}
 
-		if (sizeof(array_diff_assoc($auth_settings, $test_auth_settings)))
+		if (count(array_diff_assoc($auth_settings, $test_auth_settings)))
 		{
 			return false;
 		}
@@ -886,7 +886,7 @@ class acp_permissions
 		global $user, $db, $cache, $auth;
 
 		// User or group to be set?
-		$ug_type = (sizeof($user_id)) ? 'user' : 'group';
+		$ug_type = (count($user_id)) ? 'user' : 'group';
 
 		// Check the permission setting again
 		if (!$auth->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !$auth->acl_get('a_auth' . $ug_type . 's'))
@@ -895,7 +895,7 @@ class acp_permissions
 			trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
-		$auth_admin->acl_delete($ug_type, (($ug_type == 'user') ? $user_id : $group_id), (sizeof($forum_id) ? $forum_id : false), $permission_type);
+		$auth_admin->acl_delete($ug_type, (($ug_type == 'user') ? $user_id : $group_id), (count($forum_id) ? $forum_id : false), $permission_type);
 
 		// Do we need to recache the moderator lists?
 		if ($permission_type == 'm_')
@@ -903,7 +903,7 @@ class acp_permissions
 			phpbb_cache_moderators($db, $cache, $auth);
 		}
 
-		$this->log_action($mode, 'del', $permission_type, $ug_type, (($ug_type == 'user') ? $user_id : $group_id), (sizeof($forum_id) ? $forum_id : array(0 => 0)));
+		$this->log_action($mode, 'del', $permission_type, $ug_type, (($ug_type == 'user') ? $user_id : $group_id), (count($forum_id) ? $forum_id : array(0 => 0)));
 
 		if ($mode == 'setting_forum_local' || $mode == 'setting_mod_local')
 		{
@@ -1053,7 +1053,7 @@ class acp_permissions
 		$total = ACL_NO;
 		$add_key = (($forum_id) ? '_LOCAL' : '');
 
-		if (sizeof($groups))
+		if (count($groups))
 		{
 			// Get group auth settings
 			$hold_ary = $auth->acl_group_raw_data(array_keys($groups), $permission, $forum_id);
@@ -1099,7 +1099,7 @@ class acp_permissions
 
 		// Get user specific permission... globally or for this forum
 		$hold_ary = $auth->acl_user_raw_data($user_id, $permission, $forum_id);
-		$auth_setting = (!sizeof($hold_ary)) ? ACL_NO : $hold_ary[$user_id][$forum_id][$permission];
+		$auth_setting = (!count($hold_ary)) ? ACL_NO : $hold_ary[$user_id][$forum_id][$permission];
 
 		switch ($auth_setting)
 		{
@@ -1258,7 +1258,7 @@ class acp_permissions
 		/** @var \phpbb\group\helper $group_helper */
 		$group_helper = $phpbb_container->get('group_helper');
 
-		$sql_forum_id = ($permission_scope == 'global') ? 'AND a.forum_id = 0' : ((sizeof($forum_id)) ? 'AND ' . $db->sql_in_set('a.forum_id', $forum_id) : 'AND a.forum_id <> 0');
+		$sql_forum_id = ($permission_scope == 'global') ? 'AND a.forum_id = 0' : ((count($forum_id)) ? 'AND ' . $db->sql_in_set('a.forum_id', $forum_id) : 'AND a.forum_id <> 0');
 
 		// Permission options are only able to be a permission set... therefore we will pre-fetch the possible options and also the possible roles
 		$option_ids = $role_ids = array();
@@ -1274,7 +1274,7 @@ class acp_permissions
 		}
 		$db->sql_freeresult($result);
 
-		if (sizeof($option_ids))
+		if (count($option_ids))
 		{
 			$sql = 'SELECT DISTINCT role_id
 				FROM ' . ACL_ROLES_DATA_TABLE . '
@@ -1288,15 +1288,15 @@ class acp_permissions
 			$db->sql_freeresult($result);
 		}
 
-		if (sizeof($option_ids) && sizeof($role_ids))
+		if (count($option_ids) && count($role_ids))
 		{
 			$sql_where = 'AND (' . $db->sql_in_set('a.auth_option_id', $option_ids) . ' OR ' . $db->sql_in_set('a.auth_role_id', $role_ids) . ')';
 		}
-		else if (sizeof($role_ids))
+		else if (count($role_ids))
 		{
 			$sql_where = 'AND ' . $db->sql_in_set('a.auth_role_id', $role_ids);
 		}
-		else if (sizeof($option_ids))
+		else if (count($option_ids))
 		{
 			$sql_where = 'AND ' . $db->sql_in_set('a.auth_option_id', $option_ids);
 		}

phpBB/includes/acp/acp_profile.php

@@ -446,7 +446,7 @@ class acp_profile
 				{
 					$exploded_options = (is_array($options)) ? $options : explode("\n", $options);
 
-					if (sizeof($exploded_options) == sizeof($lang_options) || $action == 'create')
+					if (count($exploded_options) == count($lang_options) || $action == 'create')
 					{
 						// The number of options in the field is equal to the number of options already in the database
 						// Or we are creating a new dropdown list.
@@ -567,7 +567,7 @@ class acp_profile
 					}
 				}
 
-				if (sizeof($error))
+				if (count($error))
 				{
 					$submit = false;
 				}
@@ -600,9 +600,9 @@ class acp_profile
 					$s_hidden_fields .= build_hidden_fields($_new_key_ary);
 				}
 
-				if (!sizeof($error))
+				if (!count($error))
 				{
-					if (($step == 3 && (sizeof($this->lang_defs['iso']) == 1 || $save)) || ($action == 'edit' && $save))
+					if (($step == 3 && (count($this->lang_defs['iso']) == 1 || $save)) || ($action == 'edit' && $save))
 					{
 						if (!check_form_key($form_key))
 						{
@@ -616,7 +616,7 @@ class acp_profile
 				$template->assign_vars(array(
 					'S_EDIT'			=> true,
 					'S_EDIT_MODE'		=> ($action == 'edit') ? true : false,
-					'ERROR_MSG'			=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR_MSG'			=> (count($error)) ? implode('<br />', $error) : '',
 
 					'L_TITLE'			=> $user->lang['STEP_' . $step . '_TITLE_' . strtoupper($action)],
 					'L_EXPLAIN'			=> $user->lang['STEP_' . $step . '_EXPLAIN_' . strtoupper($action)],
@@ -664,7 +664,7 @@ class acp_profile
 
 						$template->assign_vars(array(
 							'S_STEP_TWO'		=> true,
-							'L_NEXT_STEP'			=> (sizeof($this->lang_defs['iso']) == 1) ? $user->lang['SAVE'] : $user->lang['PROFILE_LANG_OPTIONS'])
+							'L_NEXT_STEP'			=> (count($this->lang_defs['iso']) == 1) ? $user->lang['SAVE'] : $user->lang['PROFILE_LANG_OPTIONS'])
 						);
 
 						// Build options based on profile type
@@ -738,6 +738,32 @@ class acp_profile
 			break;
 		}
 
+		$tpl_name = $this->tpl_name;
+		$page_title = $this->page_title;
+		$u_action = $this->u_action;
+
+		/**
+		* Event to handle actions on the ACP profile fields page
+		*
+		* @event core.acp_profile_action
+		* @var	string	action		Action that is being performed
+		* @var	string	tpl_name	Template file to load
+		* @var	string	page_title	Page title
+		* @var	string	u_action	The URL we are at, read only
+		* @since 3.2.2-RC1
+		*/
+		$vars = array(
+			'action',
+			'tpl_name',
+			'page_title',
+			'u_action',
+		);
+		extract($phpbb_dispatcher->trigger_event('core.acp_profile_action', compact($vars)));
+
+		$this->tpl_name = $tpl_name;
+		$this->page_title = $page_title;
+		unset($u_action);
+
 		$sql = 'SELECT *
 			FROM ' . PROFILE_FIELDS_TABLE . '
 			ORDER BY field_order';
@@ -750,7 +776,7 @@ class acp_profile
 			$active_value = (!$row['field_active']) ? 'activate' : 'deactivate';
 			$id = $row['field_id'];
 
-			$s_need_edit = (sizeof($this->lang_defs['diff'][$row['field_id']])) ? true : false;
+			$s_need_edit = (count($this->lang_defs['diff'][$row['field_id']])) ? true : false;
 
 			if ($s_need_edit)
 			{
@@ -762,7 +788,8 @@ class acp_profile
 				continue;
 			}
 			$profile_field = $this->type_collection[$row['field_type']];
-			$template->assign_block_vars('fields', array(
+
+			$field_block = array(
 				'FIELD_IDENT'		=> $row['field_ident'],
 				'FIELD_TYPE'		=> $profile_field->get_name(),
 
@@ -774,8 +801,26 @@ class acp_profile
 				'U_MOVE_UP'					=> $this->u_action . "&amp;action=move_up&amp;field_id=$id" . '&amp;hash=' . generate_link_hash('acp_profile'),
 				'U_MOVE_DOWN'				=> $this->u_action . "&amp;action=move_down&amp;field_id=$id" . '&amp;hash=' . generate_link_hash('acp_profile'),
 
-				'S_NEED_EDIT'				=> $s_need_edit)
+				'S_NEED_EDIT'				=> $s_need_edit,
 			);
+
+			/**
+			* Event to modify profile field data before it is assigned to the template
+			*
+			* @event core.acp_profile_modify_profile_row
+			* @var	array	row				Array with data for the current profile field
+			* @var	array	field_block		Template data that is being assigned to the 'fields' block
+			* @var	object	profile_field	A profile field instance, implements \phpbb\profilefields\type\type_base
+			* @since 3.2.2-RC1
+			*/
+			$vars = array(
+				'row',
+				'field_block',
+				'profile_field',
+			);
+			extract($phpbb_dispatcher->trigger_event('core.acp_profile_modify_profile_row', compact($vars)));
+
+			$template->assign_block_vars('fields', $field_block);
 		}
 		$db->sql_freeresult($result);
 
@@ -1011,7 +1056,7 @@ class acp_profile
 			$this->update_insert(PROFILE_LANG_TABLE, $sql_ary, array('field_id' => $field_id, 'lang_id' => $default_lang_id));
 		}
 
-		if (is_array($cp->vars['l_lang_name']) && sizeof($cp->vars['l_lang_name']))
+		if (is_array($cp->vars['l_lang_name']) && count($cp->vars['l_lang_name']))
 		{
 			foreach ($cp->vars['l_lang_name'] as $lang_id => $data)
 			{
@@ -1087,7 +1132,7 @@ class acp_profile
 			}
 		}
 
-		if (is_array($cp->vars['l_lang_options']) && sizeof($cp->vars['l_lang_options']))
+		if (is_array($cp->vars['l_lang_options']) && count($cp->vars['l_lang_options']))
 		{
 			$empty_lang = array();
 
@@ -1098,7 +1143,7 @@ class acp_profile
 					$lang_ary = explode("\n", $lang_ary);
 				}
 
-				if (sizeof($lang_ary) != sizeof($cp->vars['lang_options']))
+				if (count($lang_ary) != count($cp->vars['lang_options']))
 				{
 					$empty_lang[$lang_id] = true;
 				}
@@ -1150,7 +1195,7 @@ class acp_profile
 			}
 		}
 
-		if (sizeof($profile_lang_fields))
+		if (count($profile_lang_fields))
 		{
 			foreach ($profile_lang_fields as $sql)
 			{
@@ -1213,7 +1258,7 @@ class acp_profile
 			$where_sql[] = $key . ' = ' . ((is_string($value)) ? "'" . $db->sql_escape($value) . "'" : (int) $value);
 		}
 
-		if (!sizeof($where_sql))
+		if (!count($where_sql))
 		{
 			return;
 		}
@@ -1229,14 +1274,14 @@ class acp_profile
 		{
 			$sql_ary = array_merge($where_fields, $sql_ary);
 
-			if (sizeof($sql_ary))
+			if (count($sql_ary))
 			{
 				$db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql_ary));
 			}
 		}
 		else
 		{
-			if (sizeof($sql_ary))
+			if (count($sql_ary))
 			{
 				$sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql_ary) . '
 					WHERE ' . implode(' AND ', $where_sql);

phpBB/includes/acp/acp_prune.php

@@ -55,7 +55,7 @@ class acp_prune
 	*/
 	function prune_forums($id, $mode)
 	{
-		global $db, $user, $auth, $template, $phpbb_log, $request;
+		global $db, $user, $auth, $template, $phpbb_log, $request, $phpbb_dispatcher;
 
 		$all_forums = $request->variable('all_forums', 0);
 		$forum_id = $request->variable('f', array(0));
@@ -97,7 +97,7 @@ class acp_prune
 					'S_PRUNED'		=> true)
 				);
 
-				$sql_forum = (sizeof($forum_id)) ? ' AND ' . $db->sql_in_set('forum_id', $forum_id) : '';
+				$sql_forum = (count($forum_id)) ? ' AND ' . $db->sql_in_set('forum_id', $forum_id) : '';
 
 				// Get a list of forum's or the data for the forum that we are pruning.
 				$sql = 'SELECT forum_id, forum_name
@@ -165,7 +165,7 @@ class acp_prune
 			}
 			else
 			{
-				confirm_box(false, $user->lang['PRUNE_FORUM_CONFIRM'], build_hidden_fields(array(
+				$hidden_fields = array(
 					'i'				=> $id,
 					'mode'			=> $mode,
 					'submit'		=> 1,
@@ -177,13 +177,25 @@ class acp_prune
 					'prune_old_polls'	=> $request->variable('prune_old_polls', 0),
 					'prune_announce'	=> $request->variable('prune_announce', 0),
 					'prune_sticky'		=> $request->variable('prune_sticky', 0),
-				)));
+				);
+
+				/**
+				 * Use this event to pass data from the prune form to the confirmation screen
+				 *
+				 * @event core.prune_forums_settings_confirm
+				 * @var array	hidden_fields	Hidden fields that are passed through the confirm screen
+				 * @since 3.2.2-RC1
+				 */
+				$vars = array('hidden_fields');
+				extract($phpbb_dispatcher->trigger_event('core.prune_forums_settings_confirm', compact($vars)));
+
+				confirm_box(false, $user->lang['PRUNE_FORUM_CONFIRM'], build_hidden_fields($hidden_fields));
 			}
 		}
 
 		// If they haven't selected a forum for pruning yet then
 		// display a select box to use for pruning.
-		if (!sizeof($forum_id))
+		if (!count($forum_id))
 		{
 			$template->assign_vars(array(
 				'U_ACTION'			=> $this->u_action,
@@ -215,15 +227,27 @@ class acp_prune
 
 			$db->sql_freeresult($result);
 
-			$l_selected_forums = (sizeof($forum_id) == 1) ? 'SELECTED_FORUM' : 'SELECTED_FORUMS';
+			$l_selected_forums = (count($forum_id) == 1) ? 'SELECTED_FORUM' : 'SELECTED_FORUMS';
 
-			$template->assign_vars(array(
+			$template_data = array(
 				'L_SELECTED_FORUMS'		=> $user->lang[$l_selected_forums],
 				'U_ACTION'				=> $this->u_action,
 				'U_BACK'				=> $this->u_action,
 				'FORUM_LIST'			=> $forum_list,
-				'S_HIDDEN_FIELDS'		=> $s_hidden_fields)
+				'S_HIDDEN_FIELDS'		=> $s_hidden_fields,
 			);
+
+			/**
+			 * Event to add/modify prune forums settings template data
+			 *
+			 * @event core.prune_forums_settings_template_data
+			 * @var array	template_data	Array with form template data
+			 * @since 3.2.2-RC1
+			 */
+			$vars = array('template_data');
+			extract($phpbb_dispatcher->trigger_event('core.prune_forums_settings_template_data', compact($vars)));
+
+			$template->assign_vars($template_data);
 		}
 	}
 
@@ -252,7 +276,7 @@ class acp_prune
 				$user_ids = $usernames = array();
 
 				$this->get_prune_users($user_ids, $usernames);
-				if (sizeof($user_ids))
+				if (count($user_ids))
 				{
 					if ($action == 'deactivate')
 					{
@@ -291,7 +315,7 @@ class acp_prune
 				$user_ids = $usernames = array();
 				$this->get_prune_users($user_ids, $usernames);
 
-				if (!sizeof($user_ids))
+				if (!count($user_ids))
 				{
 					trigger_error($user->lang['USER_PRUNE_FAILURE'] . adm_back_link($this->u_action), E_USER_WARNING);
 				}
@@ -434,7 +458,7 @@ class acp_prune
 			}
 			// implicit else when both arrays are empty do nothing
 
-			if ((sizeof($active) && sizeof($active) != 3) || (sizeof($joined_before) && sizeof($joined_before) != 3) || (sizeof($joined_after) && sizeof($joined_after) != 3))
+			if ((count($active) && count($active) != 3) || (count($joined_before) && count($joined_before) != 3) || (count($joined_after) && count($joined_after) != 3))
 			{
 				trigger_error($user->lang['WRONG_ACTIVE_JOINED_DATE'] . adm_back_link($this->u_action), E_USER_WARNING);
 			}
@@ -448,15 +472,15 @@ class acp_prune
 			$where_sql .= ($count !== false) ? " AND user_posts " . $key_match[$count_select] . ' ' . (int) $count . ' ' : '';
 
 			// First handle pruning of users who never logged in, last active date is 0000-00-00
-			if (sizeof($active) && (int) $active[0] == 0 && (int) $active[1] == 0 && (int) $active[2] == 0)
+			if (count($active) && (int) $active[0] == 0 && (int) $active[1] == 0 && (int) $active[2] == 0)
 			{
 				$where_sql .= ' AND user_lastvisit = 0';
 			}
-			else if (sizeof($active) && $active_select != 'lt')
+			else if (count($active) && $active_select != 'lt')
 			{
 				$where_sql .= ' AND user_lastvisit ' . $key_match[$active_select] . ' ' . gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]);
 			}
-			else if (sizeof($active))
+			else if (count($active))
 			{
 				$where_sql .= ' AND (user_lastvisit > 0 AND user_lastvisit < ' . gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]) . ')';
 			}

phpBB/includes/acp/acp_reasons.php

@@ -103,7 +103,7 @@ class acp_reasons
 						}
 					}
 
-					if (!sizeof($error))
+					if (!count($error))
 					{
 						// New reason?
 						if ($action == 'add')
@@ -171,7 +171,7 @@ class acp_reasons
 					'L_TITLE'		=> $user->lang['REASON_' . $l_title],
 					'U_ACTION'		=> $this->u_action . "&id=$reason_id&action=$action",
 					'U_BACK'		=> $this->u_action,
-					'ERROR_MSG'		=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR_MSG'		=> (count($error)) ? implode('<br />', $error) : '',
 
 					'REASON_TITLE'			=> $reason_row['reason_title'],
 					'REASON_DESCRIPTION'	=> $reason_row['reason_description'],
@@ -182,7 +182,7 @@ class acp_reasons
 					'S_AVAILABLE_TITLES'	=> implode($user->lang['COMMA_SEPARATOR'], array_map('htmlspecialchars', array_keys($user->lang['report_reasons']['TITLE']))),
 					'S_EDIT_REASON'			=> true,
 					'S_TRANSLATED'			=> $translated,
-					'S_ERROR'				=> (sizeof($error)) ? true : false,
+					'S_ERROR'				=> (count($error)) ? true : false,
 					)
 				);
 

phpBB/includes/acp/acp_search.php

@@ -332,9 +332,9 @@ class acp_search
 								$forum_ids[] = $row['forum_id'];
 							}
 							$db->sql_freeresult($result);
-							$row_count += sizeof($ids);
+							$row_count += count($ids);
 
-							if (sizeof($ids))
+							if (count($ids))
 							{
 								$this->search->index_remove($ids, $posters, $forum_ids);
 							}
@@ -474,8 +474,8 @@ class acp_search
 			$statistics = array();
 			foreach ($data as $statistic => $value)
 			{
-				$n = sizeof($statistics);
-				if ($n && sizeof($statistics[$n - 1]) < 3)
+				$n = count($statistics);
+				if ($n && count($statistics[$n - 1]) < 3)
 				{
 					$statistics[$n - 1] += array('statistic_2' => $statistic, 'value_2' => $value);
 				}
@@ -492,7 +492,7 @@ class acp_search
 				'S_ACTIVE'			=> ($type == $config['search_type']) ? true : false,
 				'S_HIDDEN_FIELDS'	=> build_hidden_fields(array('search_type' => $type)),
 				'S_INDEXED'			=> (bool) $search->index_created(),
-				'S_STATS'			=> (bool) sizeof($statistics))
+				'S_STATS'			=> (bool) count($statistics))
 			);
 
 			foreach ($statistics as $statistic)

phpBB/includes/acp/acp_storage.php

@@ -0,0 +1,318 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class acp_storage
+{
+	/** @var \phpbb\config $config */
+	protected $config;
+
+	/** @var \phpbb\language\language $lang */
+	protected $lang;
+
+	/** @var \phpbb\request\request */
+	protected $request;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/** @var \phpbb\di\service_collection */
+	protected $provider_collection;
+
+	/** @var \phpbb\di\service_collection */
+	protected $storage_collection;
+
+	/** @var string */
+	public $page_title;
+
+	/** @var string */
+	public $tpl_name;
+
+	/** @var string */
+	public $u_action;
+
+	/**
+	 *  @param string $id
+	 * @param string $mode
+	 */
+	public function main($id, $mode)
+	{
+		global $phpbb_container, $phpbb_dispatcher;
+
+		$this->config = $phpbb_container->get('config');
+		$this->lang = $phpbb_container->get('language');
+		$this->request = $phpbb_container->get('request');
+		$this->template = $phpbb_container->get('template');
+		$this->user = $phpbb_container->get('user');
+		$this->provider_collection = $phpbb_container->get('storage.provider_collection');
+		$this->storage_collection = $phpbb_container->get('storage.storage_collection');
+
+		// Add necesary language files
+		$this->lang->add_lang(['acp/storage']);
+
+		/**
+		 * Add language strings
+		 *
+		 * @event core.acp_storage_load
+		 * @since 3.3.0-a1
+		 */
+		$phpbb_dispatcher->dispatch('core.acp_storage_load');
+
+		$this->overview($id, $mode);
+	}
+
+	/**
+	 * @param string $id
+	 * @param string $mode
+	 */
+	public function overview($id, $mode)
+	{
+		$form_key = 'acp_storage';
+		add_form_key($form_key);
+
+		// Template from adm/style
+		$this->tpl_name = 'acp_storage';
+
+		// Set page title
+		$this->page_title = 'STORAGE_TITLE';
+
+		if ($this->request->is_set_post('submit'))
+		{
+			$modified_storages = [];
+			$messages = [];
+
+			if (!check_form_key($form_key))
+			{
+				$messages[] = $this->lang->lang('FORM_INVALID');
+			}
+
+			foreach ($this->storage_collection as $storage)
+			{
+				$storage_name = $storage->get_name();
+
+				$options = $this->get_provider_options($this->get_current_provider($storage_name));
+
+				$modified = false;
+
+				// Check if provider have been modified
+				if ($this->get_new_provider($storage_name) != $this->get_current_provider($storage_name))
+				{
+					$modified = true;
+				}
+
+				// Check if options have been modified
+				if (!$modified)
+				{
+					foreach (array_keys($options) as $definition)
+					{
+						if ($this->get_new_definition($storage_name, $definition) != $this->get_current_definition($storage_name, $definition))
+						{
+							$modified = true;
+							break;
+						}
+					}
+				}
+
+				// If the storage have been modified, validate options
+				if ($modified)
+				{
+					$modified_storages[] = $storage_name;
+					$this->validate_data($storage_name, $messages);
+				}
+			}
+
+			if (!empty($modified_storages))
+			{
+				if (empty($messages))
+				{
+					foreach ($modified_storages as $storage_name)
+					{
+						$this->update_storage_config($storage_name);
+					}
+
+					trigger_error($this->lang->lang('STORAGE_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action), E_USER_NOTICE);
+				}
+				else
+				{
+					trigger_error(implode('<br />', $messages) . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+			}
+
+			// If there is no errors
+			trigger_error($this->lang->lang('STORAGE_NO_CHANGES') . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
+		$this->template->assign_vars(array(
+			'STORAGES' => $this->storage_collection,
+			'PROVIDERS' => $this->provider_collection,
+		));
+	}
+
+	/**
+	 * Get the current provider from config
+	 *
+	 * @param string $key Storage name
+	 * @return string The current provider
+	 */
+	protected function get_current_provider($storage_name)
+	{
+		return $this->config['storage\\' . $storage_name . '\\provider'];
+	}
+
+	/**
+	 * Get the new provider from the request
+	 *
+	 * @param string $key Storage name
+	 * @return string The new provider
+	 */
+	protected function get_new_provider($storage_name)
+	{
+		return $this->request->variable([$storage_name, 'provider'], '');
+	}
+
+	/**
+	 * Get adapter definitions from a provider
+	 *
+	 * @param string $provider Provider class
+	 * @return array Adapter definitions
+	 */
+	protected function get_provider_options($provider)
+	{
+		return $this->provider_collection->get_by_class($provider)->get_options();
+	}
+
+	/**
+	 * Get the current value of the definition of a storage from config
+	 *
+	 * @param string $storage_name Storage name
+	 * @param string $definition Definition
+	 * @return string Definition value
+	 */
+	protected function get_current_definition($storage_name, $definition)
+	{
+		return $this->config['storage\\' . $storage_name . '\\config\\' . $definition];
+	}
+
+	/**
+	 * Get the new value of the definition of a storage from the request
+	 *
+	 * @param string $storage_name Storage name
+	 * @param string $definition Definition
+	 * @return string Definition value
+	 */
+	protected function get_new_definition($storage_name, $definition)
+	{
+		return $this->request->variable([$storage_name, $definition], '');
+	}
+
+	/**
+	 * Validates data
+	 *
+	 * @param string $storage_name Storage name
+	 * @param array $messages Reference to messages array
+	 */
+	protected function validate_data($storage_name, &$messages)
+	{
+		$storage_title = $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE');
+
+		// Check if provider exists
+		try
+		{
+			$new_provider = $this->provider_collection->get_by_class($this->get_new_provider($storage_name));
+		}
+		catch (\Exception $e)
+		{
+			$messages[] = $this->lang->lang('STORAGE_PROVIDER_NOT_EXISTS', $storage_title);
+			return;
+		}
+
+		// Check if provider is available
+		if (!$new_provider->is_available())
+		{
+			$messages[] = $this->lang->lang('STORAGE_PROVIDER_NOT_AVAILABLE', $storage_title);
+			return;
+		}
+
+		// Check options
+		$new_options = $this->get_provider_options($this->get_new_provider($storage_name));
+
+		foreach ($new_options as $definition_key => $definition_value)
+		{
+			$provider = $this->provider_collection->get_by_class($this->get_new_provider($storage_name));
+			$definition_title = $this->lang->lang('STORAGE_ADAPTER_' . strtoupper($provider->get_name()) . '_OPTION_' . strtoupper($definition_key));
+
+			$value = $this->get_new_definition($storage_name, $definition_key);
+
+			switch ($definition_value['type'])
+			{
+				case 'email':
+					if (!filter_var($value, FILTER_VALIDATE_EMAIL))
+					{
+						$messages[] = $this->lang->lang('STORAGE_FORM_TYPE_EMAIL_INCORRECT_FORMAT', $definition_title, $storage_title);
+					}
+				case 'text':
+				case 'password':
+					$maxlength = isset($definition_value['maxlength']) ? $definition_value['maxlength'] : 255;
+					if (strlen($value) > $maxlength)
+					{
+						$messages[] = $this->lang->lang('STORAGE_FORM_TYPE_TEXT_TOO_LONG', $definition_title, $storage_title);
+					}
+					break;
+				case 'radio':
+				case 'select':
+					if (!in_array($value, array_values($definition_value['options'])))
+					{
+						$messages[] = $this->lang->lang('STORAGE_FORM_TYPE_SELECT_NOT_AVAILABLE', $definition_title, $storage_title);
+					}
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Updates an storage with the info provided in the form
+	 *
+	 * @param string $storage_name Storage name
+	 */
+	protected function update_storage_config($storage_name)
+	{
+		$current_options = $this->get_provider_options($this->get_current_provider($storage_name));
+
+		// Remove old storage config
+		foreach (array_keys($current_options) as $definition)
+		{
+			$this->config->delete('storage\\' . $storage_name . '\\config\\' . $definition);
+		}
+
+		// Update provider
+		$this->config->set('storage\\' . $storage_name . '\\provider', $this->get_new_provider($storage_name));
+
+		// Set new storage config
+		$new_options = $this->get_provider_options($this->get_new_provider($storage_name));
+
+		foreach (array_keys($new_options) as $definition)
+		{
+			$this->config->set('storage\\' . $storage_name . '\\config\\' . $definition, $this->get_new_definition($storage_name, $definition));
+		}
+	}
+}