aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2010-09-022-4/+6
|\ | | | | | | | | | | * develop-olympus: [ticket/9662] Search flood interval no longer applies to non-keyword searches [ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()
| * Merge branch 'ticket/jellydoughnut/9662' into develop-olympusAndreas Fischer2010-09-021-2/+3
| |\ | | | | | | | | | | | | * ticket/jellydoughnut/9662: [ticket/9662] Search flood interval no longer applies to non-keyword searches
| | * [ticket/9662] Search flood interval no longer applies to non-keyword searchesJosh Woody2010-08-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | The search interval was not consistently applied to "special" searches like "unread posts" and "view your topics." Now the special searches are always exempt from the flood interval. PHPBB3-9662
| * | Merge branch 'ticket/bantu/9615' into develop-olympusChris Smith2010-08-301-2/+3
| |\ \ | | | | | | | | | | | | | | | | * ticket/bantu/9615: [ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()
| | * | [ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()Andreas Fischer2010-08-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When magic_quotes_gpc is 'On' it also affects the $_FILES array and a filename like 'bantu"s testfile.txt' will be returned as 'bantu\"s testfile.txt'. Because utf8_basename() also strips off anything before the last backslash the filename was returned as '"s testfile.txt'. Calling stripslashes() before utf8_basename() solves the problem. PHPBB3-9615
* | | | Merge branch 'develop-olympus' into developNils Adermann2010-08-301-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/9793] Make sure send_status_line() is defined when in avatar mode.
| * | | Merge branch 'ticket/bantu/9793' into develop-olympusNils Adermann2010-08-301-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9793: [ticket/9793] Make sure send_status_line() is defined when in avatar mode.
| | * | | [ticket/9793] Make sure send_status_line() is defined when in avatar mode.Andreas Fischer2010-08-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When download/file.php is in avatar mode set_modified_headers() can be called, which then calls send_status_line() which is not available because includes/functions.php is not included in avatar mode. We also load includes/functions.php in the bootstrap now to solve this problem. Regression from c1a4cb1d01dc19650219566b60671abc767af662. PHPBB3-9793 PHPBB3-7782
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-08-2821-37/+57
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9117] Wrong redirection after login. [ticket/9772] Unify permissions for sending email when board_email_form is off [ticket/7369] CPF date should always render the users selection. [ticket/7296] Exporting styles to tar creates corrupted archives. [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().
| * | | | Merge branch 'ticket/rxu/9117' into develop-olympusAndreas Fischer2010-08-282-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/9117: [ticket/9117] Wrong redirection after login.
| | * | | | [ticket/9117] Wrong redirection after login.rxu2010-08-282-2/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Go easy way for now - just place S_LOGIN_REDIRECT before S_HIDDEN_FIELDS so the last value override the previous one. PHPBB3-9117
| * | | | Merge branch 'ticket/cs278/7369' into develop-olympusAndreas Fischer2010-08-281-2/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/7369: [ticket/7369] CPF date should always render the users selection.
| | * | | | [ticket/7369] CPF date should always render the users selection.Chris Smith2010-08-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPF render code was incorrectly adding the users timezone offset instead of removing it to compensate for the addition made in user::format_date(). PHPBB3-7369
| * | | | | 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-2814-25/+43
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9519
| | * | | | | | [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1010-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-283-3/+3
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * 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-283-3/+3
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'develop-olympus' into developAndreas Fischer2010-08-222-2/+36
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/7260] Don't delete poll if one exists and editing user lacks permission [ticket/9646] Honor CSS comments in @import statements
| * | | | | | 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/7260' into develop-olympusChris Smith2010-08-221-0/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/7260: [ticket/7260] Don't delete poll if one exists and editing user lacks permission
| | * | | | | [ticket/7260] Don't delete poll if one exists and editing user lacks permissionJoas Schilling2010-08-221-0/+26
| | | |_|/ / | | |/| | | | | | | | | | | | | | | PHPBB3-7260
* | | | | | Merge branch 'ticket/p/6855' into developAndreas Fischer2010-08-222-10/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/6855: [ticket/6855] Changed 'seperator' to 'separator'. [Igor Wiedler]
| * | | | | | [ticket/6855] Changed 'seperator' to 'separator'. [Igor Wiedler]Oleg Pudeyev2010-07-062-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-6855
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2010-08-2149-197/+550
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: (57 commits) Revert "[ticket/7716] Data too long for column 'message_subject'" [ticket/7716] Data too long for column 'message_subject' [ticket/9780] Adding unit tests for gen_rand_string(). [ticket/9780] Add length check back to gen_rand_string(). [ticket/7972] Copying topics in the MCP now indexes the new topic. [ticket/9782] Board disable radio set on when server load high [ticket/9635] Useless parameter $data['post_time'] in function submit_post. [ticket/9104] Safari does not display box headers correctly in the ACP. [ticket/9777] Print error message in pre-commit hook when php is not installed. [ticket/7716] Data too long for column 'message_subject' [task/git-tools] Ignore git commit message comments [task/git-tools] Adjust the hook to enforce that a ticket is always mentioned [task/git-tools] Vastly expanded commit-msg hook. [task/git-tools] Beginnings of a syntax checking hook. [task/git-tools] Append ticket identifier to commit message prior to editing. [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/9771] Remove query string parameters that have no name. [ticket/9760] Remove unrestricted wildcards from search terms. [ticket/9599] Reimplement phpbb_checkdnsrr() function. ... Conflicts: tests/template/template.php
| * | | | | | 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/nickvergessen/9104' into develop-olympusAndreas Fischer2010-08-211-5/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9104: [ticket/9104] Safari does not display box headers correctly in the ACP.
| | * | | | | | [ticket/9104] Safari does not display box headers correctly in the ACP.Joas Schilling2010-08-191-5/+1
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-9104
| * | | | | | Merge branch 'ticket/cs278/7332' into develop-olympusAndreas Fischer2010-08-213-2/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | | | [ticket/7332] Collapse post details content down to a maximum of 300px heighChris Smith2010-08-082-1/+12
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MCP post details can be difficult to use if the post is particularly long this change shrinks the post area to a maximum of 300 pixels, like the topic review, making it easier to access the functions beneath the post content. 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.