aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-05-081-0/+12
|\
| * Merge pull request #3455 from brunoais/ticket/13660Marc Alexander2015-05-081-0/+12
| |\ | | | | | | | | | [ticket/13660] Allow changing the query for total reports in mcp_front
| | * [ticket/13660] BUMP version to 3.1.5-RC1brunoais2015-05-061-1/+1
| | | | | | | | | | | | PHPBB3-13660
| | * [ticket/13660] Fix @since version.brunoais2015-03-101-1/+1
| | | | | | | | | | | | PHPBB3-13660
| | * [ticket/13660] Allow changing the query for total reports in mcp_frontbrunoais2015-02-281-0/+12
| | | | | | | | | | | | PHPBB3-13660
* | | Merge branch '3.1.x'Nicofuma2015-05-061-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3583 from nickvergessen/ticket/13807Nicofuma2015-05-061-1/+1
| |\ \ | | | | | | | | | | | | Ticket/13807 Allow building changesets for the event list
| | * | [ticket/13807] Fix "changed version" to match our version numberingJoas Schilling2015-05-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13807
* | | | Merge branch '3.1.x'Andreas Fischer2015-05-061-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13819] Add missing sql_freeresult() to files in includes/ Conflicts: phpBB/includes/acp/acp_database.php
| * | | [ticket/13819] Add missing sql_freeresult() to files in includes/Marc Alexander2015-05-052-0/+2
| |/ / | | | | | | | | | PHPBB3-13819
* | | [ticket/13638] Inject $filesystem in \phpbb\template\assetNicofuma2015-05-052-0/+2
| | | | | | | | | | | | PHPBB3-13638
* | | [ticket/13762] Moving language related functionality into a separate classMateBartus2015-05-025-209/+38
| | | | | | | | | | | | PHPBB3-13762
* | | [ticket/13793] Remove translation on throwing exceptionsMateBartus2015-05-011-5/+9
| | | | | | | | | | | | PHPBB3-13793
* | | Merge branch '3.1.x'Andreas Fischer2015-04-281-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [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
| * | 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
* | | | | Merge branch '3.1.x'Andreas Fischer2015-04-271-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
| * | | | [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 #3524 from marc1706/ticket/8672Tristan Darricau2015-04-272-16/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/8672] Add class for retrieving imagesize without download
| * | | | | [ticket/8672] User $user->lang() instead of sprintfMarc Alexander2015-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8672
| * | | | | [ticket/8672] Use fastImageSize in classesMarc Alexander2015-04-242-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8672
| * | | | | [ticket/8672] Add class for retrieving imagesize without downloadMarc Alexander2015-04-242-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getimagesize() always downloads the complete file before checking the actual image dimensions. This class will be able to do the same without having to download possibly large files. PHPBB3-8672
* | | | | | Merge pull request #3548 from s9e/ticket/12745Andreas Fischer2015-04-261-9/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12745] Allow Unicode characters from the SMP to be used in text * s9e/ticket/12745: [ticket/12745] Added HTML entity test [ticket/12745] Added support for Unicode characters outside BMP [ticket/12745] Updated s9e\TextFormatter
| * | | | | | [ticket/12745] Added support for Unicode characters outside BMPJoshyPHP2015-04-251-9/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12745
* | | | | | Merge branch '3.1.x'Marc Alexander2015-04-261-0/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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 branch '3.1.x'Andreas Fischer2015-04-251-2/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | * 3.1.x: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
| * | | | | 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 #3446 from MateBartus/ticket/13654Tristan Darricau2015-04-163-30/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13654] Moving reporting into controller
| * | | | | [ticket/13654] Moving reporting into controllerMateBartus2015-04-163-30/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving report.php's content into different services and controllers to better comply with the MVC model. Also implementing: * Replacement for reasons_display() * Adding assign_meta_refresh_var() to \controller\helper * Adding separate routes for easy configuration * Updating unit tests to expect to correct results * Add BC tests PHPBB3-13654
* | | | | | Merge pull request #3487 from MateBartus/ticket/13697Tristan Darricau2015-04-1613-483/+254
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | [ticket/13697] Moving filesystem related functions to filesystem service
| * | | | | [ticket/13697] Moving filesystem related functions to filesystem serviceMateBartus2015-04-1613-483/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moving filesystem service to \phpbb\filesystem namespace * Wraping Symfony's Filesystem component * Moving filesystem related functions from includes/functions.php into \phpbb\filesystem\filesystem Functions moved (and deprecated): - phpbb_chmod - phpbb_is_writable - phpbb_is_absolute - phpbb_own_realpath - phpbb_realpath * Adding interface for filesystem service PHPBB3-13697
* | | | | | Merge branch '3.1.x'Joas Schilling2015-04-061-0/+25
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | | | | | | Merge pull request #3461 from s9e/ticket/11768Tristan Darricau2015-04-057-122/+158
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [3.2][ticket/11768] Integrate s9e\TextFormatter