aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10369] Add warning about paths outside of phpBB root not being filteredAndreas Fischer2011-09-181-0/+2
| | | | PHPBB3-10369
* [ticket/10369] Rename filter_errfile() to filter_root_path().Andreas Fischer2011-09-182-4/+4
| | | | PHPBB3-10369
* [ticket/10369] DRY code to remove phpbb path from errfile.Andreas Fischer2011-09-182-6/+24
| | | | PHPBB3-10369
* [ticket/10369] Always include errfile and errline in format_errors().Andreas Fischer2011-09-181-5/+9
| | | | | | | We remove the phpBB root path from errfile. This is consistent with how msg_handler handles E_WARNING messages etc. PHPBB3-10369
* Merge remote-tracking branch 'bantu/ticket/10294' into develop-olympusAndreas Fischer2011-09-061-1/+1
|\ | | | | | | | | * bantu/ticket/10294: [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
| * [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.Andreas Fischer2011-07-281-1/+1
| | | | | | | | | | | | sqlsrv_rows_affected() expects a statement resource, not a connection resource. PHPBB3-10294
* | Merge remote-tracking branch 'Noxwizard/ticket/10351' into develop-olympusAndreas Fischer2011-09-061-1/+1
|\ \ | | | | | | | | | | | | * Noxwizard/ticket/10351: [ticket/10351] Fix Oracle's sql_column_remove()
| * | [ticket/10351] Fix Oracle's sql_column_remove()Patrick Webster2011-09-041-1/+1
| | | | | | | | | | | | | | | | | | The correct syntax is DROP COLUMN. PHPBB3-10351
* | | Merge remote-tracking branch 'Noxwizard/ticket/10352' into develop-olympusAndreas Fischer2011-09-061-0/+1
|\ \ \ | | | | | | | | | | | | | | | | * Noxwizard/ticket/10352: [ticket/10352] Add missing break for Oracle's sql_table_drop()
| * | | [ticket/10352] Add missing break for Oracle's sql_table_drop()Patrick Webster2011-09-041-0/+1
| |/ / | | | | | | | | | PHPBB3-10352
* | | Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympusOleg Pudeyev2011-09-051-0/+6
|\ \ \ | |/ / |/| | | | | | | | | | | * nickvergessen/ticket/10321: [ticket/10321] Add descriptions to the unit tests [ticket/10321] Do not append the ? if the param-list is empty anyway.
| * | [ticket/10321] Do not append the ? if the param-list is empty anyway.Joas Schilling2011-08-211-0/+6
| | | | | | | | | | | | PHPBB3-10321
* | | [ticket/10346] Add drop_tables to perform_schema_changes and add testsNils Adermann2011-08-291-0/+17
| | | | | | | | | | | | PHPBB3-10346
* | | Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympusNils Adermann2011-08-261-0/+6
|\ \ \ | | | | | | | | | | | | | | | | * github-bantu/ticket/10335: [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
| * | | [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.Andreas Fischer2011-08-241-0/+6
| | | | | | | | | | | | | | | | PHPBB3-10335
* | | | Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympusNils Adermann2011-08-252-1/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10320: [ticket/10320] Exclude passworded forums when determining "Most active topic". [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
| * | | | [ticket/10320] Exclude passworded forums when determining "Most active topic".Andreas Fischer2011-08-251-1/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10320
| * | | | [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.Andreas Fischer2011-08-251-0/+33
| |/ / / | | | | | | | | | | | | PHPBB3-10320
* | | | [ticket/9995] Do not run forum SQL query when marking the whole board read.Andreas Fischer2011-08-261-14/+27
| | | | | | | | | | | | | | | | PHPBB3-9995
* | | | [ticket/9995] Always continue when harvesting $forum_ids for markread().Andreas Fischer2011-08-261-1/+2
| | | | | | | | | | | | | | | | PHPBB3-9995
* | | | [ticket/9995] Remove useless statement from display_forums()Andreas Fischer2011-08-261-2/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $forum_ids array is only used if $mark_read == 'forums'. When $mark_read == 'forums', we either continue when $auth->acl_get('f_list', $forum_id) is false or true. So this statement is never useful. PHPBB3-9995
* | | [ticket/10240] Reverted a commit which added buggy code.Callum Macrae2011-08-211-3/+0
|/ / | | | | | | | | | | | | | | This reverts commit f9dbe33fa7917b6220a85a01ed9f395f3f1bb888. The code which was added also removed new lines and tabs. PHPBB3-10240
* | Merge remote-tracking branch 'bantu/ticket/9297' into develop-olympusOleg Pudeyev2011-08-141-11/+44
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/9297: [ticket/9297] Add network to class name of unit tests. [ticket/9297] Fix typo in localhost. [ticket/9297] Rename test class to reflect its contents. [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work. [ticket/9297] Fix markTestSkipped call in setUpBeforeClass. [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails. [ticket/9297] Separate ipv4 and ipv6 tests into separate functions. [ticket/9297] Update copyright year of unit test file. [ticket/9297] Make EPSV unit tests work without IPv6. [ticket/9297] Unit tests for ftp_fsock PASV and EPSV. [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.
| * | [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.Andreas Fischer2011-08-111-11/+44
| | | | | | | | | | | | PHPBB3-9297
* | | Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympusOleg Pudeyev2011-08-091-0/+3
|\ \ \ | | | | | | | | | | | | | | | | * callumacrae/ticket/10240: [ticket/10240] Added code to strip control characters from messages.
| * | | [ticket/10240] Added code to strip control characters from messages.Callum Macrae2011-08-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible to evade the word filter using control characters. Seeing as control characters have no practical application in a bulletin board software, it doesn't do any harm to remove them entirely. That is what this commit does. PHPBB3-10240
* | | | Merge remote-tracking branch 'naderman/ticket/8937' into develop-olympusOleg Pudeyev2011-08-071-0/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * naderman/ticket/8937: [ticket/8937] Keep space characters in front of [code] bbcode content
| * | | [ticket/8937] Keep space characters in front of [code] bbcode contentNils Adermann2011-07-171-0/+7
| | |/ | |/| | | | | | | PHPBB3-8937
* | | Merge remote-tracking branch 'bantu/ticket/10299' into develop-olympusOleg Pudeyev2011-08-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * bantu/ticket/10299: [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
| * | | [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()Andreas Fischer2011-07-311-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10299
* | | | [ticket/10303] Removed HTTP_VERSION code path from send_status_line().Chris Smith2011-08-051-6/+0
|/ / / | | | | | | | | | PHPBB3-10303
* | | Merge remote-tracking branch 'callumacrae/ticket/9645' into develop-olympusOleg Pudeyev2011-07-301-0/+8
|\ \ \ | | | | | | | | | | | | | | | | * callumacrae/ticket/9645: [ticket/9645] Added code to repair invalid anchor names in acp_php_info.
| * | | [ticket/9645] Added code to repair invalid anchor names in acp_php_info.Callum Macrae2011-07-281-0/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Some of the anchor tags produced by php_info had names like "module_Zend Optimizer", which is obviously invalid. This commit adds some code that repairs the names by replacing all spaces found in the names with underscores. PHPBB3-9645
* | | Merge remote-tracking branch 'bantu/ticket/10263' into develop-olympusAndreas Fischer2011-07-301-2/+2
|\ \ \ | |_|/ |/| | | | | | | | * bantu/ticket/10263: [ticket/10263] Fix comment about return value of phpbb_version_compare().
| * | [ticket/10263] Fix comment about return value of phpbb_version_compare().Andreas Fischer2011-07-271-2/+2
| | | | | | | | | | | | PHPBB3-10263
* | | Merge remote-tracking branch 'github-bantu/ticket/10257' into develop-olympusNils Adermann2011-07-161-1/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10257: [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003. [ticket/10257] Fix AAAA record parsing for old versions of Windows [ticket/10257] Add missing break statement after CNAME block.
| * | | [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003.Andreas Fischer2011-07-131-1/+4
| | | | | | | | | | | | | | | | PHPBB3-10257
| * | | [ticket/10257] Fix AAAA record parsing for old versions of WindowsPatrick Webster2011-07-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Older versions of Windows use a different output format for AAAA records. PHPBB3-10257
| * | | [ticket/10257] Add missing break statement after CNAME block.Andreas Fischer2011-07-131-0/+1
| | |/ | |/| | | | | | | PHPBB3-10257
* | | Merge remote-tracking branch 'github-bantu/ticket/10274' into develop-olympusNils Adermann2011-07-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * github-bantu/ticket/10274: [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_main
| * | | [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_mainAndreas Fischer2011-07-151-1/+1
| |/ / | | | | | | | | | PHPBB3-10274
* | | Merge remote-tracking branch 'github-bantu/ticket/10263' into develop-olympusNils Adermann2011-07-163-9/+31
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | * github-bantu/ticket/10263: [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.php [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.php [ticket/10263] Adding unit tests for phpbb_version_compare(). [ticket/10263] Add wrapper for version_compare() that allows the use of A and B
| * | [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.phpAndreas Fischer2011-07-141-4/+1
| | | | | | | | | | | | PHPBB3-10263
| * | [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.phpAndreas Fischer2011-07-141-5/+2
| | | | | | | | | | | | PHPBB3-10263
| * | [ticket/10263] Add wrapper for version_compare() that allows the use of A and BAndreas Fischer2011-07-131-0/+28
| |/ | | | | | | | | | | | | Add wrapper function for version_compare() that allows using uppercase A and B for alpha and beta release version strings. PHPBB3-10263
* | Merge remote-tracking branch 'github-rxu/ticket/10226' into develop-olympusNils Adermann2011-07-161-1/+17
|\ \ | | | | | | | | | | | | | | | * github-rxu/ticket/10226: [ticket/10226] Use is_numeric() instead of preg_replace() [ticket/10226] Allow mysqli connections via local sockets/pipes
| * | [ticket/10226] Use is_numeric() instead of preg_replace()rxu2011-06-211-1/+1
| | | | | | | | | | | | PHPBB3-10226
| * | [ticket/10226] Allow mysqli connections via local sockets/pipesrxu2011-06-211-1/+17
| | | | | | | | | | | | PHPBB3-10226
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/10252' into ↵Nils Adermann2011-07-161-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10252: [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permission
| * | | [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permissionJoas Schilling2011-07-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Be careful when using this function with permissions a_, m_, u_ and f_ ! It may not work correctly. When a user group grants an a_* permission, e.g. a_foo, but the user's a_foo permission is set to "Never", then the user does not in fact have the a_ permission. But the user will still be listed as having the a_ permission. PHPBB3-10252