aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'feature/naderman/auto-loading' into developAndreas Fischer2010-08-201-1/+1
|\ | | | | | | | | * feature/naderman/auto-loading: [feature/auto-loading] Only check subdir if there is another name part.
| * [feature/auto-loading] Only check subdir if there is another name part.Nils Adermann2010-08-191-1/+1
| | | | | | | | PHPBB3-9682
* | Merge branch 'develop-olympus' into developAndreas Fischer2010-07-1112-28/+61
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-119-24/+51
| |\ \ | | | | | | | | | | | | | | | | * 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-119-24/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | [ticket/9629] Allow style.php to retrieve its session ID from cookiesJosh Woody2010-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/jellydoughnut/9650' into develop-olympusAndreas Fischer2010-07-102-3/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * 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-082-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-084-5/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-081-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 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-061-1/+1
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-9570
| * | | | 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 'develop-olympus' into developAndreas Fischer2010-07-086-7/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-081-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 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-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9578
| * | | | | Merge branch 'ticket/jellydoughnut/9695' into develop-olympusAndreas Fischer2010-07-081-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-011-2/+2
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | [ticket/9712] Future dates can be formatted as 'less than one minute ago'Chris Smith2010-07-071-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-9712
| * | | | [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-058-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-0/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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-204-5/+15
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | Merge branch 'ticket/bantu/9656' into develop-olympusAndreas Fischer2010-06-201-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9656: [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
| | * | | | | [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.Andreas Fischer2010-06-201-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-9656
| * | | | | Merge branch 'ticket/bantu/9643' into develop-olympusAndreas Fischer2010-06-201-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9643: [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.
| | * | | | | [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.Andreas Fischer2010-06-081-1/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-9643
| * | | | | Merge branch 'ticket/bantu/9112' into develop-olympusAndreas Fischer2010-06-201-0/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9112: [ticket/9112] Make sure current user can see most active forum/topic.
| | * | | | | [ticket/9112] Make sure current user can see most active forum/topic.Andreas Fischer2010-06-151-0/+7
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | PHPBB3-9112
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-06-172-3/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9132] Oracle CLOB support is broken, preventing storage of long strings [ticket/9606] Optimize unread search option.
| * | | | | Merge branch 'ticket/jellydoughnut/9132' into develop-olympusAndreas Fischer2010-06-171-0/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9132: [ticket/9132] Oracle CLOB support is broken, preventing storage of long strings
| | * | | | | [ticket/9132] Oracle CLOB support is broken, preventing storage of long stringsJosh Woody2010-06-131-0/+5
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts Oracle support to the state it was in prior to phpBB 3.0.6. That is, storage of long strings works again (e.g. posts > 4 KB), but the database backup/restore functionality is broken. We feel that the ability to store long strings is more important than the DB restore, since Oracle 10g itself provides tools for backing up databases. PHPBB3-9132
| * | | | | Merge branch 'ticket/rxu/9606' into develop-olympusAndreas Fischer2010-06-171-3/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/9606: [ticket/9606] Optimize unread search option.
| | * | | | | [ticket/9606] Optimize unread search option.rxu2010-05-171-3/+4
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of redundant SQL query in search.php that should increase performance slightly. PHPBB3-9606
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-06-154-6/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9623] Proper UTF8 encoding for usernames in pruning section [ticket/9633] Newly Registered Group Colour not used in "Our Newest Member" [ticket/9179] Remove unnecessary newline. [ticket/9147] "Change topic type"-option "Normal" always selected.
| * | | | | Merge branch 'ticket/jellydoughnut/9633' into develop-olympusAndreas Fischer2010-06-151-0/+1
| |\ \ \ \ \
| | * | | | | [ticket/9633] Newly Registered Group Colour not used in "Our Newest Member"Josh Woody2010-06-011-0/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Due to an oversight, the default group was not properly checked in the user_add function. This fix corrects the check. No other changes are needed because they go direct to the database, this one used an array in memory. PHPBB3-9633
| * | | | | [ticket/9623] Proper UTF8 encoding for usernames in pruning sectionJosh Woody2010-06-151-4/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | The username textboxes were not being properly encoded in UTF8. PHPBB3-9623
| * | | | Merge branch 'feature/notify_status' into develop-olympusNils Adermann2010-05-301-1/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * feature/notify_status: [ticket/9179] Remove unnecessary newline.
| | * | | | [ticket/9179] Remove unnecessary newline.Andreas Fischer2010-05-301-1/+0
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | cc8d22bed6bdba0a8f5797eef3627a62c240a48f added one empty line too much. PHPBB3-9179
| * | | | Merge branch 'ticket/nickvergessen/9147' into develop-olympusNils Adermann2010-05-301-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9147: [ticket/9147] "Change topic type"-option "Normal" always selected.
| | * | | | [ticket/9147] "Change topic type"-option "Normal" always selected.Joas Schilling2010-05-281-1/+1
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-9147