aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/8904] Show default value for numeric custom profile fields when editingNiklas Schmidtmer2011-02-131-1/+1
| | | | | | | | | When displaying the default value for a numeric custom profile field, only use request_var to obtain the value on creation. When editing, it will always override the actual value with an empty string, as this is request_var's default return value. PHPBB3-8904
* Merge branch 'ticket/p/10029' into develop-olympusAndreas Fischer2011-02-101-1/+7
|\ | | | | | | | | * ticket/p/10029: [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.
| * [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.Oleg Pudeyev2011-02-091-1/+7
| | | | | | | | PHPBB3-10029
* | Merge branch 'ticket/nickvergessen/9949' into develop-olympusAndreas Fischer2011-02-071-0/+1
|\ \ | | | | | | | | | | | | | | | * ticket/nickvergessen/9949: [ticket/9949] Unit tests for user::lang() [ticket/9949] $user->lang() uses last int-value to get the key not first
| * | [ticket/9949] $user->lang() uses last int-value to get the key not firstJoas Schilling2011-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The comment in the code says: "We now get the first number passed and will select the key based upon this number". But the loop over the arguments is not left and therefore it uses the last int-value not the first one. PHPBB3-9949
* | | Merge branch 'ticket/nickvergessen/9966' into develop-olympusAndreas Fischer2011-02-041-6/+6
|\ \ \ | |_|/ |/| | | | | | | | * ticket/nickvergessen/9966: [ticket/9966] Language download in ACP creates index.html and misses captcha_*
| * | [ticket/9966] Language download in ACP creates index.html and misses captcha_*Joas Schilling2011-01-291-6/+6
| |/ | | | | | | | | | | The language pack download page includes index.html files instead of index.htm. It also does not include the new captcha_*.php files which are included since 3.0.6. PHPBB3-9966
* | Merge branch 'ticket/p/10014' into develop-olympusAndreas Fischer2011-02-011-2/+2
|\ \ | | | | | | | | | | | | * ticket/p/10014: [ticket/10014] Clearly indicate fatal errors in file acm.
| * | [ticket/10014] Clearly indicate fatal errors in file acm.Oleg Pudeyev2011-01-281-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | If acm_file cannot open the cache file for writing, it prints a message to that effect and calls die(). The message itself does not indicate that it is a fatal error, and someone seeing the message might expect that inability to write to cache is not fatal. Make it clear that the error is fatal by printing the word "Fatal" before the message. PHPBB3-10014
* | [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().Joas Schilling2011-01-301-2/+2
|/ | | | PHPBB3-9985
* [ticket/8779] Slow search for 'View unread posts'rxu2011-01-241-2/+3
| | | | | | Adjust SQL query to speedup search for unread posts (thanks naderman). PHPBB3-8779
* Merge branch 'ticket/bantu/9859' into develop-olympusNils Adermann2011-01-162-2/+2
|\ | | | | | | | | | | | | | | | | * ticket/bantu/9859: [ticket/9859] Remove the years from the copyright statements in docs files. [ticket/9859] Remove the year from the copyright meta tag in docs/*.html [ticket/9859] Remove the meta copyright tag as well. [ticket/9859] Remove the credit line comment from all html files. [ticket/9859] Remove years in credit line from some more files.
| * [ticket/9859] Remove years in credit line from some more files.Andreas Fischer2011-01-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Standard HTML output now includes: Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group Print output now includes: Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/ This also fixes an inconsistency where "phpBB Group" was linked instead of "phpBB". PHPBB3-9859
* | [ticket/9933] Remove empty word check.rxu2011-01-161-5/+0
| | | | | | | | PHPBB3-9933
* | [ticket/9933] Add $use_unicode parameter to get_censor_preg_expression().Andreas Fischer2011-01-161-6/+7
| | | | | | | | | | | | | | | | | | Rename $unicode to $unicode_support, pass in $use_unicode defaulting to true. In unit tests we can now pass in $use_unicode as false and also test the code path that is taken when PCRE does not support unicode. PHPBB3-9933
* | [ticket/9933] Adjust word censor regex for non-unicode mode.rxu2011-01-161-4/+8
|/ | | | PHPBB3-9933
* Merge branch 'ticket/bantu/9764' into develop-olympusIgor Wiedler2011-01-103-4/+4
|\
| * [ticket/9764] Allow $config['mime_triggers'] to be an empty string.Andreas Fischer2010-10-283-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explode('|', '') and explode('|', NULL) both return array(0 => '') which can cause filespec::check_content() to reject everything starting with a '<' character in case $config['mime_triggers'] is an empty string or not set. fileupload::set_disallowed_content() now filters out empty strings by calling array_diff() on the passed array, so setting $config['mime_triggers'] to an empty string will turn off mime checking completely. On the other side we want to fail safe if $config['mime_triggers'] is not set at all. To do this, the array fileupload::$disallowed_content now contains some default strings to be filtered out. PHPBB3-9764
* | [ticket/9933] Move word censor regex into separate function in functions.phprxu2011-01-072-18/+43
| | | | | | | | PHPBB3-9933
* | [ticket/9933] Wrong handling consecutive multiple asterisks in word censorrxu2011-01-072-2/+5
| | | | | | | | | | | | Fix consecutive asterisks issue in word censor. PHPBB3-9933
* | [ticket/9937] Make sure feed icon only shows for FORUM_POSTIgor Wiedler2010-12-211-1/+1
| | | | | | | | | | | | This is cleaner, since feed.php only supports FORUM_POST. PHPBB3-9937
* | Merge branch 'ticket/rmcgirr83/9937' into develop-olympusIgor Wiedler2010-12-211-1/+1
|\ \ | | | | | | | | | | | | * ticket/rmcgirr83/9937: [ticket/9937] The feed icon displays on External links...which we don't want
| * | [ticket/9937] The feed icon displays on External links...which we don't wantRMcGirr832010-12-211-1/+1
| | | | | | | | | | | | PHPBB3-9937
* | | Merge branch 'ticket/igorw/9924' into develop-olympusNils Adermann2010-12-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/igorw/9924: [ticket/9924] Pass template instance into $template->display hook
| * | | [ticket/9924] Pass template instance into $template->display hookIgor Wiedler2010-11-231-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9924
* | | | [feature/acm-wincache] Adding caching module for WinCache's User Cache.ChrisTX2010-12-131-0/+84
| | | | | | | | | | | | | | | | PHPBB3-9942
* | | | Merge branch 'ticket/nickvergessen/9930' into develop-olympusAndreas Fischer2010-12-031-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9930: [ticket/9930] Redirect failes with open_basedir enabled.
| * | | | [ticket/9930] Redirect failes with open_basedir enabled.Joas Schilling2010-11-251-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Open_basedir does not allow file_exists() for "." and directories without a trayling-slash. Therefor we must append it on the check. PHPBB3-9930
* | | | Merge branch 'ticket/igorw/9910' into develop-olympusAndreas Fischer2010-12-031-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9910: [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
| * | | | [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMsIgor Wiedler2010-11-211-0/+3
| |/ / / | | | | | | | | | | | | PHPBB3-9910
* | | | [ticket/9932] Add the Bing bot when convertingRichard Foote2010-11-291-0/+1
|/ / / | | | | | | | | | PHPBB3-9932
* | | Merge branch 'prep-release-3.0.8' into develop-olympusNils Adermann2010-11-202-1/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.8: [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog [ticket/9903] Script for detecting potentially malicious flash bbcodes [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix. [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * | [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelogNils Adermann2010-11-191-1/+1
| | |
| * | [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.Ruslan Uzdenov2010-11-181-0/+9
| | | | | | | | | | | | | | | | | | Fix XSS in Flash-BBcode by validating that the supplied argument is a URL. PHPBB3-9903
* | | [develop-olympus] Remove accidentally added trailing newlines.Nils Adermann2010-11-111-1/+1
| | |
* | | [develop-olympus] Incrementing the version number to 3.0.9-dev.Nils Adermann2010-11-111-2/+2
|/ /
* | [develop-olympus] Bumping version number for 3.0.8-RC1.Nils Adermann2010-11-081-1/+1
| |
* | [ticket/9696] Surpress is_dir() notice when using SQLite with open_basedir.Paul Sohier2010-11-071-1/+1
| | | | | | | | PHPBB3-9696
* | Merge branch 'ticket/bantu/9075' into develop-olympusNils Adermann2010-11-071-0/+5
|\ \ | | | | | | | | | | | | * ticket/bantu/9075: [ticket/9075] CPF Numbers fields: Prevent SQL error on registration page.
| * | [ticket/9075] CPF Numbers fields: Prevent SQL error on registration page.Andreas Fischer2010-10-301-0/+5
| |/ | | | | | | | | | | | | | | | | | | | | When an administrator set a numbers field to default to 'not specified', a SQL error was caused on the registration page because it was tried to insert an empty string into an integer column. Because the column already supports NULL values, empty strings are now converted to NULL for custom profile fields of the type 'Numbers' before insertion into the data table. PHPBB3-9075
* | Merge branch 'ticket/igorw/9850' into develop-olympusAndreas Fischer2010-11-062-1/+11
|\ \ | | | | | | | | | | | | * ticket/igorw/9850: [ticket/9850] Display upgrade instructions for feature release in acp
| * | [ticket/9850] Display upgrade instructions for feature release in acpIgor Wiedler2010-11-022-1/+11
| |/ | | | | | | PHPBB3-9850
* | Merge branch 'task/naderman/mssql-db-tests' into develop-olympusAndreas Fischer2010-11-031-6/+20
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | * task/naderman/mssql-db-tests: [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results. [task/mssql-db-tests] Split up database tests into SELECT and write operations [task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start. [task/mssql-db-tests] sql_query_limit must return all results when total = 0 [task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connections [task/mssql-db-tests] Refactored getConnection into multiple smaller parts. [task/mssql-db-tests] Allow test configuration with environment variables. [task/mssql-db-tests] No longer display an error when skipping db tests. [task/mssql-db-tests] Use a simple getter for test case helpers.
| * [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.Nils Adermann2010-10-251-1/+6
| | | | | | | | PHPBB3-9868
| * [task/mssql-db-tests] sql_query_limit must return all results when total = 0Nils Adermann2010-10-251-5/+14
| | | | | | | | PHPBB3-9868
* | Merge branch 'ticket/cs278/9061' into develop-olympusAndreas Fischer2010-10-271-19/+68
|\ \ | | | | | | | | | | | | | | | * ticket/cs278/9061: [ticket/9061] Simplify conditional statements by reworking the logic. [ticket/9061] Fixed a race condition in queue locking.
| * | [ticket/9061] Simplify conditional statements by reworking the logic.Chris Smith2010-10-271-12/+18
| | | | | | | | | | | | PHPBB3-9061
| * | [ticket/9061] Fixed a race condition in queue locking.Oleg Pudeyev2010-10-271-19/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed queue locking to cover all queue file operations, in particular the check for queue file existince and inclusion of queue file must be done under one lock. Also refactored queue locking and unlocking into separate methods. PHPBB3-9061
| | |
| \ \
*-. \ \ Merge branches 'ticket/bantu/9101', 'ticket/bantu/9595' and ↵Igor Wiedler2010-10-251-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ticket/bantu/9853' into develop-olympus * ticket/bantu/9101: [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN. * ticket/bantu/9595: [ticket/9595] List min/max characters indexed by search for mysql_fulltext. * ticket/bantu/9853: [ticket/9853] Change recaptcha theme from default to 'clean'.
| | * | | [ticket/9595] List min/max characters indexed by search for mysql_fulltext.Andreas Fischer2010-10-211-0/+8
| | | |/ | | |/| | | | | | | | | PHPBB3-9595