aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Merge branch 'ticket/jellydoughnut/9772' into develop-olympusAndreas Fischer2010-08-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9772: [ticket/9772] Unify permissions for sending email when board_email_form is off
| * | | [ticket/9772] Unify permissions for sending email when board_email_form is offJosh Woody2010-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sending email via memberlist.php was limited to users having u_sendemail. When board_email_form is disabled, no such requirement was enforced. This is now changed. PHPBB3-9772
* | | | Merge branch 'ticket/jellydoughnut/9646' into develop-olympusAndreas Fischer2010-08-221-2/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9646: [ticket/9646] Honor CSS comments in @import statements
| * | | | [ticket/9646] Honor CSS comments in @import statementsJosh Woody2010-08-201-2/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a basic CSS comment parser that allows comments to prevent loading an @import statement. For simplicity, only whitespace is allowed between /* and the @import. Also adjust regex to not parse improper quotation marks. PHPBB3-9646 PHPBB3-8169
* | | | Merge branch 'ticket/nickvergessen/7716' into develop-olympusAndreas Fischer2010-08-211-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/7716: [ticket/7716] Data too long for column 'message_subject'
| * | | | [ticket/7716] Data too long for column 'message_subject'Joas Schilling2010-08-211-0/+3
| |/ / / | | | | | | | | | | | | PHPBB3-7716
* | | | Revert "[ticket/7716] Data too long for column 'message_subject'"Andreas Fischer2010-08-211-4/+0
| | | | | | | | | | | | | | | | This reverts commit 91a60aa878e703ff9af714e0316828216d3dcfa3.
* | | | Merge branch 'ticket/nickvergessen/7716' into develop-olympusAndreas Fischer2010-08-211-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/7716: [ticket/7716] Data too long for column 'message_subject'
| * | | | [ticket/7716] Data too long for column 'message_subject'Joas Schilling2010-08-191-0/+4
| |/ / / | | | | | | | | | | | | PHPBB3-7716
* | | | Merge branch 'ticket/cs278/7332' into develop-olympusAndreas Fischer2010-08-211-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/7332: [ticket/7332] Redirect users back to post details when performing actions. [ticket/7332] Collapse post details content down to a maximum of 300px heigh
| * | | | [ticket/7332] Redirect users back to post details when performing actions.Chris Smith2010-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moderators are redirected to the index page of the MCP after locking a post, a better location would be to direct them back to the post details. PHPBB3-7332
* | | | | Merge branch 'ticket/cs278/7972' into develop-olympusAndreas Fischer2010-08-201-0/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/7972: [ticket/7972] Copying topics in the MCP now indexes the new topic.
| * | | | | [ticket/7972] Copying topics in the MCP now indexes the new topic.Chris Smith2010-08-201-0/+35
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-7972
* | | | | Merge branch 'ticket/nickvergessen/9635' into develop-olympusAndreas Fischer2010-08-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9635: [ticket/9635] Useless parameter $data['post_time'] in function submit_post.
| * | | | | [ticket/9635] Useless parameter $data['post_time'] in function submit_post.Joas Schilling2010-08-191-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-9635
* | | | | Merge branch 'ticket/nickvergessen/9782' into develop-olympusAndreas Fischer2010-08-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9782: [ticket/9782] Board disable radio set on when server load high
| * | | | | [ticket/9782] Board disable radio set on when server load highJoas Schilling2010-08-201-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-9782
* | | | | [ticket/9780] Add length check back to gen_rand_string().Joas Schilling2010-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9780
* | | | | Merge branch 'ticket/bantu/9702' into develop-olympusJosh Woody2010-08-191-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9702: [ticket/9702] Take user's timezone settings into account when banning Until ->
| * | | | | [ticket/9702] Take user's timezone settings into account when banning Until ->Andreas Fischer2010-07-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9702
* | | | | | Merge branch 'ticket/bantu/9599' into develop-olympusJosh Woody2010-08-191-17/+152
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9599: [ticket/9599] Reimplement phpbb_checkdnsrr() function. [ticket/9599] Adding tests for phpbb_checkdnsrr(). [ticket/9599] Adding network function tests.
| * | | | | | [ticket/9599] Reimplement phpbb_checkdnsrr() function.Andreas Fischer2010-08-031-17/+152
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gethostbyname(), checkdnsrr(), dns_get_record() or nslookup via exec(). PHPBB3-9599
* | | | | | Merge branch 'ticket/bantu/9534' into develop-olympusJosh Woody2010-08-191-9/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9534: [ticket/9534] Update function documentation for user_ipwhois(). [ticket/9534] Adding support for IPv6 addresses in user_ipwhois().
| * | | | | | [ticket/9534] Update function documentation for user_ipwhois().Andreas Fischer2010-07-111-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9534
| * | | | | | [ticket/9534] Adding support for IPv6 addresses in user_ipwhois().Andreas Fischer2010-07-111-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whois.arin.net does currently not refer to other servers (using ReferralServer) when queried for an IPv6 address. whois.sixxs.net however works in this case. This also adds '.' to the hostname to make sure we're querying the dns root. PHPBB3-9534
* | | | | | | Merge branch 'ticket/bantu/9167' into develop-olympusJosh Woody2010-08-192-35/+50
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9167: [ticket/9167] Detect and remove any dead left over shadow topics on update. [ticket/9167] Remove shadow topics from remaining forums when deleting a forum Conflicts: phpBB/install/database_update.php
| * | | | | | [ticket/9167] Remove shadow topics from remaining forums when deleting a forumAndreas Fischer2010-06-112-35/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including posts. The function delete_topic_shadows() had to be reimplemented. It was there but it was completly broken and hasn't been used at all. PHPBB3-9167
* | | | | | | Merge branch 'ticket/bantu/9612' into develop-olympusJosh Woody2010-08-193-5/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9612: [ticket/9612] Introduce new function gen_rand_string_friendly().
| * | | | | | | [ticket/9612] Introduce new function gen_rand_string_friendly().Andreas Fischer2010-05-173-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new function gen_rand_string_friendly() for user friendly random strings like passwords and captcha codes. Strings generated by gen_rand_string_friendly() will not contain the characters 0 and O. By adding a new function we can increase the entropy of strings generated by gen_rand_string() by putting 0 and O back in. PHPBB3-9612
* | | | | | | | Merge branch 'ticket/bantu/9611' into develop-olympusJosh Woody2010-08-194-14/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | * ticket/bantu/9611: [ticket/9611] Make length of activation keys variable between 6 and 10.
| * | | | | | [ticket/9611] Make length of activation keys variable between 6 and 10.Andreas Fischer2010-05-174-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9611
* | | | | | | Merge branch 'ticket/cs278/9771' into develop-olympusAndreas Fischer2010-08-101-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9771: [ticket/9771] Remove query string parameters that have no name.
| * | | | | | | [ticket/9771] Remove query string parameters that have no name.Chris Smith2010-08-081-0/+5
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-9771
* | | | | | | Merge branch 'ticket/cs278/9760' into develop-olympusAndreas Fischer2010-08-101-1/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9760: [ticket/9760] Remove unrestricted wildcards from search terms.
| * | | | | | | [ticket/9760] Remove unrestricted wildcards from search terms.Chris Smith2010-08-081-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wildcards without any further result restrictions will cause phpBB to search for everything, potentially allowing a DoS attack against the DB server by any user who can use the search system. PHPBB3-9760
* | | | | | | | Merge branch 'ticket/rxu/6747' into develop-olympusAndreas Fischer2010-08-101-1/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/6747: [ticket/9747] Improve word censor.
| * | | | | | | [ticket/9747] Improve word censor.rxu2010-07-251-1/+8
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better handling of the asterisk inside censor pattern like 'bad*word' etc. PHPBB3-9747
* | | | | | | Merge branch 'ticket/jellydoughnut/9757' into develop-olympusAndreas Fischer2010-07-311-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9757: [ticket/9757] Fix empty template variable {HISTORY_TITLE}
| * | | | | | | [ticket/9757] Fix empty template variable {HISTORY_TITLE}Josh Woody2010-07-291-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The template variable {HISTORY_TITLE} was always being set to the empty string. It is now filled with the title of the currently displayed message. It is not showed in prosilver or subsilver2 for aesthetic reasons (title is already prominent) PHPBB3-9757
* | | | | | | Merge branch 'ticket/kellanved/9521' into develop-olympusAndreas Fischer2010-07-311-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/kellanved/9521: [ticket/9521] Fix error reporting for the native SQL Server plugin.
| * | | | | | | [ticket/9521] Fix error reporting for the native SQL Server plugin.Henry Sudhof2010-07-311-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native SQL Server plugin used to return an error string when calling sql_error. However, some error condition checks are done using is_array. This patch wraps the error into an array to follow the error logic used elsewhere. PHPBB3-9521
* | | | | | | | Merge branch 'ticket/jellydoughnut/9679' into develop-olympusAndreas Fischer2010-07-311-8/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9679: [ticket/9679] phpBB offers to notify poster even if notification is disabled
| * | | | | | | | [ticket/9679] phpBB offers to notify poster even if notification is disabledJosh Woody2010-07-291-8/+11
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "notify user" check box would not do anything if checked in this case, but it was still presented. The checkbox is now only shown if there are notification options enabled. PHPBB3-9679