From 5602398a46172353d9bfc3d11841bb6ef92d2a76 Mon Sep 17 00:00:00 2001 From: Thorsten Rinne Date: Mon, 17 Jan 2022 20:02:40 +0100 Subject: [PATCH] chore: 3.0.10 release --- API.md | 2 ++ CHANGELOG | 5 ++-- CODE_OF_CONDUCT.md | 28 ++++++++++--------- CONTRIBUTING.md | 8 ++++-- README.md | 2 +- SECURITY.md | 11 +++++--- nginx.conf | 2 +- package.json | 2 +- phpmyfaq/.htaccess | 2 +- .../themes/default/templates/contact.html | 2 +- phpmyfaq/setup/index.php | 2 +- phpmyfaq/setup/update.php | 2 +- phpmyfaq/src/phpMyFAQ/System.php | 2 +- scripts/version.sh | 2 +- 14 files changed, 41 insertions(+), 31 deletions(-) diff --git a/API.md b/API.md index 8e941cb141..a7cfce2531 100644 --- a/API.md +++ b/API.md @@ -38,3 +38,5 @@ Open endpoints require no Authentication. ### Login APIs - [Login](api-docs/login.md): `POST /api/v2.0/login` + +Copyright © 2001-2022 Thorsten Rinne and the phpMyFAQ Team diff --git a/CHANGELOG b/CHANGELOG index a1599177b7..43d2e1eeff 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,7 +5,8 @@ CHANGELOG This is a log of major user-visible changes in each phpMyFAQ release. -Version 3.0.10 - 2021- +Version 3.0.10 - 2022-01-17 +- fixed multiple XSS and CSRF vulnerabilities (0x7zed, M0rphling, justinp09010, Dennis Yassine, Thorsten) - fixed many minor bugs (Thorsten) Version 3.0.9 - 2021-04-17 @@ -1460,4 +1461,4 @@ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. -(c) 2001-2021 phpMyFAQ Team +Copyright © 2001-2022 Thorsten Rinne and the phpMyFAQ Team diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index dcde2a870b..054407c4ce 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,11 +1,11 @@ # Contributor Code of Conduct -As contributors and maintainers of phpMyFAQ, and in the interest of fostering an open and welcoming community, we pledge to respect -all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or +As contributors and maintainers of phpMyFAQ, and in the interest of fostering an open and welcoming community, we pledge to respect +all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. -We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, -gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, +gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality. Examples of unacceptable behavior by participants include: @@ -17,21 +17,23 @@ Examples of unacceptable behavior by participants include: - Publishing other's private information, such as physical or electronic addresses, without explicit permission - Other unethical or unprofessional conduct -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other -contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other +contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. -By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every -aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from +By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every +aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at -[thorsten@phpmyfaq.de](mailto:thorsten@phpmyfaq.de). All complaints will be reviewed and investigated and will result in a response -that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at +[thorsten@phpmyfaq.de](mailto:thorsten@phpmyfaq.de). All complaints will be reviewed and investigated and will result in a response +that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the atreporter of an incident. -This Code of Conduct is adapted from the Contributor Covenant, version 1.3.0, available from +This Code of Conduct is adapted from the Contributor Covenant, version 1.3.0, available from http://contributor-covenant.org/version/1/3/0/ + +Copyright © 2001-2022 Thorsten Rinne and the phpMyFAQ Team diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bee70e6d5f..b45e65eb8c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,11 +1,13 @@ # Contributing -Since phpMyFAQ is an Open Source project we encourage developers to contribute patches and code for us to include in the main +Since phpMyFAQ is an Open Source project we encourage developers to contribute patches and code for us to include in the main package of phpMyFAQ. However there are a few rules and limitations when doing so and this page list them. 1. Contributed code will be licensed under the MPL 2.0 license. 2. Copyright notices will be changed to phpMyFAQ Team. But contributors will get credit for their work! 3. All third party code will be reviewed, tested and possible modified before being released. -These basic rules makes it possible for us to earn a living of the phpMyFAQ project but it also ensures that the code remains -Open Source and under the MPL 2.0 license. All contributions will be added to the changelog and on the phpMyFAQ website. +These basic rules makes it possible for us to earn a living of the phpMyFAQ project but it also ensures that the code remains +Open Source and under the MPL 2.0 license. All contributions will be added to the changelog and on the phpMyFAQ website. + +Copyright © 2001-2022 Thorsten Rinne and the phpMyFAQ Team diff --git a/README.md b/README.md index 838e3b4ddf..0e20cb5ea1 100644 --- a/README.md +++ b/README.md @@ -169,4 +169,4 @@ The REST API v2 documentation is located [here in this repository](API.md) and o Mozilla Public License 2.0, see LICENSE for more information. -Copyright © 2001-2021 Thorsten Rinne and the phpMyFAQ Team +Copyright © 2001-2022 Thorsten Rinne and the phpMyFAQ Team diff --git a/SECURITY.md b/SECURITY.md index d6ff278906..0352a11839 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -5,10 +5,11 @@ security vulnerability in phpMyFAQ, we appreciate your help in disclosing it to ## Supported Versions -| Version | Supported | -| ------- | ------------------ | -| 3.0.x | :white_check_mark: | -| < 2.9 | :x: | +| Version | Supported | +| --------- | ------------------ | +| 3.1.0-dev | :white_check_mark: | +| 3.0.x | :white_check_mark: | +| < 2.9 | :x: | ## Reporting a Vulnerability @@ -19,3 +20,5 @@ and work to address any issues that arise as quickly as possible. Please act in good faith towards our users’ privacy and data during your disclosure. We won’t take legal action against you or administrative action against your account if you act accordingly: White hat researchers are always appreciated. + +Copyright © 2001-2022 Thorsten Rinne and the phpMyFAQ Team diff --git a/nginx.conf b/nginx.conf index 4aa046f968..2d27381d6c 100644 --- a/nginx.conf +++ b/nginx.conf @@ -10,7 +10,7 @@ # obtain one at http://mozilla.org/MPL/2.0/. # # @author Florian Anderiasch -# @copyright 2011-2019 phpMyFAQ Team +# @copyright 2011-2022 phpMyFAQ Team # @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 # @link https://www.phpmyfaq.de # @since 2011-01-14 diff --git a/package.json b/package.json index 0e5893c2cd..6121c25bb3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@thorsten/phpmyfaq", - "version": "3.0.9", + "version": "3.0.10", "description": "phpMyFAQ", "repository": "git://github.com/thorsten/phpMyFAQ.git", "author": "Thorsten Rinne", diff --git a/phpmyfaq/.htaccess b/phpmyfaq/.htaccess index efc8273660..c9c0cd45ab 100644 --- a/phpmyfaq/.htaccess +++ b/phpmyfaq/.htaccess @@ -8,7 +8,7 @@ # @author Thorsten Rinne # @author Patrick Preuster # @author Matteo Scaramuccia -# @copyright 2004-2020 phpMyFAQ Team +# @copyright 2004-2022 phpMyFAQ Team # @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 # @link https://www.phpmyfaq.de # @since 2004-11-13 diff --git a/phpmyfaq/assets/themes/default/templates/contact.html b/phpmyfaq/assets/themes/default/templates/contact.html index 85466463f5..4074c9058e 100644 --- a/phpmyfaq/assets/themes/default/templates/contact.html +++ b/phpmyfaq/assets/themes/default/templates/contact.html @@ -58,7 +58,7 @@

