[prep-release-3.2.0-b1] Updates changelog

PHPBB3-14453

.appveyor.yml

@@ -1,147 +0,0 @@
-build: false
-clone_folder: c:\projects\phpbb
-version: '{build}'
-
-services:
-  - iis
-
-environment:
-  COMPOSER_AUTH:
-    secure: '{"github-oauth": {"github.com": "zvq38wk7sRe87Y9W2OCYXcK7WKQDsig7GRIUDHGmxm6ZQRK8JswPbi8JoJQbFhM+"}}'
-  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
-      choco install chocolatey -y --version 0.10.13 --allow-downgrade
-      choco install php -y --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 choco install mariadb -y --force
-        $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 choco install sqlite -y
-        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
-      choco install phantomjs -y
-      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 urlrewrite -y
-  - 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,10 +0,0 @@
-Checklist:
-
-- [ ] Correct branch: master for new features; 3.2.x for fixes
-- [ ] Tests pass
-- [ ] 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**):
-
-https://tracker.phpbb.com/browse/PHPBB3-12345

.gitignore

@@ -4,7 +4,7 @@
 !/phpBB/cache/.htaccess
 !/phpBB/cache/index.html
 /phpBB/composer.phar
-/phpBB/config*.php*
+/phpBB/config*.php
 /phpBB/ext/*
 /phpBB/files/*
 /phpBB/images/avatars/gallery/*
@@ -17,12 +17,8 @@
 /phpBB/styles/*
 !/phpBB/styles/prosilver
 !/phpBB/styles/all
-node_modules
 /phpBB/vendor
 /tests/phpbb_unit_tests.sqlite*
 /tests/test_config*.php
 /tests/tmp/*
 /tests/vendor
-/vagrant/phpbb-install-config.yml
-.vagrant
-.idea

.jshintrc

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

.travis.yml

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

CONTRIBUTING.md

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

LICENSE

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

README.md

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

Vagrantfile

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

build/build.xml

@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.2.10-RC2" />
-	<property name="prevversion" value="3.2.10-RC1" />
-	<property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0-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, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.2.9" />
+	<property name="newversion" value="3.2.0-b1" />
+	<property name="prevversion" value="3.2.0-a2" />
+	<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.2.0-a1" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -49,7 +49,7 @@
 	-->
 	<target name="composer">
 		<exec dir="phpBB"
-			command="php ../composer.phar install --ignore-platform-reqs"
+			command="php ../composer.phar install --dev"
 			checkreturn="true"
 			passthru="true" />
 	</target>
@@ -142,9 +142,7 @@
 
 		<phingcall target="export">
 			<property name="revision" value="release-${version}" />
-			<property name="version" value="${version}" />
 			<property name="dir" value="build/old_versions/release-${version}" />
-			<property name="skip-composer" value="true" />
 		</phingcall>
 
 		<phingcall target="clean-diff-dir">
@@ -250,35 +248,26 @@
 			<equals arg1="${composer-has-dependencies}" arg2="1" trim="true" />
 			<then>
 				<!-- We have non-dev composer dependencies -->
+				<exec dir="."
+					command="git ls-tree ${revision} composer.phar"
+					checkreturn="true"
+					outputProperty='composer-ls-tree-output' />
 				<if>
-					<not><isset property="skip-composer" /></not>
+					<equals arg1="${composer-ls-tree-output}" arg2="" trim="true" />
 					<then>
-						<exec dir="."
-							command="git ls-tree ${revision} composer.phar"
-							checkreturn="true"
-							outputProperty='composer-ls-tree-output' />
-						<if>
-							<equals arg1="${composer-ls-tree-output}" arg2="" trim="true" />
-							<then>
-								<fail message="There are composer dependencies, but composer.phar is missing." />
-							</then>
-							<else>
-								<!-- Export the phar, install dependencies, delete phar. -->
-								<exec dir="."
-									command="git archive ${revision} composer.phar | tar -xf - -C ${dir}"
-									checkreturn="true" />
-								<exec dir="${dir}"
-									command="php composer.phar install --no-dev --optimize-autoloader --ignore-platform-reqs"
-									checkreturn="true"
-									passthru="true" />
-								<delete file="${dir}/composer.phar" />
-
-								<phingcall target="clean-vendor-dir">
-									<property name="dir" value="${dir}" />
-								</phingcall>
-							</else>
-						</if>
+						<fail message="There are composer dependencies, but composer.phar is missing." />
 					</then>
+					<else>
+						<!-- Export the phar, install dependencies, delete phar. -->
+						<exec dir="."
+							command="git archive ${revision} composer.phar | tar -xf - -C ${dir}"
+							checkreturn="true" />
+						<exec dir="${dir}"
+							command="php composer.phar install --no-dev --optimize-autoloader"
+							checkreturn="true"
+							passthru="true" />
+						<delete file="${dir}/composer.phar" />
+					</else>
 				</if>
 			</then>
 			<else>
@@ -288,54 +277,6 @@
 			</else>
 		</if>
 
-		<!-- Checkout latest viglink to ext folder -->
-		<available file="${dir}/ext" type="dir" property="add-viglink-ext" />
-		<exec dir="${dir}"
-			command='php -r "echo version_compare(&apos;${version}&apos;, &apos;3.2.0-RC2&apos;, &apos;>=&apos;) ? &apos;true&apos; : &apos;false&apos;;"'
-			checkreturn="true"
-			outputProperty='viglink-available' />
-		<if>
-			<and>
-				<equals arg1="${add-viglink-ext}" arg2="1" trim="true" />
-				<or>
-					<equals arg1="${revision}" arg2="HEAD" trim="true" />
-					<equals arg1="${viglink-available}" arg2="1" trim="true" />
-				</or>
-			</and>
-			<then>
-				<exec dir="${dir}/ext" command="mkdir phpbb" passthru="true" />
-
-				<exec dir="${dir}/ext/phpbb" command="git clone https://github.com/phpbb-extensions/viglink.git viglink" passthru="true" checkreturn="true" />
-				<if>
-					<equals arg1="${revision}" arg2="HEAD" trim="true" />
-					<then>
-						<exec dir="${dir}/ext/phpbb/viglink"
-							command="git rev-parse release-phpbb-${version}"
-							returnProperty='viglink_head_tag_exists' />
-						<if>
-							<equals arg1="${viglink_head_tag_exists}" arg2="0" trim="true" />
-							<then>
-								<exec dir="${dir}/ext/phpbb/viglink" command="git checkout release-phpbb-${version}" passthru="true" />
-							</then>
-							<else>
-								<exec dir="${dir}/ext/phpbb/viglink" command="git checkout master" passthru="true" />
-							</else>
-						</if>
-					</then>
-					<else>
-						<exec dir="${dir}/ext/phpbb/viglink" command="git checkout release-phpbb-${version}" passthru="true" />
-					</else>
-				</if>
-				<delete dir="${dir}/ext/phpbb/viglink/.git" />
-				<delete dir="${dir}/ext/phpbb/viglink/tests" />
-				<delete dir="${dir}/ext/phpbb/viglink/travis" />
-				<delete file="${dir}/ext/phpbb/viglink/.gitattributes" />
-				<delete file="${dir}/ext/phpbb/viglink/.travis.yml" />
-				<delete file="${dir}/ext/phpbb/viglink/phpunit.xml.dist" />
-				<delete file="${dir}/ext/phpbb/viglink/README.md" />
-			</then>
-		</if>
-
 		<!-- Create schema.json -->
 		<exec dir="${dir}" command="php develop/create_schema_files.php" />
 
@@ -345,6 +286,10 @@
 		<delete dir="${dir}/config/development" />
 		<delete dir="${dir}/config/test" />
 
+		<phingcall target="clean-vendor-dir">
+			<property name="dir" value="${dir}" />
+		</phingcall>
+
 		<echo msg="Setting permissions for checkout of ${revision} in ${dir}" />
 		<!-- set permissions of all files to 644, directories to 755 -->
 		<exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" />
@@ -373,35 +318,6 @@
 		<delete file="${dir}/vendor/google/recaptcha/phpunit.xml.dist" />
 		<delete file="${dir}/vendor/google/recaptcha/README.md" />
 
-		<delete dir="${dir}/vendor/guzzlehttp/guzzle/build" />
-		<delete dir="${dir}/vendor/guzzlehttp/guzzle/docs" />
-		<delete dir="${dir}/vendor/guzzlehttp/guzzle/tests" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/CHANGELOG.md" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/.editorconfig" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/.gitignore" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/Makefile" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/README.md" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/.travis.yml" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/UPGRADING.md" />
-
-		<delete dir="${dir}/vendor/guzzlehttp/ringphp/docs" />
-		<delete dir="${dir}/vendor/guzzlehttp/ringphp/tests" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/CHANGELOG.md" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/.gitignore" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/Makefile" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/README.rst" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/.travis.yml" />
-
-		<delete dir="${dir}/vendor/guzzlehttp/streams/tests" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/CHANGELOG.rst" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/.gitignore" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/Makefile" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/README.rst" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/.travis.yml" />
-
 		<delete dir="${dir}/vendor/lusitanian/oauth/examples" />
 		<delete dir="${dir}/vendor/lusitanian/oauth/tests" />
 		<delete file="${dir}/vendor/lusitanian/oauth/.gitignore" />
@@ -410,13 +326,6 @@
 		<delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" />
 		<delete file="${dir}/vendor/lusitanian/oauth/README.md" />
 
-		<delete dir="${dir}/vendor/paragonie/random_compat/dist" />
-		<delete dir="${dir}/vendor/paragonie/random_compat/other" />
-		<delete file="${dir}/vendor/paragonie/random_compat/CHANGELOG.md" />
-		<delete file="${dir}/vendor/paragonie/random_compat/ERRATA.md" />
-		<delete file="${dir}/vendor/paragonie/random_compat/README.md" />
-		<delete file="${dir}/vendor/paragonie/random_compat/SECURITY.md" />
-
 		<delete file="${dir}/vendor/patchwork/utf8/.travis.yml" />
 		<delete file="${dir}/vendor/patchwork/utf8/CHANGELOG.md" />
 		<delete file="${dir}/vendor/patchwork/utf8/phpunit.xml.dist" />
@@ -426,13 +335,6 @@
 		<delete file="${dir}/vendor/psr/log/.gitignore" />
 		<delete file="${dir}/vendor/psr/log/README.md" />
 
-		<delete dir="${dir}/vendor/react/promise/tests" />
-		<delete file="${dir}/vendor/react/promise/CHANGELOG.md" />
-		<delete file="${dir}/vendor/react/promise/.gitignore" />
-		<delete file="${dir}/vendor/react/promise/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/react/promise/README.md" />
-		<delete file="${dir}/vendor/react/promise/.travis.yml" />
-
 		<delete dir="${dir}/vendor/s9e/text-formatter/.git" />
 
 		<delete dir="${dir}/vendor/symfony/config/.git" />
@@ -498,13 +400,6 @@
 		<delete file="${dir}/vendor/symfony/http-kernel/README.md" />
 		<delete file="${dir}/vendor/symfony/http-kernel/phpunit.xml.dist" />
 
-		<delete dir="${dir}/vendor/symfony/proxy-manager-bridge/.git" />
-		<delete dir="${dir}/vendor/symfony/proxy-manager-bridge/Tests" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/.gitignore" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/README.md" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/phpunit.xml.dist" />
-
 		<delete dir="${dir}/vendor/symfony/routing/.git" />
 		<delete dir="${dir}/vendor/symfony/routing/Tests" />
 		<delete file="${dir}/vendor/symfony/routing/.gitignore" />
@@ -535,15 +430,6 @@
 		<delete file="${dir}/vendor/twig/twig/CHANGELOG" />
 		<delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" />
 		<delete file="${dir}/vendor/twig/twig/README.rst" />
-
-		<delete file="${dir}/vendor/zendframework/zend-code/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-code/README.md" />
-
-		<delete file="${dir}/vendor/zendframework/zend-eventmanager/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-eventmanager/README.md" />
-
-		<delete file="${dir}/vendor/zendframework/zend-stdlib/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-stdlib/README.md" />
 	</target>
 
 	<target name="clean-diff-dir">

build/build_helper.php

@@ -33,14 +33,14 @@ class build_package
 	var $status_begun = false;
 	var $num_dots = 0;
 
-	function __construct($versions, $verbose = false)
+	function build_package($versions, $verbose = false)
 	{
 		$this->versions = $versions;
 		$this->verbose = $verbose;
 
 		// Get last two entries
-		$_latest = $this->versions[count($this->versions) - 1];
-		$_before = $this->versions[count($this->versions) - 2];
+		$_latest = $this->versions[sizeof($this->versions) - 1];
+		$_before = $this->versions[sizeof($this->versions) - 2];
 
 		$this->locations = array(
 			'new_version'	=> dirname(dirname(__FILE__)) . '/phpBB/',

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

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

build/generate_package_json.php

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

build/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 (count($package->old_packages))
+if (sizeof($package->old_packages))
 {
 	chdir($package->locations['old_versions']);
 
@@ -76,7 +76,7 @@ if (count($package->old_packages))
 			// Create Directories along the way?
 			$file = explode('/', $file);
 			// Remove filename portion
-			$file[count($file)-1] = '';
+			$file[sizeof($file)-1] = '';
 
 			chdir($dest_filename_dir);
 			foreach ($file as $entry)
@@ -169,7 +169,7 @@ if (count($package->old_packages))
 			// Create Directories along the way?
 			$file = explode('/', $file);
 			// Remove filename portion
-			$file[count($file)-1] = '';
+			$file[sizeof($file)-1] = '';
 
 			chdir($dest_filename_dir . '/install/update/old');
 			foreach ($file as $entry)
@@ -214,7 +214,7 @@ if (count($package->old_packages))
 			// Create Directories along the way?
 			$file = explode('/', $file);
 			// Remove filename portion
-			$file[count($file)-1] = '';
+			$file[sizeof($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 (count($file_contents['all']))
+		if (sizeof($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 (count($file_contents['binary']))
+		if (sizeof($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 (count($file_contents['deleted']))
+		if (sizeof($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 (count($package->old_packages))
+if (sizeof($package->old_packages))
 {
 	// Build Patch Files
 	chdir($package->get('patch_directory'));

build/sami-all.conf.php

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

git-tools/hooks/commit-msg

@@ -147,15 +147,6 @@ then
 	quit $ERR_LENGTH;
 fi
 
-# Check for CR/LF line breaks
-if grep -q $'\r$' "$1"
-then
-	complain "The commit message uses CR/LF line breaks, which are not permitted." >&2
-	complain >&2
-
-	quit $ERR_EOF;
-fi
-
 lines=$(wc -l "$1" | awk '{ print $1; }');
 expecting=header;
 in_description=0;

git-tools/setup_github_network.php

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

phpBB/.htaccess

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

phpBB/adm/index.php

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

phpBB/adm/style/acp_attachments.html

@@ -37,6 +37,12 @@
 
 <!-- IF S_ATTACHMENT_SETTINGS -->
 
+	<!-- IF not S_THUMBNAIL_SUPPORT -->
+		<div class="errorbox">
+			<p>{L_NO_THUMBNAIL_SUPPORT}</p>
+		</div>
+	<!-- ENDIF -->
+
 	<form id="attachsettings" method="post" action="{U_ACTION}">
 	<!-- BEGIN options -->
 		<!-- IF options.S_LEGEND -->
@@ -50,21 +56,16 @@
 			<dl>
 				<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 				<dd>{options.CONTENT}</dd>
-				{% if (options.KEY == 'allow_attachments' and S_EMPTY_POST_GROUPS) or (options.KEY == 'allow_pm_attach' and S_EMPTY_PM_GROUPS) %}
-					<dd><span class="error">{{ lang(options.KEY == 'allow_attachments' ? 'NO_EXT_GROUP_ALLOWED_POST' : 'NO_EXT_GROUP_ALLOWED_PM', U_EXTENSION_GROUPS) }}</span></dd>
-				{% endif %}
 			</dl>
 
 		<!-- ENDIF -->
 	<!-- END options -->
 	</fieldset>
 
-	<fieldset>
-		<legend>{{ lang('ACP_SUBMIT_CHANGES') }}</legend>
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		</p>
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	</fieldset>
 
 	<!-- IF not S_SECURE_DOWNLOADS -->
@@ -115,7 +116,7 @@
 <!-- ELSEIF S_EXTENSION_GROUPS -->
 
 	<!-- IF S_EDIT_GROUP -->
-		<script>
+		<script type="text/javascript" defer="defer">
 		// <![CDATA[
 			function update_image(newimage)
 			{
@@ -195,7 +196,7 @@
 		</dl>
 		<dl>
 			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt>
-			<dd><input type="number" id="extgroup_filesize" min="0" max="999999999999999" step="any" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
+			<dd><input type="number" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
 		</dl>
 		<dl>
 			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}{L_COLON}</label></dt>
@@ -209,13 +210,10 @@
 			<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
 		</dl>
 
-		</fieldset>
-		<fieldset>
-			<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-				<p class="submit-buttons">
-					<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-					<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-				</p>
+		<p class="submit-buttons">
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		</p>
 		{S_FORM_TOKEN}
 		</fieldset>
 
@@ -316,14 +314,10 @@
 	</tbody>
 	</table>
 
-	</fieldset>
-	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		</p>
-
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
 	</form>
@@ -335,74 +329,42 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<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>
+	<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 -->
 		<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>
+			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
+			<td>{orphan.FILETIME}</td>
+			<td>{orphan.FILESIZE}</td>
+			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" maxlength="10" value="{orphan.POST_ID}" style="width: 75%;" /></td>
+			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
+			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
 		</tr>
-		</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 -->
+	<!-- 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>
 
-	<!-- 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 -->
-	</fieldset>
-	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-			<p class="submit-buttons">
-				<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-				<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-			</p>
-	<!-- ENDIF -->
+	<br />
 
+	<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>
@@ -436,25 +398,17 @@
 	</tr>
 	</thead>
 	<tbody>
-	{% for attachments in attachments %}
+	<!-- BEGIN attachments -->
 		<tr>
 			<td>
-				{{ lang('EXTENSION_GROUP') ~ lang('COLON') }} <strong>{{ attachments.EXT_GROUP_NAME }}</strong>
-				{% if attachments.S_IN_MESSAGE %}
-					<br>{{ attachments.L_DOWNLOAD_COUNT }}
-					<br>{{ lang('IN') }} {{ lang('PRIVATE_MESSAGE') }}
-				{% else %}
-					<br><a href="{{ attachments.U_FILE }}"><strong>{{ attachments.REAL_FILENAME }}</strong></a>
-					{% if attachments.COMMENT %}<br>{{ attachments.COMMENT }}{% endif %}
-					<br>{{ attachments.L_DOWNLOAD_COUNT }}
-					<br>{{ lang('TOPIC') ~ lang('COLON') }} <a href="{{ attachments.U_VIEW_TOPIC }}">{{ attachments.TOPIC_TITLE }}</a>
-				{% endif %}
+				<!-- IF attachments.S_IN_MESSAGE -->{L_EXTENSION_GROUP}{L_COLON} <strong><!-- IF attachments.EXT_GROUP_NAME -->{attachments.EXT_GROUP_NAME}<!-- ELSE -->{L_NO_EXT_GROUP}<!-- ENDIF --></strong><br />{attachments.L_DOWNLOAD_COUNT}<br />{L_IN} {L_PRIVATE_MESSAGE}
+				<!-- ELSE --><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br />{L_TOPIC}{L_COLON} <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF -->
 			</td>
-			<td>{{ attachments.FILETIME }}<br>{{ lang('POST_BY_AUTHOR') }} {{ attachments.ATTACHMENT_POSTER }}</td>
-			<td class="centered-text">{{ attachments.FILESIZE }}</td>
-			<td class="centered-text"><input type="checkbox" class="radio" name="delete[{{ attachments.ATTACH_ID }}]" /></td>
+			<td>{attachments.FILETIME}<br />{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER}</td>
+			<td class="centered-text">{attachments.FILESIZE}</td>
+			<td class="centered-text"><input type="checkbox" class="radio" name="delete[{attachments.ATTACH_ID}]" /></td>
 		</tr>
-	{% endfor %}
+	<!-- END attachments -->
 	</tbody>
 	</table>
 <!-- ELSE -->
@@ -486,7 +440,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_avatar_options_gravatar.html

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

phpBB/adm/style/acp_avatar_options_remote.html

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

phpBB/adm/style/acp_ban.html

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

phpBB/adm/style/acp_board.html

@@ -18,11 +18,10 @@
 <!-- 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_captcha.html

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

phpBB/adm/style/acp_contact.html

@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 
-<script>
+<script type="text/javascript">
 // <![CDATA[
 
 	var form_name = 'acp_contact';
@@ -66,12 +66,9 @@
 		</dl>
 	</fieldset>
 
-	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		</p>
+	<fieldset class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
 		{S_FORM_TOKEN}
 	</fieldset>
 </form>

phpBB/adm/style/acp_database.html

@@ -14,12 +14,13 @@
 		<legend>{L_RESTORE_OPTIONS}</legend>
 	<dl>
 		<dt><label for="file">{L_SELECT_FILE}{L_COLON}</label></dt>
-		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_FIRST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
+		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
 	</dl>
 
 	<p class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" />&nbsp;
 		<input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}" />&nbsp;
+		<input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" />
 	</p>
 	{S_FORM_TOKEN}
 	</fieldset>
@@ -35,7 +36,7 @@
 
 	<p>{L_ACP_BACKUP_EXPLAIN}</p>
 
-	<script>
+	<script type="text/javascript">
 	// <![CDATA[
 
 		function selector(bool)
@@ -67,6 +68,13 @@
 		<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}</label>
 		<!-- END methods --></dd>
 	</dl>
+	<dl>
+		<dt><label for="where">{L_ACTION}{L_COLON}</label></dt>
+		<dd>
+			<label><input id="where" type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>
+			<label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label>
+		</dd>
+	</dl>
 	<dl>
 		<dt><label for="table">{L_TABLE_SELECT}{L_COLON}</label></dt>
 		<dd><select id="table" name="table[]" size="10" multiple="multiple">
@@ -76,15 +84,12 @@
 		</select></dd>
 		<dd><a href="#" onclick="selector(true); return false;">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false); return false;">{L_DESELECT_ALL}</a></dd>
 	</dl>
-	</fieldset>
 
-	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		</p>
-		{S_FORM_TOKEN}
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
 	</fieldset>
 	</form>
 

phpBB/adm/style/acp_ext_details.html

@@ -7,19 +7,20 @@
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<!-- IF S_VERSIONCHECK -->
-		<!-- IF S_VERSIONCHECK_FAIL -->
-		<div class="errorbox notice">
-			<p>{L_VERSIONCHECK_FAIL}</p>
-			<p>{VERSIONCHECK_FAIL_REASON}</p>
-			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
-		</div>
-		<!-- ELSE -->
-		<div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->">
-			<p>{UP_TO_DATE_MSG} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
-		</div>
-		<!-- ENDIF -->
+	<div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->">
+		<p>{UP_TO_DATE_MSG} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+	</div>
+	<!-- ELSE IF S_VERSIONCHECK_STATUS == 0 -->
+	<div class="errorbox notice">
+		<p>{L_VERSIONCHECK_FAIL}</p>
+		<p>{VERSIONCHECK_FAIL_REASON}</p>
+		<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+	</div>
+	<!-- ELSE IF S_VERSIONCHECK_STATUS == 1 -->
+	<div class="errorbox notice">
+		<p>{VERSIONCHECK_FAIL_REASON}</p>
+	</div>
 	<!-- ENDIF -->
-<!-- EVENT acp_ext_details_notice -->
 
 	<fieldset>
 		<legend>{L_EXT_DETAILS}</legend>
@@ -135,5 +136,4 @@
 		<!-- END meta_authors -->
 	</fieldset>
 
-	<!-- EVENT acp_ext_details_end -->
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_ext_list.html

@@ -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.2" 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="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>
 	</fieldset>
 
 	<form id="version_check_settings" method="post" action="{U_ACTION}" style="display:none">
@@ -44,15 +44,14 @@
 	<tbody>
 		<!-- IF .enabled -->
 		<tr>
-			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong><!-- EVENT acp_ext_list_enabled_title_after --></td>
+			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
 		</tr>
 		<!-- BEGIN enabled -->
 		<tr class="ext_enabled row-highlight">
-			<td><strong title="{enabled.NAME}">{enabled.META_DISPLAY_NAME}</strong><!-- EVENT acp_ext_list_enabled_name_after --></td>
+			<td><strong title="{enabled.NAME}">{enabled.META_DISPLAY_NAME}</strong></td>
 			<td style="text-align: center;">
 				<!-- IF enabled.S_VERSIONCHECK -->
-				<strong 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 -->
+				<strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.META_VERSION}</strong>
 				<!-- ELSE -->
 				{enabled.META_VERSION}
 				<!-- ENDIF -->
@@ -70,15 +69,14 @@
 
 		<!-- IF .disabled -->
 		<tr>
-			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong><!-- EVENT acp_ext_list_disabled_title_after --></td>
+			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
 		</tr>
 		<!-- BEGIN disabled -->
 		<tr class="ext_disabled row-highlight">
-			<td><strong title="{disabled.NAME}">{disabled.META_DISPLAY_NAME}</strong><!-- EVENT acp_ext_list_disabled_name_after --></td>
+			<td><strong title="{disabled.NAME}">{disabled.META_DISPLAY_NAME}</strong></td>
 			<td style="text-align: center;">
 				<!-- IF disabled.S_VERSIONCHECK -->
-				<strong 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 -->
+				<strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.META_VERSION}</strong>
 				<!-- ELSE -->
 				{disabled.META_VERSION}
 				<!-- ENDIF -->

phpBB/adm/style/acp_forums.html

@@ -4,7 +4,7 @@
 
 <!-- IF S_EDIT_FORUM -->
 
-	<script>
+	<script type="text/javascript">
 	// <![CDATA[
 		/**
 		* Handle displaying/hiding several options based on the forum type
@@ -242,7 +242,7 @@
 		</dl>
 		<dl>
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
-			<dd><input type="number" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" min="0" max="9999" /></dd>
+			<dd><input type="number" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" min="0" max="9999" /></dd>
 		</dl>
 		<!-- EVENT acp_forums_normal_settings_append -->
 		</fieldset>
@@ -257,15 +257,15 @@
 		</dl>
 		<dl>
 			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
@@ -289,11 +289,11 @@
 		</dl>
 		<dl>
 			<dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_SHADOW_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_SHADOW_FREQ}" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_SHADOW_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<!-- EVENT acp_forums_prune_settings_append -->
 		</fieldset>
@@ -405,7 +405,7 @@
 
 <!-- ELSEIF S_CONTINUE_SYNC -->
 
-	<script>
+	<script type="text/javascript">
 	// <![CDATA[
 		var close_waitscreen = 0;
 		// no scrollbars...
@@ -421,7 +421,7 @@
 
 <!-- ELSE -->
 
-	<script>
+	<script type="text/javascript">
 	// <![CDATA[
 		/**
 		* Popup search progress bar
@@ -447,7 +447,7 @@
 	<!-- ENDIF -->
 
 	<!-- IF S_RESYNCED -->
-		<script>
+		<script type="text/javascript">
 		// <![CDATA[
 			var close_waitscreen = 1;
 		// ]]>

phpBB/adm/style/acp_groups.html

@@ -36,12 +36,10 @@
 		<dl>
 			<dt><label for="group_type">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
 			<dd>
-				{% EVENT acp_group_types_prepend %}
 				<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>
 				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>
 				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label>
 				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}</label>
-				{% EVENT acp_group_types_append %}
 			</dd>
 		</dl>
 	<!-- ELSE -->
@@ -88,11 +86,11 @@
 		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
 	<dl>
 		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}{L_COLON}</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
-		<dd><input name="group_message_limit" type="number" id="group_message_limit" min="0" max="9999" value="{GROUP_MESSAGE_LIMIT}" /></dd>
+		<dd><input name="group_message_limit" type="number" id="group_message_limit" maxlength="4" size="4" min="0" max="9999" value="{GROUP_MESSAGE_LIMIT}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}{L_COLON}</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
-		<dd><input name="group_max_recipients" type="number" id="group_max_recipients" min="0" max="9999" value="{GROUP_MAX_RECIPIENTS}" /></dd>
+		<dd><input name="group_max_recipients" type="number" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
@@ -318,7 +316,7 @@
 	<tbody>
 		<!-- ELSE -->
 		<tr>
-			<td><strong<!-- IF groups.GROUP_COLOR --> style="color: #{groups.GROUP_COLOR}"<!-- ENDIF -->>{groups.GROUP_NAME}</strong></td>
+			<td><strong>{groups.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
 			<td style="text-align: center;">{groups.PENDING_MEMBERS}</td>
 			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>

phpBB/adm/style/acp_groups_position.html

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

phpBB/adm/style/acp_help_phpbb.html

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

phpBB/adm/style/acp_icons.html

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

phpBB/adm/style/acp_inactive.html

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

phpBB/adm/style/acp_jabber.html

@@ -31,7 +31,7 @@
 </dl>
 <dl>
 	<dt><label for="jab_port">{L_JAB_PORT}{L_COLON}</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
-	<dd><input type="number" id="jab_port" name="jab_port" value="{JAB_PORT}" min="0" max="99999" /></dd>
+	<dd><input type="number" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
 </dl>
 <dl>
 	<dt><label for="jab_username">{L_JAB_USERNAME}{L_COLON}</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
@@ -47,35 +47,17 @@
 	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
-<dl>
-	<dt><label for="jab_verify_peer">{L_JAB_VERIFY_PEER}{L_COLON}</label><br /><span>{L_JAB_VERIFY_PEER_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_verify_peer" name="jab_verify_peer" value="1"<!-- IF JAB_VERIFY_PEER --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_verify_peer" value="0"<!-- IF not JAB_VERIFY_PEER --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="jab_verify_peer_name">{L_JAB_VERIFY_PEER_NAME}{L_COLON}</label><br /><span>{L_JAB_VERIFY_PEER_NAME_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_verify_peer_name" name="jab_verify_peer_name" value="1"<!-- IF JAB_VERIFY_PEER_NAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_verify_peer_name" value="0"<!-- IF not JAB_VERIFY_PEER_NAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="jab_allow_self_signed">{L_JAB_ALLOW_SELF_SIGNED}{L_COLON}</label><br /><span>{L_JAB_ALLOW_SELF_SIGNED_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_allow_self_signed" name="jab_allow_self_signed" value="1"<!-- IF JAB_ALLOW_SELF_SIGNED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_allow_self_signed" value="0"<!-- IF not JAB_ALLOW_SELF_SIGNED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
 <!-- ENDIF -->
 <dl>
 	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}{L_COLON}</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
-	<dd><input type="number" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" min="0" max="99999" /></dd>
+	<dd><input type="number" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" min="0" max="99999" /></dd>
 </dl>
 
 </fieldset>
 
-<fieldset>
-	<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
+<fieldset class="submit-buttons">
+	<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>

phpBB/adm/style/acp_language.html

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

phpBB/adm/style/acp_main.html

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

phpBB/adm/style/acp_modules.html

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

phpBB/adm/style/acp_permission_roles.html

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

phpBB/adm/style/acp_permissions.html

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

phpBB/adm/style/acp_posting_buttons.html

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

phpBB/adm/style/acp_profile.html

@@ -21,11 +21,8 @@
 
 	<!-- IF S_STEP_ONE -->
 
-		{% EVENT acp_profile_options_before %}
-
 		<fieldset>
 			<legend>{L_TITLE}</legend>
-		{% EVENT acp_profile_basic_options_before %}
 		<dl>
 			<dt><label>{L_FIELD_TYPE}{L_COLON}</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
 			<dd><strong>{FIELD_TYPE}</strong></dd>
@@ -46,11 +43,8 @@
 			<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
-		{% EVENT acp_profile_basic_options_after %}
 		</fieldset>
 
-		{% EVENT acp_profile_visibility_options_before %}
-
 		<fieldset>
 			<legend>{L_VISIBILITY_OPTION}</legend>
 		<dl>
@@ -91,13 +85,9 @@
 			<dd><input type="checkbox" class="radio" id="field_is_contact" name="field_is_contact" value="1"<!-- IF S_FIELD_CONTACT --> checked="checked"<!-- ENDIF --> /></dd>
 			<dd><input class="text medium" type="text" name="field_contact_desc" id="field_contact_desc" value="{FIELD_CONTACT_DESC}" /> <label for="field_contact_desc">{L_FIELD_CONTACT_DESC}</label></dd>
 			<dd><input class="text medium" type="text" name="field_contact_url" id="field_contact_url" value="{FIELD_CONTACT_URL}" /> <label for="field_contact_url">{L_FIELD_CONTACT_URL}</label></dd>
-			<!-- EVENT acp_profile_contact_last -->
 		</dl>
-		{% EVENT acp_profile_contact_after %}
 		</fieldset>
 
-		{% EVENT acp_profile_visibility_options_after %}
-
 		<!-- IF S_EDIT_MODE -->
 			<fieldset class="quick">
 				<input class="button1" type="submit" name="save" value="{L_SAVE}" />
@@ -137,7 +127,6 @@
 			<!-- ENDIF -->
 			</dl>
 		<!-- ENDIF -->
-		<!-- EVENT acp_profile_step_one_lang_after -->
 		</fieldset>
 
 		<fieldset class="quick">
@@ -247,7 +236,7 @@
 	<form id="profile_fields" method="post" action="{U_ACTION}">
 
 	<fieldset class="quick">
-		<select name="field_type">{S_TYPE_OPTIONS}</select>
+		<input class="text small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select>
 		<input class="button1" type="submit" name="submit" value="{L_CREATE_NEW_FIELD}" />
 		<input type="hidden" name="create" value="1" />
 		{S_FORM_TOKEN}

phpBB/adm/style/acp_prune_forums.html

@@ -94,9 +94,7 @@
 		<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_prune_users.html

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

phpBB/adm/style/acp_ranks.html

@@ -6,7 +6,7 @@
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
 
-	<script>
+	<script type="text/javascript">
 	// <![CDATA[
 		function update_image(newimage)
 		{
@@ -44,7 +44,7 @@
 	<div id="posts"<!-- IF S_SPECIAL_RANK --> style="display: none;"<!-- ENDIF -->>
 	<dl>
 		<dt><label for="min_posts">{L_RANK_MINIMUM}{L_COLON}</label></dt>
-		<dd><input name="min_posts" type="number" id="min_posts" min="0" max="9999999999" value="{MIN_POSTS}" /></dd>
+		<dd><input name="min_posts" type="number" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
 	</dl>
 	</div>
 

phpBB/adm/style/acp_search.html

@@ -18,11 +18,11 @@
 	</dl>
 	<dl>
 		<dt><label for="search_interval">{L_SEARCH_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_interval" type="number" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
+		<dd><input id="search_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
 		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_anonymous_interval" type="number" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
+		<dd><input id="search_anonymous_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
 		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}{L_COLON}</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
@@ -30,15 +30,15 @@
 	</dl>
 	<dl>
 		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}{L_COLON}</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
-		<dd><input id="min_search_author_chars" type="number" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
+		<dd><input id="min_search_author_chars" type="number" size="4" maxlength="4" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
-		<dd><input id="max_num_search_keywords" type="number" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
+		<dd><input id="max_num_search_keywords" type="number" size="4" maxlength="4" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}{L_COLON}</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
-		<dd><input id="search_store_results" type="number" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
+		<dd><input id="search_store_results" type="number" size="4" maxlength="6" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
 	</dl>
 	</fieldset>
 
@@ -59,19 +59,17 @@
 
 	<!-- END backend -->
 
-	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-		<p class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		</p>
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
 
 <!-- ELSEIF S_INDEX -->
 
-	<script>
+	<script type="text/javascript">
 	// <![CDATA[
 		/**
 		* Popup search progress bar
@@ -91,12 +89,10 @@
 		<p>{L_CONTINUE_EXPLAIN}</p>
 
 		<form id="acp_search_continue" method="post" action="{U_CONTINUE_INDEXING}">
-			<fieldset>
-				<legend>{L_ACP_SUBMIT_CHANGES}</legend>
-				<p class="submit-buttons">
-					<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-					<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-				</p>
+			<fieldset class="submit-buttons">
+				<legend>{L_SUBMIT}</legend>
+				<input class="button1" type="submit" id="continue" name="continue" value="{L_CONTINUE}" onclick="popup_progress_bar('{S_CONTINUE_INDEXING}');" />&nbsp;
+				<input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" />
 				{S_FORM_TOKEN}
 			</fieldset>
 		</form>

phpBB/adm/style/acp_send_statistics.html

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

phpBB/adm/style/acp_styles.html

@@ -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.2" target="_blank">{L_BROWSE_STYLES_DATABASE}</a></span>
+	<span class="small"><a href="https://www.phpbb.com/go/customise/styles/3.1" target="_blank">{L_BROWSE_STYLES_DATABASE}</a></span>
 </fieldset>
 
 <form id="acp_styles" method="post" action="{U_ACTION}">
@@ -51,10 +51,6 @@
 		<dt><label>{L_STYLE_PATH}{L_COLON}</label></dt>
 		<dd><strong>{STYLE_PATH}</strong></dd>
 	</dl>
-	<dl>
-		<dt><label>{L_STYLE_VERSION}{L_COLON}</label></dt>
-		<dd><strong>{STYLE_VERSION}</strong></dd>
-	</dl>
 	<dl>
 		<dt><label for="name">{L_COPYRIGHT}{L_COLON}</label></dt>
 		<dd><strong>{STYLE_COPYRIGHT}</strong></dd>
@@ -96,7 +92,6 @@
 	<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}
@@ -130,7 +125,6 @@
 				<span class="style-path"><br />{L_STYLE_PATH}{L_COLON} {styles_list.STYLE_PATH_FULL}</span>
 			<!-- ENDIF -->
 		</td>
-		<td class="{$ROW_CLASS} users">{styles_list.STYLE_PHPBB_VERSION}</td>
 		<!-- IF not STYLES_LIST_HIDE_COUNT -->
 			<td class="{$ROW_CLASS} users">{styles_list.USERS}</td>
 		<!-- ENDIF -->
@@ -146,9 +140,7 @@
 		{styles_list.EXTRA}
 		<td class="{$ROW_CLASS} mark" width="20">
 			<!-- IF styles_list.STYLE_ID -->
-				{% if styles_list.STYLE_NAME !== 'prosilver' %}
-					<input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}" />
-				{% endif %}
+				<input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}" />
 			<!-- ELSE -->
 				<!-- IF styles_list.COMMENT != '' -->
 					&nbsp;

phpBB/adm/style/acp_update.html

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

phpBB/adm/style/acp_users.html

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

phpBB/adm/style/acp_users_overview.html

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

phpBB/adm/style/acp_users_prefs.html

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

phpBB/adm/style/acp_users_signature.html

@@ -1,4 +1,4 @@
-<script>
+<script type="text/javascript">
 // <![CDATA[
 
 	var form_name = 'user_signature';

phpBB/adm/style/admin.css

@@ -1,4 +1,4 @@
-/*  phpBB 3.2 Admin Style Sheet
+/*  phpBB 3.1 Admin Style Sheet
 	------------------------------------------------------------------------
 	Original author:	subBlue ( http://www.subblue.com/ )
 	Copyright (c) phpBB Limited <https://www.phpbb.com>
@@ -525,6 +525,7 @@ li {
 	padding: 0;
 	border-right: 1px solid #CCCFD3;
 	position: relative;
+	z-index: 1;
 }
 
 .rtl #menu {
@@ -840,7 +841,6 @@ table.zebra-table tbody tr:nth-child(odd) {
 }
 
 .row2 {
-	word-break: break-all;
 	background-color: #DCEBFE;
 }
 
@@ -1891,6 +1891,7 @@ li.pagination ul {
 	color: #000;
 	text-align: center;
 	border: 1px solid #AAA;
+	opacity: .95;
 }
 
 .tooltip span.top {
@@ -2049,8 +2050,6 @@ fieldset.permissions .padding {
 }
 
 .permissions-category ul {
-	display: flex;
-	flex-wrap: wrap;
 	margin: 0;
 	padding: 0;
 	list-style: none;
@@ -2104,6 +2103,7 @@ fieldset.permissions .padding {
 
 .permissions-category .activetab a span.tabbg {
 	background-position: 100% 0;
+	padding-bottom: 7px;
 	color: #333333;
 }
 
@@ -2298,10 +2298,6 @@ fieldset.permissions .padding {
 		margin: 0 !important;
 	}
 
-	.permissions-category ul {
-		display: block;
-	}
-
 	.permissions-category a, .permissions-category a span.tabbg {
 		display: block;
 		float: none !important;
@@ -2465,9 +2461,6 @@ fieldset.permissions .padding {
 	text-align: left;
 }
 
-.rtl .dropdown li {
-	text-align: right;
-}
 .wrap .dropdown li, .dropdown.wrap li {
 	white-space: normal;
 }
@@ -2478,14 +2471,10 @@ fieldset.permissions .padding {
 
 .roles-options > .dropdown {
 	left: auto;
-	top: 3.2em;
+	top: 3em;
 	width: 250px;
 }
 
-.rtl .roles-options > .dropdown {
-	right: auto;
-}
-
 .roles-options {
 	-webkit-user-select: none;
 	-moz-user-select: none;
@@ -2500,14 +2489,10 @@ fieldset.permissions .padding {
 	border-radius: 3px;
 	padding: 4px;
 	width: 250px;
-	display: none;
+	display: block;
 	background: url('../images/arrow_down.gif') no-repeat 245px .7em;
 }
 
-.rtl .roles-options > span {
-	background: url('../images/arrow_down.gif') no-repeat 7px .7em;
-}
-
 .roles-options li {
 	list-style: none;
 }
@@ -2521,14 +2506,6 @@ fieldset.permissions .padding {
 /* Classes for additional tasks
 ---------------------------------------- */
 
