aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2010-07-1115-36/+77
|\ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9637] Do not cache SQL server version in all cases [ticket/9629] Allow style.php to retrieve its session ID from cookies [ticket/9678] Flash attachments are not displayed in subsilver2. [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments. [ticket/9650] Do not allow banning the anonymous user by username Conflicts: phpBB/styles/subsilver2/template/attachment.html phpBB/styles/subsilver2/template/posting_buttons.html
| * Merge branch 'ticket/jellydoughnut/9637' into develop-olympusAndreas Fischer2010-07-1110-25/+52
| |\ | | | | | | | | | | | | * ticket/jellydoughnut/9637: [ticket/9637] Do not cache SQL server version in all cases
| | * [ticket/9637] Do not cache SQL server version in all casesJosh Woody2010-07-1110-25/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the existing cache is global, there is no way to differentiate between each of two databases which may be two different DBAL objects pointing to servers with wildly different versions of an RDBMS. phpBB only has this situation in the UCF, thus only one file changed outside the DBAL. I have added a second optional parameter, $use_cache to each of the implementations of dbal::sql_server_info() PHPBB3-9637
| * | Merge branch 'ticket/jellydoughnut/9629' into develop-olympusAndreas Fischer2010-07-112-8/+15
| |\ \ | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9629: [ticket/9629] Allow style.php to retrieve its session ID from cookies
| | * | [ticket/9629] Allow style.php to retrieve its session ID from cookiesJosh Woody2010-07-112-8/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | style.php takes a session ID to ensure it gets the right language for a user, but that session ID is always passed in GET. This allows change allows the SID to be read from the cookie, and theoretically makes it friendlier for caching engines like Varnish. PHPBB3-9629
| * | Merge branch 'ticket/nickvergessen/9678' into develop-olympusAndreas Fischer2010-07-101-2/+2
| |\ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/9678: [ticket/9678] Flash attachments are not displayed in subsilver2.
| | * | [ticket/9678] Flash attachments are not displayed in subsilver2.Joas Schilling2010-07-081-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9678
| * | | Merge branch 'ticket/nickvergessen/9677' into develop-olympusAndreas Fischer2010-07-101-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9677: [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.
| | * | | [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.Joas Schilling2010-07-081-0/+1
| | |/ / | | | | | | | | | | | | PHPBB3-9677
| * | | Merge branch 'ticket/jellydoughnut/9650' into develop-olympusAndreas Fischer2010-07-103-3/+10
| |\ \ \ | | |/ / | |/| | | | | | | | | | * ticket/jellydoughnut/9650: [ticket/9650] Do not allow banning the anonymous user by username
| | * | [ticket/9650] Do not allow banning the anonymous user by usernameJosh Woody2010-07-083-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | Banning anonymous can result in bad things, like not being able to log in. However, it was possible until now. PHPBB3-9650
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-07-0810-7/+167
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9704] Fix minor typo in coding guidelines. [ticket/9690] Add forthcoming Bing Bot to list of recognized bots [ticket/9451] Add optional $can_upload parameter to avatar_process_user(). [ticket/9593] A readme file for unit tests and running unit tests. [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation. [ticket/9589] Added sample nginx configuration file for phpbb.
| * | | Merge branch 'ticket/p/9570' into develop-olympusAndreas Fischer2010-07-082-2/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/p/9570: [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
| | * | | [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.Oleg Pudeyev2010-07-062-2/+3
| | |/ / | | | | | | | | | | | | PHPBB3-9570
| * | | Merge branch 'ticket/p/9589' into develop-olympusAndreas Fischer2010-07-081-0/+70
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/p/9589: [ticket/9589] Added sample nginx configuration file for phpbb.
| | * | | [ticket/9589] Added sample nginx configuration file for phpbb.Oleg Pudeyev2010-06-101-0/+70
| | | | | | | | | | | | | | | | | | | | PHPBB3-9589
| * | | | Merge branch 'ticket/p/9593' into develop-olympusAndreas Fischer2010-07-081-0/+33
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/9593: [ticket/9593] A readme file for unit tests and running unit tests.
| | * | | | [ticket/9593] A readme file for unit tests and running unit tests.Oleg Pudeyev2010-07-071-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a readme file explaining prerequisites for unit tests, and how to run unit tests. PHPBB3-9593
| * | | | | Merge branch 'ticket/bantu/9451' into develop-olympusAndreas Fischer2010-07-083-4/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9451: [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
| | * | | | | [ticket/9451] Add optional $can_upload parameter to avatar_process_user().Thatbitextra2010-07-073-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid unnecessary overhead in avatar_process_user() by optionally passing in the value of $can_upload. PHPBB3-9451
| * | | | | | Merge branch 'ticket/jellydoughnut/9690' into develop-olympusAndreas Fischer2010-07-082-0/+53
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9690: [ticket/9690] Add forthcoming Bing Bot to list of recognized bots
| | * | | | | | [ticket/9690] Add forthcoming Bing Bot to list of recognized botsJosh Woody2010-07-072-0/+53
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Microsoft will rename MSN Bot to Bing Bot later this year, and change its user agent. This updates phpBB to be aware of Bing Bot PHPBB3-9690
| * | | | | | Merge branch 'ticket/evil3/9704' into develop-olympusAndreas Fischer2010-07-081-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/evil3/9704: [ticket/9704] Fix minor typo in coding guidelines.
| | * | | | | | [ticket/9704] Fix minor typo in coding guidelines.Igor Wiedler2010-07-081-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-9704
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-07-088-11/+26
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9712] Future dates can be formatted as 'less than one minute ago' [ticket/9659] Signature options in set_user_options [ticket/9703] Correct database leak where deleting user did not rm some PM data [ticket/9697] Backlink broken when the select parent forum does not exist. [ticket/9695] Correct the improper display of user input in mcp_ban.php [ticket/9628] _add_module 'after'-parameter does not work correctly. [ticket/9578] ACP Posting tab is missing "Post settings" module.
| * | | | | | Merge branch 'ticket/nickvergessen/9578' into develop-olympusAndreas Fischer2010-07-082-1/+14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9578: [ticket/9578] ACP Posting tab is missing "Post settings" module.
| | * | | | | | [ticket/9578] ACP Posting tab is missing "Post settings" module.Joas Schilling2010-05-282-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9578
| * | | | | | | Merge branch 'ticket/nickvergessen/9628' into develop-olympusAndreas Fischer2010-07-081-1/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9628: [ticket/9628] _add_module 'after'-parameter does not work correctly.
| | * | | | | | | [ticket/9628] _add_module 'after'-parameter does not work correctly.Joas Schilling2010-05-281-1/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The modules were grouped by left_id so num_modules is always one (hopefully), but the number of rows is the actual value we'd like to know. Removing the GROUP BY resolves the issue. PHPBB3-9628
| * | | | | | | Merge branch 'ticket/jellydoughnut/9695' into develop-olympusAndreas Fischer2010-07-082-5/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9695: [ticket/9695] Correct the improper display of user input in mcp_ban.php
| | * | | | | | | [ticket/9695] Correct the improper display of user input in mcp_ban.phpJosh Woody2010-07-012-5/+5
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the improper display of "ban_reason" and "ban_give_reason" in mcp_ban.php PHPBB3-9695
| * | | | | | | Merge branch 'ticket/nickvergessen/9697' into develop-olympusAndreas Fischer2010-07-081-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9697: [ticket/9697] Backlink broken when the select parent forum does not exist.
| | * | | | | | | [ticket/9697] Backlink broken when the select parent forum does not exist.Joas Schilling2010-07-021-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9697
| * | | | | | | Merge branch 'ticket/jellydoughnut/9703' into develop-olympusAndreas Fischer2010-07-081-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9703: [ticket/9703] Correct database leak where deleting user did not rm some PM data
| | * | | | | | | [ticket/9703] Correct database leak where deleting user did not rm some PM dataJosh Woody2010-07-031-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users' PM rules and PM folders were being left intact when deleting them. PHPBB3-9703
| * | | | | | | Merge branch 'ticket/cs278/9712' into develop-olympusAndreas Fischer2010-07-081-2/+2
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9712: [ticket/9712] Future dates can be formatted as 'less than one minute ago'
| | * | | | | | [ticket/9712] Future dates can be formatted as 'less than one minute ago'Chris Smith2010-07-071-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-9712
| * | | | | | Merge branch 'ticket/naderman/9659' into develop-olympusAndreas Fischer2010-07-071-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * ticket/naderman/9659: [ticket/9659] Signature options in set_user_options
| | * | | | | [ticket/9659] Signature options in set_user_optionsRichard Foote2010-07-061-0/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The phpBB3 defaults are being used. PHPBB3-9659
* | | | | | [feature/auto-loading] Added autoloader to common and ensured compatabilityNils Adermann2010-07-0510-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autoloader is registered in install without caching, since caching is set up during installation. This provides the same functionality, performance is not a concern during installation anyway. In common.php the autoloader is instantiated after the cache is initialised and is started with the standard cache backend used for other cached values. A few places in the code using class_exists had to be updated to explicitly avoid autoloading, since they are used to check whether a file needs to be included which does not (yet) follow the naming scheme the autoloader follows. PHPBB3-9682
* | | | | | [feature/auto-loading] Added a phpBB autoloader with caching support.Nils Adermann2010-07-058-0/+317
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phpBB class name lookups follow these rules: - All classes are prefixed with phpbb_ - All classes reside in includes/ or a subdirectory thereof - Directories must not contain underscores - The class name is separated into parts by underscores, the parts are checked from first to last, until one is found which is not a directory, all remaining parts make up the file name. If no parts are left, the last directory name is used. Examples: directory structure: includes/ class_name.php dir/ class_name.php dir.php subdir/ class_name.php lookups: phpbb_class_name -> includes/class_name.php phpbb_dir_class_name -> includes/dir/class_name.php phpbb_dir -> includes/dir/dir.php phpbb_dir_subdir_class_name -> includes/dir/subdir/class_name.php Optionally the class can be supplied with a cache instance, either in the constructor or via set_cache() at a later time. This allows for the lookups to be cached, so the directories do not have to be traveresed on every request. This makes it necessary for the cache and its dependency to continue to be loaded the old way - without autoloading. The code will not be changed to use autoloading, but it will rather only be used for new classes where applicable. PHPBB3-9682
* | | | | | Merge branch 'task/coding-guidelines' into developNils Adermann2010-07-041-111/+113
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * task/coding-guidelines: [task/coding-guidelines] Class member qualifier guidelines [task/coding-guidelines] Added a section about class names. [task/coding-guidelines] Coding guideline update: Class names, eval, VCS, EOF
| * | | | | | [task/coding-guidelines] Class member qualifier guidelinesNils Adermann2010-07-041-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use private, protected or public instead of var. Use static public instead of public static. Use class constants instead of define(). PHPBB3-9557
| * | | | | | [task/coding-guidelines] Added a section about class names.Nils Adermann2010-07-041-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class naming / autoloading RFC is located on area51: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=33237 PHPBB3-9557
| * | | | | | [task/coding-guidelines] Coding guideline update: Class names, eval, VCS, EOFNils Adermann2010-07-041-111/+67
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Class names need to be prefixed with phpbb_ - eval should not be used in any form - there should be newlines at the end of file - the closing php tag should be ommited - array elements should always have a trailing comma - the phpBB VCS is now git - removed the coding guidelines changelog PHPBB3-9557
* | | | | | Merge branch 'ticket/bantu/8212' into developAndreas Fischer2010-06-201-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/8212: [ticket/8212] Tiny 'typo in comment' fix
| * | | | | | [ticket/8212] Tiny 'typo in comment' fixAndreas Fischer2010-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8212
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-06-205-6/+16
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value. [ticket/9665] Allow preview of signature when it is the string "0". [ticket/9112] Make sure current user can see most active forum/topic. [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action. [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address. Conflicts: phpBB/styles/subsilver2/template/ucp_profile_signature.html phpBB/styles/subsilver2/template/viewtopic_body.html
| * | | | | | Merge branch 'ticket/bantu/9655' into develop-olympusAndreas Fischer2010-06-201-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9655: [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
| | * | | | | | [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.Andreas Fischer2010-06-141-2/+2
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-9655
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-20 11:32:57 +0000