aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-08-111-6/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge pull request #5634 from dark-1/ticket/16111Marc Alexander2019-08-111-6/+28
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | [ticket/16111] Add core.message_history_modify_sql_ary
| | * | | | | [ticket/16111] Add core.message_history_modify_sql_aryDark❶2019-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16111
| | * | | | | [ticket/16111] Add core.message_history_modify_sql_aryDark❶2019-07-281-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16111
| | * | | | | [ticket/16111] Add core.message_history_modify_sql_aryDark❶2019-07-281-6/+33
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-16111
* | | | | | Merge branch '3.2.x' into 3.3.xDerky2019-07-302-2/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5628 from marc1706/ticket/16101Derky2019-07-302-2/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16101] Add Referrer-Policy header to phpBB's headers
| | * | | | | [ticket/16101] Add Referrer-Policy header to phpBB's headersMarc Alexander2019-07-202-2/+4
| | | |_|/ / | | |/| | | | | | | | | | | | | | | PHPBB3-16101
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-291-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5635 from EA117/ticket/16066Marc Alexander2019-07-291-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | [ticket/16066] Fix FORM_INVALID always returned for banned user.
| | * | | | [ticket/16066] Fix FORM_INVALID always returned for banned user.EA1172019-07-281-1/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the introduction of add_form_key() and check_form_key() calls to login_box() in phpBB 3.2.6 and later, if a banned user attempts to login, they receive a "The submitted form was invalid. Try submitting again." Instead of the message indicating that they are banned, and why. This is happening because check_ban() actually calls into login_box() recursively, but after the $user->session_id has been switched to a new session ID for the logging-on user. Therefore, now that check_form_key() has been introduced to login_box(), it is impossible for check_form_key() to succeed during this recursive call. Fix is to make login_box()'s use of check_form_key() conditional on whether IN_CHECK_BAN is defined, so that the recursive call does not attempt to re-validate the form_key again. Note the form_key has already been successfully verified by the original call into login_box(), prior to calling into check_ban() and attempting to recursively call login_box(). So the protection of why check_form_key() was added is still intact with this change. PHPBB3-16066
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-282-2/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #5459 from mrgoldy/ticket/15886Marc Alexander2019-07-282-2/+5
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/15886] Group helper functions
| | * | | [ticket/15886] Appropriate HTML docsmrgoldy2019-03-101-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Add @html doc for group/user stringsmrgoldy2019-03-091-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Change phpbb_get_group_avatar variable namesmrgoldy2018-12-301-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-281-14/+10
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #5575 from rubencm/ticket/14459Marc Alexander2019-07-281-14/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14459] Check language input for group and fix template logic
| | * | | | [ticket/14459] Use language propertyrubencm2019-07-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Rename variablerubencm2019-07-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Fixrubencm2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Uppercase string to try to match language keysrubencm2019-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Uppercase string to try to match language keysrubencm2019-06-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Remove unused variablesrubencm2019-06-251-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Fix template logicrubencm2019-06-211-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Fix rebaserubencm2019-06-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Check language input for grouprubencm2019-06-201-1/+5
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-14459
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-272-7/+10
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #5601 from senky/ticket/16013Marc Alexander2019-07-272-7/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16013] Allow admins to use disallowed username
| | * | | | [ticket/16013] Allow admins to use disallowed usernameJakub Senko2019-05-242-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16013
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-271-0/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5631 from kasimi/ticket/16106Marc Alexander2019-07-271-0/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16106] Add core.mcp_main_before
| | * | | | | [ticket/16106] Add core.mcp_main_beforekasimi2019-07-231-0/+16
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-16106
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-271-0/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5630 from 3D-I/ticket/16103Marc Alexander2019-07-271-0/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16103] Add core.pm_modify_message_subject
| | * | | | | [ticket/16103] Add core.pm_modify_message_subject3D-I2019-07-201-0/+10
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-16103
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-231-21/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5610 from espipj/ticket/16070Marc Alexander2019-07-231-21/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16070] Remove support for WebSTAR and Xitami
| | * | | | | [ticket/16070] Remove unused codeespipj2019-05-271-21/+0
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-16070
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-231-4/+24
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5624 from senky/ticket/16089Marc Alexander2019-07-231-4/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16089] Add core.confirm_box_ajax_before
| | * | | | | [ticket/16089] Add core.confirm_box_ajax_beforeJakub Senko2019-07-221-4/+24
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-16089
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-221-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5606 from senky/ticket/15976Marc Alexander2019-07-221-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15976] Reset user_passchg only if user changed password
| | * | | | | [ticket/15976] Reset user_passchg only if user changed passwordJakub Senko2019-05-271-1/+2
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-15976
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-221-3/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5572 from dark-1/ticket/16023Marc Alexander2019-07-221-3/+20
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16023] Add core.message_history_modify_template_vars
| | * | | | | [ticket/16023] Add core.message_history_modify_template_varsDark❶2019-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16023
| | * | | | | [ticket/16023] Add core.message_history_modify_template_varsDark❶2019-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16023
| | * | | | | [ticket/16023] Add core.message_history_modify_template_varsDark❶2019-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16023