aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [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
| * | | | [ticket/9613] Implement a load switch for unread posts search feature.rxu2010-08-292-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since unread posts search can produce a high server load in certain circumstances, we implement a switch for ACP "Load settings" to have an option to disable this type of search. PHPBB3-9613
* | | | | Merge branch 'ticket/bantu/9609' into develop-olympusIgor Wiedler2010-09-162-6/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9609: [ticket/9609] Change header() calls setting HTTP status to send_status_line().
| * | | | | [ticket/9609] Change header() calls setting HTTP status to send_status_line().Andreas Fischer2010-09-112-6/+7
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-9609
* | | | | Merge branch 'ticket/bantu/9503' into develop-olympusIgor Wiedler2010-09-121-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * ticket/bantu/9503: [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.
| * | | | [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.Andreas Fischer2010-07-231-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Show 'No subject specified' in 'Posts awaiting approval' if post subject is empty. PHPBB3-9503
* | | | Merge branch 'ticket/evil3/8944' into develop-olympusChris Smith2010-09-051-1/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/evil3/8944: [ticket/8944] Patch db_tools to support index length for MySQL4 [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
| * | | | [ticket/8944] Patch db_tools to support index length for MySQL4Igor Wiedler2010-09-051-1/+17
| | | | |
* | | | | [ticket/9039] Make mssqlnative.php non-executableIgor Wiedler2010-09-031-0/+0
|/ / / / | | | | | | | | | | | | PHPBB3-9039
* | | | Merge branch 'ticket/bantu/9615' into develop-olympusChris Smith2010-08-301-2/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * ticket/bantu/9615: [ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()
| * | | [ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()Andreas Fischer2010-08-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When magic_quotes_gpc is 'On' it also affects the $_FILES array and a filename like 'bantu"s testfile.txt' will be returned as 'bantu\"s testfile.txt'. Because utf8_basename() also strips off anything before the last backslash the filename was returned as '"s testfile.txt'. Calling stripslashes() before utf8_basename() solves the problem. PHPBB3-9615
* | | | Merge branch 'ticket/cs278/7369' into develop-olympusAndreas Fischer2010-08-281-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/cs278/7369: [ticket/7369] CPF date should always render the users selection.
| * | | | [ticket/7369] CPF date should always render the users selection.Chris Smith2010-08-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPF render code was incorrectly adding the users timezone offset instead of removing it to compensate for the addition made in user::format_date(). PHPBB3-7369
* | | | | Merge branch 'ticket/nickvergessen/7296' into develop-olympusAndreas Fischer2010-08-282-5/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/7296: [ticket/7296] Exporting styles to tar creates corrupted archives.
| * | | | | [ticket/7296] Exporting styles to tar creates corrupted archives.Joas Schilling2010-08-222-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the folders to the archive before putting the files inside, seems to break the tar-archives. PHPBB3-7296
* | | | | | Merge branch 'ticket/nickvergessen/9519' into develop-olympusAndreas Fischer2010-08-2811-21/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9519: [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
| * | | | | | [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-192-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the ACM-Modules we need to check whether the function is loaded, before we use it, as this is not the case from download/file.php in avatar-mode. PHPBB3-9519
| * | | | | | [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9519
| * | | | | | [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes/functions_convert.php and install/install_convert.php tested by Dicky. PHPBB3-9519
| * | | | | | [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-109-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acm_memory.php is untested. install/install_convert.php and includes/functions_convert.php are going to be tested and committed afterwards. PHPBB3-9519