From eb8ace14c8d4fb7f0d080bf28ffb16f8d5fe8424 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Jan 2020 14:33:22 +0100 Subject: [PATCH 1/9] [prep-release-3.3.0] Update version numbers for 3.3.0 release --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/build.xml b/build/build.xml index ea137f50bc..587eda9f5e 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index e3dbdc4adb..9508ce5cfc 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -@define('PHPBB_VERSION', '3.3.0-RC2-dev'); +@define('PHPBB_VERSION', '3.3.0'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index f9b7e8010e..6da6e2eb22 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.3.0-RC1', + 'phpbb_version' => '3.3.0', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 9a9d320b30..cf8cfd18a3 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.0-RC1'); +define('PHPBB_VERSION', '3.3.0'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index b5fc4f13a5..e308c82357 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -278,7 +278,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.0-RC2-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 7cc7ba4922..0c7eba6700 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.3.0-RC1 -phpbb_version = 3.3.0-RC1 +style_version = 3.3.0 +phpbb_version = 3.3.0 # Defining a different template bitfield # template_bitfield = //g= From 944a748cb6d235c58e52c22254f466e941f3d449 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Jan 2020 14:35:26 +0100 Subject: [PATCH 2/9] [prep-release-3.3.0] Add migration for 3.3.0 --- phpBB/phpbb/db/migration/data/v330/v330.php | 37 +++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v330/v330.php diff --git a/phpBB/phpbb/db/migration/data/v330/v330.php b/phpBB/phpbb/db/migration/data/v330/v330.php new file mode 100644 index 0000000000..05baffbdbd --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v330/v330.php @@ -0,0 +1,37 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v330; + +class v330 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.0', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\v329', + '\phpbb\db\migration\data\v330\v330rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.3.0')), + ); + } +} From e900104e10b37214f8eaf6a484ba6ea93935f946 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Jan 2020 22:01:09 +0100 Subject: [PATCH 3/9] [prep-release-3.3.0] Add changelog for 3.3.0 --- phpBB/docs/CHANGELOG.html | 43 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index e23a1bebb1..4d24456e6d 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.3.0-RC1
    • Changes since 3.3.0-b2
    • Changes since 3.3.0-b1
    • Changes since 3.2.x
      • @@ -145,6 +146,48 @@
      +

      Changes since 3.3.0-RC1

      +

      Bug

      +
        +
      • [PHPBB3-15592] - "Place inline" button appears when BBcode is disabled (Post settings)
        • +
      • [PHPBB3-15902] - Out of range error with Sphinx search
        • +
      • [PHPBB3-16209] - Nginx example configuration file blocks an image in the ACP
        • +
      • [PHPBB3-16230] - Check phrasing of FILESYSTEM_CANNOT_* lang keys
        • +
      • [PHPBB3-16257] - Typo in Email Settings section
        • +
      • [PHPBB3-16260] - Missing check whether the index exists in ACP - PHP 7.4
        • +
      • [PHPBB3-16261] - Missing check whether the index exists in install - PHP 7.4
        • +
      • [PHPBB3-16262] - php 7.3 compact() calls with undefined variables causing error page
        • +
      • [PHPBB3-16263] - Apache auth provider test fails on bamboo
        • +
      • [PHPBB3-16266] - Error on clean install with PHP 7.4
        • +
      • [PHPBB3-16267] - Check whether the index exists in ACP BBcodes - PHP 7.4
        • +
      • [PHPBB3-16273] - Trying to access array offset on value of type bool in Memberlist
        • +
      • [PHPBB3-16274] - compact() calls with undefined variables in search.php
        • +
      • [PHPBB3-16276] - Undefined $mode property in bbcode_firstpass class
        • +
      • [PHPBB3-16278] - Update instructions (INSTALL.html)
        • +
      • [PHPBB3-16281] - Extensions' Tab does not show up automatically
        • +
      • [PHPBB3-16282] - Default jQuery CDN URL is outdated on new installs
        • +
      • [PHPBB3-16285] - Missing sanity checks in migrations for 3.3
        • +
      • [PHPBB3-16287] - At first ACP screen after install, error message regarding statistics submission
        • +
      +

      Improvement

      + +

      Security

      +
        +
      • [SECURITY-249] - Group avatar overwrite on invalid submit
        • +
      • [SECURITY-250] - Group leader can be tricked into approving user
        • +
      +

      Hardening

      +
        +
      • [SECURITY-251] - Unwanted move of PMs to folders
        • +
      • [SECURITY-252] - PMs of unsuspecting users can be marked as important
        • +
      • [SECURITY-253] - PM export without proper validation
        • +
      +

      Changes since 3.3.0-b2

      Bug

        From f6b47e2ee3069fbf9ba49a3520d1f2044cd2a52f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Jan 2020 22:32:59 +0100 Subject: [PATCH 4/9] [ticket/16290] Update to new SVG logo in package docs PHPBB3-16290 --- phpBB/docs/CHANGELOG.html | 2 +- phpBB/docs/FAQ.html | 2 +- phpBB/docs/INSTALL.html | 2 +- phpBB/docs/README.html | 2 +- phpBB/docs/assets/css/stylesheet.css | 24 ++++++++++++++++-------- phpBB/docs/assets/images/site_logo.gif | Bin 5070 -> 0 bytes phpBB/docs/assets/images/site_logo.svg | 6 ++++++ phpBB/docs/auth_api.html | 2 +- phpBB/docs/coding-guidelines.html | 2 +- 9 files changed, 28 insertions(+), 14 deletions(-) delete mode 100644 phpBB/docs/assets/images/site_logo.gif create mode 100644 phpBB/docs/assets/images/site_logo.svg diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 557fca202f..62eef66528 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -20,7 +20,7 @@
        - +

        phpBB 3.3.x Changelog

        Skip

        diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html index fb097911d8..5e0403e804 100644 --- a/phpBB/docs/FAQ.html +++ b/phpBB/docs/FAQ.html @@ -20,7 +20,7 @@
        - +

        phpBB 3.3.x FAQ

        phpBB 3.3.x frequently asked questions

        Skip

        diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 7d759b42f0..d196403f62 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -20,7 +20,7 @@
        - +

        phpBB 3.3.x Install

        phpBB 3.3.x Installation, updating and conversion information

        Skip

        diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 32b2d98ab4..824a604105 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -20,7 +20,7 @@
        - +

        phpBB 3.3.x Readme

        Skip

        diff --git a/phpBB/docs/assets/css/stylesheet.css b/phpBB/docs/assets/css/stylesheet.css index c090ab7e07..b240a90d58 100644 --- a/phpBB/docs/assets/css/stylesheet.css +++ b/phpBB/docs/assets/css/stylesheet.css @@ -104,14 +104,14 @@ h4 { border-top: 1px solid #ccc; } -code { - color: #006600; - font-weight: normal; - font-family: 'Courier New', monospace; - border-color: #D1D7DC; - border-width: 1px; - border-style: solid; - background-color: #FAFAFA; +code { + color: #006600; + font-weight: normal; + font-family: 'Courier New', monospace; + border-color: #D1D7DC; + border-width: 1px; + border-style: solid; + background-color: #FAFAFA; padding: 0 4px; } @@ -154,6 +154,14 @@ a#logo:hover { text-decoration: none; } +.site_logo { + background-image: url("../images/site_logo.svg"); + background-repeat: no-repeat; + display: inline-block; + width: 149px; + height: 52px; +} + #doc-description { float: left; width: 70%; diff --git a/phpBB/docs/assets/images/site_logo.gif b/phpBB/docs/assets/images/site_logo.gif deleted file mode 100644 index 2517fbedd691d93bebf31860a8b75b8de8b450f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5070 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 + + + + + diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html index 960fa76417..c011fdc27f 100644 --- a/phpBB/docs/auth_api.html +++ b/phpBB/docs/auth_api.html @@ -20,7 +20,7 @@
        - +

        Auth API

        This is an explanation of how to use the phpBB auth/acl API

        Skip

        diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index ffa2112771..8b4cc2a814 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -20,7 +20,7 @@
        - +

        Coding Guidelines

        Rhea coding guidelines document

        Skip

        From 4591cf9afad80e1afd8a9659713f66b8e85c6b86 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Jan 2020 22:49:18 +0100 Subject: [PATCH 5/9] [prep-release-3.3.0] Update changelog --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index ee9fbbb36c..7e0b2fb77f 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -175,6 +175,7 @@
      • [PHPBB3-16277] - Move from each() function
      • [PHPBB3-16279] - Add permission for Emojii in topic title
      • [PHPBB3-16283] - Update requirements for 3.3.0
        • +
      • [PHPBB3-16290] - Update to new SVG logo in package docs

      Security

        From 9fa058a8bd66966082d624aacb65aa4abb46ef98 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Jan 2020 14:58:17 +0100 Subject: [PATCH 6/9] [ticket/16266] Remove extra declaration of constants PHPBB3-16266 --- phpBB/phpbb/passwords/driver/argon2i.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/phpBB/phpbb/passwords/driver/argon2i.php b/phpBB/phpbb/passwords/driver/argon2i.php index bf4d6ec33a..03368f6361 100644 --- a/phpBB/phpbb/passwords/driver/argon2i.php +++ b/phpBB/phpbb/passwords/driver/argon2i.php @@ -37,23 +37,15 @@ class argon2i extends base_native { parent::__construct($config, $helper); - // Workaround to prevent "Use of undefined constant" warning on some unsupported PHP installations - if (!defined('PASSWORD_ARGON2I')) - { - define('PASSWORD_ARGON2_DEFAULT_MEMORY_COST', 1024); - define('PASSWORD_ARGON2_DEFAULT_TIME_COST', 2); - define('PASSWORD_ARGON2_DEFAULT_THREADS', 1); - } - /** * For Sodium implementation of argon2 algorithm (since PHP 7.4), set special value of 1 for "threads" cost factor * See https://wiki.php.net/rfc/sodium.argon.hash and PHPBB3-16266 * Don't allow cost factors to be below default settings where possible */ - $this->memory_cost = max($memory_cost, PASSWORD_ARGON2_DEFAULT_MEMORY_COST); - $this->time_cost = max($time_cost, PASSWORD_ARGON2_DEFAULT_TIME_COST); + $this->memory_cost = max($memory_cost, defined('PASSWORD_ARGON2_DEFAULT_MEMORY_COST') ? PASSWORD_ARGON2_DEFAULT_MEMORY_COST : 1024); + $this->time_cost = max($time_cost, defined('PASSWORD_ARGON2_DEFAULT_TIME_COST') ? PASSWORD_ARGON2_DEFAULT_TIME_COST : 2); $this->threads = (defined('PASSWORD_ARGON2_PROVIDER') && PASSWORD_ARGON2_PROVIDER == 'sodium') ? - PASSWORD_ARGON2_DEFAULT_THREADS : max($threads, PASSWORD_ARGON2_DEFAULT_THREADS); + PASSWORD_ARGON2_DEFAULT_THREADS : max($threads, defined('PASSWORD_ARGON2_DEFAULT_THREADS') ? PASSWORD_ARGON2_DEFAULT_THREADS : 1); } /** From 433a23feb4244e24653e3b3d27ae3b5161e4aa8a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Jan 2020 16:12:15 +0100 Subject: [PATCH 7/9] [prep-release-3.3.0] Rename 3.3 to Proteus --- phpBB/docs/coding-guidelines.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 8b4cc2a814..b2f6780e03 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -4,7 +4,7 @@ - + phpBB3 • Coding Guidelines @@ -22,7 +22,7 @@

        Coding Guidelines

        -

        Rhea coding guidelines document

        +

        Proteus coding guidelines document

        Skip

        @@ -37,7 +37,7 @@

        - These are the phpBB Coding Guidelines for Rhea, all attempts should be made to follow them as closely as possible. + These are the phpBB Coding Guidelines for Proteus, all attempts should be made to follow them as closely as possible.

        Coding Guidelines

        From 16dbbdb34cfaaf27d367f77395c72fd5676d9a22 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 6 Jan 2020 11:18:16 +0100 Subject: [PATCH 8/9] [ticket/16293] Do not update to hashes that don't support combined hashing PHPBB3-16293 --- phpBB/phpbb/cron/task/core/update_hashes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/cron/task/core/update_hashes.php b/phpBB/phpbb/cron/task/core/update_hashes.php index ba095abc8b..9e938f74dd 100644 --- a/phpBB/phpbb/cron/task/core/update_hashes.php +++ b/phpBB/phpbb/cron/task/core/update_hashes.php @@ -56,7 +56,7 @@ class update_hashes extends \phpbb\cron\task\base foreach ($defaults as $type) { - if ($hashing_algorithms[$type]->is_supported()) + if ($hashing_algorithms[$type]->is_supported() && !$hashing_algorithms[$type] instanceof \phpbb\passwords\driver\base_native) { $this->default_type = $type; break; From 8d00784dfe2c8bcb10843ff70b4cfa998d703285 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 6 Jan 2020 11:21:43 +0100 Subject: [PATCH 9/9] [prep-release-3.3.0] Update changelog --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 7e0b2fb77f..a6ad4897b3 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -168,6 +168,7 @@
      • [PHPBB3-16282] - Default jQuery CDN URL is outdated on new installs
      • [PHPBB3-16285] - Missing sanity checks in migrations for 3.3
      • [PHPBB3-16287] - At first ACP screen after install, error message regarding statistics submission
        • +
      • [PHPBB3-16293] - Update hashes cron produces invalid hashes while updating from 3.0

      Improvement