-.current-ext {
-	color: #228822;
-}
-
-.outdated-ext {
-	color: #BC2A4D;
-}
-
 .phpinfo {
 	overflow: auto;
 	width: 99%;
@@ -2606,120 +2583,3 @@ fieldset.permissions .padding {
 	line-height: 25px;
 	font-weight: bold;
 }
-
-.send-stats-row {
-	margin: 15px 0;
-}
-
-.send-stats-row:before {
-	display: table;
-	content: " ";
-}
-
-.send-stats-tile {
-	position: relative;
-	padding: 14px;
-	margin-bottom: 20px;
-	background-color: #eff0f2;
-	border-radius: 6px;
-	box-shadow: rgba(0,0,0,0.3) 1px 1px 5px;
-}
-
-.send-stats-tile h2 {
-	margin-top: 0;
-	text-align: center;
-    padding-bottom: 1em;
-}
-
-.send-stats-tile i {
-	padding-right: 0.3em;
-}
-
-.icon {
-	font-family: FontAwesome;
-	font-style: normal;
-}
-
-.send-stats-data-row {
-	background: #f9f9f9;
-	border-radius: 6px;
-	border: #DEDEDE 1px solid;
-	padding: 10px;
-	border-top-width: 0;
-	border-top-right-radius: 0;
-	border-top-left-radius: 0;
-}
-
-.send-stats-data-hidden .configlist {
-	display: none;
-}
-
-.send-stats-data-only-row {
-	border-radius: 6px !important;
-	border-bottom-width: 1px !important;
-}
-
-.send-stats-data-hidden {
-	padding: 0;
-	border: none;
-}
-
-.send-stats-row > .send-stats-data-row:first-child {
-	background-color: #d9edf7;
-	border-bottom-width: 0;
-	border-top-right-radius: 6px;
-	border-top-left-radius: 6px;
-	border-top-width: 1px;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-.send-stats-settings dt, .send-stats-settings dd {
-	min-width: 25px;
-}
-
-.send-stats-settings dd {
-	line-height: 1.5em;
-}
-
-.send-stats-settings input {
-	display: none;
-}
-
-.send-stats-settings input[type=checkbox] + label:before {
-	content: "\f096";
-	font-family: FontAwesome;
-	font-size: 1.5em;
-}
-
-.send-stats-settings input[type=checkbox]:checked + label:before {
-	content: "\f14a";
-	color: #3c763d;
-}
-
-.send-stats-data-row a:hover span {
-	text-decoration: underline;
-}
-
-.send-stats-data-row a {
-	text-decoration: none;
-	cursor: default;
-}
-
-.send-stats-data-row i {
-	padding-left: 6px;
-}
-
-.configlist {
-	word-wrap: break-word;
-	word-break: break-all;
-}
-
-/* stylelint-disable declaration-property-unit-whitelist */
-.emoji {
-	min-height: 18px;
-	min-width: 18px;
-	height: 1em;
-	width: 1em;
-}
-/* stylelint-enable declaration-property-unit-whitelist */

phpBB/adm/style/admin.js

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

phpBB/adm/style/ajax.js

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

phpBB/adm/style/installer_footer.html

@@ -6,25 +6,14 @@
 
 	<div id="page-footer">
 		<div class="copyright">
-			{% if S_COPYRIGHT_HTML %}
-				{{ CREDIT_LINE }}
-			{% endif %}
+			Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited
 		</div>
 	</div>
 </div>
 
-<script>
-<!--
-installLang = {
-	title: '{LA_TIMEOUT_DETECTED_TITLE}',
-	msg: '{LA_TIMEOUT_DETECTED_MESSAGE}'
-};
-//-->
-</script>
-
-<script src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF -->
-<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
 

phpBB/adm/style/installer_form.html

@@ -1,4 +1,3 @@
-<!-- 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 -->
@@ -9,9 +8,9 @@
 		<!-- IF options.S_LEGEND -->
 			<!-- IF not options.S_FIRST_ROW -->
 			</fieldset>
-			<!-- ENDIF -->
-			<fieldset>
 
+			<fieldset>
+			<!-- ENDIF -->
 		<legend>{options.LEGEND}</legend>
 		<!-- ELSE -->
 		<dl>
@@ -50,7 +49,7 @@
 <fieldset class="submit-buttons">
 	<legend>{L_SUBMIT}</legend>
 	<!-- BEGIN submit_buttons -->
-	<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 --> />
+	<input class="button1" type="submit" name="{submit_buttons.KEY}" value="{submit_buttons.TITLE}" />
 	<!-- END submit_buttons -->
 </fieldset>
 <!-- ENDIF -->

phpBB/adm/style/installer_header.html

@@ -2,7 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1" />
 	<!-- IF META -->{META}<!-- ENDIF -->
 	<title>{PAGE_TITLE}</title>

phpBB/adm/style/overall_footer.html

@@ -33,9 +33,9 @@
 	</div>
 </div>
 
-<script src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
-<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 <!-- INCLUDEJS admin.js -->
 

phpBB/adm/style/overall_header.html

@@ -2,15 +2,13 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
-<link href="{T_FONT_AWESOME_LINK}" rel="stylesheet">
 <link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" />
 
-<script>
+<script type="text/javascript">
 // <![CDATA[
 var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
 var on_page = '{CURRENT_PAGE}';
@@ -54,7 +52,7 @@ function marklist(id, name, state)
 
 	for (var r = 0; r < rb.length; r++)
 	{
-		if (rb[r].name.substr(0, name.length) == name && rb[r].disabled !== true)
+		if (rb[r].name.substr(0, name.length) == name)
 		{
 			rb[r].checked = state;
 		}

phpBB/adm/style/permission_mask.html

@@ -1,5 +1,5 @@
 
-<script>
+<script type="text/javascript">
 // <![CDATA[
 	var active_pmask = '0';
 	var active_fmask = '0';
@@ -9,14 +9,12 @@
 
 	var role_options = new Array();
 
-	var no_role_assigned = "{LA_NO_ROLE_ASSIGNED}";
-
 	<!-- IF S_ROLE_JS_ARRAY -->
 		{S_ROLE_JS_ARRAY}
 	<!-- ENDIF -->
 // ]]>
 </script>
-<script src="style/permissions.js"></script>
+<script type="text/javascript" src="style/permissions.js"></script>
 
 <!-- BEGIN p_mask -->
 <div class="clearfix"></div>
@@ -41,19 +39,18 @@
 		</div>
 		<dl class="permissions-simple">
 			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}{L_COLON}</label></dt>
-			{% if p_mask.f_mask.role_options %}
+			{% if role_options %}
 				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%">
-					<div class="dropdown-container dropdown-{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>
+					<div class="dropdown-container dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}">
 						<span title="Roles" class="button icon-button tools-icon dropdown-trigger dropdown-select">{L_NO_ROLE_ASSIGNED}</span>
 						<div class="dropdown hidden">
 							<ul class="dropdown-contents" id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" >
-								{% for role in p_mask.f_mask.role_options %}
+								{% for role in loops.role_options %}
 									<li data-id="{{ role.ID }}" data-target-id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" data-title="{{ role.TITLE }}"{% if role.SELECTED == true %} data-selected="{{ role.SELECTED }}"{% endif %}>{{ role.ROLE_NAME }}</li>
 								{% endfor %}
 							</ul>
 						</div>
-						<input type="hidden" data-name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]"{% if p_mask.f_mask.S_ROLE_ID %}value="{{ p_mask.f_mask.S_ROLE_ID }}"{% endif %} />
+						<input type="hidden" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]"{% if S_ROLE_ID %}value="{{ S_ROLE_ID }}"{% endif %} />
 					</div>
 				</dd>
 			{% else %}

