Skip to content

Commit b3d572a

Browse files
authored
Merge branch 'main' into 4.2_dev
2 parents 57fcaad + e8e3f5f commit b3d572a

File tree

176 files changed

+14070
-1347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+14070
-1347
lines changed

CHANGELOG.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ This is a log of major user-visible changes in each phpMyFAQ release.
1313
- added API for glossary definitions (Thorsten)
1414
- added admin log CSV export feature (Thorsten)
1515
- added pagination, sorting, and filtering for APIs (Thorsten)
16-
- WIP: added support for custom pages in the frontend (Thorsten)
16+
- added support for custom pages with WYSIWYG editor, SEO features, multi-language support, and search integration (Thorsten)
17+
- added a translation adapter system with support for Google Cloud Translation, DeepL, Azure Translator, Amazon Translate, and LibreTranslate (Thorsten)
1718
- improved audit and activity log with comprehensive security event tracking (Thorsten)
1819
- improved API errors with formatted RFC 7807 Problem Details JSON responses (Thorsten)
20+
- improved support for PDO (Thorsten)
1921
- migrated codebase to use PHP 8.4 language features (Thorsten)
2022

2123
### phpMyFAQ v4.1.0-RC.3 - unreleased
@@ -637,7 +639,7 @@ This is a log of major user-visible changes in each phpMyFAQ release.
637639
- removed bundled SyntaxHighlighter (Thorsten)
638640
- dropped support for ext/mysql (Thorsten)
639641
- dropped support for SQLite2 (Thorsten)
640-
- dropped support for Zeus Webserver, IIS 6 and lighttpd (Thorsten)
642+
- dropped support for Zeus Webserver, IIS 6, and lighttpd (Thorsten)
641643
- fixed a lot of minor bugs (Thorsten)
642644

643645
### phpMyFAQ v2.8.29 - 2016-05-31
@@ -863,7 +865,7 @@ This is a log of major user-visible changes in each phpMyFAQ release.
863865
- improved CSS development with LESS (Thorsten)
864866
- improved minified CSS output (Thorsten)
865867
- simplified the link verification (Thorsten)
866-
- dropped support for IBM DB2, Interbase/Firebird and Sybase (Thorsten)
868+
- dropped support for IBM DB2, Interbase/Firebird, and Sybase (Thorsten)
867869
- dropped support for PHP register_globals and magic_quotes_gpc (Thorsten)
868870
- dropped support for Google Translate API v1 (Thorsten)
869871
- removed Delicious support (Thorsten)
@@ -1903,7 +1905,7 @@ This is a log of major user-visible changes in each phpMyFAQ release.
19031905

19041906
- phpMyFAQ is now Open Source software
19051907
- template system for free layouts
1906-
- fully compatible with PHP 4.1, PHP 4.2 and PHP 4.3 (register_globals = off)
1908+
- fully compatible with PHP 4.1, PHP 4.2, and PHP 4.3 (register_globals = off)
19071909
- all color and font definitions with CSS
19081910
- better SQL queries
19091911
- better category navigation

CLAUDE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ It is built using HTML5, CSS, TypeScript, and PHP and supports various databases
5454
- TypeScript code in watch mode: pnpm test:watch
5555
- TypeScript linting: pnpm lint
5656
- TypeScript code formatting: pnpm lint:fix
57+
- TypeScript errors have to be fixed before committing code.
5758

5859
## Building
5960

@@ -64,7 +65,7 @@ It is built using HTML5, CSS, TypeScript, and PHP and supports various databases
6465
## Coding Standards
6566

6667
- Use PER Coding Style 3.0 for PHP code.
67-
- Use TypeScript coding standards for TypeScript code.
68+
- Use TypeScript coding standards for TypeScript code in strict mode.
6869
- Use HTML5 and CSS3 standards for frontend code.
6970
- Use semicolons at the end of each statement.
7071
- Use single quotes for strings.

README.md

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# phpMyFAQ 4.1-dev
1+
# phpMyFAQ 4.2-dev
22

