aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-02-011-2/+2
|\ | | | | | | | | * develop-olympus: [ticket/10014] Clearly indicate fatal errors in file acm.
| * 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/8065] Add an option to lock topics while moving them.Joas Schilling2011-01-301-0/+9
| | | | | | | | | | | | PHPBB3-8065
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-01-301-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand(). [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
| * | [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().Joas Schilling2011-01-301-2/+2
| |/ | | | | | | PHPBB3-9985
* | Merge branch 'develop-olympus' into developNils Adermann2011-01-231-2/+3
|\ \ | |/ | | | | | | * develop-olympus: [ticket/8779] Slow search for 'View unread posts'
| * [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/9790' into developIgor Wiedler2011-01-181-20/+37
|\ \ | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9790: [ticket/9790] Support for lighttpd's X-Sendfile header for attachments. [ticket/9790] Support for nginx's X-Accel-Redirect header for attachments. [ticket/9790] Always call file_gc(false) before sending the file. [ticket/9790] Add $exit parameter to file_gc().
| * | [ticket/9790] Support for lighttpd's X-Sendfile header for attachments.Andreas Fischer2011-01-181-15/+8
| | | | | | | | | | | | PHPBB3-9790
| * | [ticket/9790] Support for nginx's X-Accel-Redirect header for attachments.Andreas Fischer2011-01-171-0/+10
| | | | | | | | | | | | PHPBB3-9790
| * | [ticket/9790] Always call file_gc(false) before sending the file.Andreas Fischer2011-01-171-3/+4
| | | | | | | | | | | | | | | | | | This also unloads the cache before the file is send. PHPBB3-9790
| * | [ticket/9790] Add $exit parameter to file_gc().Andreas Fischer2011-01-171-2/+15
| | | | | | | | | | | | PHPBB3-9790
* | | Merge branch 'develop-olympus' into developNils Adermann2011-01-162-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [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.
| * | 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
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-01-161-19/+11
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9933] Remove empty word check. [ticket/9933] Add $use_unicode parameter to get_censor_preg_expression(). [ticket/9933] Adjust word censor regex for non-unicode mode. Conflicts: phpBB/includes/functions.php Also remove static $unicode_support.
| * | [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 'task/naderman/config-class' into developAndreas Fischer2011-01-128-107/+476
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * task/naderman/config-class: [task/config-class] Do not create multiple cache driver instances. [task/config-class] Add an attribute for the table name in phpbb_config_db. [task/config-class] Correctly merge cached config with dynamically loaded data. [task/config-class] Always specify the config table to use. [task/config-class] Fix db config constructor param order [task/config-class] Implemented a config class to replace the global array.
| * | [task/config-class] Do not create multiple cache driver instances.Nils Adermann2011-01-121-23/+42
| | | | | | | | | | | | | | | | | | | | | Retrieve the driver from the service instead of creating new ones over and over from the factory. PHPBB3-9988
| * | [task/config-class] Add an attribute for the table name in phpbb_config_db.Nils Adermann2011-01-121-0/+6
| | | | | | | | | | | | PHPBB3-9988
| * | [task/config-class] Correctly merge cached config with dynamically loaded data.Nils Adermann2011-01-121-1/+5
| | | | | | | | | | | | PHPBB3-9988
| * | [task/config-class] Always specify the config table to use.Nils Adermann2011-01-121-1/+1
| | | | | | | | | | | | PHPBB3-9988
| * | [task/config-class] Fix db config constructor param orderIgor Wiedler2011-01-111-2/+2
| | | | | | | | | | | | PHPBB3-9988
| * | [task/config-class] Implemented a config class to replace the global array.Nils Adermann2011-01-108-86/+426
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a phpbb_config class which simply holds an array and does not persist any data. It implements ArrayAccess, Countable and IteratorAggregate to allow regular use of configuration as if it was still an array. The phpbb_config_db class depends on an instance of the dbal and a cache driver. It obtains the configuration data from cache and database as necessary and persists data to the database. The functions set_config and set_config_count remain for backward compatability but they only call methods on the new config class now instead of directly manipulating the database and cache. PHPBB3-9988
* | | [task/acm-refactor] Refactor WinCache ACM moduleIgor Wiedler2011-01-111-7/+1
| | | | | | | | | | | | PHPBB3-9983
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-01-103-4/+4
|\ \ \ | |/ / |/| / | |/
| * 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
* | | [task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests.Nils Adermann2011-01-092-26/+17
| | | | | | | | | | | | PHPBB3-9983
* | | [task/acm-refactor] Refactor the ACM classes to have a common interface.Igor Wiedler2011-01-0912-70/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are now refered to as cache drivers rather than ACM classes. The additional utility functions from the original cache class have been moved to the cache_service. The class loader is now instantiated without a cache instance and passed one as soon as it is constructed to allow autoloading the cache classes. PHPBB3-9983
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-01-073-18/+46
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9933] Create unit test for word censor regular expression. [ticket/9933] Move word censor regex into separate function in functions.php [ticket/9933] Wrong handling consecutive multiple asterisks in word censor Conflicts: phpBB/includes/cache.php
| * | [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/9746] Adding some more calls to phpbb_ip_normalise().Andreas Fischer2011-01-031-1/+1
| | | | | | | | | | | | PHPBB3-9746
* | | [ticket/9746] Update documentation of phpbb_inet_pton().Andreas Fischer2011-01-031-1/+2
| | | | | | | | | | | | PHPBB3-9746
* | | [ticket/9746] Ease up phpbb_ip_normalise() function.Andreas Fischer2011-01-031-20/+1
| | | | | | | | | | | | PHPBB3-9746
* | | [ticket/9746] Added PHP implementation of inet_pton and inet_ntop.Marek A. Ruszczyński2011-01-031-2/+118
| | | | | | | | | | | | PHPBB3-9746
* | | [ticket/9746] Adding wrapper functions for inet_ntop() and inet_pton().Andreas Fischer2011-01-031-1/+32
| | | | | | | | | | | | PHPBB3-9746
* | | [ticket/9746] Adding calls to phpbb_ip_normalise() from session management.Andreas Fischer2011-01-031-0/+18
| | | | | | | | | | | | PHPBB3-9746
* | | [ticket/9746] Adding new function phpbb_ip_normalise().Andreas Fischer2011-01-031-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a function that normalises internet protocol addresses. While there should be no problem at all when handling IPv4 addresses, the many different representations of the exact same IPv6 address and webservers mapping IPv4-addresses into the IPv6 space made it necessary to add such a function. PHPBB3-9746
* | | [feature/update-session-api] Add update_session methodIgor Wiedler2010-12-291-9/+20
| | | | | | | | | | | | PHPBB3-9688
* | | [ticket/9574] Add pcre_utf8_support() functionIgor Wiedler2010-12-285-11/+21
| | | | | | | | | | | | | | | | | | | | | Refactor the check for PCRE UTF-8 support into a new pcre_utf8_support() function. PHPBB3-9574
* | | [ticket/9574] Remove conditional PHP<5.2 codeIgor Wiedler2010-12-289-135/+31
| | | | | | | | | | | | | | | | | | | | | There is a large amount of conditional code for PHP < 5.2 that can be removed with phpBB 3.1. PHPBB3-9574
* | | [ticket/9574] Drop fallback implementationsIgor Wiedler2010-12-281-101/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phpBB 3.0 includes fallback implementations for following PHP5+ functions: array_combine str_split stripos htmlspecialchars_decode Since phpBB 3.1 requires PHP 5.2+ these can be dropped. PHPBB3-9574
* | | Merge branch 'develop-olympus' into developAndreas Fischer2010-12-211-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/9937] Make sure feed icon only shows for FORUM_POST [ticket/9937] The feed icon displays on External links...which we don't want [ticket/9925] prosilver logo margin bug in IE 6-7-8
| * | [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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 05:54:50 +0000