phpBB/adm/style/permissions.js

@@ -269,14 +269,8 @@ function mark_one_option(id, field_name, s) {
 }
 
 /**
- * (Re)set the permission role dropdown.
- *
- * Try and match the set permissions to an existing role.
- * Otherwise reset the dropdown to "Select a role.."
- *
- * @param {string}	id		The fieldset identifier
- * @returns {void}
- */
+* Reset role dropdown field to Select role... if an option gets changed
+*/
 function reset_role(id) {
 	var t = document.getElementById(id);
 
@@ -284,37 +278,14 @@ function reset_role(id) {
 		return;
 	}
 
-	// Before resetting the role dropdown, try and match any permission role
-	var parent = t.parentNode,
-		roleId = match_role_settings(id.replace('role', 'perm')),
-		text = no_role_assigned,
-		index = 0;
-
-	// If a role permissions was matched, grab that option's value and index
-	if (roleId) {
-		for (var i = 0; i < t.options.length; i++) {
-			if (parseInt(t.options[i].value, 10) === roleId) {
-				text = t.options[i].text;
-				index = i;
-				break;
-			}
-		}
-	}
-
-	// Update the select's value and selected index
-	t.value = roleId;
-	t.options[index].selected = true;
-
-	// Update the dropdown trigger to show the new value
-	parent.querySelector('span.dropdown-trigger').innerText = text;
-	parent.querySelector('input[data-name^=role]').value = roleId;
+	t.options[0].selected = true;
 }
 
 /**
 * Load role and set options accordingly
 */
 function set_role_settings(role_id, target_id) {
-	var settings = role_options[role_id];
+	settings = role_options[role_id];
 
 	if (!settings) {
 		return;
@@ -327,51 +298,3 @@ function set_role_settings(role_id, target_id) {
 		mark_one_option(target_id, r, (settings[r] === 1) ? 'y' : 'n');
 	}
 }
-
-/**
- * Match the set permissions against the available roles.
- *
- * @param {string}	id		The parent fieldset identifier
- * @return {number}			The permission role identifier
- */
-function match_role_settings(id) {
-	var fieldset = document.getElementById(id),
-		radios = fieldset.getElementsByTagName('input'),
-		set = {};
-
-	// Iterate over all the radio buttons
-	for (var i = 0; i < radios.length; i++) {
-		var matches = radios[i].id.match(/setting\[\d+]\[\d+]\[([a-z_]+)]/);
-
-		// Make sure the name attribute matches, the radio is checked and it is not the "No" (-1) value.
-		if (matches !== null && radios[i].checked && radios[i].value !== '-1') {
-			set[matches[1]] = parseInt(radios[i].value, 10);
-		}
-	}
-
-	// Sort and stringify the 'set permissions' object
-	set = sort_and_stringify(set);
-
-	// Iterate over the available role options and return the first match
-	for (var r in role_options)
-	{
-		if (sort_and_stringify(role_options[r]) === set) {
-			return parseInt(r, 10);
-		}
-	}
-
-	return 0;
-}
-
-/**
- * Sort and stringify an Object so it can be easily compared against another object.
- *
- * @param {object}	obj		The object to sort (by key) and stringify
- * @return {string}			The sorted object as a string
- */
-function sort_and_stringify(obj) {
-	return JSON.stringify(Object.keys(obj).sort().reduce(function (result, key) {
-		result[key] = obj[key];
-		return result;
-	}, {}));
-}

phpBB/adm/style/progress_bar.html

@@ -1,6 +1,6 @@
 <!-- INCLUDE simple_header.html -->
 
-<script>
+<script type="text/javascript">
 // <![CDATA[
 	/**
 	* Close previously opened popup
@@ -31,7 +31,7 @@
 	<p>{L_PROGRESS_EXPLAIN}</p>
 </div>
 
-<script>
+<script type="text/javascript">
 // <![CDATA[
 	close_popup();
 // ]]>

phpBB/adm/style/simple_footer.html

@@ -16,9 +16,9 @@
 
 </div>
 
-<script src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
-<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 
 <!-- EVENT acp_simple_footer_after -->
 {$SCRIPTS}

phpBB/adm/style/simple_header.html

@@ -2,14 +2,13 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
 
 <link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" />
 
-<script>
+<script type="text/javascript">
 // <![CDATA[
 var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
 var on_page = '{CURRENT_PAGE}';
@@ -66,7 +65,7 @@ function marklist(id, name, state)
 	
 	for (var r = 0; r < rb.length; r++)
 	{
-		if (rb[r].name.substr(0, name.length) == name && rb[r].disabled !== true)
+		if (rb[r].name.substr(0, name.length) == name)
 		{
 			rb[r].checked = state;
 		}

phpBB/adm/style/tooltip.js

@@ -130,17 +130,10 @@ phpbb.positionTooltip = function ($element) {
 	$element = $element.parent();
 	offset = $element.offset();
 
-	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
-		});
-	}
+	$('#_tooltip_container').css({
+		top: offset.top + 30,
+		left: offset.left - 205
+	});
 };
 
 /**
@@ -148,43 +141,20 @@ phpbb.positionTooltip = function ($element) {
  */
 phpbb.prepareRolesDropdown = function () {
 	var $options = $('.roles-options li');
-
-	// Display span and hide select
-	$('.roles-options > span').css('display', 'block');
-	$('.roles-options > select').hide();
-	$('.roles-options > input[type=hidden]').each(function () {
-		var $this = $(this);
-
-		if ($this.attr('data-name') && !$this.attr('name')) {
-			$this.attr('name', $this.attr('data-name'));
-		}
-	});
+	var $rolesOptions = $options.closest('.roles-options');
+	var $span = $rolesOptions.children('span');
 
 	// Prepare highlighting of select options and settings update
 	$options.each(function () {
 		var $this = $(this);
-		var $rolesOptions = $this.closest('.roles-options');
-		var $span = $rolesOptions.children('span');
 
 		// Correctly show selected option
 		if (typeof $this.attr('data-selected') !== 'undefined') {
-			$rolesOptions
+			$rolesOptions.closest('.roles-options')
 				.children('span')
 				.text($this.text())
 				.attr('data-default', $this.text())
 				.attr('data-default-val', $this.attr('data-id'));
-
-			// Save default text of drop down if there is no default set yet
-			if (typeof $span.attr('data-default') === 'undefined') {
-				$span.attr('data-default', $span.text());
-			}
-
-			// Prepare resetting drop down on form reset
-			$this.closest('form').on('reset', function () {
-				$span.text($span.attr('data-default'));
-				$rolesOptions.children('input[type=hidden]')
-					.val($span.attr('data-default-val'));
-			});
 		}
 
 		$this.on('mouseover', function () {
@@ -193,7 +163,6 @@ phpbb.prepareRolesDropdown = function () {
 			$this.addClass('roles-highlight');
 		}).on('click', function () {
 			var $this = $(this);
-			var $rolesOptions = $this.closest('.roles-options');
 
 			// Update settings
 			set_role_settings($this.attr('data-id'), $this.attr('data-target-id'));
@@ -209,6 +178,19 @@ phpbb.prepareRolesDropdown = function () {
 			$('body').trigger('click');
 		});
 	});
+
+	// Save default text of drop down if there is no default set yet
+	if (typeof $span.attr('data-default') === 'undefined') {
+		$span.attr('data-default', $span.text());
+	}
+
+	// Prepare resetting drop down on form reset
+	$options.closest('form').on('reset', function () {
+		$span.text($span.attr('data-default'));
+		$rolesOptions.children('input[type=hidden]')
+			.val($span.attr('data-id'));
+	});
+
 };
 
 // Run onload functions for RolesDropdown and tooltips

phpBB/assets/cookieconsent/cookieconsent.min.css

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

phpBB/assets/javascript/core.js

@@ -20,13 +20,6 @@ var phpbbAlertTimer = null;
 
 phpbb.isTouch = (window && typeof window.ontouchstart !== 'undefined');
 
-// Add ajax pre-filter to prevent cross-domain script execution
-$.ajaxPrefilter(function(s) {
-	if (s.crossDomain) {
-		s.contents.script = false;
-	}
-});
-
 /**
  * Display a loading screen
  *
@@ -34,36 +27,29 @@ $.ajaxPrefilter(function(s) {
  */
 phpbb.loadingIndicator = function() {
 	if (!$loadingIndicator) {
-		$loadingIndicator = $('<div />', {
-			'id': 'loading_indicator',
-			'class': 'loading_indicator'
+		$loadingIndicator = $('<div />', { 
+			id: 'loading_indicator', 
+			class: 'loading_indicator', 
 		});
 		$loadingIndicator.appendTo('#page-footer');
 	}
 
 	if (!$loadingIndicator.is(':visible')) {
 		$loadingIndicator.fadeIn(phpbb.alertTime);
-		// Wait 60 seconds and display an error if nothing has been returned by then.
+		// Wait fifteen seconds and display an error if nothing has been returned by then.
 		phpbb.clearLoadingTimeout();
 		phpbbAlertTimer = setTimeout(function() {
-			phpbb.showTimeoutMessage();
-		}, 60000);
+			var $alert = $('#phpbb_alert');
+
+			if ($loadingIndicator.is(':visible')) {
+				phpbb.alert($alert.attr('data-l-err'), $alert.attr('data-l-timeout-processing-req'));
+			}
+		}, 15000);
 	}
 
 	return $loadingIndicator;
 };
 
-/**
- * Show timeout message
- */
-phpbb.showTimeoutMessage = function () {
-	var $alert = $('#phpbb_alert');
-
-	if ($loadingIndicator.is(':visible')) {
-		phpbb.alert($alert.attr('data-l-err'), $alert.attr('data-l-timeout-processing-req'));
-	}
-};
-
 /**
  * Clear loading alert timeout
 */
@@ -186,7 +172,7 @@ phpbb.alert.close = function($alert, fadedark) {
 phpbb.confirm = function(msg, callback, fadedark) {
 	var $confirmDiv = $('#phpbb_confirm');
 	$confirmDiv.find('.alert_text').html(msg);
-	fadedark = typeof fadedark !== 'undefined' ? fadedark : true;
+	fadedark = fadedark || true;
 
 	$(document).on('keydown.phpbb.alert', function(e) {
 		if (e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) {
@@ -201,7 +187,9 @@ phpbb.confirm = function(msg, callback, fadedark) {
 	$confirmDiv.find('input[type="button"]').one('click.phpbb.confirmbox', function(e) {
 		var confirmed = this.name === 'confirm';
 
-		callback(confirmed);
+		if (confirmed) {
+			callback(true);
+		}
 		$confirmDiv.find('input[type="button"]').off('click.phpbb.confirmbox');
 		phpbb.alert.close($confirmDiv, fadedark || !confirmed);
 
@@ -853,10 +841,7 @@ phpbb.timezonePreselectSelect = function(forceSelector) {
 	var minutes = offset % 60;
 	var hours = (offset - minutes) / 60;
 
-	if (hours === 0) {
-		hours = '00';
-		sign = '+';
-	} else if (hours < 10) {
+	if (hours < 10) {
 		hours = '0' + hours.toString();
 	} else {
 		hours = hours.toString();
@@ -945,9 +930,9 @@ phpbb.addAjaxCallback('alt_text', function() {
 	$anchor.each(function() {
 		var $this = $(this);
 		altText = $this.attr('data-alt-text');
-		$this.attr('data-alt-text', $.trim($this.text()));
-		$this.attr('title', altText);
-		$this.children('span').text(altText);
+		$this.attr('data-alt-text', $this.text());
+		$this.attr('title', $.trim(altText));
+		$this.text(altText);
 	});
 });
 
@@ -1047,7 +1032,7 @@ phpbb.resizeTextArea = function($items, options) {
 
 	function autoResize(item) {
 		function setHeight(height) {
-			height += parseInt($item.css('height'), 10) - $item.innerHeight();
+			height += parseInt($item.css('height'), 10) - $item.height();
 			$item
 				.css({ height: height + 'px', resize: 'none' })
 				.addClass('auto-resized');
@@ -1066,7 +1051,7 @@ phpbb.resizeTextArea = function($items, options) {
 				configuration.maxHeight
 			),
 			$item = $(item),
-			height = parseInt($item.innerHeight(), 10),
+			height = parseInt($item.height(), 10),
 			scrollHeight = (item.scrollHeight) ? item.scrollHeight : 0;
 
 		if (height < 0) {
@@ -1341,7 +1326,6 @@ phpbb.toggleDropdown = function() {
 			$this.css({
 				marginLeft: 0,
 				left: 0,
-				marginRight: 0,
 				maxWidth: (windowWidth - 4) + 'px'
 			});
 
@@ -1557,13 +1541,6 @@ phpbb.toggleSelectSettings = function(el) {
 		var $this = $(this),
 			$setting = $($this.data('toggle-setting'));
 		$setting.toggle($this.is(':selected'));
-
-		// Disable any input elements that are not visible right now
-		if ($this.is(':selected')) {
-			$($this.data('toggle-setting') + ' input').prop('disabled', false);
-		} else {
-			$($this.data('toggle-setting') + ' input').prop('disabled', true);
-		}
 	});
 };
 
@@ -1653,7 +1630,7 @@ phpbb.lazyLoadAvatars = function loadAvatars() {
 	});
 };
 
-$(window).on('load', phpbb.lazyLoadAvatars);
+$(window).load(phpbb.lazyLoadAvatars);
 
 /**
 * Apply code editor to all textarea elements with data-bbcode attribute
@@ -1665,7 +1642,7 @@ $(function() {
 
 	phpbb.registerPageDropdowns();
 
-	$('[data-orientation]').each(function() {
+	$('#color_palette_placeholder').each(function() {
 		phpbb.registerPalette($(this));
 	});
 

phpBB/assets/javascript/editor.js

@@ -17,10 +17,17 @@ var is_ie = ((clientPC.indexOf('msie') !== -1) && (clientPC.indexOf('opera') ===
 var is_win = ((clientPC.indexOf('win') !== -1) || (clientPC.indexOf('16bit') !== -1));
 var baseHeight;
 
+/**
+* Shows the help messages in the helpline window
+*/
+function helpline(help) {
+	document.forms[form_name].helpbox.value = help_line[help];
+}
+
 /**
 * Fix a bug involving the TextRange object. From
 * http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/
+*/ 
 function initInsertions() {
 	var doc;
 
@@ -97,8 +104,8 @@ function bbfontstyle(bbopen, bbclose) {
 	}
 	// IE
 	else if (document.selection) {
-		var range = textarea.createTextRange();
-		range.move("character", new_pos);
+		var range = textarea.createTextRange(); 
+		range.move("character", new_pos); 
 		range.select();
 		storeCaret(textarea);
 	}
@@ -407,12 +414,6 @@ function getCaretPosition(txtarea) {
 		if ($('#attach-panel').length) {
 			phpbb.showDragNDrop(textarea);
 		}
-
-		$('textarea').on('keydown', function (e) {
-			if (e.which === 13 && (e.metaKey || e.ctrlKey)) {
-				$(this).closest('form').find(':submit').click();
-			}
-		});
 	});
 })(jQuery);
 

phpBB/assets/javascript/installer.js

@@ -12,8 +12,6 @@
 	var progressTimer = null;
 	var currentProgress = 0;
 	var refreshRequested = false;
-	var transmissionOver = false;
-	var statusCount = 0;
 
 	// Template related variables
 	var $contentWrapper = $('.install-body').find('.main');
@@ -331,63 +329,6 @@
 		if (responseObject.hasOwnProperty('redirect')) {
 			redirect(responseObject.redirect.url, responseObject.redirect.use_ajax);
 		}
-
-		if (responseObject.hasOwnProperty('over')) {
-			if (responseObject.over) {
-				transmissionOver = true;
-			}
-		}
-	}
-
-	/**
-	 * Processes status data
-	 *
-	 * @param status
-	 */
-	function processTimeoutResponse(status) {
-		if (statusCount === 12) { // 1 minute hard cap
-			status = 'fail';
-		}
-
-		if (status === 'continue') {
-			refreshRequested = false;
-			doRefresh();
-		} else if (status === 'running') {
-			statusCount++;
-			$('#loading_indicator').css('display', 'block');
-			setTimeout(queryInstallerStatus, 5000);
-		} else {
-			$('#loading_indicator').css('display', 'none');
-			addMessage('error',
-				[{
-					title: installLang.title,
-					description: installLang.msg
-				}]
-			);
-		}
-	}
-
-	/**
-	 * Queries the installer's status
-	 */
-	function queryInstallerStatus() {
-		var url = $(location).attr('pathname');
-		var lookUp = 'install/app.php';
-		var position = url.indexOf(lookUp);
-
-		if (position === -1) {
-			lookUp = 'install';
-			position = url.indexOf(lookUp);
-
-			if (position === -1) {
-				return false;
-			}
-		}
-
-		url = url.substring(0, position) + lookUp + '/installer/status';
-		$.getJSON(url, function(data) {
-			processTimeoutResponse(data.status);
-		});
 	}
 
 	/**
@@ -416,17 +357,10 @@
 			$('#loading_indicator').css('display', 'none');
 			resetPolling();
 
-			var timeoutDetected = !transmissionOver;
-
 			if (refreshRequested) {
 				refreshRequested = false;
 				doRefresh();
 			}
-
-			if (timeoutDetected) {
-				statusCount = 0;
-				queryInstallerStatus();
-			}
 		}
 	}
 
@@ -486,7 +420,6 @@
 	 */
 	function startPolling(xhReq) {
 		resetPolling();
-		transmissionOver = false;
 		pollTimer = setInterval(function () {
 			pollContent(xhReq);
 		}, 250);

phpBB/assets/javascript/plupload.js

@@ -21,9 +21,7 @@ phpbb.plupload.initialize = function() {
 	// Only execute if Plupload initialized successfully.
 	phpbb.plupload.uploader.bind('Init', function() {
 		phpbb.plupload.form = $(phpbb.plupload.config.form_hook)[0];
-		let $attachRowTemplate = $('#attach-row-tpl');
-		$attachRowTemplate.removeClass('attach-row-tpl');
-		phpbb.plupload.rowTpl = $attachRowTemplate[0].outerHTML;
+		phpbb.plupload.rowTpl = $('#attach-row-tpl')[0].outerHTML;
 
 		// Hide the basic upload panel and remove the attach row template.
 		$('#attach-row-tpl, #attach-panel-basic').remove();
@@ -90,12 +88,6 @@ phpbb.plupload.getSerializedData = function() {
 			obj['attachment_data[' + i + '][' + key + ']'] = datum[key];
 		}
 	}
-
-	// Insert form data
-	var $pluploadForm = $(phpbb.plupload.config.form_hook).first();
-	obj.creation_time = $pluploadForm.find('input[type=hidden][name="creation_time"]').val();
-	obj.form_token = $pluploadForm.find('input[type=hidden][name="form_token"]').val();
-
 	return obj;
 };
 
@@ -219,7 +211,7 @@ phpbb.plupload.updateHiddenData = function(row, attach, index) {
 			.attr('type', 'hidden')
 			.attr('name', 'attachment_data[' + index + '][' + key + ']')
 			.attr('value', attach[key]);
-		$(row).append(input);
+		$('textarea', row).after(input);
 	}
 };
 
@@ -270,17 +262,6 @@ phpbb.plupload.deleteFile = function(row, attachId) {
 
 			return;
 		}
-
-		// Handle errors while deleting file
-		if (typeof response.error !== 'undefined') {
-			phpbb.alert(phpbb.plupload.lang.ERROR, response.error.message);
-
-			// We will have to assume that the deletion failed. So leave the file status as uploaded.
-			row.find('.file-status').toggleClass('file-uploaded');
-
-			return;
-		}
-
 		phpbb.plupload.update(response, 'removal', index);
 		// Check if the user can upload files now if he had reached the max files limit.
 		phpbb.plupload.handleMaxFilesReached();
@@ -463,44 +444,6 @@ phpbb.plupload.fileError = function(file, error) {
 phpbb.plupload.uploader = new plupload.Uploader(phpbb.plupload.config);
 phpbb.plupload.initialize();
 
-/**
- * Add a file filter to check for max file sizes per mime type.
- */
-plupload.addFileFilter('mime_types_max_file_size', function(types, file, callback) {
-	if (file.size !== 'undefined') {
-		$(types).each(function(i, type) {
-			let extensions = [],
-				extsArray = type.extensions.split(',');
-
-			$(extsArray).each(function(i, extension) {
-				/^\s*\*\s*$/.test(extension) ? extensions.push("\\.*") : extensions.push("\\." + extension.replace(new RegExp("[" + "/^$.*+?|()[]{}\\".replace(/./g, "\\$&") + "]", "g"), "\\$&"));
-			});
-
-			let regex = new RegExp("(" + extensions.join("|") + ")$", "i");
-
-			if (regex.test(file.name)) {
-				if (type.max_file_size !== 'undefined' && type.max_file_size) {
-					if (file.size > type.max_file_size) {
-						phpbb.plupload.uploader.trigger('Error', {
-							code: plupload.FILE_SIZE_ERROR,
-							message: plupload.translate('File size error.'),
-							file: file
-						});
-
-						callback(false);
-					} else {
-						callback(true);
-					}
-				} else {
-					callback(true);
-				}
-
-				return false;
-			}
-		});
-	}
-});
-
 var $fileList = $('#file-list');
 
 /**

phpBB/bin/phpbbcli.php

@@ -42,7 +42,6 @@ require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
-require($phpbb_root_path . 'includes/functions_compatibility.' . $phpEx);
 
 $phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
 $phpbb_container = $phpbb_container_builder->with_config($phpbb_config_php_file);
@@ -69,22 +68,17 @@ $phpbb_container = $phpbb_container_builder->get_container();
 $phpbb_container->get('request')->enable_super_globals();
 require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
 
-register_compatibility_globals();
-
-/** @var \phpbb\config\config $config */
-$config = $phpbb_container->get('config');
-
-/** @var \phpbb\language\language $language */
-$language = $phpbb_container->get('language');
-$language->set_default_language($config['default_lang']);
-$language->add_lang(array('common', 'acp/common', 'cli'));
-
 /* @var $user \phpbb\user */
 $user = $phpbb_container->get('user');
 $user->data['user_id'] = ANONYMOUS;
 $user->ip = '127.0.0.1';
+$user->add_lang('acp/common');
+$user->add_lang('cli');
 
-$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $language);
+/* @var $lang \phpbb\language\language */
+$lang = $phpbb_container->get('language');
+
+$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $lang);
 $application->setDispatcher($phpbb_container->get('dispatcher'));
 $application->register_container_commands($phpbb_container->get('console.command_collection'));
 $application->run($input);

phpBB/common.php

@@ -12,7 +12,7 @@
 */
 
 /**
-* Minimum Requirement: PHP 5.4.0
+* Minimum Requirement: PHP 5.3.9
 */
 
 if (!defined('IN_PHPBB'))
@@ -43,13 +43,7 @@ if (!defined('PHPBB_INSTALLED'))
 	// available as used by the redirect function
 	$server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
 	$server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT');
-	$secure = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 1 : 0;
-
-	if (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https')
-	{
-		$secure = 1;
-		$server_port = 443;
-	}
+	$secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0;
 
 	$script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF');
 	if (!$script_name)
@@ -134,8 +128,6 @@ $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
 
 require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
 
-register_compatibility_globals();
-
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));

phpBB/composer.json

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

phpBB/config/default/container/services.yml

@@ -108,7 +108,7 @@ services:
             - '%tables.ext%'
             - '%core.root_path%'
             - '%core.php_ext%'
-            - '@cache'
+            - '@cache.driver'
 
     file_downloader:
         class: phpbb\file_downloader
@@ -122,13 +122,7 @@ services:
     group_helper:
         class: phpbb\group\helper
         arguments:
-            - '@auth'
-            - '@cache'
-            - '@config'
             - '@language'
-            - '@dispatcher'
-            - '@path_helper'
-            - '@user'
 
     log:
         class: phpbb\log\log
@@ -167,7 +161,7 @@ services:
 
     version_helper:
         class: phpbb\version_helper
-        shared: false
+        scope: prototype
         arguments:
             - '@cache'
             - '@config'

phpBB/config/default/container/services_attachment.yml

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

phpBB/config/default/container/services_auth.yml

@@ -63,7 +63,6 @@ services:
             - '@auth.provider.oauth.service_collection'
             - '%tables.users%'
             - '@service_container'
-            - '@dispatcher'
             - '%core.root_path%'
             - '%core.php_ext%'
         tags:
@@ -100,11 +99,3 @@ services:
             - '@request'
         tags:
             - { name: auth.provider.oauth.service }
-
-    auth.provider.oauth.service.twitter:
-        class: phpbb\auth\provider\oauth\service\twitter
-        arguments:
-            - '@config'
-            - '@request'
-        tags:
-            - { name: auth.provider.oauth.service }

phpBB/config/default/container/services_avatar.yml

@@ -3,7 +3,6 @@ services:
         class: phpbb\avatar\manager
         arguments:
             - '@config'
-            - '@dispatcher'
             - '@avatar.driver_collection'
 
 # ----- Avatar drivers -----

phpBB/config/default/container/services_captcha.yml

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

phpBB/config/default/container/services_console.yml

@@ -3,6 +3,7 @@ services:
         class: phpbb\console\exception_subscriber
         arguments:
             - '@language'
+            - '%debug.exceptions%'
         tags:
             - { name: kernel.event_subscriber }
 
@@ -110,7 +111,15 @@ services:
 
     console.command.db.revert:
         class: phpbb\console\command\db\revert
-        parent: console.command.db.migrate
+        arguments:
+            - '@user'
+            - '@language'
+            - '@migrator'
+            - '@ext.manager'
+            - '@config'
+            - '@cache'
+            - '@filesystem'
+            - '%core.root_path%'
         tags:
             - { name: console.command }
 
@@ -128,7 +137,6 @@ services:
             - '@user'
             - '@ext.manager'
             - '@log'
-            - '%cache.driver.class%'
         tags:
             - { name: console.command }
 
@@ -138,7 +146,6 @@ services:
             - '@user'
             - '@ext.manager'
             - '@log'
-            - '%cache.driver.class%'
         tags:
             - { name: console.command }
 
@@ -148,7 +155,6 @@ services:
             - '@user'
             - '@ext.manager'
             - '@log'
-            - '%cache.driver.class%'
         tags:
             - { name: console.command }
 
@@ -158,7 +164,6 @@ services:
             - '@user'
             - '@ext.manager'
             - '@log'
-            - '%cache.driver.class%'
         tags:
             - { name: console.command }
 
@@ -170,27 +175,6 @@ services:
         tags:
             - { name: console.command }
 
-    console.command.fixup.update_hashes:
-        class: phpbb\console\command\fixup\update_hashes
-        arguments:
-            - '@config'
-            - '@user'
-            - '@dbal.conn'
-            - '@passwords.manager'
-            - '@passwords.driver_collection'
-            - '%passwords.algorithms%'
-        tags:
-            - { name: console.command }
-
-    console.command.fixup.fix_left_right_ids:
-        class: phpbb\console\command\fixup\fix_left_right_ids
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@cache.driver'
-        tags:
-            - { name: console.command }
-
     console.command.reparser.list:
         class: phpbb\console\command\reparser\list_all
         arguments:
@@ -212,7 +196,6 @@ services:
     console.command.thumbnail.delete:
         class: phpbb\console\command\thumbnail\delete
         arguments:
-            - '@config'
             - '@user'
             - '@dbal.conn'
             - '%core.root_path%'
@@ -222,7 +205,6 @@ services:
     console.command.thumbnail.generate:
         class: phpbb\console\command\thumbnail\generate
         arguments:
-            - '@config'
             - '@user'
             - '@dbal.conn'
             - '@cache'
@@ -237,63 +219,3 @@ services:
             - '@user'
         tags:
             - { name: console.command }
-
-    console.command.update.check:
-        class: phpbb\console\command\update\check
-        arguments:
-            - '@user'
-            - '@config'
-            - '@service_container'
-            - '@language'
-        tags:
-            - { name: console.command }
-
-    console.command.user.activate:
-        class: phpbb\console\command\user\activate
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@config'
-            - '@language'
-            - '@log'
-            - '@notification_manager'
-            - '@user_loader'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-        tags:
-            - { name: console.command }
-
-    console.command.user.add:
-        class: phpbb\console\command\user\add
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@config'
-            - '@language'
-            - '@passwords.manager'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-        tags:
-            - { name: console.command }
-
-    console.command.user.delete:
-        class: phpbb\console\command\user\delete
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@language'
-            - '@log'
-            - '@user_loader'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-        tags:
-            - { name: console.command }
-
-    console.command.user.reclean:
-        class: phpbb\console\command\user\reclean
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@language'
-        tags:
-            - { name: console.command }

phpBB/config/default/container/services_content.yml

@@ -35,7 +35,6 @@ services:
             - '@config_text'
             - '@dbal.conn'
             - '@user'
-            - '@dispatcher'
             - '%core.root_path%'
             - '%core.php_ext%'
 

phpBB/config/default/container/services_cron.yml

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

phpBB/config/default/container/services_db.yml

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

phpBB/config/default/container/services_event.yml

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

phpBB/config/default/container/services_feed.yml

@@ -11,21 +11,19 @@ services:
             - '@feed.helper'
             - '@user'
             - '@auth'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.helper:
         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
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -34,12 +32,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.forums:
         class: phpbb\feed\forums
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -48,12 +45,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.news:
         class: phpbb\feed\news
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -62,12 +58,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.overall:
         class: phpbb\feed\overall
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -76,16 +71,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@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
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -94,12 +84,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.topics:
         class: phpbb\feed\topics
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -108,12 +97,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.topics_active:
         class: phpbb\feed\topics_active
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -122,5 +110,4 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'

phpBB/config/default/container/services_files.yml

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