33
![Packagist PHP Version Support](https://img.shields.io/packagist/php-v/thorsten/phpMyFAQ)
44
![GitHub](https://img.shields.io/github/license/thorsten/phpMyFAQ)
@@ -7,28 +7,42 @@
77

88
## What is phpMyFAQ?
99

10-
phpMyFAQ is a multilingual, completely database-driven FAQ system.
11-
It supports various databases to store all data; PHP 8.3+ is needed to access this data.
12-
phpMyFAQ also offers a multi-language Content Management System with a WYSIWYG editor and a media manager, real time
13-
search support with Elasticsearch and OpenSearch, flexible multi-user support with user and group based permissions on
14-
categories and records, a wiki-like revision feature, a news system, user-tracking, 40+ supported languages, enhanced
15-
automatic content negotiation, HTML5/CSS3 based responsive templates, PDF-support, a backup and restore system, a
16-
dynamic sitemap, related FAQs, tagging, enhanced SEO features, built-in spam protection systems, Microsoft Entra ID,
17-
Microsoft Active Directory and OpenLDAP support, a experimental MCP server, and an easy-to-use installation.
18-
It's possible to update your phpMyFAQ installation via the web interface or on the command line.
10+
phpMyFAQ is a comprehensive, multilingual FAQ system that is entirely database-driven.
11+
It is compatible with a variety of databases for data storage and requires PHP 8.4+ for data access.
12+
The system features a multi-language Content Management System equipped with a WYSIWYG editor and an Image Manager.
13+
It also provides real-time search capabilities with Elasticsearch or OpenSearch.
14+
15+
phpMyFAQ supports flexible multi-user functionality, offering user and group-based permissions on categories and FAQs.
16+
It includes a wiki-like revision feature, a news system, and configurable user-tracking.
17+
Administrators can monitor user activities through detailed log files.
18+
Additionally, phpMyFAQ supports adding its own custom pages to the FAQ system.
19+
With support for over 40 languages, it also boasts enhanced automatic content negotiation and HTML5- / CSS3-based
20+
responsive templates.
21+
These Twig-based templates allow for the inclusion of your own text and HTML snippets. There's also a built-in plugin
22+
system for further customization.
23+
24+
Additional features include PDF support, a backup system, a dynamic sitemap, related FAQs, tagging, a plugin system,
25+
and built-in spam protection systems.
26+
phpMyFAQ also supports two-factor authentication (2FA) for enhanced security.
27+
A REST API is available for integration with other systems.
28+
It also supports OpenLDAP, Microsoft Active Directory, Microsoft Entra ID, and an MCP Server for AI agents.
29+
The system is easy to install, thanks to its user-friendly installation script.
30+
31+
phpMyFAQ is versatile
32+
and can be run on almost any web hosting provider or deployed in the cloud using a Docker container.
1933

2034
## Requirements
2135

2236
phpMyFAQ is only supported on PHP 8.3 and up, you need a database as well. Supported databases are MySQL, MariaDB,
23-
Percona Server, PostgreSQL, Microsoft SQL Server and SQLite3. If you want to use Elasticsearch or Opensearch as the main
24-
search engine, you need Elasticsearch v6+ or OpenSearch v1+. Check our detailed requirements on
37+
Percona Server, PostgreSQL, Microsoft SQL Server, and SQLite3. If you want to use Elasticsearch or Opensearch as the
38+
main search engine, you need Elasticsearch v6+ or OpenSearch v1+. Check our detailed requirements on
2539
[phpmyfaq.de](https://www.phpmyfaq.de/requirements) for more information.
2640

2741
## Installation
2842

2943
### phpMyFAQ installation package for end-users
3044

31-
The best way to install phpMyFAQ is to download it on [phpmyfaq.de](https://www.phpmyfaq.de/download), unzip the package
45+
The best way to install phpMyFAQ is to download it on [phpmyfaq.de](https://www.phpmyfaq.de/download), unzip the package,
3246
and open http://www.example.org/phpmyfaq/setup/ in your preferred browser.
3347

3448
### phpMyFAQ installation with Docker
@@ -165,7 +179,7 @@ And constructed with the following guidelines:
165179

166180
- Breaking backward compatibility bumps the major (and resets the minor and patch)
167181
- New additions without breaking backward compatibility bump the minor (and reset the patch)
168-
- Bug fixes and misc changes bumps the patch
182+
- Bug fixes and misc changes bump the patch
169183

170184
For more information on SemVer, please visit http://semver.org/.
171185

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
"zircote/swagger-php": "^6.0"
6666
},
6767
"suggest": {
68+
"ext-frankenphp": "*",
6869
"ext-ldap": "*",
6970
"ext-openssl": "*",
7071
"ext-pdo": "*",

0 commit comments

Comments
 (0)