style="display:inline-block;overflow:hidden;background:url(https://linkmaker.itunes.apple.com/images/badges/en-us/badge_appstore-lrg.svg) no-repeat;width:165px;height:40px;margin:10px;" >
- © 2001-2020 by + © 2001-2022 by phpMyFAQ Team under the Mozilla Public License 2.0. All rights reserved.
diff --git a/phpmyfaq/setup/index.php b/phpmyfaq/setup/index.php index 793783ed6a..459a389352 100644 --- a/phpmyfaq/setup/index.php +++ b/phpmyfaq/setup/index.php @@ -27,7 +27,7 @@ use phpMyFAQ\Strings; use phpMyFAQ\System; -define('COPYRIGHT', '© 2001-2019 phpMyFAQ Team | Follow us on Twitter '); +define('COPYRIGHT', '© 2001-2022 phpMyFAQ Team | Follow us on Twitter '); define('PMF_ROOT_DIR', dirname(dirname(__FILE__))); define('PMF_SRC_DIR', PMF_ROOT_DIR.'/src'); define('IS_VALID_PHPMYFAQ', null); diff --git a/phpmyfaq/setup/update.php b/phpmyfaq/setup/update.php index a94e78d460..e6e8633563 100644 --- a/phpmyfaq/setup/update.php +++ b/phpmyfaq/setup/update.php @@ -22,7 +22,7 @@ use phpMyFAQ\Permission\BasicPermission; use phpMyFAQ\System; -define('COPYRIGHT', '© 2001-2021 phpMyFAQ Team'); +define('COPYRIGHT', '© 2001-2022 phpMyFAQ Team'); define('PMF_ROOT_DIR', dirname(dirname(__FILE__))); define('IS_VALID_PHPMYFAQ', null); diff --git a/phpmyfaq/src/phpMyFAQ/System.php b/phpmyfaq/src/phpMyFAQ/System.php index 4fc4b022f1..10be7f4423 100644 --- a/phpmyfaq/src/phpMyFAQ/System.php +++ b/phpmyfaq/src/phpMyFAQ/System.php @@ -44,7 +44,7 @@ class System /** * Patch level. */ - private const VERSION_PATCH_LEVEL = 9; + private const VERSION_PATCH_LEVEL = 10; /** * Pre-release version. diff --git a/scripts/version.sh b/scripts/version.sh index 9414617eec..23465dd014 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -1,4 +1,4 @@ #!/bin/sh if [ "x${PMF_VERSION}" = "x" ]; then - PMF_VERSION="3.0.9" + PMF_VERSION="3.0.10" fi