aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2010-10-041-4/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | | | | | * develop-olympus: [ticket/9804] Account evil3 renamed to igorw, adjust AUTHORS [ticket/9829] Fix error in recaptcha validation.
| * | | | [ticket/9829] Fix error in recaptcha validation.Cristian Rodriguez2010-09-191-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recaptcha plugin falsely accepted error responses by recaptcha as valid solutions. PHPBB3-9829
* | | | | Merge branch 'develop-olympus' into developIgor Wiedler2010-09-161-0/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/9091] Extract IPv4 address from addresses mapped into IPv6.
| * | | | Merge branch 'ticket/bantu/9091' into develop-olympusIgor Wiedler2010-09-161-0/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9091: [ticket/9091] Extract IPv4 address from addresses mapped into IPv6.
| | * | | | [ticket/9091] Extract IPv4 address from addresses mapped into IPv6.Andreas Fischer2010-07-231-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9091
* | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2010-09-164-7/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9609] Change header() calls setting HTTP status to send_status_line(). [ticket/9613] Slightly update language strings. [ticket/9613] Fix missing database part for unread posts search load switch. [ticket/9613] Implement a load switch for unread posts search feature. [ticket/9785] Allow users to request new passwords when board is disabled. [ticket/9644] Check $mode before calling user_notification() from submit_post()
| * | | | | Merge branch 'ticket/bantu/9644' into develop-olympusIgor Wiedler2010-09-161-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9644: [ticket/9644] Check $mode before calling user_notification() from submit_post()
| | * | | | | [ticket/9644] Check $mode before calling user_notification() from submit_post()Andreas Fischer2010-07-231-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-9644
| * | | | | Merge branch 'ticket/bantu/9613' into develop-olympusIgor Wiedler2010-09-162-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9613: [ticket/9613] Slightly update language strings. [ticket/9613] Fix missing database part for unread posts search load switch. [ticket/9613] Implement a load switch for unread posts search feature.
| | * | | | | [ticket/9613] Slightly update language strings.Andreas Fischer2010-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9613
| | * | | | | [ticket/9613] Implement a load switch for unread posts search feature.rxu2010-08-292-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since unread posts search can produce a high server load in certain circumstances, we implement a switch for ACP "Load settings" to have an option to disable this type of search. PHPBB3-9613
| * | | | | | Merge branch 'ticket/bantu/9609' into develop-olympusIgor Wiedler2010-09-162-6/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9609: [ticket/9609] Change header() calls setting HTTP status to send_status_line().
| | * | | | | | [ticket/9609] Change header() calls setting HTTP status to send_status_line().Andreas Fischer2010-09-112-6/+7
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-9609
* | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2010-09-121-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9754] Populate S_USER_POSTED variable with correct value in search.php [ticket/9748] Replace <br /> before converting < and > to their entities. [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.
| * | | | | | Merge branch 'ticket/bantu/9503' into develop-olympusIgor Wiedler2010-09-121-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * ticket/bantu/9503: [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.
| | * | | | | [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.Andreas Fischer2010-07-231-1/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show 'No subject specified' in 'Posts awaiting approval' if post subject is empty. PHPBB3-9503
* | | | | | Merge branch 'ticket/bantu/7252' into developIgor Wiedler2010-09-122-24/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/7252: [ticket/7252] Align array keys and values to "=>". [ticket/7252] Replace magic values with PHP constants. [ticket/7252] Replace magic values with PHP constants.
| * | | | | | [ticket/7252] Align array keys and values to "=>".Andreas Fischer2010-09-121-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-7252
| * | | | | | [ticket/7252] Replace magic values with PHP constants.Chris Smith2010-09-101-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_supported_image_types() in includes/functions_posting.php contained the values of PHP constants hardcoded instead of using the constants. PHPBB3-7252
| * | | | | | [ticket/7252] Replace magic values with PHP constants.Chris Smith2010-09-101-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fileupload::image_types() contained hardcoded references to values of built in PHP constants, these have been replaced with the constants instead now. PHPBB3-7252
* | | | | | | Merge branch 'ticket/evil3/9394' into developAndreas Fischer2010-09-121-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | * ticket/evil3/9394: [ticket/9394] Fix comment in functions_upload
| * | | | | | [ticket/9394] Fix comment in functions_uploadIgor Wiedler2010-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9394
* | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2010-09-092-1/+17
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [task/git-tools] Change the GNU --lines argument to the POSIX -l [task/git-tools] Solve dependency on the GNU wc --max-line-length option [ticket/8944] Patch db_tools to support index length for MySQL4 [ticket/9039] Make mssqlnative.php non-executable [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update [ticket/9800] Update tracker URL in docs/README.html
| * | | | | | Merge branch 'ticket/evil3/8944' into develop-olympusChris Smith2010-09-051-1/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/evil3/8944: [ticket/8944] Patch db_tools to support index length for MySQL4 [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
| | * | | | | | [ticket/8944] Patch db_tools to support index length for MySQL4Igor Wiedler2010-09-051-1/+17
| | |/ / / / /
| * | | | | | [ticket/9039] Make mssqlnative.php non-executableIgor Wiedler2010-09-031-0/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-9039
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-09-021-2/+3
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | * 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/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 developAndreas Fischer2010-08-2814-29/+49
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/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-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 'develop-olympus' into developAndreas Fischer2010-08-221-2/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/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-2124-113/+367
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.