aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-281-2/+2
|\ | | | | | | | | | | | | | | | | | | * prep-release-3.1.4: [ticket/security-180] Use language variable for redirect error in 3.1+ [ticket/security-180] Merge if statement with previous one in 3.1.x [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| * [ticket/security-180] Use language variable for redirect error in 3.1+Marc Alexander2015-04-281-1/+1
| | | | | | | | SECURITY-180
| * Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-281-1/+1
| |\ | | | | | | | | | | | | Conflicts: tests/security/redirect_test.php
| | * [ticket/security-180] Always fail when redirecting to an insecure URLJoas Schilling2015-04-111-1/+1
| | | | | | | | | | | | SECURITY-180
| * | [ticket/security-180] Merge if statement with previous one in 3.1.xMarc Alexander2015-04-281-7/+1
| | | | | | | | | | | | SECURITY-180
| * | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-281-0/+6
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/security/redirect_test.php
| | * [ticket/security-180] Make sure that redirect goes to full URL plus slashMarc Alexander2015-04-111-1/+1
| | | | | | | | | | | | SECURITY-180
| | * [ticket/security-180] Check if redirect URL contains board URLMarc Alexander2015-04-101-0/+6
| | | | | | | | | | | | SECURITY-180
* | | [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserverAlexander Köplinger2015-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was added as a workaround for bugs in very old versions of IIS, dating back to 2002: see commit 849d76697444f4e3523845f8c96569ccde57d868. Newer IIS versions handle the 'Location' header just fine, so we can avoid the unnecessary HTML page for redirects. Given that it seems to work fine since IIS 6.0 (on WinServer 2003), I don't think it's worth adding a special check for earlier versions as they are no longer supported by MS as well. PHPBB3-12101
* | | Merge pull request #3532 from prototech/ticket/13755Marc Alexander2015-04-261-0/+2
|\ \ \ | | | | | | | | | | | | [ticket/13755] Ignore dots in path when determining file extension.
| * | | [ticket/13755] Ignore dots in path when determining file extension.Cesar G2015-04-101-0/+2
| | | | | | | | | | | | | | | | PHPBB3-13755
* | | | Merge pull request #3550 from bantu/ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. * bantu/ticket/13765-3.1.4: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
| * | Merge branch 'ticket/13765' into ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13765: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. Conflicts: phpBB/includes/functions.php phpBB/includes/startup.php
| | * | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.Joas Schilling2015-04-252-2/+2
| | |/ | | | | | | | | | PHPBB3-13765
| | * Merge pull request #3359 from marc1706/ticket/13568Nicofuma2015-03-291-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | [ticket/13568] Validate imagick path as readable absolute path closes #3359
| | * | [ticket/13617] Enforce column size limit for session_forum_idNils Adermann2015-02-251-1/+3
| | | | | | | | | | | | | | | | PHPBB3-13617
* | | | [3.1.x] Update development version to 3.1.5-devJoas Schilling2015-04-101-1/+1
|/ / /
* | | Update version to 3.1.4-RC1Joas Schilling2015-04-091-1/+1
| | |
* | | Merge pull request #3409 from Senky/ticket/11424Joas Schilling2015-04-061-0/+25
|\ \ \ | | | | | | | | | | | | [ticket/11424] Quick-Mod Tools race condition results in NO_MODE
| * | | [ticket/11424] Add space between control flow keywords and parenthesisJakub Senko2015-02-191-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11424
| * | | [ticket/11424] Handle race condition properly for Quick-Mod ToolsJakub Senko2015-02-161-0/+25
| | | | | | | | | | | | | | | | PHPBB3-11424
* | | | [ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.phprxu2015-04-051-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | message_parser.php performs include of bbcode.php at the very start using $phpbb_root_path and $phpEx vars, so there's a possibility those can be undefined at that point, especially when message_parser.php is being included in event listener or another extension file where $phpbb_root_path and $phpEx don't exist. This can be fixed by adding the appropriate vars definitions. PHPBB3-13743
* | | | Merge pull request #3376 from marc1706/ticket/13568-ascNicofuma2015-03-292-5/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13568] Validate imagick path as readable absolute path closes #3376
| * \ \ \ Merge branch 'ticket/13568' into ticket/13568-ascMarc Alexander2015-02-062-5/+10
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/index.php phpBB/includes/acp/acp_attachments.php
| | * | | [ticket/13568] Use more descriptive validation names and merge with path blockMarc Alexander2015-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | * | | [ticket/13568] Validate imagick path as readable absolute pathMarc Alexander2015-02-021-1/+1
| | | |/ | | |/| | | | | | | | | PHPBB3-13568
| | * | Merge branch 'prep-release-3.0.13' into develop-olympusAndreas Fischer2015-01-291-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
| | | * \ Merge pull request #3348 from bantu/ticket/13549Andreas Fischer2015-01-291-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME... * bantu/ticket/13549: [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
| | | | * | [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.Marc Alexander2015-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ORIG_PATH_INFO on IIS also contains the script name. Only use that for killing the script after removing the script name from ORIG_PATH_INFO. PHPBB3-13549
| | * | | | Merge branch 'prep-release-3.0.13' into develop-olympusAndreas Fischer2015-01-291-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [ticket/12933] Handle case when * is last character of word
| | | * | | [ticket/12933] Handle case when * is last character of wordDhruv2015-01-281-1/+1
| | | |/ / | | | | | | | | | | | | | | | PHPBB3-12933
| | | * | [prep-release-3.0.13] Bump version numbers for 3.0.13 releaseNils Adermann2015-01-261-1/+1
| | | | |
* | | | | Merge pull request #3398 from marc1706/ticket/13612Nicofuma2015-03-241-5/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13612] Run meta refresh until extension is fully enabled
| * | | | | [ticket/13612] Always display success message if extension was enabledMarc Alexander2015-02-141-5/+0
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | An error will already be triggered if enable_step() is not successful. Redirecting for no obvious reason will just confuse users. PHPBB3-13612
* | | | | [ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.Cesar G2015-03-231-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOGIN_ERROR_PASSWORD may be returned as the message if the password is invalid while hitting the LOGIN_ERROR_ATTEMPTS error. PHPBB3-13698
* | | | | [ticket/13719] Remove superfluous $search_options in acp_search.brunoais2015-03-231-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-13719
* | | | | Merge pull request #3445 from RMcGirr83/ticket/13650Marc Alexander2015-03-101-3/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13650] Move core event
| * | | | | [ticket/13650] Move core eventRMcGirr832015-02-251-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13650
* | | | | | Merge pull request #3452 from RobertHeim/ticket/13658Marc Alexander2015-03-071-1/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13658] add event before and after topics are deleted
| * | | | | | [ticket/13658] renamed events and added table_ary parameterRobert Heim2015-02-271-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added suffix '_query' to event names - added table_ary to before event PHPBB3-13658
| * | | | | | [ticket/13658] add event before and after topics are deletedRobertHeim2015-02-271-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13658
* | | | | | | Merge pull request #3473 from RMcGirr83/ticket/13675Marc Alexander2015-03-061-1/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13675] Add validate to acp_profile event and add template events
| * | | | | | | [ticket/13675] Add validate to acp_profile event and add template eventsRichard McGirr2015-03-061-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for acp users profile PHPBB3-13675
* | | | | | | | Merge pull request #3450 from brunoais/ticket/13142Marc Alexander2015-03-061-23/+51
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13142] Before query to get the total number of reports
| * | | | | | | | [ticket/13142] Default $total to -1 before the event for more flexibilitybrunoais2015-02-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
| * | | | | | | | [ticket/13142] Removed surperfulous spacebrunoais2015-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
| * | | | | | | | [ticket/13142] Removed surperfulous new linebrunoais2015-02-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
| * | | | | | | | [ticket/13142] Place the event in the most meaningful placebrunoais2015-02-261-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event now has nearly all variables and it is in the place where it can most influence this method's outcome without requiring the extension to re-process phpBB's code. PHPBB3-13142
| * | | | | | | | [ticket/13142] Delete event in order to move it.brunoais2015-02-261-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
* | | | | | | | | Merge pull request #3426 from kinerity/ticket/13637Marc Alexander2015-03-061-0/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13637] Add core.ucp_pm_compose_alter_vars PHP event