aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tagsIgor Wiedler2011-07-103-5/+0
| | | | | | These meta tags are IE specific and do not validate as HTML5. PHPBB3-10258
* [ticket/10258] Change the DOCTYPE to HTML5Igor Wiedler2011-07-093-12/+15
| | | | PHPBB3-10258
* Merge branch 'develop-olympus' into developAndreas Fischer2011-07-072-1/+37
|\ | | | | | | | | | | | | | | * develop-olympus: [ticket/10250] The site_logo hash is different depending on imageset & language [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
| * Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-072-1/+37
| |\ | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10250] The site_logo hash is different depending on imageset & language [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
| | * Merge remote-tracking branch 'naderman/ticket/10250' into prep-release-3.0.9Andreas Fischer2011-07-072-1/+37
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10250: [ticket/10250] The site_logo hash is different depending on imageset & language [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
| | | * [ticket/10250] The site_logo hash is different depending on imageset & languageNils Adermann2011-07-061-4/+12
| | | | | | | | | | | | | | | | PHPBB3-10250
| | | * [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imagesetNils Adermann2011-07-051-0/+1
| | | | | | | | | | | | | | | | PHPBB3-10250
| | | * [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is usedNils Adermann2011-07-051-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new logo is slightly wider than the old logo. If we changed the size in the imageset.cfg we would cause a conflict for everyone who replaced the logo with their own and modified the size. Instead we overwrite the width and height in the img() function in session.php only if its contents are that of the stock phpbb logo. PHPBB3-10250
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-07-062-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9859] Changing all phpBB footers to match the new credit line [ticket/9859] New footer copyright line with registered symbol
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-07-062-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * prep-release-3.0.9: [ticket/9859] Changing all phpBB footers to match the new credit line [ticket/9859] New footer copyright line with registered symbol
| | * | [ticket/9859] Changing all phpBB footers to match the new credit lineYuriy Rusko2011-07-062-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9859
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-051-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-051-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
| | * | Merge remote-tracking branch 'naderman/ticket/10247' into prep-release-3.0.9Andreas Fischer2011-07-051-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10247: [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)
| | | * | [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)Nils Adermann2011-07-041-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | attempt_id column was deleted PHPBB3-10247
| | * | [prep-release-3.0.9] Bumping version number for the final 3.0.9 release.Andreas Fischer2011-07-051-1/+1
| | |/
| | * [prep-release-3.0.9] Bumping version number for 3.0.9-RC3.Andreas Fischer2011-06-261-1/+1
| | |
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-261-16/+15
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10188] Prevent semi-compressed output
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-261-16/+15
| |\ \ | | |/ | | | | | | | | | * prep-release-3.0.9: [ticket/10188] Prevent semi-compressed output
| | * [ticket/10188] Prevent semi-compressed outputNils Adermann2011-06-261-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a non-fatal error occurs at the beginning of the script before any custom error handler is set one of two situations can be encountered: 1) if the ini option output buffer is disabled: - headers are sent to the http client - the error message is output 2) if the ini option output_buffer is enabled or the script is run within an ob_start()/ob_end() wrapper: - the error message is written to the output buffer Once the script reaches page_header() phpbb starts gzip compression if enabled. This is done through ob_start with a ob_gzhandler as a callback. The compression is skipped if headers have already been sent. In situation 1) the error message sent in plain text comes with headers and this gzip compression is skipped. The client receives a plaintext version of the page. However in situation 2) headers have not been sent yet and the rest of the page will be compressed. The result is a plaintext error message followed by compressed output. The client does not understand this output resulting in either an error message or simply a blank page in the browser. In addition to the above situation this problem occurs with errors that are triggered after the custom error handler is loaded. The problem has been noticed before, and a workaround was found. The error handler would call ob_flush() for particular configuration settings before outputting the error message. This resulted in headers being sent when output buffering was enabled thus disabling gzip compression for the rest of the page. The constraints under which ob_flush() was called were lessened over time whenever a new case was found that would trigger this problem. Eventually ob_flush() would be called even when code causing an E_NOTICE was simply run within an ob_start/ob_end. This makes it impossible to use output buffering to retrieve the content of an error message without prohibiting the page from setting headers afterwards. This commit removes all flushing in msg_handler completely and instead fixes the problem for both errors before and after the error handler is registered. GZIP compression is only enabled if there is at most one level of output buffering (e.g. the output_buffer php.ini option is enabled) and if there has not yet been any output in this buffer. This should avoid any partial output compression. PHPBB3-10188
* | | Merge branch 'develop-olympus' into developNils Adermann2011-06-261-0/+28
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.
| * | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-06-261-0/+28
| |\ \ | | |/ | | | | | | | | | * prep-release-3.0.9: [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.
| | * [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.Andreas Fischer2011-06-251-0/+28
| | | | | | | | | | | | PHPBB3-7729
* | | Merge branch 'develop-olympus' into developNils Adermann2011-06-201-1/+2
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
| * | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-06-201-1/+2
| |\ \ | | |/ | | | | | | | | | * prep-release-3.0.9: [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
| | * [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"Andreas Fischer2011-06-201-1/+2
| | | | | | | | | | | | PHPBB3-10234
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-191-3/+6
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10227] Allow persistent connections for mysqli with PHP 5.3.0+
| * | [ticket/10227] Allow persistent connections for mysqli with PHP 5.3.0+rxu2011-06-191-3/+6
| | | | | | | | | | | | PHPBB3-10227
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-161-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10221] Append unit (seconds) after input field, remove from explanation
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-161-1/+1
| |\ \ | | |/ | | | | | | | | | * prep-release-3.0.9: [ticket/10221] Append unit (seconds) after input field, remove from explanation
| | * [ticket/10221] Append unit (seconds) after input field, remove from explanationNils Adermann2011-06-161-1/+1
| | | | | | | | | | | | PHPBB3-10221
| | * [prep-release-3.0.9] Bumping version number for 3.0.9-RC2.Andreas Fischer2011-06-151-1/+1
| | |
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-151-0/+122
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10218] Prevent startime from being overwritten by deregister_globals() [ticket/10218] Moving global deregistration, etc. to startup.php Conflicts: phpBB/install/database_update.php
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-151-0/+122
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10218] Prevent startime from being overwritten by deregister_globals() [ticket/10218] Moving global deregistration, etc. to startup.php Conflicts: phpBB/install/database_update.php
| | * Merge remote-tracking branch 'Marshalrusty/ticket/10218' into prep-release-3.0.9Andreas Fischer2011-06-151-0/+122
| | |\ | | | | | | | | | | | | | | | | | | | | * Marshalrusty/ticket/10218: [ticket/10218] Prevent startime from being overwritten by deregister_globals() [ticket/10218] Moving global deregistration, etc. to startup.php
| | | * [ticket/10218] Prevent startime from being overwritten by deregister_globals()Yuriy Rusko2011-06-151-2/+3
| | | | | | | | | | | | | | | | PHPBB3-10218
| | | * [ticket/10218] Moving global deregistration, etc. to startup.phpYuriy Rusko2011-06-141-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Because startup.php deletes all variables, the constants in database_update are used to preserve settings at the top. PHPBB3-10218
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-151-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10220] Limit user agent value length for storage in login attempt table
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-151-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * prep-release-3.0.9: [ticket/10220] Limit user agent value length for storage in login attempt table
| | * | [ticket/10220] Limit user agent value length for storage in login attempt tableNils Adermann2011-06-151-1/+1
| | |/ | | | | | | | | | PHPBB3-10220
| * | [develop-olympus] Incrementing the version to 3.0.10-dev in develop-olympus.Andreas Fischer2011-06-131-1/+1
| |/
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-131-2/+2
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10214] Correct Oracle create table query syntax in db_tools
| * [ticket/10214] Correct Oracle create table query syntax in db_toolsNils Adermann2011-06-131-2/+2
| | | | | | | | | | | | | | | | Removes the semicolon at end of oracle CREATE TABLE queries and adds a semicolon to the end of a SELECT query inside of the trigger for a new table's auto increment column before the end keyword PHPBB3-10214
| * [develop-olympus] Bumping version number for 3.0.9-RC1.Andreas Fischer2011-06-121-1/+1
| |
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-123-5/+35
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9892] Correct copyright year [ticket/9892] Remove incorrect use of camel case [ticket/9892] Removing closing php tag from create_schema_files [ticket/9892] Transaction support for database update sql execution function [ticket/9892] count is a keyword in firebird, so renaming this alias [ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to change config [ticket/9892] Shorten login_attempt key names to avoid firebird length problems [ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent state [ticket/9892] Adding a number of tests for db_tools [ticket/9892] Table prefix lengths influence index lengths in db_tools [ticket/9892] Shorten the index names on the q&a captcha [ticket/9892] column & index name limits, firebird auto increment in db_tools Conflicts: phpBB/develop/create_schema_files.php
| * [ticket/9892] count is a keyword in firebird, so renaming this aliasNils Adermann2011-06-121-2/+2
| | | | | | | | PHPBB3-9892
| * [ticket/9892] Table prefix lengths influence index lengths in db_toolsNils Adermann2011-06-121-5/+9
| | | | | | | | PHPBB3-9892
| * [ticket/9892] Shorten the index names on the q&a captchaNils Adermann2011-06-121-2/+2
| | | | | | | | PHPBB3-9892
| * [ticket/9892] column & index name limits, firebird auto increment in db_toolsNils Adermann2011-06-121-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Column names are limited to 30 characters - Index names are limited to 31 characters. On some dbms the index name contains both table name and actual index name so the limit applies to the sum of the lenghts of table name and index name. - Auto incremented column names are limited to 26 characters to provide an additional 4 characters for sequence names The code for firebird auto increment support using generators/sequences with triggers was copied from create_schema_files.php PHPBB3-9892
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-116-4/+82
|\ \ | |/ | | | | | | | | | | | | | | * develop-olympus: [ticket/9992] Clarify explanations of ip and account limits on login [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN [ticket/9992] Use sql_fetchfield for single row and single column result [ticket/9992] Adding a limit on login attempts per IP. [ticket/9992] Make sql_create_table and sql_table_exists available in updater