aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [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
* | | | Merge branch 'ticket/naderman/9686' into develop-olympusAndreas Fischer2010-10-252-28/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/naderman/9686: [ticket/9686] Fix mssqlnative database data export
| * | | | [ticket/9686] Fix mssqlnative database data exportNils Adermann2010-10-252-28/+46
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We require version 1.1 of the sqlsrv extension anyway so the regular sqlsrv_num_rows can be used instead of buffering the result. The result buffer (class result_mssqlnative) should never automatically free the resource it receives - we consistently close resources using sql_freeresult(). PHPBB3-9686
* | | | Merge branch 'ticket/rxu/9478' into develop-olympusAndreas Fischer2010-10-251-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/rxu/9478: [ticket/9478] Validate maximum number of allowed recipients per PM value.
| * | | | [ticket/9478] Validate maximum number of allowed recipients per PM value.rxu2010-10-251-0/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | Do not allow to enter the value larger than it's allowed by MySQL mediumnt(8). PHPBB3-9478
* | | | Merge branch 'ticket/igorw/9807' into develop-olympusNils Adermann2010-10-231-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | * ticket/igorw/9807: [ticket/9807] Update existing module permissions in database [ticket/9807] Hide avatar tab in UCP when avatars are disabled
| * | | [ticket/9807] Hide avatar tab in UCP when avatars are disabledIgor Wiedler2010-09-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9807
* | | | Merge branch 'ticket/rxu/9840' into develop-olympusAndreas Fischer2010-10-181-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * ticket/rxu/9840: [ticket/9840] Display view unread posts link for guests.
| * | | [ticket/9840] Display view unread posts link for guests.rxu2010-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Display view unread posts link for guests if applicable. PHPBB3-9840
* | | | Merge branch 'ticket/bantu/9698' into develop-olympusIgor Wiedler2010-10-171-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9698: [ticket/9698] Add .htaccess to the includes subdirectory.
| * | | | [ticket/9698] Add .htaccess to the includes subdirectory.Andreas Fischer2010-10-151-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add .htaccess to the includes folder to prevent full path disclosure when running PHP 5.3. When the error_reporting setting in php.ini contains the E_DEPRECATED error level, the PHP parser throws an error message containing the local filesystem path when accessing one of the captcha plugins directly. This is because the captcha plugins return explicit references for PHP 4 compatibility. PHPBB3-9698
* | | | [ticket/7538] Limit user_login_attempts to prevent SQL errors.Andreas Fischer2010-10-152-2/+8
|/ / / | | | | | | | | | PHPBB3-7538
* | | [ticket/9829] Fix error in recaptcha validation.Cristian Rodriguez2010-09-191-4/+1
| | | | | | | | | | | | | | | | | | | | | The recaptcha plugin falsely accepted error responses by recaptcha as valid solutions. PHPBB3-9829
* | | Merge branch 'ticket/bantu/9091' into develop-olympusIgor Wiedler2010-09-161-0/+11
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9091: [ticket/9091] Extract IPv4 address from addresses mapped into IPv6.
| * | | [ticket/9091] Extract IPv4 address from addresses mapped into IPv6.Andreas Fischer2010-07-231-0/+11
| | | | | | | | | | | | | | | | PHPBB3-9091
* | | | Merge branch 'ticket/bantu/9644' into develop-olympusIgor Wiedler2010-09-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9644: [ticket/9644] Check $mode before calling user_notification() from submit_post()
| * | | | [ticket/9644] Check $mode before calling user_notification() from submit_post()Andreas Fischer2010-07-231-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-9644
* | | | Merge branch 'ticket/bantu/9613' into develop-olympusIgor Wiedler2010-09-162-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9613: [ticket/9613] Slightly update language strings. [ticket/9613] Fix missing database part for unread posts search load switch. [ticket/9613] Implement a load switch for unread posts search feature.
| * | | | [ticket/9613] Slightly update language strings.Andreas Fischer2010-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9613