aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [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 #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
| * | | | [ticket/11768] Updated annotation [ci skip]JoshyPHP2015-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | [ticket/11768] Reverted change to bbcode_uidJoshyPHP2015-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the off-chance some other routine expect bbcode_uid to never be empty. PHPBB3-11768
| * | | | [ticket/11768] Invalidate the text_formatter cache whenever a style is installedJoshyPHP2015-04-021-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The acp_styles module purges the cache every time a style is uninstalled, modified or made default, but it does not purge the cache when a new style is installed. Here we invalidate the text_formatter cache (not purge the whole cache) so that new styles take effect immediately. PHPBB3-11768
| * | | | [ticket/11768] Re-added the code that got lost in rebaseJoshyPHP2015-04-022-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | [ticket/11768] This commit integrates s9e\TextFormatters9e2015-04-026-120/+145
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | This commit integrates s9e\TextFormatter as outlined in http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=44467 PHPBB3-11768
* | | | Merge branch '3.1.x'Tristan Darricau2015-04-051-0/+13
|\ \ \ \ | | |/ / | |/| |
| * | | [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 #3430 from MateBartus/ticket/12466Tristan Darricau2015-04-051-1660/+2
|\ \ \ \ | |_|/ / |/| | | | | | | [ticket/12466] Move classes from acp_database.php to their own files
| * | | [ticket/12466] Move classes from acp_database.php to their own filesMateBartus2015-02-271-1660/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moving classes from acp_database.php to phpbb/db/extractor namespace, also into separate files * Adding DocBlocks and property visibility to classes * Removing globals from code * Passing former globals to base_extractor's constructor * Adding DB extractor as a service, also implementing the extractor interface as well as the extractor factory. PHPBB3-12466
* | | | Merge branch '3.1.x'Nicofuma2015-03-292-5/+10
|\ \ \ \ | | |/ / | |/| |
| * | | 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 branch '3.1.x'Nicofuma2015-03-241-5/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | | | | | | Merge branch '3.1.x'Nicofuma2015-03-241-13/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [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
* | | | | | | Merge branch '3.1.x'Cesar G2015-03-231-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13719] Remove superfluous $search_options in acp_search.
| * | | | | | [ticket/13719] Remove superfluous $search_options in acp_search.brunoais2015-03-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13719
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-03-101-3/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 branch '3.1.x'Marc Alexander2015-03-071-1/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 branch '3.1.x'Marc Alexander2015-03-061-1/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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 branch '3.1.x'Marc Alexander2015-03-061-23/+51
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3450 from brunoais/ticket/13142Marc Alexander2015-03-061-23/+51
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13142] Before query to get the total number of reports